diff --git a/flake.nix b/flake.nix index aeb8a9af..3707fb83 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,7 @@ piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; bakersfield-rpi4 = libx.mkHost { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; }; - steamdeck = libx.mkDeck { hostname = "steamdeck"; type = "small"; }; + steamdeck = libx.mkDeck { hostname = "steamdeck"; desktop = "plasma6"; type = "small"; }; }; homeConfigurations = { "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; type = "small"; }; @@ -81,7 +81,7 @@ "albert@piaware-rpi4" = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@quitman-rpi4" = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@bakersfield-rpi4" = libx.mkHome { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; }; - "albert@steamdeck" = libx.mkHome { hostname = "steamdeck"; type = "small"; }; + "albert@steamdeck" = libx.mkHome { hostname = "steamdeck"; desktop = "plasma6"; type = "small"; }; # Containers "albert@rdesktop" = libx.mkHome { hostname = "rdesktop"; desktop = "xfce"; }; }; diff --git a/lib/default.nix b/lib/default.nix index 06bacdf8..aab62626 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -85,15 +85,14 @@ system ? "x86_64-linux", theme ? "stylix", type ? "default", - repo ? "nixpkgs-unstable", - unfree ? false + repo ? "nixpkgs-unstable" }: inputs.${repo}.lib.nixosSystem { specialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme self; # Some packages (ie, Vintage Story) I want to keep on unstable no matter what default repo I use pkgs-unstable = import inputs.nixpkgs-unstable { inherit system; - config.allowUnfree = unfree; + config.allowUnfree = true; hostPlatform = system; }; }; diff --git a/nixos/hosts/steamdeck/default.nix b/nixos/hosts/steamdeck/default.nix index 828a4c75..cd68c880 100644 --- a/nixos/hosts/steamdeck/default.nix +++ b/nixos/hosts/steamdeck/default.nix @@ -26,6 +26,7 @@ steam.enable = true; steam.autoStart = true; steam.user = username; + steam.desktopSession = "plasma"; steamos.useSteamOSConfig = true; devices.steamdeck.enable = true; hardware.has.amd.gpu = true; diff --git a/nixos/minimal.nix b/nixos/minimal.nix index be9e66f6..0e460d15 100644 --- a/nixos/minimal.nix +++ b/nixos/minimal.nix @@ -1,5 +1,8 @@ -{ lib, pkgs, hostname, stateVersion, username, desktop, system, ... }: { +{ lib, inputs, pkgs, hostname, stateVersion, username, desktop, system, ... }: { imports = [ + # Modules + inputs.disko.nixosModules.disko + # Services ./common/services/openssh.nix ./common/services/fail2ban.nix