97 files changed, 26 insertions, 118 deletions

diff --git a/modules/nixos/archetypes/collections/bluetooth.nix b/archetypes/collections/bluetooth.nix
index 749a9f1..749a9f1 100644
--- a/modules/nixos/archetypes/collections/bluetooth.nix
+++ b/archetypes/collections/bluetooth.nix
diff --git a/modules/nixos/archetypes/collections/desktop/cad.nix b/archetypes/collections/desktop/cad.nix
index 33edcd5..33edcd5 100644
--- a/modules/nixos/archetypes/collections/desktop/cad.nix
+++ b/archetypes/collections/desktop/cad.nix
diff --git a/modules/nixos/archetypes/collections/desktop/chromium.nix b/archetypes/collections/desktop/chromium.nix
index b4638f0..b4638f0 100644
--- a/modules/nixos/archetypes/collections/desktop/chromium.nix
+++ b/archetypes/collections/desktop/chromium.nix
diff --git a/modules/nixos/archetypes/collections/desktop/crypto.nix b/archetypes/collections/desktop/crypto.nix
index f90919e..f90919e 100644
--- a/modules/nixos/archetypes/collections/desktop/crypto.nix
+++ b/archetypes/collections/desktop/crypto.nix
diff --git a/modules/nixos/archetypes/collections/desktop/default.nix b/archetypes/collections/desktop/default.nix
index bbca8df..bbca8df 100644
--- a/modules/nixos/archetypes/collections/desktop/default.nix
+++ b/archetypes/collections/desktop/default.nix
diff --git a/modules/nixos/archetypes/collections/desktop/extra.nix b/archetypes/collections/desktop/extra.nix
index 699b20f..699b20f 100644
--- a/modules/nixos/archetypes/collections/desktop/extra.nix
+++ b/archetypes/collections/desktop/extra.nix
diff --git a/modules/nixos/archetypes/collections/desktop/firefox.nix b/archetypes/collections/desktop/firefox.nix
index 02656f6..02656f6 100644
--- a/modules/nixos/archetypes/collections/desktop/firefox.nix
+++ b/archetypes/collections/desktop/firefox.nix
diff --git a/modules/nixos/archetypes/collections/desktop/graphics.nix b/archetypes/collections/desktop/graphics.nix
index f4242d1..f4242d1 100644
--- a/modules/nixos/archetypes/collections/desktop/graphics.nix
+++ b/archetypes/collections/desktop/graphics.nix
diff --git a/modules/nixos/archetypes/collections/desktop/office.nix b/archetypes/collections/desktop/office.nix
index 23e6862..23e6862 100644
--- a/modules/nixos/archetypes/collections/desktop/office.nix
+++ b/archetypes/collections/desktop/office.nix
diff --git a/modules/nixos/archetypes/collections/desktop/utilities.nix b/archetypes/collections/desktop/utilities.nix
index 43d4973..43d4973 100644
--- a/modules/nixos/archetypes/collections/desktop/utilities.nix
+++ b/archetypes/collections/desktop/utilities.nix
diff --git a/modules/nixos/archetypes/collections/desktop/xserver.nix b/archetypes/collections/desktop/xserver.nix
index 4cbdae8..4cbdae8 100644
--- a/modules/nixos/archetypes/collections/desktop/xserver.nix
+++ b/archetypes/collections/desktop/xserver.nix
diff --git a/modules/nixos/archetypes/collections/development/default.nix b/archetypes/collections/development/default.nix
index 87fe2d2..87fe2d2 100644
--- a/modules/nixos/archetypes/collections/development/default.nix
+++ b/archetypes/collections/development/default.nix
diff --git a/modules/nixos/archetypes/collections/development/docker.nix b/archetypes/collections/development/docker.nix
index 629dff3..629dff3 100644
--- a/modules/nixos/archetypes/collections/development/docker.nix
+++ b/archetypes/collections/development/docker.nix
diff --git a/modules/nixos/archetypes/collections/fonts.nix b/archetypes/collections/fonts.nix
index 136e31b..136e31b 100644
--- a/modules/nixos/archetypes/collections/fonts.nix
+++ b/archetypes/collections/fonts.nix
diff --git a/modules/nixos/archetypes/collections/utilities.nix b/archetypes/collections/utilities.nix
index 85763a4..85763a4 100644
--- a/modules/nixos/archetypes/collections/utilities.nix
+++ b/archetypes/collections/utilities.nix
diff --git a/modules/nixos/archetypes/collections/virtualization.nix b/archetypes/collections/virtualization.nix
index fda0e48..fda0e48 100644
--- a/modules/nixos/archetypes/collections/virtualization.nix
+++ b/archetypes/collections/virtualization.nix
diff --git a/archetypes/default.nix b/archetypes/default.nix
new file mode 100644
index 0000000..f201fc3
--- /dev/null
+++ b/archetypes/default.nix
@@ -0,0 +1,15 @@
+{
+	imports = [
+		./collections/bluetooth.nix
+		./collections/desktop
+		./collections/development
+		./collections/fonts.nix
+		./collections/utilities.nix
+		./collections/virtualization.nix
+
+		./profiles/desktop
+		./profiles/headless
+
+		./users/primary.nix
+	];
+}
diff --git a/modules/nixos/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix
index d9a7dc7..d9a7dc7 100644
--- a/modules/nixos/archetypes/profiles/desktop/default.nix
+++ b/archetypes/profiles/desktop/default.nix
diff --git a/modules/nixos/archetypes/profiles/headless/default.nix b/archetypes/profiles/headless/default.nix
index ef17db0..ef17db0 100644
--- a/modules/nixos/archetypes/profiles/headless/default.nix
+++ b/archetypes/profiles/headless/default.nix
diff --git a/modules/nixos/archetypes/tjkeller/default.nix b/archetypes/tjkeller/default.nix
index 6a9bbd9..6a9bbd9 100644
--- a/modules/nixos/archetypes/tjkeller/default.nix
+++ b/archetypes/tjkeller/default.nix
diff --git a/modules/nixos/archetypes/tjkeller/hosts.nix b/archetypes/tjkeller/hosts.nix
index 66c6ccc..66c6ccc 100644
--- a/modules/nixos/archetypes/tjkeller/hosts.nix
+++ b/archetypes/tjkeller/hosts.nix
diff --git a/modules/nixos/archetypes/tjkeller/localization.nix b/archetypes/tjkeller/localization.nix
index 8313f07..8313f07 100644
--- a/modules/nixos/archetypes/tjkeller/localization.nix
+++ b/archetypes/tjkeller/localization.nix
diff --git a/modules/nixos/archetypes/tjkeller/nas.nix b/archetypes/tjkeller/nas.nix
index 1ed0ca3..1ed0ca3 100644
--- a/modules/nixos/archetypes/tjkeller/nas.nix
+++ b/archetypes/tjkeller/nas.nix
diff --git a/modules/nixos/archetypes/tjkeller/printing.nix b/archetypes/tjkeller/printing.nix
index d5cceab..d5cceab 100644
--- a/modules/nixos/archetypes/tjkeller/printing.nix
+++ b/archetypes/tjkeller/printing.nix
diff --git a/modules/nixos/archetypes/tjkeller/resources/secrets/hashed-root-password.yaml b/archetypes/tjkeller/resources/secrets/hashed-root-password.yaml
index a42fd42..a42fd42 100644
--- a/modules/nixos/archetypes/tjkeller/resources/secrets/hashed-root-password.yaml
+++ b/archetypes/tjkeller/resources/secrets/hashed-root-password.yaml
diff --git a/modules/nixos/archetypes/tjkeller/resources/secrets/wpa_supplicant-conf.yaml b/archetypes/tjkeller/resources/secrets/wpa_supplicant-conf.yaml
index 2fd7a0e..2fd7a0e 100644
--- a/modules/nixos/archetypes/tjkeller/resources/secrets/wpa_supplicant-conf.yaml
+++ b/archetypes/tjkeller/resources/secrets/wpa_supplicant-conf.yaml
diff --git a/modules/nixos/archetypes/tjkeller/user.nix b/archetypes/tjkeller/user.nix
index 2695549..2695549 100644
--- a/modules/nixos/archetypes/tjkeller/user.nix
+++ b/archetypes/tjkeller/user.nix
diff --git a/modules/nixos/archetypes/tjkeller/wifi.nix b/archetypes/tjkeller/wifi.nix
index 32b6ef8..32b6ef8 100644
--- a/modules/nixos/archetypes/tjkeller/wifi.nix
+++ b/archetypes/tjkeller/wifi.nix
diff --git a/modules/nixos/archetypes/users/primary.nix b/archetypes/users/primary.nix
index a29c3b8..a29c3b8 100644
--- a/modules/nixos/archetypes/users/primary.nix
+++ b/archetypes/users/primary.nix
diff --git a/flake.nix b/flake.nix
index d2112ca..007bd8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@ rec {
 	outputs = { nixpkgs, home-manager, arkenfox, ... }@inputs :
 		let
 			system = "x86_64-linux";
-			pkgs = nixpkgs.legacyPackages.${system};
+			#pkgs = nixpkgs.legacyPackages.${system};
 			userDetails = {
 				username = "timmy";
 				email = "tjk@tjkeller.xyz";
@@ -44,22 +44,23 @@ rec {
 					inherit userDetails;
 				};
 				modules = [
-					./modules/hosts/${hostname}/configuration.nix
-					./modules/nixos
-					./modules/overlays
+					./hosts/${hostname}/configuration.nix
+					./nixos
+					./archetypes
+					./pkgs
 					home-manager.nixosModules.home-manager {
 						home-manager = {
-							backupFileExtension = "backup";
+							backupFileExtension = "backup";  # In case file is overwritten
 							useGlobalPkgs = true;
 							useUserPackages = true;
-							users.${userDetails.username} = import ./modules/home;
+							users.${userDetails.username} = import ./home-manager;
 							extraSpecialArgs = {
 								inherit userDetails;
 								inherit homeStateVersion;
 							};
 							sharedModules = [
-								inputs.arkenfox.hmModules.arkenfox
-								./modules/hosts/${hostname}/home.nix
+								arkenfox.hmModules.arkenfox
+								./hosts/${hostname}/home.nix
 							];
 						};
 					}
diff --git a/modules/home/default.nix b/home-manager/default.nix
index 022ee9f..bcd99eb 100644
--- a/modules/home/default.nix
+++ b/home-manager/default.nix
@@ -6,7 +6,6 @@
 	};
 
 	imports = [
-		#./chrome.nix
 		./firefox.nix
 		./git.nix
 		./gtk-bookmarks.nix
diff --git a/modules/home/firefox.nix b/home-manager/firefox.nix
index 8aa1af3..8aa1af3 100644
--- a/modules/home/firefox.nix
+++ b/home-manager/firefox.nix
diff --git a/modules/home/git.nix b/home-manager/git.nix
index 9d15a90..9d15a90 100644
--- a/modules/home/git.nix
+++ b/home-manager/git.nix
diff --git a/modules/home/gtk-bookmarks.nix b/home-manager/gtk-bookmarks.nix
index 24c6563..24c6563 100644
--- a/modules/home/gtk-bookmarks.nix
+++ b/home-manager/gtk-bookmarks.nix
diff --git a/modules/home/htop.nix b/home-manager/htop.nix
index 523fee8..523fee8 100644
--- a/modules/home/htop.nix
+++ b/home-manager/htop.nix
diff --git a/modules/home/initial-home-setup.nix b/home-manager/initial-home-setup.nix
index 4132386..4132386 100644
--- a/modules/home/initial-home-setup.nix
+++ b/home-manager/initial-home-setup.nix
diff --git a/modules/home/pcmanfm.nix b/home-manager/pcmanfm.nix
index 3c70521..3c70521 100644
--- a/modules/home/pcmanfm.nix
+++ b/home-manager/pcmanfm.nix
diff --git a/modules/home/resources/activation-scripts/clone-repos.sh b/home-manager/resources/activation-scripts/clone-repos.sh
index eaee4dc..eaee4dc 100644
--- a/modules/home/resources/activation-scripts/clone-repos.sh
+++ b/home-manager/resources/activation-scripts/clone-repos.sh
diff --git a/modules/home/resources/firefox/uiCustomization.json b/home-manager/resources/firefox/uiCustomization.json
index 339b716..339b716 100644
--- a/modules/home/resources/firefox/uiCustomization.json
+++ b/home-manager/resources/firefox/uiCustomization.json
diff --git a/modules/home/resources/firefox/userChrome.css b/home-manager/resources/firefox/userChrome.css
index 624ab26..624ab26 100644
--- a/modules/home/resources/firefox/userChrome.css
+++ b/home-manager/resources/firefox/userChrome.css
diff --git a/modules/home/resources/pcmanfm/root.desktop b/home-manager/resources/pcmanfm/root.desktop
index 4b4d263..4b4d263 100644
--- a/modules/home/resources/pcmanfm/root.desktop
+++ b/home-manager/resources/pcmanfm/root.desktop
diff --git a/modules/home/theme-st.nix b/home-manager/theme-st.nix
index 0a06cd0..0a06cd0 100644
--- a/modules/home/theme-st.nix
+++ b/home-manager/theme-st.nix
diff --git a/modules/home/theme.nix b/home-manager/theme.nix
index 9e4edae..9e4edae 100644
--- a/modules/home/theme.nix
+++ b/home-manager/theme.nix
diff --git a/modules/home/userdirs.nix b/home-manager/userdirs.nix
index 58c1d59..58c1d59 100644
--- a/modules/home/userdirs.nix
+++ b/home-manager/userdirs.nix
diff --git a/modules/home/wallpapers.nix b/home-manager/wallpapers.nix
index d7e067a..d7e067a 100644
--- a/modules/home/wallpapers.nix
+++ b/home-manager/wallpapers.nix
diff --git a/modules/hosts/T495/configuration.nix b/hosts/T495/configuration.nix
index 171f746..171f746 100644
--- a/modules/hosts/T495/configuration.nix
+++ b/hosts/T495/configuration.nix
diff --git a/modules/hosts/T495/hardware-configuration.nix b/hosts/T495/hardware-configuration.nix
index 6258a83..6258a83 100644
--- a/modules/hosts/T495/hardware-configuration.nix
+++ b/hosts/T495/hardware-configuration.nix
diff --git a/modules/hosts/T495/home.nix b/hosts/T495/home.nix
index f233c08..f233c08 100644
--- a/modules/hosts/T495/home.nix
+++ b/hosts/T495/home.nix
diff --git a/modules/hosts/T495/resources/input-leap/input-leap.conf b/hosts/T495/resources/input-leap/input-leap.conf
index c2d5176..c2d5176 100644
--- a/modules/hosts/T495/resources/input-leap/input-leap.conf
+++ b/hosts/T495/resources/input-leap/input-leap.conf
diff --git a/modules/hosts/T495/resources/secrets/wg0.yaml b/hosts/T495/resources/secrets/wg0.yaml
index 6df5ff6..6df5ff6 100644
--- a/modules/hosts/T495/resources/secrets/wg0.yaml
+++ b/hosts/T495/resources/secrets/wg0.yaml
diff --git a/modules/hosts/T495/wg.nix b/hosts/T495/wg.nix
index 3881b63..3881b63 100644
--- a/modules/hosts/T495/wg.nix
+++ b/hosts/T495/wg.nix
diff --git a/modules/hosts/X230/configuration.nix b/hosts/X230/configuration.nix
index accbb1c..accbb1c 100644
--- a/modules/hosts/X230/configuration.nix
+++ b/hosts/X230/configuration.nix
diff --git a/modules/hosts/X230/hardware-configuration.nix b/hosts/X230/hardware-configuration.nix
index 0791585..0791585 100644
--- a/modules/hosts/X230/hardware-configuration.nix
+++ b/hosts/X230/hardware-configuration.nix
diff --git a/modules/hosts/X230/home.nix b/hosts/X230/home.nix
index 03b559d..03b559d 100644
--- a/modules/hosts/X230/home.nix
+++ b/hosts/X230/home.nix
diff --git a/modules/hosts/flex-wg-router/configuration.nix b/hosts/flex-wg-router/configuration.nix
index f21046d..f21046d 100644
--- a/modules/hosts/flex-wg-router/configuration.nix
+++ b/hosts/flex-wg-router/configuration.nix
diff --git a/modules/hosts/flex-wg-router/hardware-configuration.nix b/hosts/flex-wg-router/hardware-configuration.nix
index 01cff6d..01cff6d 100644
--- a/modules/hosts/flex-wg-router/hardware-configuration.nix
+++ b/hosts/flex-wg-router/hardware-configuration.nix
diff --git a/modules/hosts/flex-wg-router/home.nix b/hosts/flex-wg-router/home.nix
index 21d548f..21d548f 100644
--- a/modules/hosts/flex-wg-router/home.nix
+++ b/hosts/flex-wg-router/home.nix
diff --git a/modules/hosts/hp-envy-office/configuration.nix b/hosts/hp-envy-office/configuration.nix
index 60be56d..60be56d 100644
--- a/modules/hosts/hp-envy-office/configuration.nix
+++ b/hosts/hp-envy-office/configuration.nix
diff --git a/modules/hosts/hp-envy-office/hardware-configuration.nix b/hosts/hp-envy-office/hardware-configuration.nix
index 22a8c24..22a8c24 100644
--- a/modules/hosts/hp-envy-office/hardware-configuration.nix
+++ b/hosts/hp-envy-office/hardware-configuration.nix
diff --git a/modules/hosts/hp-envy-office/home.nix b/hosts/hp-envy-office/home.nix
index 2e4f61f..2e4f61f 100644
--- a/modules/hosts/hp-envy-office/home.nix
+++ b/hosts/hp-envy-office/home.nix
diff --git a/modules/hosts/libreX60/bios-flashing.nix b/hosts/libreX60/bios-flashing.nix
index 6117813..6117813 100644
--- a/modules/hosts/libreX60/bios-flashing.nix
+++ b/hosts/libreX60/bios-flashing.nix
diff --git a/modules/hosts/libreX60/configuration.nix b/hosts/libreX60/configuration.nix
index 9c83a42..9c83a42 100644
--- a/modules/hosts/libreX60/configuration.nix
+++ b/hosts/libreX60/configuration.nix
diff --git a/modules/hosts/libreX60/hardware-configuration.nix b/hosts/libreX60/hardware-configuration.nix
index b0a7868..b0a7868 100644
--- a/modules/hosts/libreX60/hardware-configuration.nix
+++ b/hosts/libreX60/hardware-configuration.nix
diff --git a/modules/hosts/libreX60/home.nix b/hosts/libreX60/home.nix
index f5957d6..f5957d6 100644
--- a/modules/hosts/libreX60/home.nix
+++ b/hosts/libreX60/home.nix
diff --git a/modules/hosts/libreX60/powertop-auto-tune.nix b/hosts/libreX60/powertop-auto-tune.nix
index 0eb9578..0eb9578 100644
--- a/modules/hosts/libreX60/powertop-auto-tune.nix
+++ b/hosts/libreX60/powertop-auto-tune.nix
diff --git a/modules/hosts/optiplex/configuration.nix b/hosts/optiplex/configuration.nix
index 36241a8..8a06294 100644
--- a/modules/hosts/optiplex/configuration.nix
+++ b/hosts/optiplex/configuration.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }: {
 	imports = [
 		./hardware-configuration.nix
-		../../nixos/archetypes/tjkeller
+		../../archetypes/tjkeller
 	];
 
 	# Setup bootloader
diff --git a/modules/hosts/optiplex/hardware-configuration.nix b/hosts/optiplex/hardware-configuration.nix
index 3d9651e..3d9651e 100644
--- a/modules/hosts/optiplex/hardware-configuration.nix
+++ b/hosts/optiplex/hardware-configuration.nix
diff --git a/modules/hosts/optiplex/home.nix b/hosts/optiplex/home.nix
index ee56dc6..d293ae0 100644
--- a/modules/hosts/optiplex/home.nix
+++ b/hosts/optiplex/home.nix
@@ -1,5 +1,5 @@
 { ... }: {
-	imports = [ ../../home ];
+	imports = [ ../../home-manager ];
 
 	theme.mint.theme.color = "Dark-Green";
 	theme.mint.icons.color = "Green";
diff --git a/modules/hosts/poweredge/configuration.nix b/hosts/poweredge/configuration.nix
index 08e392d..08e392d 100644
--- a/modules/hosts/poweredge/configuration.nix
+++ b/hosts/poweredge/configuration.nix
diff --git a/modules/home/alacritty.nix b/modules/home/alacritty.nix
deleted file mode 100644
index f60fe01..0000000
--- a/modules/home/alacritty.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, lib, ... }: {
-	options = {
-		alacritty = {
-			enable = lib.mkEnableOption "enables creation of alacritty config file";
-			font.size = lib.mkOption {
-				type = lib.types.int;
-				default = 12;
-			};
-			font.family = lib.mkOption {
-				type = lib.types.str;
-				default = "JetBrainsMonoNL Nerd Font Mono";
-			};
-		};
-	};
-
-	config = {
-		programs.alacritty.enable = config.alacritty.enable;
-		programs.alacritty.settings = lib.mkIf config.alacritty.enable {
-			colors = {
-				bright = {
-					black   = "#7f7f7f";
-					blue    = "#1578c1";
-					cyan    = "#00c4a3";
-					green   = "#2bb500";
-					magenta = "#b14ff7";
-					red     = "#ed1207";
-					white   = "#ffffff";
-					yellow  = "#fc9700";
-				};
-				normal = {
-					black   = "#101010";
-					blue    = "#1578c1";
-					cyan    = "#00c4a3";
-					green   = "#2bb500";
-					magenta = "#b14ff7";
-					red     = "#ed1207";
-					white   = "#ffffff";
-					yellow  = "#fc9700";
-				};
-				primary = {
-					background = "#101010";
-					foreground = "#ffffff";
-				};
-			};
-			cursor.style.blinking = "Never";
-			env.TERM = "xterm-256color";
-			font = {
-				size = config.alacritty.font.size;
-				normal.family = config.alacritty.font.family;
-			};
-			mouse.bindings = [{
-				action = "PasteSelection";
-				mouse = "Right";
-			}];
-			window = {
-				dynamic_padding = true;
-				dynamic_title = true;
-				title = "Terminal";
-				# Pretend to be st
-				class = {
-					general = "st";
-					instance = "st";
-				};
-			};
-		};
-	};
-}
diff --git a/modules/home/chrome.nix b/modules/home/chrome.nix
deleted file mode 100644
index 976a74b..0000000
--- a/modules/home/chrome.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, lib, ... }: {
-	programs.chromium = {
-		enable = true;
-		package = pkgs.ungoogled-chromium;
-	};
-	programs.chromium.extensions =
-		let
-			createChromiumExtensionFor = browserVersion: { id, sha256, version }:
-				{
-					inherit id;
-					crxPath = builtins.fetchurl {
-						url = "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc";
-						name = "${id}.crx";
-						inherit sha256;
-					};
-					inherit version;
-				};
-			createChromiumExtension = createChromiumExtensionFor (lib.versions.major pkgs.ungoogled-chromium.version);
-		in
-		[
-			(createChromiumExtension {
-				# ublock origin
-				id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
-				sha256 = "sha256:1i0668xhq5iflb4fn0ghwp79iz6mwspgxdqwp6incbvsyzr596kg";
-				version = "1.61.0";
-			})
-		];
-}
diff --git a/modules/nixos/bootloader.nix b/nixos/bootloader.nix
index bb807cf..bb807cf 100644
--- a/modules/nixos/bootloader.nix
+++ b/nixos/bootloader.nix
diff --git a/modules/nixos/default.nix b/nixos/default.nix
index 59364f7..ff9a0e1 100644
--- a/modules/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,17 +1,5 @@
 {
 	imports = [
-		./archetypes/collections/bluetooth.nix
-		./archetypes/collections/desktop
-		./archetypes/collections/development
-		./archetypes/collections/fonts.nix
-		./archetypes/collections/utilities.nix
-		./archetypes/collections/virtualization.nix
-
-		./archetypes/profiles/desktop
-		./archetypes/profiles/headless
-
-		./archetypes/users/primary.nix
-
 		./programs/awesome.nix
 		./programs/ddcutil.nix
 		./programs/home-manager.nix
diff --git a/modules/nixos/doas.nix b/nixos/doas.nix
index aeed170..aeed170 100644
--- a/modules/nixos/doas.nix
+++ b/nixos/doas.nix
diff --git a/modules/nixos/filesystems.nix b/nixos/filesystems.nix
index 00ab409..00ab409 100644
--- a/modules/nixos/filesystems.nix
+++ b/nixos/filesystems.nix
diff --git a/modules/nixos/hosts.nix b/nixos/hosts.nix
index a87f3b4..a87f3b4 100644
--- a/modules/nixos/hosts.nix
+++ b/nixos/hosts.nix
diff --git a/modules/nixos/net-iface-labels.nix b/nixos/net-iface-labels.nix
index b7ac655..b7ac655 100644
--- a/modules/nixos/net-iface-labels.nix
+++ b/nixos/net-iface-labels.nix
diff --git a/modules/nixos/nix.nix b/nixos/nix.nix
index ff8dd28..ff8dd28 100644
--- a/modules/nixos/nix.nix
+++ b/nixos/nix.nix
diff --git a/modules/nixos/pipewire.nix b/nixos/pipewire.nix
index be3eaf4..be3eaf4 100644
--- a/modules/nixos/pipewire.nix
+++ b/nixos/pipewire.nix
diff --git a/modules/nixos/powerkeys.nix b/nixos/powerkeys.nix
index fd4aa00..fd4aa00 100644
--- a/modules/nixos/powerkeys.nix
+++ b/nixos/powerkeys.nix
diff --git a/modules/nixos/printing.nix b/nixos/printing.nix
index a6df279..a6df279 100644
--- a/modules/nixos/printing.nix
+++ b/nixos/printing.nix
diff --git a/modules/nixos/programs/awesome.nix b/nixos/programs/awesome.nix
index 0856384..0856384 100644
--- a/modules/nixos/programs/awesome.nix
+++ b/nixos/programs/awesome.nix
diff --git a/modules/nixos/programs/ddcutil.nix b/nixos/programs/ddcutil.nix
index ef1801b..ef1801b 100644
--- a/modules/nixos/programs/ddcutil.nix
+++ b/nixos/programs/ddcutil.nix
diff --git a/modules/nixos/programs/home-manager.nix b/nixos/programs/home-manager.nix
index 49149d3..49149d3 100644
--- a/modules/nixos/programs/home-manager.nix
+++ b/nixos/programs/home-manager.nix
diff --git a/modules/nixos/secrets.nix b/nixos/secrets.nix
index 46d8f1e..46d8f1e 100644
--- a/modules/nixos/secrets.nix
+++ b/nixos/secrets.nix
diff --git a/modules/nixos/services/cgit.nix b/nixos/services/cgit.nix
index 366c1f8..366c1f8 100644
--- a/modules/nixos/services/cgit.nix
+++ b/nixos/services/cgit.nix
diff --git a/modules/nixos/services/gitea.nix b/nixos/services/gitea.nix
index 32c56db..32c56db 100644
--- a/modules/nixos/services/gitea.nix
+++ b/nixos/services/gitea.nix
diff --git a/modules/nixos/services/searxng.nix b/nixos/services/searxng.nix
index 8ed632e..8ed632e 100644
--- a/modules/nixos/services/searxng.nix
+++ b/nixos/services/searxng.nix
diff --git a/modules/nixos/ssh.nix b/nixos/ssh.nix
index 8f81474..8f81474 100644
--- a/modules/nixos/ssh.nix
+++ b/nixos/ssh.nix
diff --git a/modules/nixos/sudo.nix b/nixos/sudo.nix
index 5fa2727..5fa2727 100644
--- a/modules/nixos/sudo.nix
+++ b/nixos/sudo.nix
diff --git a/modules/nixos/suspend.nix b/nixos/suspend.nix
index 11404de..11404de 100644
--- a/modules/nixos/suspend.nix
+++ b/nixos/suspend.nix
diff --git a/modules/overlays/crazydiskinfo/default.nix b/pkgs/crazydiskinfo/default.nix
index 61de338..61de338 100644
--- a/modules/overlays/crazydiskinfo/default.nix
+++ b/pkgs/crazydiskinfo/default.nix
diff --git a/modules/overlays/default.nix b/pkgs/default.nix
index 1c0ed23..1c0ed23 100644
--- a/modules/overlays/default.nix
+++ b/pkgs/default.nix
diff --git a/modules/overlays/lowbat/default.nix b/pkgs/lowbat/default.nix
index 64ec205..64ec205 100644
--- a/modules/overlays/lowbat/default.nix
+++ b/pkgs/lowbat/default.nix
diff --git a/modules/overlays/st/overrides.nix b/pkgs/st/overrides.nix
index 2d0a37e..2d0a37e 100644
--- a/modules/overlays/st/overrides.nix
+++ b/pkgs/st/overrides.nix
diff --git a/modules/overlays/xerox-workcentre-7800-series-driver/default.nix b/pkgs/xerox-workcentre-7800-series-driver/default.nix
index cfdaaae..cfdaaae 100644
--- a/modules/overlays/xerox-workcentre-7800-series-driver/default.nix
+++ b/pkgs/xerox-workcentre-7800-series-driver/default.nix
diff --git a/modules/overlays/xorg/overrides.nix b/pkgs/xorg/overrides.nix
index 7225431..7225431 100644
--- a/modules/overlays/xorg/overrides.nix
+++ b/pkgs/xorg/overrides.nix