only allow specified unfree software on hosts that use unfree and update all active hosts to work with new config

3 files changed, 31 insertions, 47 deletions

diff --git a/hosts/T495/configuration.nix b/hosts/T495/configuration.nix
index 171f746..b636991 100644
--- a/hosts/T495/configuration.nix
+++ b/hosts/T495/configuration.nix
@@ -1,9 +1,5 @@
 { config, lib, pkgs, ... }: {
-	imports = [
-		./hardware-configuration.nix
-		./wg.nix
-		../../nixos/archetypes/tjkeller
-	];
+	imports = [ ./wg.nix ];
 
 	# Setup bootloader
 	boot._loader.enable = true;
@@ -37,22 +33,22 @@
 			};
 			bluetooth.enable = true;
 		};
-		# Setup user
-		users.primary = {
+	};
+
+	# Enable user timmy
+	_users.timmy = {
+		enable = true;
+		autologin.enable = true;
+		nas = {
 			enable = true;
-			autologin.enable = true;
-		};
-		# Enable network drives
-		tjkeller = {
-			nas = {
-				enable = true;
-				office.enable = true;
-			};
+			office.enable = true;
 		};
 	};
 
 	# Install spotify
-	nixpkgs.config.allowUnfree = true;
+	nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+		"spotify"
+	];
 	environment.systemPackages = with pkgs; [
 		spotify
 	];
@@ -60,5 +56,24 @@
 	# Use amdgpu driver for x11
 	services.xserver.videoDrivers = [ "amdgpu" ];
 
+	# Configure home
+	home-manager.users.timmy = {
+		gtk._mintTheme = {
+			dark = true;
+			color = "Purple";
+			icons.color = "Purple";
+		};
+		programs._st = {
+			enable = true;
+			font = {
+				name = "TamzenForPowerline";
+				attrs = {
+					pixelsize = 20;
+				};
+			};
+		};
+		programs._seasonalwallpaper.wallpapers.download = true;
+	};
+
 	system.stateVersion = "24.05";
 }
diff --git a/hosts/T495/home.nix b/hosts/T495/home.nix
deleted file mode 100644
index f233c08..0000000
--- a/hosts/T495/home.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ ... }: {
-	imports = [ ../../home ];
-
-	theme = {
-		mint.theme.color = "Dark-Purple";
-		mint.icons.color = "Purple";
-		st = {
-			enable = true;
-			font = "TamzenForPowerline:pixelsize=20";
-		};
-	};
-	wallpapers.enable = true;
-
-	home.file.input-leap-config = {
-		source = ./resources/input-leap;
-		recursive = true;
-		target = "./.config/input-leap";
-	};
-}
diff --git a/hosts/T495/resources/input-leap/input-leap.conf b/hosts/T495/resources/input-leap/input-leap.conf
deleted file mode 100644
index c2d5176..0000000
--- a/hosts/T495/resources/input-leap/input-leap.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-section: screens
-	T495:
-	optiplex:
-end
-
-section: links
-	T495:
-		up = optiplex
-
-	optiplex:
-		down = T495
-end