home-manager: clean up global configuration & import a bit

Signed-off-by: Christoph Heiss <christoph@c8h4.io>

common/users.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [ ../secrets/users.nix ../system/home-manager ];
+  imports = [ ../secrets/users.nix ];
 
   users.mutableUsers = false;
 

flake.nix

@@ -146,10 +146,6 @@
               simple-nixos-mailserver.nixosModules.mailserver
               { nixpkgs = { inherit overlays; }; }
               home-manager.nixosModules.home-manager
-              {
-                home-manager.useUserPackages = true;
-                home-manager.useGlobalPkgs = true;
-              }
               # who doesn't love a bit of composability
               ({ config, ... }: {
                 _module.args = {

system/baremetal-server.nix

@@ -1,7 +1,12 @@
 { config, ... }:
 
 {
-  imports = [ ../common ../services/openssh.nix ../system/headless.nix ];
+  imports = [
+    ../common
+    ../system/home-manager
+    ../services/openssh.nix
+    ../system/headless.nix
+  ];
 
   boot.loader.grub = {
     efiInstallAsRemovable = true;

system/desktop.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [ ../common ../services/openssh.nix ];
+  imports = [ ../common ../system/home-manager ../services/openssh.nix ];
 
   boot.kernelParams = [ "audit=0" ];
 

system/home-manager/default.nix

@@ -1 +1,6 @@
-{ home-manager.users.christoph.imports = [ ./common.nix ]; }
+{
+  home-manager.useUserPackages = true;
+  home-manager.useGlobalPkgs = true;
+
+  home-manager.users.christoph.imports = [ ./common.nix ];
+}

system/virtual-machine.nix

@@ -1,5 +1,10 @@
 {
-  imports = [ ../common ../services/openssh.nix ../system/headless.nix ];
+  imports = [
+    ../common
+    ../system/home-manager
+    ../services/openssh.nix
+    ../system/headless.nix
+  ];
 
   boot.initrd.availableKernelModules =
     [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" ];