diff --git a/hosts/modules/gui/default.nix b/hosts/modules/gui/default.nix index 594016df..c589af33 100644 --- a/hosts/modules/gui/default.nix +++ b/hosts/modules/gui/default.nix @@ -11,5 +11,6 @@ in ./plasma.nix ./plasma-mobile.nix ./sway + ./sxmo.nix ]; } diff --git a/hosts/modules/gui/sxmo.nix b/hosts/modules/gui/sxmo.nix index c1acbe47..ada174e6 100644 --- a/hosts/modules/gui/sxmo.nix +++ b/hosts/modules/gui/sxmo.nix @@ -36,14 +36,51 @@ in hardware.bluetooth.enable = true; services.blueman.enable = true; - services.xserver.windowManager.session = [{ - name = "sxmo"; - desktopNames = [ "sxmo" ]; - start = '' - ${pkgs.sxmo-utils}/bin/sxmo_xinit.sh & - waitPID=$! - ''; - }]; + # sxmo internally uses doas instead of sudo + security.doas.enable = true; + security.doas.wheelNeedsPassword = false; + + # services.xserver.windowManager.session = [{ + # name = "sxmo"; + # desktopNames = [ "sxmo" ]; + # start = '' + # ${pkgs.sxmo-utils}/bin/sxmo_xinit.sh & + # waitPID=$! + # ''; + # }]; + # services.xserver.enable = true; + + # services.greetd = { + # enable = true; + # settings = { + # default_session = { + # command = "${pkgs.sxmo-utils}/bin/sxmo_winit.sh"; + # user = "colin"; + # }; + # }; + # }; + + services.xserver.enable = true; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.displayManager.lightdm.greeters.gtk.enable = true; + services.xserver.displayManager.lightdm.extraSeatDefaults = '' + user-session = swmo + ''; + services.xserver.displayManager.sessionPackages = [ pkgs.sxmo-utils ]; + + environment.systemPackages = with pkgs; [ + gojq + inotify-tools + libnotify + superd + sway + sxmo-utils + xdg-user-dirs + ]; + environment.sessionVariables.XDG_DATA_DIRS = [ + # TODO: only need the share/sxmo directly linked + "${pkgs.sxmo-utils}/share" + ]; }) ]; }