Add Lenovo laptop

nixos/base.nix

@@ -73,7 +73,4 @@
 
   # Allow binary firmware
   hardware.enableRedistributableFirmware = true;
-
-  # Force Electron to use Wayland
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 }

nixos/deck.nix

@@ -35,8 +35,12 @@
     ./services/mpd.nix
   ];
 
+  # Set hostname
   networking.hostName = "JimDeck";
 
+  # Force Electron to use Wayland
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "24.11";
 }

nixos/desktop.nix

@@ -38,8 +38,12 @@
     ./services/mpd.nix
   ];
 
+  # Set hostname
   networking.hostName = "JimDesktop";
 
+  # Force Electron to use Wayland
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "24.05";
 }

nixos/hardware/machines/lenovo.nix

@@ -0,0 +1,54 @@
+# This file was initially made by 'nixos-generate-config', try not to edit too much
+{ config, lib, pkgs, modulesPath, ... }: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  # Set all boot options
+  boot = {
+    # Set a kernel version and load/blacklist drivers    
+    kernelPackages = pkgs.linuxPackages_zen;
+    blacklistedKernelModules = [
+      "pcspkr"
+    ];               
+    kernel.sysctl."vm.max_map_count" = 2147483642;       
+    initrd = {
+      availableKernelModules = [
+        "nvme"
+	"xhci_pci"
+	"usbhid"
+	"usb_storage"
+	"sd_mod"
+	"sdhci_pci"
+      ];
+      kernelModules = [
+	"kvm-amd"
+      ];
+    };
+                                                         
+    # Manage supported filesystems                       
+    supportedFilesystems = {                             
+      ntfs = true;
+      zfs = lib.mkForce false;
+    };
+  };
+
+  # Mount everything as necessary
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/c0fe8419-88f9-48a0-8c5b-acd4c11f8037";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/5669-7EF6";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+  };
+
+  # Enables DHCP on each ethernet and wireless interface.
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

nixos/lenovo.nix

@@ -0,0 +1,46 @@
+{
+  imports = [
+    # Base configs
+    ./base.nix
+
+    # Import users and groups
+    ./users/jimbo.nix
+    ./users/groups.nix
+
+    # Desktop only
+    ./desktop/misc.nix
+    ./desktop/sway.nix
+    ./desktop/greetd-sway.nix
+    ./desktop/printing.nix
+    ./desktop/gaming.nix
+    ./desktop/pipewire.nix
+    ./desktop/bluetooth.nix
+    ./desktop/firewall.nix
+    ./desktop/fonts.nix
+    ./desktop/qt.nix
+
+    # Laptop/Portable only
+    ./hardware/wireless.nix
+
+    # Modules
+    ./modules/security.nix
+    ./modules/legacy.nix
+
+    # Hardware
+    ./hardware/machines/lenovo.nix
+    ./hardware/systemdboot.nix
+    ./hardware/opengl.nix
+
+    # Services
+    ./services/openssh.nix
+    ./services/udev.nix
+    ./services/sunshine.nix
+    ./services/mpd.nix
+  ];
+
+  # Set hostname
+  networking.hostName = "JimLenovo";
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  system.stateVersion = "24.05";
+}

nixos/server.nix

@@ -45,7 +45,10 @@
     ./server/matrix-discord.nix
   ];
 
+  # Set custom openssh port
   services.openssh.ports = [ 2222 ];
+
+  # Set hostname
   networking.hostName = "JimServer";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion