refactor: rename old profiles->modules [part 2]

hosts/home/default/default.nix

@@ -5,8 +5,8 @@
     inputs.stylix.homeManagerModules.stylix
     inputs.sops-nix.homeManagerModules.sops
     inputs.nix-index-database.hmModules.nix-index
-    ./profiles/home/common
+    ./modules/home/common
-    "${self}/profiles/home/common/sharedsetup.nix"
+    "${self}/modules/home/common/sharedsetup.nix"
   ];
 
   nixpkgs = {

hosts/nixos/chaostheatre/default.nix

@@ -1,6 +1,6 @@
 { self, config, pkgs, lib, primaryUser, ... }:
 let
-  profilesPath = "${self}/profiles";
+  modulesPath = "${self}/modules";
 in
 {
 
@@ -10,7 +10,7 @@ in
     {
       _module.args.diskDevice = config.swarselsystems.rootDisk;
     }
-    "${profilesPath}/nixos/optional/autologin.nix"
+    "${modulesPath}/nixos/optional/autologin.nix"
   ];
 
   environment.variables = {

hosts/nixos/iso/default.nix

@@ -8,15 +8,15 @@ in
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
     "${modulesPath}/installer/cd-dvd/channel.nix"
 
-    "${self}/profiles/iso/minimal.nix"
+    "${self}/modules/iso/minimal.nix"
-    "${self}/profiles/nixos/common/sharedsetup.nix"
+    "${self}/modules/nixos/common/sharedsetup.nix"
-    "${self}/profiles/home/common/sharedsetup.nix"
+    "${self}/modules/home/common/sharedsetup.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users."${primaryUser}".imports = [
-        "${self}/profiles/home/common/settings.nix"
+        "${self}/modules/home/common/settings.nix"
-        "${self}/profiles/home/common/sharedsetup.nix"
+        "${self}/modules/home/common/sharedsetup.nix"
       ];
     }
   ];

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

@@ -1,7 +1,7 @@
 { self, inputs, lib, primaryUser, ... }:
 let
   secretsDirectory = builtins.toString inputs.nix-secrets;
-  profilesPath = "${self}/profiles";
+  modulesPath = "${self}/modules";
   sharedOptions = {
     isBtrfs = true;
     isLinux = true;
@@ -17,18 +17,18 @@ in
     ./disk-config.nix
     ./hardware-configuration.nix
 
-    "${profilesPath}/nixos/optional/virtualbox.nix"
+    "${modulesPath}/nixos/optional/virtualbox.nix"
-    # "${profilesPath}/nixos/optional/vmware.nix"
+    # "${modulesPath}/nixos/optional/vmware.nix"
-    "${profilesPath}/nixos/optional/autologin.nix"
+    "${modulesPath}/nixos/optional/autologin.nix"
-    "${profilesPath}/nixos/optional/nswitch-rcm.nix"
+    "${modulesPath}/nixos/optional/nswitch-rcm.nix"
-    "${profilesPath}/nixos/optional/gaming.nix"
+    "${modulesPath}/nixos/optional/gaming.nix"
-    "${profilesPath}/nixos/optional/work.nix"
+    "${modulesPath}/nixos/optional/work.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users."${primaryUser}".imports = [
-        "${profilesPath}/home/optional/gaming.nix"
+        "${modulesPath}/home/optional/gaming.nix"
-        "${profilesPath}/home/optional/work.nix"
+        "${modulesPath}/home/optional/work.nix"
       ];
     }
   ];

hosts/nixos/sync/default.nix

@@ -1,20 +1,20 @@
 { self, inputs, lib, primaryUser, ... }:
 let
-  profilesPath = "${self}/profiles";
+  modulesPath = "${self}/modules";
 in
 {
   imports = [
 
-    "${profilesPath}/nixos/server"
+    "${modulesPath}/nixos/server"
-    "${profilesPath}/nixos/common/sharedsetup.nix"
+    "${modulesPath}/nixos/common/sharedsetup.nix"
-    "${profilesPath}/home/common/sharedsetup.nix"
+    "${modulesPath}/home/common/sharedsetup.nix"
     ./hardware-configuration.nix
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users."${primaryUser}".imports = [
-        "${profilesPath}/home/server"
+        "${modulesPath}/home/server"
-        "${profilesPath}/home/common/sharedsetup.nix"
+        "${modulesPath}/home/common/sharedsetup.nix"
       ];
     }
   ];

hosts/nixos/toto/default.nix

@@ -1,6 +1,6 @@
 { self, inputs, pkgs, lib, primaryUser, ... }:
 let
