[hyprland] Uses mainline packages, updates config as necessary

system/hosts/altair/configuration.nix

@@ -75,9 +75,6 @@
   programs.hyprland = {
     enable = true;
     withUWSM = true;
-    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    portalPackage =
-      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
     xwayland.enable = true;
   };
 
@@ -105,7 +102,7 @@
   services.gnome.gnome-keyring.enable = true;
 
   # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;

system/hosts/altair/drew.nix

@@ -31,7 +31,7 @@ in
 
   # Set up eww here because it's based on the monitor configuration
   # Eww is idempotent, so it's fine to just run it on every reload to make sure things are open
-  wayland.windowManager.hyprland.settings.execr-once = [
+  wayland.windowManager.hyprland.settings.exec = [
     "eww open-many primary-statusbar secondary-statusbar launcher"
   ];
 }

system/hosts/mcp/default.nix

@@ -1,29 +1,19 @@
-{ nixpkgs, inputs, ... }:
-nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
-  modules = [
+{ inputs, ... }:
+{
+  imports = [
     ./configuration.nix
     ./hardware-configuration.nix
     ../../authorized-keys.nix
-    inputs.home-manager.nixosModules.home-manager
     inputs.sops-nix.nixosModules.sops
-    {
-      nixpkgs.config.allowUnfree = true;
-      home-manager.users.drew =
-        { ... }:
-        {
-          imports = [
-            ./drew.nix
-          ];
-        };
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs = {
-        inherit inputs;
-      };
-    }
   ];
-  specialArgs = {
-    inherit inputs;
-  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  home-manager.users.drew =
+    { ... }:
+    {
+      imports = [
+        ./drew.nix
+      ];
+    };
 }

system/hosts/vega/drew.nix

@@ -1,14 +1,16 @@
 { ... }:
 {
-  imports = map (x: ../../../home-manager + x) [
-    "/features/development/development.nix"
-    "/features/development/haskell.nix"
-    "/features/linux-desktop.nix"
-    "/features/notes.nix"
-    "/features/eww"
-  ] ++ [
-    (import ../../../home-manager/features/wallpaper.nix [ "HDMI-A-1" ])
-  ];
+  imports =
+    map (x: ../../../home-manager + x) [
+      "/features/development/development.nix"
+      "/features/development/haskell.nix"
+      "/features/linux-desktop.nix"
+      "/features/notes.nix"
+      "/features/eww"
+    ]
+    ++ [
+      (import ../../../home-manager/features/wallpaper.nix [ "HDMI-A-1" ])
+    ];
 
   home.stateVersion = "24.11";
 
@@ -22,7 +24,7 @@
 
   # Set up eww here because it's based on the monitor configuration
   # Eww is idempotent, so it's fine to just run it on every reload to make sure things are open
-  wayland.windowManager.hyprland.settings.execr-once = [
+  wayland.windowManager.hyprland.settings.exec = [
     "eww daemon && eww open-many vertical-statusbar"
   ];
 }