Move home-manager.nix to home-manager/main.nix

common/configuration.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./home-manager.nix
+    ./home-manager/main.nix
   ];
 
   nix = {

common/home-manager.nix

@@ -1,20 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [<home-manager/nixos>];
-
-  home-manager.users.sijmen = {
-    imports = [
-      ./home-manager/home.nix
-      ./home-manager/gtk.nix
-      ./home-manager/systemd.nix
-      ./home-manager/programs.nix
-      ./home-manager/wayland.nix
-      ./home-manager/services.nix
-      ./home-manager/accounts.nix
-    ];
-
-    nixpkgs.config.allowUnfree = true;
-    home.stateVersion = config.system.stateVersion;
-  };
-}

common/home-manager/home.nix

@@ -133,7 +133,7 @@
       ncdu = "${pkgs.ncdu}/bin/ncdu --color dark";
 
       config = "vim /etc/nixos/configuration.nix";
-      hmconf = "vim /etc/nixos/common/home-manager.nix";
+      hmconf = "vim /etc/nixos/common/home-manager/main.nix";
       hmhconf = "vim /etc/nixos/common/home-manager/home.nix";
       switch = "sudo nixos-rebuild switch";
 

common/home-manager/main.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [<home-manager/nixos>];
+
+  home-manager.users.sijmen = {
+    imports = [
+      ./home.nix
+      ./gtk.nix
+      ./systemd.nix
+      ./programs.nix
+      ./wayland.nix
+      ./services.nix
+      ./accounts.nix
+    ];
+
+    nixpkgs.config.allowUnfree = true;
+    home.stateVersion = config.system.stateVersion;
+  };
+}