-  profilesPath = "${self}/profiles";
+  modulesPath = "${self}/modules";
   sharedOptions = {
     isBtrfs = true;
     isLinux = true;
@@ -12,27 +12,27 @@ in
     "${self}/hosts/nixos/toto/disk-config.nix"
     ./hardware-configuration.nix
 
-    "${profilesPath}/nixos/optional/autologin.nix"
+    "${modulesPath}/nixos/optional/autologin.nix"
-    "${profilesPath}/nixos/common/settings.nix"
+    "${modulesPath}/nixos/common/settings.nix"
-    "${profilesPath}/nixos/common/sharedsetup.nix"
+    "${modulesPath}/nixos/common/sharedsetup.nix"
-    "${profilesPath}/nixos/common/home-manager.nix"
+    "${modulesPath}/nixos/common/home-manager.nix"
-    "${profilesPath}/nixos/common/home-manager-extra.nix"
+    "${modulesPath}/nixos/common/home-manager-extra.nix"
-    "${profilesPath}/nixos/common/xserver.nix"
+    "${modulesPath}/nixos/common/xserver.nix"
-    "${profilesPath}/nixos/common/users.nix"
+    "${modulesPath}/nixos/common/users.nix"
-    "${profilesPath}/nixos/common/impermanence.nix"
+    "${modulesPath}/nixos/common/impermanence.nix"
-    "${profilesPath}/nixos/common/lanzaboote.nix"
+    "${modulesPath}/nixos/common/lanzaboote.nix"
-    "${profilesPath}/nixos/common/sops.nix"
+    "${modulesPath}/nixos/common/sops.nix"
-    "${profilesPath}/nixos/server/ssh.nix"
+    "${modulesPath}/nixos/server/ssh.nix"
-    "${profilesPath}/home/common/sharedsetup.nix"
+    "${modulesPath}/home/common/sharedsetup.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users."${primaryUser}".imports = [
         inputs.sops-nix.homeManagerModules.sops
-        "${profilesPath}/home/common/settings.nix"
+        "${modulesPath}/home/common/settings.nix"
-        "${profilesPath}/home/common/sops.nix"
+        "${modulesPath}/home/common/sops.nix"
-        "${profilesPath}/home/common/ssh.nix"
+        "${modulesPath}/home/common/ssh.nix"
-        "${profilesPath}/home/common/sharedsetup.nix"
+        "${modulesPath}/home/common/sharedsetup.nix"
       ];
     }
   ];

hosts/nixos/winters/default.nix

@@ -1,19 +1,19 @@
 { self, inputs, primaryUser, ... }:
 let
-  profilesPath = "${self}/profiles";
+  modulesPath = "${self}/modules";
 in
 {
 
   imports = [
     ./hardware-configuration.nix
 
-    "${profilesPath}/nixos/optional/autologin.nix"
+    "${modulesPath}/nixos/optional/autologin.nix"
-    "${profilesPath}/nixos/server"
+    "${modulesPath}/nixos/server"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users."${primaryUser}".imports = [
-        "${profilesPath}/home/server"
+        "${modulesPath}/home/server"
       ];
     }
   ];

lib/default.nix

@@ -55,7 +55,7 @@ in
         ] ++
         (if (host == "winters" || host == "sync") then [ ] else [
           # put nixos imports here that are for all normal hosts
-          "${self}/profiles/${type}/common"
+          "${self}/modules/${type}/common"
           inputs.stylix.nixosModules.stylix
           inputs.nswitch-rcm-nix.nixosModules.nswitch-rcm
         ]) ++ (if (type == "nixos") then [
@@ -64,7 +64,7 @@ in
             home-manager.users."${linuxUser}".imports = (
               if (host == "winters" || host == "sync") then [ ] else [
                 # put home-manager imports here that are for all normal hosts
-                "${self}/profiles/home/common"
+                "${self}/modules/home/common"
               ]
             ) ++ [
               # put home-manager imports here that are for all servers and normal hosts
@@ -74,12 +74,12 @@ in
           }
         ] else [
           # put nixos imports here that are for darwin hosts
-          "${self}/profiles/darwin/nixos/common"
+          "${self}/modules/darwin/nixos/common"
           inputs.home-manager.darwinModules.home-manager
           {
             home-manager.users."${macUser}".imports = [
               # put home-manager imports here that are for darwin hosts
-              "${self}/profiles/darwin/home"
+              "${self}/modules/darwin/home"
             ];
           }
         ])

modules/darwin/home/default.nix

@@ -0,0 +1,10 @@
+{ self, ... }:
+let
+  modulesPath = "${self}/modules";
+in
+{
+  imports = [
+    "${modulesPath}/home/common/settings.nix"
+    "${modulesPath}/home/common/sharedsetup.nix"
+  ];
+}

modules/home/common/default.nix

@@ -0,0 +1,7 @@
+{ lib, ... }:
+let
+  importNames = lib.swarselsystems.readNix "modules/home/common";
+in
+{
+  imports = lib.swarselsystems.mkImports importNames "modules/home/common";
+}

modules/home/server/default.nix

@@ -0,0 +1,11 @@
+{ self, lib, ... }:
+let
+  importNames = lib.swarselsystems.readNix "modules/home/server";
+  modulesPath = "${self}/modules";
+in
+{
+  imports = lib.swarselsystems.mkImports importNames "modules/home/server" ++ [
+    "${modulesPath}/home/common/settings.nix"
+    "${modulesPath}/home/common/sharedsetup.nix"
+  ];
+}

modules/nixos/common/default.nix

@@ -0,0 +1,17 @@
+{ self, lib, ... }:
+let
+  importNames = lib.swarselsystems.readNix "modules/nixos/common";
+  modulesPath = "${self}/modules";
+in
+{
+  imports = lib.swarselsystems.mkImports importNames "modules/nixos/common" ++ [
+    "${modulesPath}/home/common/sharedsetup.nix"
+  ];
+
+  nixpkgs.config.permittedInsecurePackages = [
+    "jitsi-meet-1.0.8043"
+    "electron-29.4.6"
+    "SDL_ttf-2.0.11"
+  ];
+
+}