Moooore changes

profiles/common.nix

@@ -7,9 +7,11 @@
     ./caches.nix
     ./quicksudo.nix
     ../users/mat.nix
-    ../users/mat-hm.nix
+    <home-manager/nixos>
   ];
 
+  home-manager.users.mat = import ../users/mat-hm.nix { inherit pkgs; };
+
   system.autoUpgrade.enable = true;
   system.copySystemConfiguration = true;
 

profiles/laptop.nix

@@ -2,8 +2,12 @@
 
 {
 
-  imports =
-    [ ./common.nix ./local.nix ./graphical.nix ../users/mat-hm-laptop.nix ];
+  imports = [ ./common.nix ./local.nix ./graphical.nix ];
+
+  home-manager.useUserPackages = true;
+  home-manager.useGlobalPkgs = true;
+
+  home-manager.users.mat = import ../users/mat-hm-laptop.nix { inherit pkgs; };
 
   # enable power management
   powerManagement.enable = true;

users/mat-hm-laptop.nix

@@ -1,11 +1,6 @@
-{ config, ... }:
-
-let
-
-  statusCmd = "i3status-rs ~/.config/i3status.toml";
-
+{ pkgs, ... }:
+let statusCmd = "i3status-rs ~/.config/i3status.toml";
 in {
-  home-manager.users.mat = { pkgs, lib, ... }: {
   home = {
     sessionVariables = {
       BROWSER = "vivaldi";
@@ -112,5 +107,4 @@ in {
       awesome = { enable = false; };
     };
   };
-  };
 }

users/mat-hm.nix

@@ -1,14 +1,8 @@
-{ config, ... }:
+{ pkgs, ... }:
 let
   name = "Matthew Ess";
   email = "mat@mat.services";
 in {
-  imports = [ <home-manager/nixos> ];
-
-  home-manager.useUserPackages = true;
-  home-manager.useGlobalPkgs = true;
-
-  home-manager.users.mat = { pkgs, ... }: {
   home = {
     sessionVariables = { EDITOR = "nvim"; };
     packages = with pkgs; [
@@ -149,5 +143,4 @@ in {
       '';
     };
   };
-  };
 }