fix bugs for t495 and cleanup

8 files changed, 55 insertions, 10 deletions

diff --git a/modules/home/resources/activation-scripts/clone-repos.sh b/modules/home/resources/activation-scripts/clone-repos.sh
index 246493a..4ed142f 100644
--- a/modules/home/resources/activation-scripts/clone-repos.sh
+++ b/modules/home/resources/activation-scripts/clone-repos.sh
@@ -14,10 +14,11 @@ clonemissing() {
 	run ln -sf $VERBOSE_ARG "$2"/* "$3"
 }
 
-#            # repo         # clone to              # link to
-clonemissing scripts.git    $HOME/docs/src/scripts  $HOME/.local/bin
-clonemissing dotconfig.git  $HOME/docs/src/config   $HOME/.config
-clonemissing nixos.git      $HOME/docs/src/nixos    ''
-clonemissing awesome        $HOME/.config/awesome   ''
-clonemissing nvim           $HOME/.config/nvim      ''
-clonemissing zsh            $HOME/.config/zsh       ''
+#            # repo         # clone to                  # link to
+clonemissing scripts.git    $HOME/docs/src/scripts      $HOME/.local/bin
+clonemissing dotconfig.git  $HOME/docs/src/config       $HOME/.config
+clonemissing userscripts    $HOME/docs/src/userscripts  ''
+clonemissing nixos.git      $HOME/docs/src/nixos        ''
+clonemissing awesome        $HOME/.config/awesome       ''
+clonemissing nvim           $HOME/.config/nvim          ''
+clonemissing zsh            $HOME/.config/zsh           ''
diff --git a/modules/hosts/T495/configuration.nix b/modules/hosts/T495/configuration.nix
index 9983a21..8e10260 100644
--- a/modules/hosts/T495/configuration.nix
+++ b/modules/hosts/T495/configuration.nix
@@ -4,11 +4,27 @@
 		./wg.nix
 	];
 	networking.hostName = "T495";
-	grub.mode = "efi";
 
+	# Use systemd-boot instead of grub
+	# grub does not recognize fs
+	grub.enable = false;
+	boot.loader = {
+		systemd-boot.enable = true;
+		efi.canTouchEfiVariables = true;
+	};
+
+	# Enable extra software pkgs
+	software = {
+		desktop.extra.enable = true;
+		dev.extra.enable = true;
+	};
 	environment.systemPackages = with pkgs; [
 		input-leap
 	];
+	docker.enable = true;
+
+	# Enable network drives
+	fs.networkFS.enable = true;
 
 	system.stateVersion = "24.05";
 }
diff --git a/modules/root/default.nix b/modules/root/default.nix
index 9b3bedd..62eb9b5 100644
--- a/modules/root/default.nix
+++ b/modules/root/default.nix
@@ -17,6 +17,7 @@
 		./printing.nix
 		./secrets.nix
 		./software.nix
+		./tlp.nix
 		./virtualisation.nix
 		./wifi.nix
 		./x11.nix
@@ -40,6 +41,7 @@
 	home-manager.enable    = lib.mkDefault true;
 	pipewire.enable        = lib.mkDefault true;
 	printing.enable        = lib.mkDefault true;
+	tlp.enable             = lib.mkDefault true;
 	scanning.enable        = lib.mkDefault true;
 	software = {
 		desktop = {
diff --git a/modules/root/normaluser.nix b/modules/root/normaluser.nix
index 192e64e..4be90e8 100644
--- a/modules/root/normaluser.nix
+++ b/modules/root/normaluser.nix
@@ -3,6 +3,6 @@
 		description = userDetails.fullname;
 		#home = userDetails.home.root;
 		isNormalUser = true;
-		extraGroups = [ "wheel" ];
+		extraGroups = [ "wheel" "docker" ];
 	};
 }
diff --git a/modules/root/secrets.nix b/modules/root/secrets.nix
index 464a8f2..bfeb542 100644
--- a/modules/root/secrets.nix
+++ b/modules/root/secrets.nix
@@ -10,4 +10,20 @@
 			wireless-env = { };
 		};
 	};
+
+	# This service is a workaround to ensure that secrets are available on
+	# reboot when the secret keys are on a separate subvolume
+	systemd.services.npcnix-force-rebuild-sops-hack = {
+		wantedBy = [ "multi-user.target" ];
+		before = [
+			# List all services that require secrets
+			"wpa_supplicant.service"
+		];
+		serviceConfig = {
+			ExecStart = "/run/current-system/activate";
+			Type = "oneshot";
+			Restart = "on-failure"; # because oneshot
+			RestartSec = "10s";
+		};
+	};
 }
diff --git a/modules/root/software.nix b/modules/root/software.nix
index 635ecf6..d7ab886 100644
--- a/modules/root/software.nix
+++ b/modules/root/software.nix
@@ -64,6 +64,7 @@
 		] ++ pkgs.lib.optionals config.software.utils.enable [
 			# Utilities
 			age
+			cryptsetup
 			ddcutil # TODO
 			fastfetch
 			htop
diff --git a/modules/root/tlp.nix b/modules/root/tlp.nix
new file mode 100644
index 0000000..3414c03
--- /dev/null
+++ b/modules/root/tlp.nix
@@ -0,0 +1,9 @@
+{ lib, config, ... }: {
+	options = {
+		tlp.enable = lib.mkEnableOption "enables tlp";
+	};
+
+	config = lib.mkIf config.tlp.enable {
+		services.tlp.enable = true;
+	};
+}
diff --git a/modules/root/wifi.nix b/modules/root/wifi.nix
index ff143b9..880d436 100644
--- a/modules/root/wifi.nix
+++ b/modules/root/wifi.nix
@@ -2,7 +2,7 @@
 let
 	mkNetworksFromEnvironmentFile = n: builtins.listToAttrs (
 		map (i: {
-			name     = "@SSID_${toString i}@";
+			name    = "@SSID_${toString i}@";
 			value = {
 				psk = "@PSK_${toString i}@";
 				priority = n - i;