replace T495 config for T430HEADmaster

6 files changed, 55 insertions, 81 deletions

diff --git a/flake.nix b/flake.nix
index 00fe837..b0f23fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -104,7 +104,7 @@ rec {
 		# Configured system hostnames go here under their respective system architecture
 		nixosConfigurations = mkNixosConfigurations {
 			x86_64-linux = [
-				"T495"
+				"T430"
 				"X230"
 				"flex-wg-router"
 				"gnuslashprinter"
diff --git a/hosts/T495/configuration.nix b/hosts/T430/configuration.nix
index b80f27e..929bab5 100644
--- a/hosts/T495/configuration.nix
+++ b/hosts/T430/configuration.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }: {
-	imports = [ ./wg.nix ];
+	#imports = [ ./wg.nix ];
 
 	# Setup bootloader
 	boot._loader.enable = true;
@@ -22,20 +22,6 @@
 				graphics.enable = true;
 				office.enable = true;
 			};
-			development = {
-				android.enable = true;
-				c.enable = true;
-				docker.enable = true;
-				lua.enable = true;
-				web = {
-					hugo = {
-						enable = true;
-						openFirewall = true;
-					};
-					node.enable = true;
-				};
-			};
-			bluetooth.enable = true;
 		};
 	};
 
@@ -43,24 +29,9 @@
 	_users.timmy = {
 		enable = true;
 		autologin.enable = true;
-		nas = {
-			enable = true;
-			office.enable = true;
-		};
 		wifi.enable = true;
 	};
 
-	# Install spotify
-	nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-		"spotify"
-	];
-	environment.systemPackages = with pkgs; [
-		spotify
-	];
-
-	# Use amdgpu driver for x11
-	services.xserver.videoDrivers = [ "amdgpu" ];
-
 	# Configure home
 	home-manager.users.timmy = {
 		gtk._mintTheme = {
@@ -68,17 +39,23 @@
 			color = "Purple";
 			icons.color = "Purple";
 		};
+		gtk = {
+			font.name = "monospace";
+			font.size = 8;
+			cursorTheme.size = 24;
+		};
 		programs._st = {
 			enable = true;
 			font = {
 				name = "TamzenForPowerline";
 				attrs = {
-					pixelsize = 20;
+					pixelsize = 14;
 				};
 			};
 		};
 		programs._seasonalwallpaper.wallpapers.download = true;
 		fonts.fontconfig = {
+			defaultFonts.monospace = [ "TamzenForPowerline" ];
 			subpixelRendering = "rgb";
 			hinting = "slight";
 		};
diff --git a/hosts/T430/hardware-configuration.nix b/hosts/T430/hardware-configuration.nix
new file mode 100644
index 0000000..78b0160
--- /dev/null
+++ b/hosts/T430/hardware-configuration.nix
@@ -0,0 +1,46 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/222813d7-cd5e-473a-9cdb-1a2bae74e904";
+
+  fileSystems."/home" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=@home" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=@nix" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/117A-6AB4";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/hosts/T495/resources/secrets/wg.yaml b/hosts/T430/resources/secrets/wg.yaml
index 7581228..7581228 100644
--- a/hosts/T495/resources/secrets/wg.yaml
+++ b/hosts/T430/resources/secrets/wg.yaml
diff --git a/hosts/T495/wg.nix b/hosts/T430/wg.nix
index 7b98ad8..7b98ad8 100644
--- a/hosts/T495/wg.nix
+++ b/hosts/T430/wg.nix
diff --git a/hosts/T495/hardware-configuration.nix b/hosts/T495/hardware-configuration.nix
deleted file mode 100644
index 6258a83..0000000
--- a/hosts/T495/hardware-configuration.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/4256823f-107b-41a9-851d-6bd9939f1f4b";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
-  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/f20115a9-0a0e-43d2-9cee-c705b2de43b9";
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/4256823f-107b-41a9-851d-6bd9939f1f4b";
-      fsType = "btrfs";
-      options = [ "subvol=@home" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/9441-53B1";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0f0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}