config/hypr/hyprland.conf

@@ -1,6 +1,5 @@
-# -- Monitors & input defaults --
-# Monitor layout is host-specific; written by the flake per host.
-source = ~/.config/hypr/monitors.conf
+# -- Monitors & input defaults (overridable per-host) --
+monitor = , preferred, auto, 2.0
 
 device {
     name = apple-spi-keyboard
@@ -9,7 +8,7 @@ device {
 
 # TrackPoint (Corne nipple): hold middle button + move to scroll, joystick-style
 device {
-    name = zmk-project-corne-tp
+    name = corne-tp
     scroll_method = on_button_down
     scroll_button = 274            # BTN_MIDDLE
     scroll_button_lock = false     # set true to toggle scroll on/off with a tap instead of holding

flake.nix

@@ -29,7 +29,7 @@
   outputs = { self, nixpkgs, apple-silicon, home-manager, firefox-addons, zen-browser, ... }:
     let
       # ───────────────────── shared home-manager user ─────────────────────
-      home = { pkgs, osConfig, ... }: {
+      home = { pkgs, ... }: {
         imports = [ zen-browser.homeModules.beta ];
         home.stateVersion = "25.11";
 
@@ -39,23 +39,8 @@
         };
 
         # Raw configs that stay files (no good native module).
-        # `hypr` is recursive so we can drop a host-specific monitors.conf in
-        # alongside the shared files (hyprland.conf `source`s it).
         xdg.configFile = {
-          "hypr" = { source = ./config/hypr; recursive = true; };
-          "hypr/monitors.conf".text =
-            if osConfig.networking.hostName == "mbp"
-            then ''
-              monitor = , preferred, auto, 2.0
-            ''
-            else ''
-              monitor = desc:Lenovo Group Limited P27q-20 V909LRFR, 2560x1440@60, 0x0, 1.25
-              monitor = desc:Lenovo Group Limited P27q-20 V909LPNY, 2560x1440@60, 2048x0, 1.25
-              monitor = desc:Lenovo Group Limited P27q-20 V909LRDD, 2560x1440@60, 4096x0, 1.25
-              workspace = 1, monitor:desc:Lenovo Group Limited P27q-20 V909LRFR, default:true
-              workspace = 2, monitor:desc:Lenovo Group Limited P27q-20 V909LPNY, default:true
-              workspace = 3, monitor:desc:Lenovo Group Limited P27q-20 V909LRDD, default:true
-            '';
+          "hypr".source   = ./config/hypr;
           "eww".source    = ./config/eww;
           "fuzzel".source = ./config/fuzzel;
         };
@@ -170,7 +155,7 @@
           };
         };
 
-        home.packages = with pkgs; [ ripgrep fd tridactyl-native lazygit rustc cargo clippy rustfmt rust-analyzer claude-code gcc bluetui impala];
+        home.packages = with pkgs; [ ripgrep fd tridactyl-native lazygit rustc cargo clippy rustfmt rust-analyzer claude-code];
       };
 
       # ───────────────────── shared system (both hosts) ─────────────────────
@@ -239,8 +224,6 @@
 
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
-        # Back up (don't clobber) any pre-existing files HM wants to manage.
-        home-manager.backupFileExtension = "hm-bak";
         home-manager.users.mads = home;
       };
 
@@ -291,20 +274,10 @@
           system = "x86_64-linux";
           modules = [
             ./hosts/pc/hardware-configuration.nix # generated on the PC
-            ({ config, ... }: {
+            ({ ... }: {
               networking.hostName = "pc";
               boot.loader.systemd-boot.enable = true;
               boot.loader.efi.canTouchEfiVariables = true; # normal x86 UEFI
-
-              # NVIDIA (RTX 20-series or newer → open kernel module).
-              services.xserver.videoDrivers = [ "nvidia" ];
-              hardware.graphics.enable = true; # OpenGL/Vulkan userspace (was hardware.opengl)
-              hardware.nvidia = {
-                modesetting.enable = true;      # required for Wayland/Hyprland
-                open = true;                    # open kernel module (Turing+)
-                nvidiaSettings = true;
-                package = config.boot.kernelPackages.nvidiaPackages.stable;
-              };
             })
           ];
         };

hosts/pc/hardware-configuration.nix

@@ -16,11 +16,11 @@
   hardware.enableRedistributableFirmware = true; # wifi/gpu firmware for arbitrary hw
 
   fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/nixos";
     fsType = "ext4";
   };
   fileSystems."/boot" = {
-    device = "/dev/disk/by-label/NIXBOOT";
+    device = "/dev/disk/by-label/BOOT";
     fsType = "vfat";
   };