cleanup and small fixes

6 files changed, 5 insertions, 31 deletions

diff --git a/modules/hosts/T430/configuration.nix b/modules/hosts/T430/configuration.nix
index 282515d..7910275 100644
--- a/modules/hosts/T430/configuration.nix
+++ b/modules/hosts/T430/configuration.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }: {
 	imports = [ ./hardware-configuration.nix ];
-	networking.hostName = "T430";
 
 	# TODO this does not function
 	#boot.initrd.systemd.extraBin = {
diff --git a/modules/hosts/T430/home.nix b/modules/hosts/T430/home.nix
index 9885a06..15df79a 100644
--- a/modules/hosts/T430/home.nix
+++ b/modules/hosts/T430/home.nix
@@ -1,6 +1,5 @@
 { ... }: {
 	imports = [ ../../home ];
 
-	alacritty.font.size = 9;
 	wallpapers.enable = true;
 }
diff --git a/modules/hosts/T495/configuration.nix b/modules/hosts/T495/configuration.nix
index 526b7bb..6ee62e9 100644
--- a/modules/hosts/T495/configuration.nix
+++ b/modules/hosts/T495/configuration.nix
@@ -2,11 +2,9 @@
 	imports = [
 		./hardware-configuration.nix
 		./games.nix
-		./input-leap.nix
+		#./input-leap.nix
 		./wg.nix
 	];
-	networking.hostName = "T495";
-
 	bootloader.mode = "efi";
 
 	# Enable extra software pkgs
@@ -27,10 +25,6 @@
 	nas.office.enable = true;
 	nas.office.automount = false;
 
-	networking.hosts = {
-		"192.168.77.3"  = [ "devel" ];
-	};
-
 	# Use amdgpu driver for x11
 	services.xserver.videoDrivers = [ "amdgpu" ];
 
diff --git a/modules/hosts/hp-envy-office/configuration.nix b/modules/hosts/hp-envy-office/configuration.nix
index 9a7a43a..fdff4f0 100644
--- a/modules/hosts/hp-envy-office/configuration.nix
+++ b/modules/hosts/hp-envy-office/configuration.nix
@@ -1,8 +1,5 @@
 { config, lib, pkgs, ... }: {
-	imports = [
-		./hardware-configuration.nix
-	];
-	networking.hostName = "hp-envy-office";
+	imports = [ ./hardware-configuration.nix ];
 
 	# Enable extra software pkgs
 	software.desktop = {
diff --git a/modules/hosts/libreX60/configuration.nix b/modules/hosts/libreX60/configuration.nix
index 942793d..38500a6 100644
--- a/modules/hosts/libreX60/configuration.nix
+++ b/modules/hosts/libreX60/configuration.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }: {
 	imports = [ ./hardware-configuration.nix ];
-	networking.hostName = "libreX60";
 
 	# Enable extra software pkgs
 	software.desktop = {
diff --git a/modules/hosts/optiplex/configuration.nix b/modules/hosts/optiplex/configuration.nix
index acda07f..d018c02 100644
--- a/modules/hosts/optiplex/configuration.nix
+++ b/modules/hosts/optiplex/configuration.nix
@@ -1,9 +1,5 @@
 { config, lib, pkgs, ... }: {
-	imports = [
-		./hardware-configuration.nix
-	];
-	networking.hostName = "optiplex";
-
+	imports = [ ./hardware-configuration.nix ];
 	bootloader.mode = "efi";
 
 	# Allow unfree for nvidia + others
@@ -32,10 +28,6 @@
 	# Disable wifi
 	wifi.enable = false;
 
-	networking.hosts = {
-		"192.168.77.3"  = [ "devel" ];
-	};
-
 	# Use nvidia driver
 	services.xserver.videoDrivers = [ "nvidia" ];
 	hardware.nvidia = {
@@ -46,14 +38,8 @@
 		package = config.boot.kernelPackages.nvidiaPackages.stable;  # Still good for 1050
 	};
 
-	# Disable suspend targets
-	systemd.targets = builtins.listToAttrs (map (name: {
-		inherit name;
-		value = {
-			enable = false;
-			unitConfig.DefaultDependencies = "no";
-		};
-	}) ["sleep" "suspend" "hibernate" "hybrid-sleep"]);
+	# Disable suspend
+	suspend.enable = false;
 
 	system.stateVersion = "24.11";
 }