pinwheel: Clean up home module

flake.nix

@@ -29,11 +29,7 @@
           inputs.agenix.nixosModules.default
           inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen
           inputs.home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.alex = import ./hosts/pinwheel/home.nix;
-          }
+          ./hosts/pinwheel/home.nix
         ];
       };
 

hosts/pinwheel/home.nix

@@ -1,17 +1,26 @@
-{ pkgs, lib, ... }:
+{ home-manager, pkgs, ... }:
 {
-  programs.home-manager.enable = true;
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
 
-  home.username = "alex";
-  home.homeDirectory = "/home/alex";
- 
-  home.packages = with pkgs; [
-    emacs
-    gnumake
-    tig
-  ];
+    users.alex = {
+      programs.home-manager.enable = true;
 
-  services.dunst.enable = true;
+      home.username = "alex";
+      home.homeDirectory = "/home/alex";
 
-  home.stateVersion = "23.05";
+      services.dunst.enable = true;
+
+      home.packages = with pkgs; [
+        gnumake
+        tig 
+        spotify
+        onlyoffice-bin
+        qmk
+      ];
+
+      home.stateVersion = "23.05";
+    };
+  };
 }