From 886e1a02096403eea8fee214836b0135a0c9e35b Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Fri, 10 Oct 2025 17:00:19 -0500
Subject: [PATCH] idk

---
 home/modules/niri.nix             |  4 ++--
 systems/nixbook/configuration.nix | 24 ++++++++++++++++++++----
 systems/nixbook/pkgs.nix          |  3 +++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/home/modules/niri.nix b/home/modules/niri.nix
index 1d01164..788f39b 100644
--- a/home/modules/niri.nix
+++ b/home/modules/niri.nix
@@ -103,7 +103,7 @@ in
         "Super+Space".action.spawn = ["${pkgs.fish}/bin/fish" "-c" "rofi -no-lazy-grab -modi combi -show combi -combi-modi drun,run"];
         "Super+Shift+W".action.spawn = "rofi -i -show window";
         "Super+V".action = spawn ["${pkgs.fish}/bin/fish" "-c" "${pkgs.cliphist}/bin/cliphist list | ${pkgs.rofi}/bin/rofi -p '󱃔 ' -dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"];
-        "Super+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btop"];
+        "Super+I".action.spawn = ["alacritty" "--class" "btop" "-e" "btop"];
         "Super+Alt+B".action.spawn = ["alacritty" "--class" "bluetui" "-e" "bluetui"];
         "Super+Alt+W".action.spawn = ["alacritty" "--class" "impala" "-e" "impala"];
         "Super+A".action.spawn = ["alacritty" "--class" "pulsemixer" "-e" "${pkgs.wiremix}/bin/wiremix" "-v" "output"];
@@ -202,7 +202,7 @@ in
           default-window-height.proportion = 0.7;
         }
         {
-          matches = [{app-id = "btm";}];
+          matches = [{app-id = "btop";}];
           open-floating = true;
           default-column-width.proportion = 0.9;
           default-window-height.proportion = 0.9;
diff --git a/systems/nixbook/configuration.nix b/systems/nixbook/configuration.nix
index 11fe8a3..e172722 100644
--- a/systems/nixbook/configuration.nix
+++ b/systems/nixbook/configuration.nix
@@ -1,24 +1,33 @@
-{ lib, config, pkgs, callPackage, inputs, ... }:
+{ lib, config, pkgs, callPackage, inputs, modulesPath, ... }:
 
 {
   imports = [
     # ./hardware-configuration.nix
     # ../../pkgs/base-packages.nix
+    (modulesPath + "/installer/scan/not-detected.nix")
     ./pkgs.nix
     ../../modules/base.nix
   ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" "acpi_call" ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
+
   networking.hostName = "nixbook";
   isoImage.squashfsCompression = "gzip -Xcompression-level 1";
   # boot.initrd.kernelModules = [ "i915" ];
   hardware.cpu.amd.updateMicrocode =
     lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   hardware.acpilight.enable = lib.mkDefault true;
   # networking.interfaces.wlp170s0.useDHCP = true;
   # networking.useDHCP = false;
   hardware.uinput.enable = true;
   hardware.bluetooth.enable = true;
-
+  networking.enableB43Firmware = true;
   # Use the systemd-boot EFI boot loader.
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
@@ -27,9 +36,12 @@
   boot.supportedFilesystems = [ "ntfs" ];
 
   services = {
-    desktopManager.plasma6.enable = true;
+    desktopManager.cosmic.enable = true;
   };
 
+  # services.displayManager.cosmic-greeter.enable = true;
+
+  services.desktopManager.plasma6.enable = true;
   services.displayManager.sddm = {
     enable = true;
     enableHidpi = true;
@@ -47,7 +59,8 @@
   #   name = "kwallet";
   #   enableKwallet = true;
   # };
-
+  fonts.fontconfig.useEmbeddedBitmaps = true;
+  fonts.fontDir.enable = true;
   fonts.packages = with pkgs; [
     nerd-fonts.victor-mono
     noto-fonts
@@ -173,6 +186,9 @@
       libvdpau-va-gl
       vaapiVdpau
       libva1
+      mesa
+      intel-media-driver # LIBVA_DRIVER_NAME=iHD
+      vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
     ];
   };
   hardware.amdgpu.initrd.enable = lib.mkDefault true;
diff --git a/systems/nixbook/pkgs.nix b/systems/nixbook/pkgs.nix
index 3344d26..16ce978 100644
--- a/systems/nixbook/pkgs.nix
+++ b/systems/nixbook/pkgs.nix
@@ -45,6 +45,9 @@
     openssl
     xdg-utils
     hardinfo2
+    calamares
+    calamares-nixos
+    calamares-nixos-extensions
     # scribus
     brightnessctl
     mpc-cli