update for niri and noctalia

hosts/thinkpad/configuration.nix

@@ -10,9 +10,10 @@
     ../../modules/common/common.nix
     ../../modules/nixos/bootloader.nix
     ../../modules/nixos/user.nix
+    ../../modules/nixos/noctalia.nix
     ../../modules/nixos/ssh.nix
     ../../modules/nixos/bluetooth.nix
-    ../../modules/nixos/i3.nix
+    ../../modules/nixos/niri.nix
     ../../modules/nixos/nm.nix
     ../../modules/nixos/sound.nix
     ../../modules/nixos/steam.nix
@@ -24,6 +25,25 @@
 
   i18n.defaultLocale = "en_CA.UTF-8";
 
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      # Required for modern Intel GPUs (Xe iGPU and ARC)
+      intel-media-driver     # VA-API (iHD) userspace
+      vpl-gpu-rt             # oneVPL (QSV) runtime
+
+      # Optional (compute / tooling):
+      #intel-compute-runtime  # OpenCL (NEO) + Level Zero for Arc/Xe
+      # NOTE: 'intel-ocl' also exists as a legacy package; not recommended for Arc/Xe.
+      # libvdpau-va-gl       # Only if you must run VDPAU-only apps
+    ];
+  };
+
+  environment.sessionVariables = {
+    LIBVA_DRIVER_NAME = "iHD";     # Prefer the modern iHD backend
+    # VDPAU_DRIVER = "va_gl";      # Only if using libvdpau-va-gl
+  };
+
   environment.systemPackages = with pkgs; [
     wget
     git

hosts/thinkpad/hardware-configuration.nix

@@ -1,42 +1,30 @@
 # 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, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/6212512c-31fc-4366-9756-a0aa05fd3c20";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/2b5e1f82-517d-4af9-8574-b099ca552ab7";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A8AE-5CBB";
-    fsType = "vfat";
-    options = ["fmask=0077" "dmask=0077"];
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/1507-27AE";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
 
-  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.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+  swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/thinkpad/home.nix

@@ -5,7 +5,11 @@
 }: {
   imports = [
     #../../modules/home-manager/sway.nix
-    ../../modules/home-manager/i3
+    #../../modules/home-manager/i3
+    #../../modules/home-manager/hyprland.nix
+    #../../modules/home-manager/hyprland.nix
+    ../../modules/home-manager/niri
+    ../../modules/home-manager/noctalia.nix
     ../../modules/home-manager/git.nix
     ../../modules/home-manager/neovim
     ../../modules/home-manager/kitty.nix
@@ -30,20 +34,22 @@
   home.homeDirectory = "/home/mthomson";
   home.stateVersion = "23.11";
 
+  # services.mako.enable = true;
+  # programs.fuzzel.enable = true;
+  # programs.waybar = {
+  #   enable = true;
+  #   systemd.enable = true;
+  # };
+
   home.packages = with pkgs; [
+    brightnessctl
     firefox
-    gcc
+    google-chrome
   ];
 
   home.sessionVariables = {
     STEAM_EXTRA_COMPAT_TOOLS_PATH = "\${HOME}/.steam/root/compatibilitytools.d";
   };
 
-  services = {
-    blueman-applet = {
-      enable = true;
-    };
-  };
-
   programs.home-manager.enable = true;
 }