diff --git a/config.nix b/config.nix index 6296f4c..ffdb179 100644 --- a/config.nix +++ b/config.nix @@ -17,7 +17,7 @@ nixos = { Hostname = "hakase"; Timezone = "America/Chicago"; - enableSteamOS = true; + enableSteamOS = false; Boot = { mode = "systemd"; # systemd or grub diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 17cd1b5..547154a 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -96,15 +96,15 @@ }; services = { - # displayManager.sessionPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland]; - # getty.autologinUser = lib.mkDefault "${myConfig.essentials.Username}"; - # greetd = { - # enable = true; - # settings.default_session = { - # user = lib.mkOverride 10 "${myConfig.essentials.Username}"; - # command = lib.mkDefault "Hyprland"; - # }; - # }; + displayManager.sessionPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland]; + getty.autologinUser = lib.mkOverride 10 "${myConfig.essentials.Username}"; + greetd = { + enable = true; + settings.default_session = { + user = lib.mkOverride 10 "${myConfig.essentials.Username}"; + command = lib.mkOverride 10 "Hyprland"; + }; + }; seatd.enable = true; upower.enable = true; scx.enable = true; # by default uses scx_rustland scheduler diff --git a/modules/default/desktop.nix b/modules/default/desktop.nix index ba30d49..614101f 100644 --- a/modules/default/desktop.nix +++ b/modules/default/desktop.nix @@ -14,6 +14,9 @@ ++ [ ../../packages/steam/default.nix ../../packages/bottles/default.nix + ] + ++ lib.optionals (myConfig.nixos.enableSteamOS == true) + [ ../../packages/steam/jovian.nix ]; } diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index b1f58ac..838f88d 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -21,6 +21,6 @@ ../../packages/mangohud/home.nix ../../packages/protonup/home.nix ../../packages/lutris/home.nix - ../../packages/steam/home.nix + # ../../packages/steam/home.nix ]; } diff --git a/packages/steam/jovian.nix b/packages/steam/jovian.nix index 55d0b57..14e8f16 100644 --- a/packages/steam/jovian.nix +++ b/packages/steam/jovian.nix @@ -14,7 +14,7 @@ }; # environment.systemPackages = with pkgs; [inputs.jovian.packages.${system}.default]; jovian.steam.enable = true; - jovian.steam.autoStart = myConfig.nixos.enableSteamOS; + jovian.steam.autoStart = true; jovian.steam.desktopSession = "hyprland"; jovian.steam.user = "${myConfig.essentials.Username}"; jovian.hardware.has.amd.gpu = true; @@ -26,13 +26,4 @@ jovian.steamos.enableMesaPatches = true; # jovian.devices.steamdeck.enableControllerUdevRules = true; - - services.flatpak.enable = true; - hardware = { - xone.enable = true; - }; - programs.nix-ld = { - enable = true; - libraries = pkgs.steam-run.args.multiPkgs pkgs; - }; }