refactor: more sane profile structure

flake.nix

@@ -100,7 +100,7 @@
         inputs.sops-nix.nixosModules.sops
         inputs.nswitch-rcm-nix.nixosModules.nswitch-rcm
         inputs.nix-topology.nixosModules.default
-        ./profiles/common/nixos
+        ./profiles/nixos/common
       ];
 
       # Home-Manager modules wanted on non-NixOS systems
@@ -112,7 +112,7 @@
       mixedModules = [
         inputs.sops-nix.homeManagerModules.sops
         inputs.nix-index-database.hmModules.nix-index
-        ./profiles/common/home
+        ./profiles/home/common
       ];
 
     in

hosts/darwin/nbm-imba-166/default.nix

@@ -4,12 +4,12 @@ let
 in
 {
   imports = [
-    "${profilesPath}/darwin/common/nixos"
+    "${profilesPath}/darwin/nixos/common"
 
     inputs.home-manager.darwinModules.home-manager
     {
       home-manager.users."leon.schwarzaeugl".imports = [
-        "${profilesPath}/darwin/common/home"
+        "${profilesPath}/darwin/home"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
   ] ++ (builtins.attrValues outputs.nixosModules);

hosts/nixos/chaostheatre/default.nix

@@ -8,7 +8,7 @@ in
 
     ./hardware-configuration.nix
 
-    "${profilesPath}/optional/nixos/autologin.nix"
+    "${profilesPath}/nixos/optional/autologin.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {

hosts/nixos/iso/default.nix

@@ -18,7 +18,7 @@ in
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = [
-        "${self}/profiles/common/home/settings.nix"
+        "${self}/profiles/home/common/settings.nix"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
   ];

hosts/nixos/nbl-imba-2/default.nix

@@ -14,18 +14,18 @@ in
     ./hardware-configuration.nix
     ./disk-config.nix
 
-    "${profilesPath}/optional/nixos/virtualbox.nix"
-    # "${profilesPath}/optional/nixos/vmware.nix"
-    "${profilesPath}/optional/nixos/autologin.nix"
-    "${profilesPath}/optional/nixos/nswitch-rcm.nix"
-    "${profilesPath}/optional/nixos/gaming.nix"
-    "${profilesPath}/optional/nixos/work.nix"
+    "${profilesPath}/nixos/optional/virtualbox.nix"
+    # "${profilesPath}/nixos/optional/vmware.nix"
+    "${profilesPath}/nixos/optional/autologin.nix"
+    "${profilesPath}/nixos/optional/nswitch-rcm.nix"
+    "${profilesPath}/nixos/optional/gaming.nix"
+    "${profilesPath}/nixos/optional/work.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = outputs.mixedModules ++ [
-        "${profilesPath}/optional/home/gaming.nix"
-        "${profilesPath}/optional/home/work.nix"
+        "${profilesPath}/home/optional/gaming.nix"
+        "${profilesPath}/home/optional/work.nix"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
   ] ++ (builtins.attrValues outputs.nixosModules);

hosts/nixos/sync/default.nix

@@ -6,13 +6,13 @@ in
   imports = [
 
     inputs.sops-nix.nixosModules.sops
-    "${profilesPath}/server/nixos"
+    "${profilesPath}/nixos/server"
     ./hardware-configuration.nix
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = [
-        "${profilesPath}/server/home"
+        "${profilesPath}/home/server"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
 

hosts/nixos/toto/default.nix

@@ -16,23 +16,23 @@ in
     inputs.impermanence.nixosModules.impermanence
     inputs.lanzaboote.nixosModules.lanzaboote
 
-    "${profilesPath}/optional/nixos/autologin.nix"
-    "${profilesPath}/common/nixos/settings.nix"
-    "${profilesPath}/common/nixos/home-manager.nix"
-    "${profilesPath}/common/nixos/xserver.nix"
-    "${profilesPath}/common/nixos/users.nix"
-    "${profilesPath}/common/nixos/impermanence.nix"
-    "${profilesPath}/common/nixos/lanzaboote.nix"
-    "${profilesPath}/common/nixos/sops.nix"
-    "${profilesPath}/server/nixos/ssh.nix"
+    "${profilesPath}/nixos/optional/autologin.nix"
+    "${profilesPath}/nixos/common/settings.nix"
+    "${profilesPath}/nixos/common/home-manager.nix"
+    "${profilesPath}/nixos/common/xserver.nix"
+    "${profilesPath}/nixos/common/users.nix"
+    "${profilesPath}/nixos/common/impermanence.nix"
+    "${profilesPath}/nixos/common/lanzaboote.nix"
+    "${profilesPath}/nixos/common/sops.nix"
+    "${profilesPath}/nixos/server/ssh.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = [
         inputs.sops-nix.homeManagerModules.sops
-        "${profilesPath}/common/home/settings.nix"
-        "${profilesPath}/common/home/sops.nix"
-        "${profilesPath}/common/home/ssh.nix"
+        "${profilesPath}/home/common/settings.nix"
+        "${profilesPath}/home/common/sops.nix"
+        "${profilesPath}/home/common/ssh.nix"
 
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }

hosts/nixos/winters/default.nix

@@ -9,13 +9,13 @@ in
 
     ./hardware-configuration.nix
 
-    "${profilesPath}/optional/nixos/autologin.nix"
-    "${profilesPath}/server/nixos"
+    "${profilesPath}/nixos/optional/autologin.nix"
+    "${profilesPath}/nixos/server"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = [
-        "${profilesPath}/server/home"
+        "${profilesPath}/home/server"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
 

profiles/common/disks/btrfs-luks.nix

@@ -1,89 +0,0 @@
-# NOTE: ... is needed because dikso passes diskoFile
-{ lib
-, pkgs
-, disk ? "/dev/vda"
-, withSwap ? false
-, swapSize
-, config
-, ...
-}:
-{
-  disko.devices = {
-    disk = {
-      disk0 = {
-        type = "disk";
-        device = disk;
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              priority = 1;
-              name = "ESP";
-              size = "512M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "defaults" ];
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "cryptroot";
-                passwordFile = "/tmp/disko-password"; # this is populated by bootstrap-nixos.sh
-                settings = {
-                  allowDiscards = true;
-                  # https://github.com/hmajid2301/dotfiles/blob/a0b511c79b11d9b4afe2a5e2b7eedb2af23e288f/systems/x86_64-linux/framework/disks.nix#L36
-                  crypttabExtraOpts = [
-                    "fido2-device=auto"
-                    "token-timeout=10"
-                  ];
-                };
-                # Subvolumes must set a mountpoint in order to be mounted,
-                # unless their parent is mounted
-                content = {
-                  type = "btrfs";
-                  extraArgs = [ "-f" ]; # force overwrite
-                  subvolumes = {
-                    "@root" = {
-                      mountpoint = "/";
-                      mountOptions = [
-                        "compress=zstd"
-                        "noatime"
-                      ];
-                    };
-                    "@persist" = {
-                      mountpoint = "${config.hostSpec.persistFolder}";
-                      mountOptions = [
-                        "compress=zstd"
-                        "noatime"
-                      ];
-                    };
-                    "@nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = [
-                        "compress=zstd"
-                        "noatime"
-                      ];
-                    };
-                    "@swap" = lib.mkIf withSwap {
-                      mountpoint = "/.swapvol";
-                      swap.swapfile.size = "${swapSize}G";
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  environment.systemPackages = [
-    pkgs.yubikey-manager # For luks fido2 enrollment before full install
-  ];
-}

profiles/common/nixos/emacs.nix

@@ -1,8 +0,0 @@
-_:
-{
-
-  services.emacs = {
-    enable = true;
-  };
-
-}

profiles/common/nixos/safeeyes.nix

@@ -1,4 +0,0 @@
-_:
-{
-  services.safeeyes.enable = true;
-}

profiles/darwin/home/default.nix

@@ -4,6 +4,6 @@ let
 in
 {
   imports = [
-    "${profilesPath}/common/home/settings.nix"
+    "${profilesPath}/home/common/settings.nix"
   ];
 }

profiles/home/server/default.nix

@@ -4,7 +4,7 @@ let
 in
 {
   imports = [
-    "${profilesPath}/common/home/settings.nix"
+    "${profilesPath}/home/common/settings.nix"
     ./symlink.nix
   ];
 }

profiles/nixos/server/default.nix

@@ -4,14 +4,14 @@ let
 in
 {
   imports = [
-    "${profilesPath}/common/nixos/settings.nix"
-    "${profilesPath}/common/nixos/home-manager.nix"
-    "${profilesPath}/common/nixos/xserver.nix"
-    "${profilesPath}/common/nixos/gc.nix"
-    "${profilesPath}/common/nixos/store.nix"
-    "${profilesPath}/common/nixos/time.nix"
-    "${profilesPath}/common/nixos/users.nix"
-    "${profilesPath}/common/nixos/nix-ld.nix"
+    "${profilesPath}/nixos/common/settings.nix"
+    "${profilesPath}/nixos/common/home-manager.nix"
+    "${profilesPath}/nixos/common/xserver.nix"
+    "${profilesPath}/nixos/common/gc.nix"
+    "${profilesPath}/nixos/common/store.nix"
+    "${profilesPath}/nixos/common/time.nix"
+    "${profilesPath}/nixos/common/users.nix"
+    "${profilesPath}/nixos/common/nix-ld.nix"
     ./settings.nix
     ./packages.nix
     ./sops.nix