diff --git a/spec/koumakyou/default.nix b/spec/koumakyou/default.nix index 6346244b..f9177341 100644 --- a/spec/koumakyou/default.nix +++ b/spec/koumakyou/default.nix @@ -35,12 +35,16 @@ ${pkgs.kmod}/bin/modprobe bmi260_core ''; - services.greetd.settings.default_session.command = let - cfg = config.programs.regreet; - in "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${pkgs.writeShellScript "cageResolution" '' - ${lib.getExe pkgs.wlr-randr} --output eDP-1 --scale 2 - ${lib.getExe cfg.package} - ''}"; + specialisation.desktop.configuration = { + programs.regreet.enable = lib.mkForce true; + jovian.steam.autoStart = lib.mkForce false; + services.greetd.settings.default_session.command = let + cfg = config.programs.regreet; + in "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${pkgs.writeShellScript "cageResolution" '' + ${lib.getExe pkgs.wlr-randr} --output eDP-1 --scale 2 + ${lib.getExe cfg.package} + ''}"; + }; hardware.enableRedistributableFirmware = true; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; diff --git a/spec/koumakyou/jovian.nix b/spec/koumakyou/jovian.nix index 27e911f6..1906e734 100644 --- a/spec/koumakyou/jovian.nix +++ b/spec/koumakyou/jovian.nix @@ -1,4 +1,8 @@ { jovian, ... }: { + imports = [ + jovian.nixosModules.jovian + ]; + jovian = { hardware.has.amd.gpu = true; steamos.useSteamOSConfig = true; @@ -6,6 +10,8 @@ steam = { enable = true; + autoStart = true; + desktopSession = "sway"; user = "app"; }; }; @@ -14,9 +20,7 @@ ".steam" ".local/share/Steam" ".config/gamescope" ]; - imports = [ - jovian.nixosModules.jovian - ]; + programs.regreet.enable = false; } // { #users.users.decky.uid = 514; #users.groups.decky.gid = 514;