[Neovim] Adds Sidekick plugin.

[Eww] Fix launcher command
[mcp] Use legacy Nvidia driver.
2026-06-13 10:22:28 -07:00 · 2026-06-11 10:31:36 -07:00 · 2026-06-04 16:52:35 -07:00 · 2026-06-04 12:11:57 -07:00 · 2026-06-04 11:45:04 -07:00 · 2026-06-04 11:43:55 -07:00
39 changed files with 1625 additions and 772 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,81 @@
 {
  "nodes": {
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprsplit",
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprsplit",
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778620495,
+        "narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -21,7 +97,395 @@
        "type": "github"
      }
    },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprsplit",
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776511930,
+        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprsplit",
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776426399,
+        "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1779392427,
+        "narHash": "sha256-0SiD8JBx6cU0KL1XjLMsR/nSZB5XY3uhrNnvfxH0CtY=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "8b7110cc68662a343b6839f292ac0f44a64c3364",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-guiutils": {
+      "inputs": {
+        "aquamarine": [
+          "hyprsplit",
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprsplit",
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprsplit",
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprsplit",
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprsplit",
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776426575,
+        "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772460177,
+        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprsplit",
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777320127,
+        "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprsplit": {
+      "inputs": {
+        "hyprland": "hyprland",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779414137,
+        "narHash": "sha256-XpwuFhwnfwPbzImZeUWWns///UEpoKNkpl1hN90C3Ag=",
+        "owner": "shezdy",
+        "repo": "hyprsplit",
+        "rev": "0fc01e7930625ecb3e069f5dc8e1d61eab929f3b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "shezdy",
+        "repo": "hyprsplit",
+        "type": "github"
+      }
+    },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprsplit",
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprsplit",
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprsplit",
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprsplit",
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprsplit",
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772462885,
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778234770,
+        "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777159683,
+        "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprsplit",
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778410714,
+        "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
+      "locked": {
+        "lastModified": 1778443072,
+        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
      "locked": {
        "lastModified": 1779971959,
        "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=",
@@ -37,12 +501,36 @@
        "type": "github"
      }
    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778507602,
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "sops-nix": "sops-nix",
-        "zen-browser": "zen-browser"
+        "hyprsplit": "hyprsplit",
+        "nixpkgs": "nixpkgs_2",
+        "sops-nix": "sops-nix"
      }
    },
    "sops-nix": {
@@ -65,23 +553,65 @@
        "type": "github"
      }
    },
-    "zen-browser": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
+    "systems": {
      "locked": {
-        "lastModified": 1779946062,
-        "narHash": "sha256-M/2bCPYjiBTkDNV29J/00z10RM3yYnL9X74RqAHDme0=",
-        "owner": "youwen5",
-        "repo": "zen-browser-flake",
-        "rev": "2e2c38ba20a3d614d0196e0aa44851547306e861",
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
        "type": "github"
      },
      "original": {
-        "owner": "youwen5",
-        "repo": "zen-browser-flake",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprsplit",
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "hyprsplit",
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprsplit",
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprsplit",
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprsplit",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsplit",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778265244,
+        "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
        "type": "github"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@@ -11,8 +11,8 @@
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    zen-browser = {
-      url = "github:youwen5/zen-browser-flake";
+    hyprsplit = {
+      url = "github:shezdy/hyprsplit";
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };
--- a/home-manager/apps/discord.nix
+++ b/home-manager/apps/discord.nix
@@ -11,8 +11,4 @@
      exec = "env ELECTRON_OZONE_PLATFORM_HINT= discord --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu";
    };
  };
-  wayland.windowManager.hyprland.settings.bind = [
-    # Pass Mouse4 through to discord
-    # ", mouse:275, pass, class:^discord$"
-  ];
 }
--- a/home-manager/features/3d-printing.nix
+++ b/home-manager/features/3d-printing.nix
@@ -29,7 +29,7 @@ in

  home.packages = with pkgs; [
    bambu-studio-wrapped
-    LycheeSlicer
+    lycheeslicer
    orca-slicer

    blender
--- a/home-manager/features/eww/default.nix
+++ b/home-manager/features/eww/default.nix
@@ -1,16 +1,48 @@
-{ pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  options = {
+    programs.eww.widgets = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+    };
+  };
+
+  config = {
+    home = {
+      packages = with pkgs; [
        # For Noto Sans NF
-    # 25.05
        nerd-fonts.noto
-    # 24.11
-    # (nerdfonts.override { fonts = [ "NotoSans" ]; })
      ];

+      file.".config/eww".source = ./config;
+    };
+
    programs.eww = {
      enable = true;
-    yuckConfig = "${./config}";
-    scssConfig = "${./config}";
+    };
+
+    systemd.user.services.eww = lib.mkIf (config.programs.eww.widgets != [ ]) {
+      Unit = {
+        Description = "Eww widgets";
+        After = [ "hyprland-session.target" ]; # Start only after hyprland
+        PartOf = [ "hyprland-session.target" ]; # Force it to exit if hyprland does
+      };
+
+      Service = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${pkgs.eww}/bin/eww open-many ${lib.concatStringsSep " " config.programs.eww.widgets}";
+        ExecStop = "${pkgs.eww}/bin/eww kill";
+      };
+
+      Install = {
+        WantedBy = [ "hyprland-session.target" ];
+      };
+    };
  };
 }
--- a/home-manager/features/gaming.nix
+++ b/home-manager/features/gaming.nix
@@ -108,25 +108,25 @@ in
    };
  };

-  wayland.windowManager.hyprland.settings.windowrulev2 = [
-    # Set up full-screen games on monitor 1 (since window 0 is the vertical one.)
-    "monitor 1,class:^steam_app_\d+$"
-    "float,class:^steam_app_\d+$"
-    "monitor 1,fullscreen:1"
-    "center,class:^steam_app_\d+$"
-
-    # Make sure WoW spawns on the right monitor and that Battlenet floats so it renders correctly
-    "monitor 1,title:^World of Warcraft$"
-    "fullscreen,title:^World of Warcraft$"
-    "monitor 1,title:^Battle.net$"
-    "float,title:^Battle.net$"
-
-    # Make Balatro into a regular window.
-    "monitor 1,title:^Balatro$"
-    "tile,title:^Balatro$"
-
-    # Load Cyberpunk 2077 on the right monitor.
-    "monitor 1,class:steam_app_1091500"
-    "fullscreen,class:steam_app_1091500"
-  ];
+  # TODO: Merge into config
+  # wayland.windowManager.hyprland.settings.windowrule = [
+  #   # Set up full-screen games on monitor 1 (since window 0 is the vertical one.)
+  #   # "match:class ^steam_app_\d+$, float"
+  #   "match:class ^steam_app_\d+$, fullscreen 1, monitor 1"
+  #   "match:class ^steam_app_\d+$, center on"
+  #
+  #   # Make sure WoW spawns on the right monitor and that Battlenet floats so it renders correctly
+  #   "match:title ^World of Warcraft$, monitor 1"
+  #   "match:title ^World of Warcraft$, fullscreen on"
+  #   "match:title ^Battle.net$, monitor 1"
+  #   "match:title ^Battle.net$, float on"
+  #
+  #   # Make Balatro into a regular window.
+  #   "match:title ^Balatro$, monitor 1"
+  #   "match:title ^Balatro$, tile on"
+  #
+  #   # Load Cyberpunk 2077 on the right monitor.
+  #   "match:class steam_app_1091500, monitor 1"
+  #   "match:class steam_app_1091500, fullscreen on"
+  # ];
 }
--- a/home-manager/features/hypr/config/.luarc.json
+++ b/home-manager/features/hypr/config/.luarc.json
@@ -0,0 +1,7 @@
+{
+  "workspace": {
+    "library": [
+      "/nix/store/ndq4688w4wjlip63msnlxld8zwcwr66l-hyprland-0.55.2/share/hypr/stubs"
+    ]
+  }
+}
--- a/home-manager/features/hypr/config/animation.lua
+++ b/home-manager/features/hypr/config/animation.lua
@@ -0,0 +1,124 @@
+hl.curve("easeOutQuint", {
+	type = "bezier",
+	points = { { 0.23, 1.0 }, { 0.32, 1.0 } },
+})
+hl.curve("easeInOutCubic", {
+	type = "bezier",
+	points = { { 0.65, 0.05 }, { 0.36, 1.0 } },
+})
+hl.curve("linear", {
+	type = "bezier",
+	points = { { 0.0, 0.0 }, { 1.0, 1.0 } },
+})
+hl.curve("almostLinear", {
+	type = "bezier",
+	points = { { 0.5, 0.5 }, { 0.75, 1.0 } },
+})
+hl.curve("quick", {
+	type = "bezier",
+	points = { { 0.15, 0.0 }, { 0.1, 1.0 } },
+})
+
+hl.animation({
+	leaf = "global",
+	enabled = true,
+	speed = 10.0,
+	bezier = "default",
+})
+hl.animation({
+	leaf = "border",
+	enabled = true,
+	speed = 5.39,
+	bezier = "easeOutQuint",
+})
+hl.animation({
+	leaf = "windows",
+	enabled = true,
+	speed = 4.79,
+	bezier = "easeOutQuint",
+})
+hl.animation({
+	leaf = "windowsIn",
+	enabled = true,
+	speed = 4.1,
+	bezier = "easeOutQuint",
+	style = "popin 87%",
+})
+hl.animation({
+	leaf = "windowsOut",
+	enabled = true,
+	speed = 1.49,
+	bezier = "linear",
+	style = "popin 87%",
+})
+hl.animation({
+	leaf = "fadeIn",
+	enabled = true,
+	speed = 1.73,
+	bezier = "almostLinear",
+})
+hl.animation({
+	leaf = "fadeOut",
+	enabled = true,
+	speed = 1.46,
+	bezier = "almostLinear",
+})
+hl.animation({
+	leaf = "fade",
+	enabled = true,
+	speed = 3.03,
+	bezier = "quick",
+})
+hl.animation({
+	leaf = "layers",
+	enabled = true,
+	speed = 3.81,
+	bezier = "easeOutQuint",
+})
+hl.animation({
+	leaf = "layersIn",
+	enabled = true,
+	speed = 4.0,
+	bezier = "easeOutQuint",
+	style = "fade",
+})
+hl.animation({
+	leaf = "layersOut",
+	enabled = true,
+	speed = 1.5,
+	bezier = "linear",
+	style = "fade",
+})
+hl.animation({
+	leaf = "fadeLayersIn",
+	enabled = true,
+	speed = 1.79,
+	bezier = "almostLinear",
+})
+hl.animation({
+	leaf = "fadeLayersOut",
+	enabled = true,
+	speed = 1.39,
+	bezier = "almostLinear",
+})
+hl.animation({
+	leaf = "workspaces",
+	enabled = true,
+	speed = 1.94,
+	bezier = "almostLinear",
+	style = "fade",
+})
+hl.animation({
+	leaf = "workspacesIn",
+	enabled = true,
+	speed = 1.21,
+	bezier = "almostLinear",
+	style = "fade",
+})
+hl.animation({
+	leaf = "workspacesOut",
+	enabled = true,
+	speed = 1.94,
+	bezier = "almostLinear",
+	style = "fade",
+})
--- a/home-manager/features/hypr/config/autostart.lua
+++ b/home-manager/features/hypr/config/autostart.lua
@@ -0,0 +1,5 @@
+hl.on("hyprland.start", function()
+	hl.exec_cmd("nm-applet")
+	hl.exec_cmd("gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'")
+	hl.exec_cmd("gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'")
+end)
--- a/home-manager/features/hypr/config/binds.lua
+++ b/home-manager/features/hypr/config/binds.lua
@@ -0,0 +1,99 @@
+local browser = "firefox --new-window"
+local mainMod = "SUPER + ALT"
+local menu = "rofi -show combi -combi-modes drun,ssh,run -theme ~/.config/rofi/launcher/style.rasi"
+local terminal = "foot"
+
+local split = require("hyprsplit")
+
+hl.bind("SUPER + ALT + T", function()
+	hl.exec_cmd(terminal)
+end)
+hl.bind("SUPER + ALT + B", function()
+	hl.exec_cmd(browser)
+end)
+hl.bind("SUPER + ALT + D", function()
+	hl.exec_cmd(menu)
+end)
+hl.bind("SUPER + ALT + SHIFT + S", function()
+	hl.exec_cmd("hyprshot -m region --clipboard-only")
+end)
+hl.bind("SUPER + ALT + CTRL + SHIFT + S", function()
+	hl.exec_cmd("hyprshot -m region -o ~/Pictures")
+end)
+hl.bind("SUPER + ALT + C", function()
+	hl.exec_cmd("swaync-client -t")
+end)
+hl.bind("SUPER + ALT + CTRL + Q", function()
+	hl.exec_cmd("/home/drew/.config/rofi/powermenu/powermenu.sh")
+end)
+hl.bind("SUPER + ALT + X", function()
+	hl.exec_cmd("/home/drew/.config/rofi/powermenu/powermenu.sh")
+end)
+hl.bind("SUPER + ALT + F", hl.dsp.window.float({ action = "toggle" }))
+hl.bind("SUPER + ALT + SHIFT + F", hl.dsp.window.fullscreen({ action = "toggle" }))
+hl.bind("SUPER + ALT + CTRL + left", hl.dsp.window.resize({ x = -20, y = 0 }))
+hl.bind("SUPER + ALT + CTRL + right", hl.dsp.window.resize({ x = 20, y = 0 }))
+hl.bind("SUPER + ALT + CTRL + down", hl.dsp.window.resize({ x = 0, y = 20 }))
+hl.bind("SUPER + ALT + CTRL + up", hl.dsp.window.resize({ x = 0, y = -20 }))
+hl.bind("SUPER + ALT + R", hl.dsp.focus({ monitor = "next" }))
+--
+hl.bind("SUPER + ALT + r", hl.dsp.focus({ monitor = "l" }))
+hl.bind("SUPER + ALT + s", hl.dsp.focus({ monitor = "r" }))
+
+local hy3 = hl.plugin.hy3
+
+hl.bind("SUPER + ALT + Q", hy3.kill_active())
+hl.bind("SUPER + ALT + G", hy3.make_group("opposite"))
+hl.bind("SUPER + ALT + W", hy3.make_group("tab", { toggle = true }))
+hl.bind("SUPER + ALT + A", hy3.change_focus("raise"))
+hl.bind("SUPER + ALT + Z", hy3.change_focus("lower"))
+hl.bind("SUPER + ALT + O", hy3.change_group("opposite"))
+hl.bind("SUPER + ALT + left", hy3.move_focus("left"))
+hl.bind("SUPER + ALT + right", hy3.move_focus("right"))
+hl.bind("SUPER + ALT + up", hy3.move_focus("up"))
+hl.bind("SUPER + ALT + down", hy3.move_focus("down"))
+hl.bind("SUPER + ALT + SHIFT + left", hy3.move_window("left"))
+hl.bind("SUPER + ALT + SHIFT + right", hy3.move_window("right"))
+hl.bind("SUPER + ALT + SHIFT + up", hy3.move_window("up"))
+hl.bind("SUPER + ALT + SHIFT + down", hy3.move_window("down"))
+
+-- Workspace binds
+for i = 1, 10 do
+	hl.bind("SUPER + ALT + " .. (i % 10), split.dsp.focus({ workspace = tostring(i) }))
+	hl.bind("SUPER + ALT + SHIFT + " .. (i % 10), split.dsp.window.move({ workspace = tostring(i) }))
+end
+
+hl.bind("SUPER + ALT + SHIFT + r", hl.dsp.window.move({ monitor = "+1" }))
+hl.bind(" + XF86AudioRaiseVolume", function()
+	hl.exec_cmd("swayosd-client --output-volume raise")
+end, { locked = true })
+hl.bind(" + XF86AudioLowerVolume", function()
+	hl.exec_cmd("swayosd-client --output-volume lower")
+end, { locked = true })
+hl.bind(" + XF86AudioMute", function()
+	hl.exec_cmd("swayosd-client --output-volume mute-toggle")
+end, { locked = true })
+hl.bind(" + XF86AudioMicMute", function()
+	hl.exec_cmd("swayosd-client --input-volume mute-toggle")
+end, { locked = true })
+hl.bind(" + XF86MonBrightnessUp", function()
+	hl.exec_cmd("brightnessctl s 10%+")
+end, { locked = true })
+hl.bind(" + XF86MonBrightnessDown", function()
+	hl.exec_cmd("brightnessctl s 10%-")
+end, { locked = true })
+hl.bind(" + XF86AudioNext", function()
+	hl.exec_cmd("playerctl next")
+end, { locked = true })
+hl.bind(" + XF86AudioPause", function()
+	hl.exec_cmd("playerctl play-pause")
+end, { locked = true })
+hl.bind(" + XF86AudioPlay", function()
+	hl.exec_cmd("playerctl play-pause")
+end, { locked = true })
+hl.bind(" + XF86AudioPrev", function()
+	hl.exec_cmd("playerctl previous")
+end, { locked = true })
+hl.bind("SUPER + mouse:272", hl.dsp.window.drag(), { mouse = true })
+hl.bind("SUPER + mouse:273", hl.dsp.window.resize(), { mouce = true })
+-- hl.bind(" + mouse:272", hl.dsp.hy3:focustab({ mouse })) --, { non_consuming = true }
--- a/home-manager/features/hypr/config/hyprland.lua
+++ b/home-manager/features/hypr/config/hyprland.lua
@@ -0,0 +1,91 @@
+local split = require("hyprsplit")
+
+split.config({
+	num_workspaces = 10,
+	persistent_workspaces = true,
+})
+
+hl.config({
+	general = {
+		allow_tearing = false,
+		border_size = 2,
+		col = {
+			active_border = {
+				colors = { "rgba(ff00ffee)", "rgba(ff9900ee)" },
+				angle = 45,
+			},
+			inactive_border = {
+				colors = { "rgba(00ffff99)", "rgba(0000cc99)" },
+				angle = 45,
+			},
+		},
+		gaps_in = 5,
+		gaps_out = 10,
+		layout = "hy3",
+		resize_on_border = true,
+	},
+	decoration = {
+		active_opacity = 1.000000,
+		blur = {
+			enabled = true,
+			passes = 1,
+			size = 3,
+			vibrancy = 0.169600,
+		},
+		inactive_opacity = 1.000000,
+		rounding = 5,
+		shadow = {
+			color = "rgba(1a1a1aee)",
+			enabled = true,
+			range = 5,
+			render_power = 3,
+		},
+	},
+	input = {
+		follow_mouse = 1,
+		kb_layout = "us",
+		kb_options = "compose:ralt",
+		sensitivity = 0,
+		touchpad = {
+			natural_scroll = false,
+		},
+	},
+	misc = {
+		disable_hyprland_logo = true,
+		force_default_wallpaper = 0,
+		vrr = 1,
+	},
+	debug = {
+		disable_logs = false,
+	},
+	cursor = {
+		no_hardware_cursors = true,
+	},
+	animations = {
+		enabled = true,
+	},
+	-- plugin = {
+	-- 	hy3 = {
+	-- 		group_inset = 10,
+	-- 		no_gaps_when_only = 0,
+	-- 		node_collapse_policy = 2,
+	-- 		tab_first_window = false,
+	-- 		tabs = {
+	-- 			height = 20,
+	-- 			rounding = 2,
+	-- 			text_height = 10,
+	-- 		},
+	-- 	},
+	-- },
+})
+
+hl.device({
+	name = "logitech-g502-1",
+	sensitivity = -0.200000,
+})
+
+-- Additional configs
+require("config.autostart")
+require("config.binds")
+require("config.animation")
+require("config.windows")
--- a/home-manager/features/hypr/config/windows.lua
+++ b/home-manager/features/hypr/config/windows.lua
@@ -0,0 +1,20 @@
+hl.window_rule({
+	match = {
+		class = "Rofi",
+	},
+	stay_focused = true,
+})
+
+-- Set border color to red if window is fullscreen
+hl.window_rule({
+	match = { fullscreen = true },
+	border_color = "rgb(FF0000) rgb(880808)",
+})
+
+-- Suppress maximize events
+hl.window_rule({
+	match = {
+		class = ".*",
+	},
+	suppress_event = "maximize",
+})
--- a/home-manager/features/hypr/hyprland.nix
+++ b/home-manager/features/hypr/hyprland.nix
@@ -0,0 +1,126 @@
+{
+  pkgs,
+  inputs,
+  config,
+  lib,
+  ...
+}:
+{
+  imports = [
+    ../swaylock.nix
+    ./hypridle.nix
+    ../../options/monitors.nix
+  ];
+
+  xdg.configFile = {
+    "hypr/hyprsplit" = {
+      source = "${inputs.hyprsplit}";
+      recursive = true;
+    };
+
+    "hypr/config" = {
+      source = ./config;
+      recursive = true;
+    };
+  };
+
+  home.packages = with pkgs; [
+    swayosd # volume pop-up
+    swaynotificationcenter # notifications
+    hyprpolkitagent # Privilege managent
+    hyprshot # Screenshot utility
+
+    # For clipboard management.  See below.
+    wl-clipboard
+    xclip
+  ];
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+
+    # TODO: Switch to the newer LUA config?
+    configType = "lua";
+
+    plugins = [
+      # https://github.com/outfoxxed/hy3
+      pkgs.hyprlandPlugins.hy3
+    ];
+
+    extraConfig = ''
+      require("config.hyprland")
+    '';
+
+    # Disable systemd because it conflicts with UWSM
+    systemd.enable = false;
+  };
+
+  programs.hyprlock = {
+    enable = false;
+    settings = {
+      general = {
+        disable_loading_bar = true;
+        hide_cursor = true;
+      };
+
+      background = {
+        monitor = "";
+        color = "rgb(000000)";
+      };
+
+      # Time
+      label = {
+        monitor = "";
+        text = ''
+          cmd[update:1000] echo "$(date '+%F %T')"
+        '';
+        font_size = 96;
+        font_family = "NotoSans Nerd Font";
+        color = "rgb(990000)";
+        position = "0, 0";
+        halign = "center";
+        valign = "center";
+      };
+
+      input-field = {
+        monitor = "";
+        size = "300, 40";
+        fade_on_empty = true;
+        outline_thickness = 2;
+        outer_color = "rgb(cc2222) rgb(661111)";
+        inner_color = "rgb(221111)";
+
+        font_color = "rgb(cc2222)";
+        dots_size = 0.2;
+        dots_spacing = 0.1;
+        placeholder_text = "";
+
+        fail_color = "rgb(cc3333)";
+        capslock_color = "rgb(cccc33)";
+
+        halign = "center";
+        valign = "center";
+        position = "0, -300px";
+      };
+    };
+  };
+
+  # UWSM sessions should not use Hyprland's variables but instead use UWSM's variable management.
+  # See https://wiki.hyprland.org/Configuring/Environment-variables/
+  home.file.".config/uwsm/env".text = ''
+    export XCURSOR_SIZE="32"
+    export HYPRCURSOR_SIZE="32"
+    export HYPRCURSOR_THEME="phinger"
+
+    # Nvidia config
+    export LIBVA_DRIVER_NAME="nvidia"
+    export __GLX_VENDOR_LIBRARY_NAME="nvidia"
+
+    # For window theming
+    export QT_QPA_PLATFORMTHEME="qt6ct   # for Qt apps"
+    export GTK_THEME="Adwaita-dark"
+
+    # Tell electron apps they should use OZone for Wayland
+    export ELECTRON_OZONE_PLATFORM_HINT="auto"
+  '';
+
+}
--- a/home-manager/features/hyprland.nix
+++ b/home-manager/features/hyprland.nix
@@ -1,507 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./swaylock.nix
-    ./hypr/hypridle.nix
-  ];
-
-  home.packages = with pkgs; [
-    swayosd # volume pop-up
-    swaynotificationcenter # notifications
-    hyprpolkitagent # Privilege managent
-    hyprshot # Screenshot utility
-
-    # For clipboard management.  See below.
-    wl-clipboard
-    xclip
-  ];
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-
-    # TODO: Switch to the newer LUA config?
-    configType = "hyprlang";
-
-    plugins = [
-      # https://github.com/outfoxxed/hy3
-      pkgs.hyprlandPlugins.hy3
-      # https://github.com/shezdy/hyprsplit
-      # TODO: Fails to build
-      # pkgs.hyprlandPlugins.hyprsplit
-    ];
-
-    # Disable systemd because it conflicts with UWSM
-    systemd.enable = false;
-
-    settings = {
-      monitor = [
-        "DP-2, 3440x1440@164.90, 0x0, 1"
-        "DP-1, 2560x1440, -1440x-510, 1, transform, 1"
-      ];
-
-      "$terminal" = "foot";
-      "$menu" = "rofi -show combi -combi-modes drun,ssh,run -theme ~/.config/rofi/launcher/style.rasi";
-      "$browser" = "zen --new-window";
-
-      exec-once = [
-        "nm-applet"
-        "sleep 2 && hyprpm reload -n"
-        "systemctl --user start hyprpolkitagent"
-
-        "gsettings set org.gnome.desktop.interface color-scheme \"prefer-dark\""
-        "gsettings set org.gnome.desktop.interface gtk-theme \"Adwaita-dark\""
-        # Hyprland doesn't paste into Firefox or Wine apps.  This program is a workaround.
-        # See https://github.com/hyprwm/Hyprland/issues/2319
-        #
-        # However, it also sometimes gets messed up and prevents all copy-paste.  Disabling unless I need it.
-        #
-        # -t text = Only handle text
-        # -w xclip -selection clipboard = Watch for events and invoke xclip
-        # "wl-paste -t text -w xclip -selection clipboard"
-      ];
-
-      general = {
-        gaps_in = 5;
-        gaps_out = 10;
-
-        border_size = 2;
-
-        # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-        "col.active_border" = "rgba(eeeeffee) rgba(3366ffee) 45deg";
-        "col.inactive_border" = "rgba(595959aa)";
-
-        # Set to true enable resizing windows by clicking and dragging on borders and gaps
-        resize_on_border = true;
-
-        # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
-        allow_tearing = false;
-
-        layout = "hy3";
-      };
-
-      # https://wiki.hyprland.org/Configuring/Variables/#decoration
-      decoration = {
-        rounding = 5;
-
-        # Change transparency of focused and unfocused windows
-        active_opacity = 1.0;
-        inactive_opacity = 1.0;
-
-        shadow = {
-          enabled = true;
-          range = 5;
-          render_power = 3;
-          color = "rgba(1a1a1aee)";
-        };
-
-        # https://wiki.hyprland.org/Configuring/Variables/#blur
-        blur = {
-          enabled = true;
-          size = 3;
-          passes = 1;
-          vibrancy = 0.1696;
-        };
-      };
-
-      # https://wiki.hyprland.org/Configuring/Variables/#animations
-      animations = {
-        enabled = "yes";
-
-        # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-        bezier = [
-          "easeOutQuint,0.23,1,0.32,1"
-          "easeInOutCubic,0.65,0.05,0.36,1"
-          "linear,0,0,1,1"
-          "almostLinear,0.5,0.5,0.75,1.0"
-          "quick,0.15,0,0.1,1"
-        ];
-
-        animation = [
-          "global, 1, 10, default"
-          "border, 1, 5.39, easeOutQuint"
-          "windows, 1, 4.79, easeOutQuint"
-          "windowsIn, 1, 4.1, easeOutQuint, popin 87%"
-          "windowsOut, 1, 1.49, linear, popin 87%"
-          "fadeIn, 1, 1.73, almostLinear"
-          "fadeOut, 1, 1.46, almostLinear"
-          "fade, 1, 3.03, quick"
-          "layers, 1, 3.81, easeOutQuint"
-          "layersIn, 1, 4, easeOutQuint, fade"
-          "layersOut, 1, 1.5, linear, fade"
-          "fadeLayersIn, 1, 1.79, almostLinear"
-          "fadeLayersOut, 1, 1.39, almostLinear"
-          "workspaces, 1, 1.94, almostLinear, fade"
-          "workspacesIn, 1, 1.21, almostLinear, fade"
-          "workspacesOut, 1, 1.94, almostLinear, fade"
-        ];
-      };
-
-      # https://wiki.hyprland.org/Configuring/Variables/#misc
-      misc = {
-        force_default_wallpaper = 0; # Set to 0 or 1 to disable the anime mascot wallpapers
-        disable_hyprland_logo = true; # If true disables the random hyprland logo / anime girl background. :(
-        vrr = 1; # Enable variable refresh rate
-      };
-
-      cursor = {
-        no_hardware_cursors = true;
-      };
-
-      ###############
-      ### PLUGINS ###
-      ###############
-
-      plugin = {
-        hy3 = {
-          # disable gaps when only one window is onscreen
-          # 0 - always show gaps
-          # 1 - hide gaps with a single window onscreen
-          # 2 - 1 but also show the window border
-          no_gaps_when_only = 0; # default: 0
-
-          # policy controlling what happens when a node is removed from a group,
-          # leaving only a group
-          # 0 = remove the nested group
-          # 1 = keep the nested group
-          # 2 = keep the nested group only if its parent is a tab group
-          node_collapse_policy = 2; # default: 2
-
-          # offset from group split direction when only one window is in a group
-          group_inset = 10; # default: 10
-
-          # if a tab group will automatically be created for the first window spawned in a workspace
-          tab_first_window = false;
-
-          # tab group settings
-          tabs = {
-            # height of the tab bar
-            height = 20; # default: 15
-
-            # padding between the tab bar and its focused node
-            #   padding = <int> # default: 5
-
-            # the tab bar should animate in/out from the top instead of below the window
-            #   from_top = <bool> # default: false
-
-            # rounding of tab bar corners
-            rounding = 2; # default: 3
-
-            # render the window title on the bar
-            #   render_text = <bool> # default: true
-
-            # center the window title
-            #   text_center = <bool> # default: false
-
-            # font to render the window title with
-            #   text_font = <string> # default: Sans
-
-            # height of the window title
-            text_height = 10; # default: 8
-
-            # left padding of the window title
-            #   text_padding = <int> # default: 3
-
-            # active tab bar segment color
-            #   col.active = <color> # default: 0xff32b4ff
-
-            # urgent tab bar segment color
-            #   col.urgent = <color> # default: 0xffff4f4f
-
-            # inactive tab bar segment color
-            #   col.inactive = <color> # default: 0x80808080
-
-            # active tab bar text color
-            #   col.text.active = <color> # default: 0xff000000
-
-            # urgent tab bar text color
-            #   col.text.urgent = <color> # default: 0xff000000
-
-            # inactive tab bar text color
-            #   col.text.inactive = <color> # default: 0xff000000
-          };
-
-          # autotiling settings
-          autotile = {
-            # enable autotile
-            #   enable = <bool> # default: false
-
-            # make autotile-created groups ephemeral
-            #   ephemeral_groups = <bool> # default: true
-
-            # if a window would be squished smaller than this width, a vertical split will be created
-            # -1 = never automatically split vertically
-            # 0 = always automatically split vertically
-            # <number> = pixel width to split at
-            #   trigger_width = <int> # default: 0
-
-            # if a window would be squished smaller than this height, a horizontal split will be created
-            # -1 = never automatically split horizontally
-            # 0 = always automatically split horizontally
-            # <number> = pixel height to split at
-            #   trigger_height = <int> # default: 0
-
-            # a space or comma separated list of workspace ids where autotile should be enabled
-            # it's possible to create an exception rule by prefixing the definition with "not:"
-            # workspaces = 1,2 # autotiling will only be enabled on workspaces 1 and 2
-            # workspaces = not:1,2 # autotiling will be enabled on all workspaces except 1 and 2
-            #   workspaces = <string> # default: all
-          };
-        };
-
-        hyprsplit = {
-          num_workspaces = 10;
-          persistent_workspaces = true;
-        };
-      };
-
-      #############
-      ### INPUT ###
-      #############
-
-      # https://wiki.hyprland.org/Configuring/Variables/#input
-      input = {
-        kb_layout = "us";
-        # kb_variant =
-        # kb_model =
-        kb_options = "compose:ralt";
-        # kb_rules =
-
-        follow_mouse = 1;
-
-        sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
-
-        touchpad = {
-          natural_scroll = false;
-        };
-      };
-
-      # Example per-device config
-      # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
-      device = {
-        name = "logitech-g502-1";
-        sensitivity = -0.2;
-      };
-
-      ###################
-      ### KEYBINDINGS ###
-      ###################
-
-      # See https://wiki.hyprland.org/Configuring/Keywords/
-      "$mainMod" = "SUPER + ALT";
-
-      bind = [
-        "$mainMod, T, exec, $terminal"
-        "$mainMod, B, exec, $browser"
-        "$mainMod, D, exec, $menu"
-        "$mainMod + SHIFT, S, exec, hyprshot -m region --clipboard-only"
-        "$mainMod + CTRL + SHIFT, S, exec, hyprshot -m region -o ~/Pictures"
-        "$mainMod, C, exec, swaync-client -t"
-
-        "$mainMod + L_CONTROL, Q, exec, /home/drew/.config/rofi/powermenu/powermenu.sh"
-        "$mainMod, X, exec, /home/drew/.config/rofi/powermenu/powermenu.sh"
-        # "$mainMod, X, exec, hyprlock"
-        # "$mainMod + SHIFT, X, exec, systemctl suspend"
-
-        "$mainMod, F, togglefloating,"
-        "$mainMod + SHIFT, F, fullscreen, 1"
-        "$mainMod + CTRL, left, resizeactive, -20 0"
-        "$mainMod + CTRL, right, resizeactive, 20 0"
-        "$mainMod + CTRL, down, resizeactive, 0 20"
-        "$mainMod + CTRL, up, resizeactive, 0 -20"
-
-        # Monitors
-        "$mainMod, R, focusmonitor, next"
-        "$mainMod + CTRL, R, movecurrentworkspacetomonitor, l"
-        "$mainMod + CTRL, S, movecurrentworkspacetomonitor, r"
-
-        # Hy3 Stuff
-        "$mainMod, Q, hy3:killactive,"
-        "$mainMod, G, hy3:makegroup, opposite, ephemeral"
-        "$mainMod, W, hy3:makegroup, tab, ephemeral"
-        "$mainMod + SHIFT, W, hy3:changegroup, toggletab"
-        "$mainMod, A, hy3:changefocus, raise"
-        "$mainMod, Z, hy3:changefocus, lower"
-        "$mainMod, O, hy3:changegroup, opposite"
-        "$mainMod, left, hy3:movefocus, l"
-        "$mainMod, right, hy3:movefocus, r"
-        "$mainMod, up, hy3:movefocus, u"
-        "$mainMod, down, hy3:movefocus, d"
-        "$mainMod, r, focusmonitor, l"
-        "$mainMod, s, focusmonitor, r"
-        "$mainMod + SHIFT, left, hy3:movewindow, l"
-        "$mainMod + SHIFT, right, hy3:movewindow, r"
-        "$mainMod + SHIFT, up, hy3:movewindow, u"
-        "$mainMod + SHIFT, down, hy3:movewindow, d"
-        # Switch workspaces with mainMod + [0-9]
-        "$mainMod, 1, split:workspace, 1"
-        "$mainMod, 2, split:workspace, 2"
-        "$mainMod, 3, split:workspace, 3"
-        "$mainMod, 4, split:workspace, 4"
-        "$mainMod, 5, split:workspace, 5"
-        "$mainMod, 6, split:workspace, 6"
-        "$mainMod, 7, split:workspace, 7"
-        "$mainMod, 8, split:workspace, 8"
-        "$mainMod, 9, split:workspace, 9"
-        "$mainMod, 0, split:workspace, 10"
-        # Move active window to a workspace with mainMod + SHIFT + [0-9]
-        # Note: using hy3:movetoworkspace instead of split:movetoworkspace.
-        # The plugins are compatible.
-        "$mainMod SHIFT, 1, hy3:movetoworkspace, 1, follow"
-        "$mainMod SHIFT, 2, hy3:movetoworkspace, 2, follow"
-        "$mainMod SHIFT, 3, hy3:movetoworkspace, 3, follow"
-        "$mainMod SHIFT, 4, hy3:movetoworkspace, 4, follow"
-        "$mainMod SHIFT, 5, hy3:movetoworkspace, 5, follow"
-        "$mainMod SHIFT, 6, hy3:movetoworkspace, 6, follow"
-        "$mainMod SHIFT, 7, hy3:movetoworkspace, 7, follow"
-        "$mainMod SHIFT, 8, hy3:movetoworkspace, 8, follow"
-        "$mainMod SHIFT, 9, hy3:movetoworkspace, 9, follow"
-        "$mainMod SHIFT, 0, hy3:movetoworkspace, 10, follow"
-        # These don't take monitor numbers, but rather differences.  It's next/prev but
-        # it'll always just move it to the other monitor
-        "$mainMod SHIFT, r, movewindow, mon:+1"
-      ];
-
-      # m = mouse bindings
-      # These use just SUPER so I can hit them with my left hand
-      bindm = [
-        "SUPER, mouse:272, movewindow"
-        "SUPER, mouse:273, resizewindow"
-      ];
-
-      # n = non-consuming
-      bindn = [
-        ", mouse:272, hy3:focustab, mouse"
-      ];
-
-      # l = available when locked
-      bindl = [
-        # Laptop multimedia keys for volume and LCD brightness
-        ",XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise"
-        ",XF86AudioLowerVolume, exec, swayosd-client --output-volume lower"
-        ",XF86AudioMute, exec, swayosd-client --output-volume mute-toggle"
-        ",XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle"
-        ",XF86MonBrightnessUp, exec, brightnessctl s 10%+"
-        ",XF86MonBrightnessDown, exec, brightnessctl s 10%-"
-        # Requires playerctl
-        ", XF86AudioNext, exec, playerctl next"
-        ", XF86AudioPause, exec, playerctl play-pause"
-        ", XF86AudioPlay, exec, playerctl play-pause"
-        ", XF86AudioPrev, exec, playerctl previous"
-      ];
-
-      ##############################
-      ### WINDOWS AND WORKSPACES ###
-      ##############################
-
-      # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-
-      windowrulev2 = [
-        # Ignore maximize requests from apps. You'll probably like this.
-        "suppressevent maximize, class:.*"
-
-        # Fix some dragging issues with XWayland
-        "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
-
-        # Make right-click backgrounds not transparent.  The menus have no class or title.
-        "opaque,class:(),title:()"
-        "noshadow,class:(),title:()"
-        "noblur,class:(),title:()"
-      ];
-
-      # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
-      workspace = [
-        "1, defaultName:L1"
-        "2, defaultName:L2"
-        "3, defaultName:L3"
-        "4, defaultName:L4"
-        "5, defaultName:L5"
-        "6, defaultName:L6"
-        "7, defaultName:L7"
-        "8, defaultName:L8"
-        "9, defaultName:L9"
-        "10, defaultName:L10"
-        "11, defaultName:R1"
-        "12, defaultName:R2"
-        "13, defaultName:R3"
-        "14, defaultName:R4"
-        "15, defaultName:R5"
-        "16, defaultName:R6"
-        "17, defaultName:R7"
-        "18, defaultName:R8"
-        "19, defaultName:R9"
-        "20, defaultName:R10"
-      ];
-    };
-  };
-
-  programs.hyprlock = {
-    enable = false;
-    settings = {
-      general = {
-        disable_loading_bar = true;
-        hide_cursor = true;
-      };
-
-      background = {
-        monitor = "";
-        color = "rgb(000000)";
-      };
-
-      # Time
-      label = {
-        monitor = "";
-        text = ''
-          cmd[update:1000] echo "$(date '+%F %T')"
-        '';
-        font_size = 96;
-        font_family = "NotoSans Nerd Font";
-        color = "rgb(990000)";
-        position = "0, 0";
-        halign = "center";
-        valign = "center";
-      };
-
-      input-field = {
-        monitor = "";
-        size = "300, 40";
-        fade_on_empty = true;
-        outline_thickness = 2;
-        outer_color = "rgb(cc2222) rgb(661111)";
-        inner_color = "rgb(221111)";
-
-        font_color = "rgb(cc2222)";
-        dots_size = 0.2;
-        dots_spacing = 0.1;
-        placeholder_text = "";
-
-        fail_color = "rgb(cc3333)";
-        capslock_color = "rgb(cccc33)";
-
-        halign = "center";
-        valign = "center";
-        position = "0, -300px";
-      };
-    };
-  };
-
-  # UWSM sessions should not use Hyprland's variables but instead use UWSM's variable management.
-  # See https://wiki.hyprland.org/Configuring/Environment-variables/
-  home.file.".config/uwsm/env".text = ''
-    export XCURSOR_SIZE="32"
-    export HYPRCURSOR_SIZE="32"
-    export HYPRCURSOR_THEME="phinger"
-
-    # Nvidia config
-    export LIBVA_DRIVER_NAME="nvidia"
-    export __GLX_VENDOR_LIBRARY_NAME="nvidia"
-
-    # For window theming
-    export QT_QPA_PLATFORMTHEME="qt6ct   # for Qt apps"
-    export GTK_THEME="Adwaita-dark"
-
-    # Tell electron apps they should use OZone for Wayland
-    export ELECTRON_OZONE_PLATFORM_HINT="auto"
-  '';
-
-}
--- a/home-manager/features/hyprpaper.nix
+++ b/home-manager/features/hyprpaper.nix
@@ -0,0 +1,17 @@
+{ config, ... }:
+{
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      splash = false; # Disable the little quotes they put on there
+      wallpaper = map (mon: {
+        monitor = mon;
+        # Each monitor gets a folder under wallpaper that containes the current images.
+        path = "~/Pictures/Wallpaper/${mon}";
+        timeout = 3600;
+        recursive = true;
+        fit_mode = "cover";
+      }) (builtins.attrNames config.hardware.monitors);
+    };
+  };
+}
--- a/home-manager/features/linux-desktop.nix
+++ b/home-manager/features/linux-desktop.nix
@@ -1,16 +1,21 @@
-{ pkgs, inputs, ... }:
+{
+  config,
+  pkgs,
+  ...
+}:
 let
-  zen-browser = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  browser = "firefox";
 in
 {
  imports = [
    ./audio.nix
-    ./hyprland.nix
+    ./hypr/hyprland.nix
    ./rofi/rofi.nix
    ./sway.nix
    ../apps/element.nix
    ../apps/discord.nix
    ./terminal.nix
+    ../options/monitors.nix
  ];

  home = {
@@ -19,9 +24,6 @@ in
      gimp3
      vlc

-      # Zen is not part of nixpkgs... yet
-      zen-browser
-
      # Common utilities
      feh
      networkmanagerapplet # network control
@@ -41,9 +43,11 @@ in
    pointerCursor = {
      enable = true;
      gtk.enable = true;
-      name = "phinger-cursors";
      size = 16;
-      package = pkgs.phinger-cursors;
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Classic";
+      # package = pkgs.phinger-cursors;
+      # name = "phinger-cursors";
    };

    # Hint for electron apps to use wayland
@@ -57,7 +61,10 @@ in

  programs = {
    # browsers
-    firefox.enable = true;
+    firefox = {
+      enable = true;
+      configPath = "${config.xdg.configHome}/mozilla/firefox";
+    };
    chromium.enable = true;
  };

@@ -99,13 +106,13 @@ in
  xdg.mimeApps = {
    enable = true;
    defaultApplications = {
-      "text/html" = [ "zen.desktop" ];
-      "default-web-browser" = [ "zen.desktop" ];
-      "x-scheme-handler/http" = [ "zen.desktop" ];
-      "x-scheme-handler/https" = [ "zen.desktop" ];
-      "x-scheme-handler/about" = [ "zen.desktop" ];
-      "x-scheme-handler/unknown" = [ "zen.desktop" ];
+      "text/html" = [ "${browser}.desktop" ];
+      "default-web-browser" = [ "${browser}.desktop" ];
+      "x-scheme-handler/http" = [ "${browser}.desktop" ];
+      "x-scheme-handler/https" = [ "${browser}.desktop" ];
+      "x-scheme-handler/about" = [ "${browser}.desktop" ];
+      "x-scheme-handler/unknown" = [ "${browser}.desktop" ];
    };
  };
-  home.sessionVariables.DEFAULT_BROWSER = "${zen-browser}/bin/zen";
+  home.sessionVariables.DEFAULT_BROWSER = "${pkgs."${browser}"}/bin/${browser}";
 }
--- a/home-manager/features/mounts/mcp-archive.nix
+++ b/home-manager/features/mounts/mcp-archive.nix
@@ -16,7 +16,7 @@
          drew@mcp:/tank/archive/drew \
          %h/archive
      '';
-      unmountArchive = "/run/wrappers/bin/fusermount -u %h/archive";
+      # unmountArchive = "/run/wrappers/bin/fusermount -u %h/archive";
    in
    {
      # Mounts the archive when the system is online.
@@ -35,41 +35,14 @@
          Type = "simple";
          ExecStartPre = "/run/current-system/sw/bin/mkdir -p %h/archive";
          ExecStart = mountArchive;
-          ExecStop = unmountArchive;

          Restart = "on-failure";
          RestartSec = "10s";
        };

        Install = {
-          WantedBy = [ "default.target" ];
-        };
-      };
-
-      # Unmounts the SSHFS mount whenever the system wants to go to sleep. If I
-      # don't do this, the service will prevent sleep while it tries to
-      # reconnect.
-      mcp-archive-unmount-on-sleep = {
-        Unit = {
-          Description = "Unmount SSHFS archive before sleep";
-
-          # Run this before the system goes to sleep.  It should then be
-          # shutdown after the system wakes up.
-          Before = [ "sleep.target" ];
-          StopWhenUnneeded = true;
-        };
-
-        Service = {
-          Type = "oneshot";
-          # The service will remain after it runs so that it stays in the
-          # service registry as active.
-          RemainAfterExit = true;
-          ExecStart = unmountArchive;
-          ExecStop = mountArchive;
-        };
-
-        Install = {
-          WantedBy = [ "sleep.target" ];
+          # It doesn't like to disconnect on sleep, so not making it automount at all
+          # WantedBy = [ "default.target" ];
        };
      };
    };
--- a/home-manager/features/neovim/config/lazyvim.json
+++ b/home-manager/features/neovim/config/lazyvim.json
@@ -11,7 +11,8 @@
    "lazyvim.plugins.extras.lang.rust",
    "lazyvim.plugins.extras.lang.tailwind",
    "lazyvim.plugins.extras.lang.toml",
-    "lazyvim.plugins.extras.lang.typescript"
+    "lazyvim.plugins.extras.lang.typescript",
+    "lazyvim.plugins.extras.ai.sidekick"
  ],
  "install_version": 8,
  "version": 8
--- a/home-manager/features/neovim/config/lua/plugins/lsp.lua
+++ b/home-manager/features/neovim/config/lua/plugins/lsp.lua
@@ -4,13 +4,20 @@ return {
    opts = {
      servers = {
        -- Lua
-        lua_ls = {},
+        lua_ls = {
+          root_markers = {
+            ".luarc.json",
+            ".git",
+          },
+        },
        -- Nix
        nil_ls = {},
        -- Typescript
        vtsls = {},
        -- Haskell
        hls = {},
+        -- Copilot
+        copilot = { enabled = true },
      },
      codelens = {
        enable = true,
--- a/home-manager/features/neovim/config/lua/plugins/openscad.lua
+++ b/home-manager/features/neovim/config/lua/plugins/openscad.lua
@@ -0,0 +1,13 @@
+return {
+  "salkin-mada/openscad.nvim",
+  config = function()
+    vim.g.openscad_load_snippets = true
+    vim.g.openscad_default_mappings = true
+    vim.g.openscad_fuzzy_finder = "snacks"
+    require("openscad")
+  end,
+  dependencies = {
+    -- Can fall back to Snacks instead.
+    -- "ibhagwan/fzf-lua",
+  },
+}
--- a/home-manager/features/neovim/config/lua/plugins/sidekick.lua
+++ b/home-manager/features/neovim/config/lua/plugins/sidekick.lua
@@ -0,0 +1,95 @@
+return {
+  -- https://github.com/folke/sidekick.nvim
+  "folke/sidekick.nvim",
+  opts = {
+    cli = {
+      mux = {
+        enabled = false, -- I haven't bothered to include tmux yet
+        backend = "tmux",
+      },
+    },
+  },
+  keys = {
+    {
+      "<tab>",
+      function()
+        -- if there is a next edit, jump to it, otherwise apply it if any
+        if not require("sidekick").nes_jump_or_apply() then
+          return "<Tab>" -- fallback to normal tab
+        end
+      end,
+      expr = true,
+      desc = "Goto/Apply Next Edit Suggestion",
+    },
+    {
+      "<c-.>",
+      function()
+        require("sidekick.cli").focus()
+      end,
+      desc = "Sidekick Focus",
+      mode = { "n", "t", "i", "x" },
+    },
+    {
+      "<leader>aa",
+      function()
+        require("sidekick.cli").toggle()
+      end,
+      desc = "Sidekick Toggle CLI",
+    },
+    {
+      "<leader>as",
+      function()
+        require("sidekick.cli").select()
+      end,
+      -- Or to select only installed tools:
+      -- require("sidekick.cli").select({ filter = { installed = true } })
+      desc = "Select CLI",
+    },
+    {
+      "<leader>ad",
+      function()
+        require("sidekick.cli").close()
+      end,
+      desc = "Detach a CLI Session",
+    },
+    {
+      "<leader>at",
+      function()
+        require("sidekick.cli").send({ msg = "{this}" })
+      end,
+      mode = { "x", "n" },
+      desc = "Send This",
+    },
+    {
+      "<leader>af",
+      function()
+        require("sidekick.cli").send({ msg = "{file}" })
+      end,
+      desc = "Send File",
+    },
+    {
+      "<leader>av",
+      function()
+        require("sidekick.cli").send({ msg = "{selection}" })
+      end,
+      mode = { "x" },
+      desc = "Send Visual Selection",
+    },
+    {
+      "<leader>ap",
+      function()
+        require("sidekick.cli").prompt()
+      end,
+      mode = { "n", "x" },
+      desc = "Sidekick Select Prompt",
+    },
+    -- Example of a keybinding to open Claude directly
+    -- {
+    --   "<leader>ac",
+    --   function()
+    --     require("sidekick.cli").toggle({ name = "claude", focus = true })
+    --   end,
+    --   desc = "Sidekick Toggle Claude",
+    -- },
+  },
+}
--- a/home-manager/features/neovim/config/lua/plugins/snacks.lua
+++ b/home-manager/features/neovim/config/lua/plugins/snacks.lua
@@ -2,6 +2,11 @@ return {
  "folke/snacks.nvim",
  opts = function(_, opts)
    vim.tbl_deep_extend("force", opts, {
+      styles = {
+        notification = {
+          wo = { wrap = true }, -- wrap notifications
+        },
+      },
      picker = {
        smart = {
          -- Remove the "recent" picker so we don't get things from other directories.
--- a/home-manager/features/neovim/default.nix
+++ b/home-manager/features/neovim/default.nix
@@ -21,6 +21,7 @@
      sqlite # For Snacks
      imagemagick # For image conversion/display
      vscode-langservers-extracted # For language servers (it wants this version of eslint for some reason)
+      copilot-language-server # Enable the copilot language server
    ];
  };

--- a/home-manager/features/rofi/config/powermenu/powermenu.sh
+++ b/home-manager/features/rofi/config/powermenu/powermenu.sh
@@ -66,21 +66,25 @@ run_cmd() {
      amixer set Master mute
      systemctl suspend
    elif [[ $1 == '--logout' ]]; then
-      if [[ "$DESKTOP_SESSION" == 'openbox' ]]; then
-        openbox --exit
-      elif [[ "$DESKTOP_SESSION" == 'bspwm' ]]; then
-        bspc quit
-      elif [[ "$DESKTOP_SESSION" == 'i3' ]]; then
-        i3-msg exit
-      elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then
-        qdbus org.kde.ksmserver /KSMServer logout 0 0 0
-      elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then
-        qdbus org.kde.ksmserver /KSMServer logout 0 0 0
-      elif [[ "$DESKTOP_SESSION" == 'hyprland-uwsm' ]]; then
-        hyprctl dispatch exit
-      elif [[ "$DESKTOP_SESSION" == 'hyprland' ]]; then
-        hyprctl dispatch exit
-      fi
+      hyprctl dispatch 'hl.dsp.exec_cmd("uwsm stop")'
+      # DESKTOP_SESSION appears to be empty right now.  I'm not going
+      # to bother setting it until I'm using more than one manager.
+      #
+      # if [[ "$DESKTOP_SESSION" == 'openbox' ]]; then
+      #   openbox --exit
+      # elif [[ "$DESKTOP_SESSION" == 'bspwm' ]]; then
+      #   bspc quit
+      # elif [[ "$DESKTOP_SESSION" == 'i3' ]]; then
+      #   i3-msg exit
+      # elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then
+      #   qdbus org.kde.ksmserver /KSMServer logout 0 0 0
+      # elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then
+      #   qdbus org.kde.ksmserver /KSMServer logout 0 0 0
+      # elif [[ "$DESKTOP_SESSION" == 'hyprland-uwsm' ]]; then
+      #   hyprctl dispatch 'exec, uwsm stop'
+      # elif [[ "$DESKTOP_SESSION" == 'hyprland' ]]; then
+      #   hyprctl dispatch exit
+      # fi
    fi
  else
    exit 0
--- a/home-manager/features/rofi/rofi.nix
+++ b/home-manager/features/rofi/rofi.nix
@@ -9,9 +9,10 @@
    recursive = true;
  };

-  wayland.windowManager.hyprland.settings.windowrulev2 = [
-    # Forces the Rofi window to hold focus so that it gets input even if
-    # something else opens or the mouse is outside the window.
-    "stayfocused, class:Rofi"
-  ];
+  # TODO: Merge into lua config
+  # wayland.windowManager.hyprland.settings.windowrule = [
+  #   # Forces the Rofi window to hold focus so that it gets input even if
+  #   # something else opens or the mouse is outside the window.
+  #   "stay_focused on, match:class Rofi"
+  # ];
 }
--- a/home-manager/features/terminal.nix
+++ b/home-manager/features/terminal.nix
@@ -60,7 +60,7 @@
        lines = 5000;
      };

-      colors = {
+      colors-dark = {
        alpha = 0.9;
        # Tokionight Night theme
        # From https://codeberg.org/dnkl/foot/src/branch/master/themes/tokyonight-night
--- a/home-manager/features/wallpaper.nix
+++ b/home-manager/features/wallpaper.nix
@@ -1,10 +1,7 @@
-monitors:
-{ ... }:
+{ config }:
 {
-  wayland.windowManager.hyprland.settings.exec-once = [
-    "wpaperd"
-  ];
-
+  # NOTE: Wpaperd displays wallpaper upside-down on 90´ ccw rotated
+  # monitors as of 26.05
  services.wpaperd = {
    enable = true;
    settings =
@@ -12,10 +9,11 @@ monitors:
        map (mon: {
          name = mon;
          value = {
-            # Each monitor gets a folder under wallpaper that containes the current images.
+            # Each monitor gets a folder under wallpaper that
+            # containes the current images.
            path = "~/Pictures/Wallpaper/${mon}";
          };
-        }) monitors
+        }) (builtins.attrNames config.hardware.monitors)
      )
      // {
        default = {
--- a/home-manager/options/monitors.nix
+++ b/home-manager/options/monitors.nix
@@ -0,0 +1,100 @@
+{ lib, config, ... }:
+{
+  options =
+    with lib;
+    with types;
+    {
+      hardware.monitors = mkOption {
+        type = lazyAttrsOf (submodule {
+          options = {
+            mode = mkOption {
+              type = str;
+              default = "auto";
+            };
+            position = mkOption {
+              type = str;
+              default = "auto";
+            };
+            rotation = mkOption {
+              type = enum [
+                "none"
+                "90"
+                "180"
+                "270"
+              ];
+              default = "none";
+            };
+            flipped = mkOption {
+              type = bool;
+              default = false;
+            };
+          };
+        });
+        default = { };
+        description = "Monitor configuration";
+      };
+    };
+
+  # config = {
+  #   xdg.configFile."hypr/monitors.lua" = lib.mkIf config.wayland.windowManager.hyprland.enable {
+  #     text =
+  #       let
+  #         workspaceSettings = (
+  #           lib.imap0 (
+  #             idx:
+  #             { name, value }:
+  #             let
+  #               offset = idx * 10;
+  #             in
+  #             lib.concatMapStrings (
+  #               i:
+  #               let
+  #                 ws = offset + i;
+  #               in
+  #               ''
+  #                 hl.workspace_rule({ workspace = ${toString ws}, monitor = "${name}", default_name = "${toString i}" })
+  #               ''
+  #             ) (lib.range 1 10)
+  #           ) (lib.attrsToList config.hardware.monitors)
+  #         );
+  #         transformMap = {
+  #           "none" = {
+  #             normal = 0;
+  #             flipped = 4;
+  #           };
+  #           "90" = {
+  #             normal = 1;
+  #             flipped = 5;
+  #           };
+  #           "180" = {
+  #             normal = 2;
+  #             flipped = 6;
+  #           };
+  #           "270" = {
+  #             normal = 3;
+  #             flipped = 7;
+  #           };
+  #         };
+  #
+  #         monitorTransform =
+  #           m:
+  #           let
+  #             t = transformMap.${m.rotation};
+  #           in
+  #           if m.flipped then t.flipped else t.normal;
+  #
+  #         monitorString = name: m: ''
+  #           hl.monitor({
+  #             output = "${name}",
+  #             mode = "${m.mode}",
+  #             position = "${m.position}",
+  #             transform = ${toString (monitorTransform m)},
+  #           })
+  #         '';
+  #
+  #         monitorSettings = lib.mapAttrsToList monitorString config.hardware.monitors;
+  #       in
+  #       lib.concatStringsSep "\n" (workspaceSettings ++ monitorSettings);
+  #   };
+  # };
+}
--- a/secrets/mcp.yaml
+++ b/secrets/mcp.yaml
@@ -29,23 +29,32 @@ immich:
    database: ENC[AES256_GCM,data:1fjOQsLZcq/T+r+AkzomWwCQWw==,iv:c4pn2rC+3xkxLJ7uAdhnTE6zVTRQkfuKK3tjUyDhfAw=,tag:kvk7DOv6X/+RDxfPxVak7w==,type:str]
 sops:
    age:
+        - recipient: age1dstsz5g4qthwt2sssu5wp787ku7rnfqm02mqaefsaueswhvqzpmsyft4p4
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVZnYrVnR1MlBjdzFpQnVi
+            RXFUcEN2N0Zoc2ZUUnprdXc0aElFaXU5c1VBCkxxcGd4QUhOaTl4K0paOTZ3d2Ez
+            Vks4blZLUVZPaklhQlE3WWhVelRFUEkKLS0tIGs2dU44NFdOVm41QXVJbHNkQTVo
+            b2NVRnVFNmF6a2hjRE9OOUxVMGpjSWcKA6Do+oddwMjc2XNJUCeGXY985gJZ4f2v
+            Dyo0/Oyuwz1jFMrjLmnmnmtyn079mT9wsm28KlaEEvzDIxOBnLjx6A==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age1yvdzvuvu5wqztcx6ll2xk6x547uuyqy735tjjdd7zftkz53jsf9qf5ahue
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiL3FoUWN1NWlDQTAvRkFM
-            TkdCMWVXYThIYVZFSlVEVmxUb1JuQmpESWtrClFlTVlHdGhndFJjUWxUMVFybGtn
-            bEpJNkFSVnpueXlvR0NkbU90RkZoTzAKLS0tIHdTTnRteWRNbW9MVmdKSVJLeWxB
-            Zkpxc1lLNVFSUFA2NTJUS0UrOXJCWXMKOuZmbFBdjPIcIUUWHHfGl8TD+HIRa9Hj
-            Eykvc7Iv5zl61kuJRorE7DWWS1I2C586c+MZtNo6GPQxUasxWRRgJQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKeGhvQWp6WWx6N1JDdm1J
+            UWlWZTV5ellMd2ZIRWpkRnJDT2s4UVZJMEM4Cll2MnVNTnFWYit2bHpCVzcwbysy
+            NkxtMUZFcDJnb3Z1TmlTWDJLNVJ4cnMKLS0tIHdqVXB1U2xVdEtlY3BsemFIcXlC
+            OHlxaytJTWlNSFRCd2dDaFVsUU1CbUkKp7J+mDnGFS9upV6QWi40ptG85+UZ5y1G
+            9ic/sQEMHQe9VeAutVz1GPYWbF3Vt5iawXmtVxN+zx/bLAYGglv5yg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1jrk4h7x4qzhr6z5m4d099mlfyjc4n5n9s52r4gfsdz0slnqlqa9sss735v
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZck5tK3p6blhxZWp5YkNF
-            b3lnMWI1dHBnQzlDOG05c0YyZlZDTzA5V2pvCis3N1BhNXlmamRFci9wWTBuRWFv
-            cC9kdWV3RnpFWTFVRVEwaTVWQVdnZE0KLS0tIEhOTzExRzRLaGdKOTRwRmNXcW5P
-            by9aNFY4dXNxaWxnTXFTQS9reHhuQWMKh5rZ93nFtBV9EpFVRp+E+GXZ6xzVy2Jw
-            vFh4deGcAb60q4odSaeWfk1Dr7L9Ua69oK9omjbCNUt+P7Kwlfca7Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkM0RRaFhGKytkSjNMU3cy
+            d1dlcms4TVMzU2xsSHBqcDJWQTdCU1dZcERJCktHRVZiWkZrbzk4QXRNSmpyY25X
+            ZUdOS2pSOVpITExpVVFyc1A3QTBDTGsKLS0tIDM4NFd1eWtZSnR4d0tLUnRFYmJW
+            QlE3cFYxUXNVam1aMlJEVTRGV2xsN1kKXMeSXiEdXyb6c+dcxX3G/Q+s78lfi90g
+            dvKJPDYvGb/8JXSkZNkLlWvHEVnsAJ1mJFb1idenYzeQvJlsX07rYA==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2026-02-25T00:28:13Z"
    mac: ENC[AES256_GCM,data:hDmqObrtfoVkQqz8JPkqlyXMbiuyBophjdZNLvTFrZw3pAVNCuzsH4zxFBOaxJttkzLc65DWDHDeEIBY5YZam1GLFFXUQ5E3Dxno7hnyzOoM2ipgDTOacI0gbKJAWgGUF3LNDdqVoREA9LC91LoNUJoNmzpTSFtuLb7ORuwCrH4=,iv:8+W3n1Cr6woEiPU9ECaMYM64HNmFHr2AIw6UohCJi00=,tag:7drkZiPAUHaEx5PagXA9JQ==,type:str]
--- a/system/features/gui.nix
+++ b/system/features/gui.nix
@@ -14,10 +14,19 @@
      variant = "";
    };
  };
-  services.displayManager.gdm = {
+  # services.displayManager.gdm = {
+  #   enable = true;
+  # };
+  services.displayManager.ly = {
    enable = true;
+    # See https://github.com/S41G0N/ly/blob/master/res/config.ini
+    settings = {
+      animation = "matrix"; # matrix|doom|none
+      bigclock = "en";
+      clear_password = true; # erase the password on failure
+      clock = "%c"; # Show the clock
+    };
  };
-  # services.displayManager.ly.enable = true;

  # Enable Hyprland so it shows up in the menu
  programs.hyprland = {
--- a/system/hosts/altair/configuration.nix
+++ b/system/hosts/altair/configuration.nix
@@ -18,7 +18,7 @@
  networking.networkmanager.enable = true;
  # Disable wpa-supplicant to avoid conflicts with network manager.
  # Appears this is not needed as of 26.05
-  # networking.wireless.enable = false;
+  networking.wireless.enable = true;

  # Set your time zone.
  time.timeZone = "America/Los_Angeles";
--- a/system/hosts/altair/drew.nix
+++ b/system/hosts/altair/drew.nix
@@ -1,13 +1,6 @@
-{ ... }:
-let
-  monitors = [
-    "DP-1"
-    "DP-2"
-  ];
-in
+{ pkgs, ... }:
 {
-  imports =
-    map (x: ../../../home-manager + x) [
+  imports = map (x: ../../../home-manager + x) [
    "/features/astronomy.nix"
    "/features/chat.nix"
    "/features/development/development.nix"
@@ -24,9 +17,7 @@ in
    "/features/mounts/mcp-archive.nix"
    "/features/notes.nix"
    "/features/3d-printing.nix"
-    ]
-    ++ [
-      (import ../../../home-manager/features/wallpaper.nix monitors)
+    "/features/hyprpaper.nix"
  ];

  home = {
@@ -48,16 +39,44 @@ in
    };
  };

-  wayland.windowManager.hyprland.settings = {
-    exec-once = [
-      # Set up eww here because it's based on the monitor configuration
-      "sleep 2 && eww open-many primary-statusbar secondary-statusbar"
-      # Set DP-2 as the primary monitor, otherwise it defaults to DP-1 because it's first in the list.
-      "xrandr --output DP-2 --primary"
-    ];
-    windowrulev2 = [
-      # Rofi doesn't center properly when I have the two asymetric monitors, so we need hyprland to manage it.
-      "center, class:Rofi"
-    ];
+  hardware.monitors = {
+    "DP-2" = {
+      position = "0x0";
+      mode = "3440x1440@164";
    };
+    "DP-1" = {
+      mode = "2560x1440";
+      position = "-1440x-510";
+      rotation = "90";
+    };
+  };
+
+  programs.eww.widgets = [
+    "primary-statusbar"
+    "secondary-statusbar"
+  ];
+
+  xdg.configFile = {
+    "hypr/altair.lua" = {
+      source = ./hyprland.lua;
+    };
+  };
+
+  wayland.windowManager.hyprland.extraConfig = ''
+    require("altair")
+  '';
+
+  # TODO: Still merging these into the LUA config
+  # wayland.windowManager.hyprland.settings = {
+  #   exec_once = [
+  #     # Set up eww here because it's based on the monitor configuration
+  #     "sleep 2 && eww open-many primary-statusbar secondary-statusbar"
+  #     # Set DP-2 as the primary monitor, otherwise it defaults to DP-1 because it's first in the list.
+  #     "xrandr --output DP-2 --primary"
+  #   ];
+  #   # windowrule = [
+  #   #   # Rofi doesn't center properly when I have the two asymetric monitors, so we need hyprland to manage it.
+  #   #   "match:class Rofi, center on"
+  #   # ];
+  # };
 }
--- a/system/hosts/altair/hardware-configuration.nix
+++ b/system/hosts/altair/hardware-configuration.nix
@@ -86,7 +86,7 @@
      #
      # Current versions can be found in https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/os-specific/linux/nvidia-x11/default.nix
      #
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
+      package = config.boot.kernelPackages.nvidiaPackages.stable;

      modesetting.enable = true;

--- a/system/hosts/altair/hyprland.lua
+++ b/system/hosts/altair/hyprland.lua
@@ -0,0 +1,64 @@
+-- These configs are specifically for Altair
+-----------------------------------------------------------
+
+for i = 1, 10 do
+	hl.workspace_rule({ workspace = i, monitor = "DP-1", default_name = tostring(i) })
+	hl.workspace_rule({ workspace = i + 10, monitor = "DP-2", default_name = tostring(i) })
+end
+
+hl.monitor({
+	output = "DP-1",
+	mode = "2560x1440",
+	position = "-1440x-510",
+	transform = 1,
+})
+
+hl.monitor({
+	output = "DP-2",
+	mode = "3440x1440@164",
+	position = "0x0",
+	transform = 0,
+})
+
+local fullscreen_windows = { "^steam_app_\\d+$" }
+
+for _, class in ipairs(fullscreen_windows) do
+	hl.window_rule({
+		name = "Fullscreen " .. class,
+		match = {
+			class = class,
+		},
+		fullscreen = true,
+		monitor = "DP-2",
+		center = true,
+	})
+end
+
+local maximized_windows = { "Slay the Spire" }
+
+for _, class in ipairs(maximized_windows) do
+	hl.window_rule({
+		name = "Maximize " .. class,
+		match = {
+			class = class,
+		},
+		maximize = true,
+		monitor = "DP-2",
+		center = true,
+	})
+end
+-- MIGRATION_WARNING: Window rule conflict for 'monitor 1': 'match:title ^World of Warcraft$' (line 200) vs 'match:title ^Battle.net$' (line 202)
+-- MIGRATION_WARNING: Window rule conflict for 'monitor 1': 'match:title ^World of Warcraft$' (line 200) vs 'match:title ^Balatro$' (line 204)
+-- MIGRATION_WARNING: Window rule conflict for 'monitor 1': 'match:title ^World of Warcraft$' (line 200) vs 'match:class steam_app_1091500' (line 206)
+-- hl.window_rule({
+--     match = { class = "monitor 1" },
+--     match:title = "^World of Warcraft$",
+--     match:title = "^Battle.net$",
+--     match:title = "^Balatro$",
+--     match:class = "steam_app_1091500",
+-- })
+-- PATTERN: MERGED with line 207
+-- MIGRATION_WARNING: Window rule conflict for 'fullscreen on': 'match:title ^World of Warcraft$' (line 201) vs 'match:class steam_app_1091500' (line 207)
+-- hl.window_rule({ match = { class = "fullscreen on" }, match:title = "^World of Warcraft$", match:class = "steam_app_1091500" })
+-- hl.window_rule({ match = { class = "float on" }, match:title = "^Battle.net$" })
+-- hl.window_rule({ match = { class = "tile on" }, match:title = "^Balatro$" })
--- a/system/hosts/mcp/containers/grafana.nix
+++ b/system/hosts/mcp/containers/grafana.nix
@@ -1,7 +1,8 @@
 { config, ... }:
 let
  lib = import ./lib.nix config;
-in {
+in
+{
  imports = [
    ./shared-postgres.nix
  ];
@@ -41,27 +42,6 @@ in {
      name = "Loki";
      description = "Log Database";
    };
-    environment = {};
-  };
-
-  services.promtail = {
-    enable = true;
-    configuration = {
-      server.http_listen_port = 9080;
-      clients = [
-        { url = "https://loki.blazestar.net/loki/api/v1/push"; }
-      ];
-      scrape_configs = [{
-        job_name = "journal";
-        journal = {
-          max_age = "12h";
-          labels = { job = "systemd-journal"; };
-        };
-        relabel_configs = [{
-          source_labels = ["__journal__systemd_unit"];
-          target_label = "unit";
-        }];
-      }];
-    };
+    environment = { };
  };
 }
--- a/system/hosts/mcp/hardware-configuration.nix
+++ b/system/hosts/mcp/hardware-configuration.nix
@@ -1,27 +1,43 @@
 # 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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-amd" ];
  boot.extraModulePackages = [ ];

-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/123e06ed-d7a4-439b-ae37-7ff8f82ae0a7";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/123e06ed-d7a4-439b-ae37-7ff8f82ae0a7";
    fsType = "ext4";
  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0AC0-73EA";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/0AC0-73EA";
    fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
  };

  swapDevices = [ ];
@@ -45,6 +61,10 @@
  services.xserver.videoDrivers = [ "nvidia" ];

  hardware.nvidia = {
+    # The GTX 960 GPU in this system needs a legacy driver. It isn't supported
+    # by the current 595 driver that is stable as of 2026-06-04
+    package = config.boot.kernelPackages.nvidiaPackages.legacy_580;
+
    modesetting.enable = true;

    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
--- a/system/hosts/vega/configuration.nix
+++ b/system/hosts/vega/configuration.nix
@@ -9,7 +9,8 @@
  # Enable networking
  networking.networkmanager.enable = true;
  # Disable wpa-supplicant to avoid conflicts with network manager.
-  networking.wireless.enable = false;
+  # Appears this is not needed as of 26.05
+  # networking.wireless.enable = true;

  # Set your time zone.
  time.timeZone = "America/Los_Angeles";
--- a/system/hosts/vega/drew.nix
+++ b/system/hosts/vega/drew.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }:
+{ ... }:
 {
-  imports =
-    map (x: ../../../home-manager + x) [
+  imports = map (x: ../../../home-manager + x) [
    "/features/chat.nix"
    "/features/development/development.nix"
    "/features/development/docker.nix"
@@ -13,45 +12,51 @@
    "/features/image-editing.nix"
    "/features/linux-desktop.nix"
    "/features/notes.nix"
-    ]
-    ++ [
-      (import ../../../home-manager/features/wallpaper.nix [ "HDMI-A-1" ])
+    "/features/hyprpaper.nix"
  ];

-  home.packages = with pkgs; [
-    slack
-    zoom-us
-    chromium
-  ];
+  home = {
+    stateVersion = "24.11";

-  home.stateVersion = "24.11";
-
-  home.username = "drew";
-  home.homeDirectory = "/home/drew";
+    username = "drew";
+    homeDirectory = "/home/drew";
+  };

  programs.git.settings.user = {
    name = "Drew Haven";
    email = "periodic@blazestar.net";
  };

+  hardware.monitors = {
+    "HDMI-A-1" = {
+      position = "0x0";
+      mode = "3440x1440@75.05";
+    };
+  };
+
+  programs.eww.widgets = [
+    "vertical-statusbar"
+  ];
+
+  # TODO: Merge into LUA configs
  wayland.windowManager.hyprland.settings = {
    # Set up eww here because it's based on the monitor configuration
    # Eww is idempotent, so it's fine to just run it on every reload to make sure things are open
-    exec-once = [
-      "sleep 2 && eww open-many vertical-statusbar"
-    ];
+    # exec_once = [
+    #   "sleep 2 && eww open-many vertical-statusbar"
+    # ];
    # Set up workspaces for this system
    # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
-    workspace = [
-      "1, defaultName:1"
-      "2, defaultName:2"
-      "3, defaultName:3"
-      "4, defaultName:4"
-      "5, defaultName:5"
-      "6, defaultName:6"
-      "7, defaultName:7"
-      "8, defaultName:8"
-      "9, defaultName:9"
-    ];
+    # workspace = [
+    #   "1, defaultName:1"
+    #   "2, defaultName:2"
+    #   "3, defaultName:3"
+    #   "4, defaultName:4"
+    #   "5, defaultName:5"
+    #   "6, defaultName:6"
+    #   "7, defaultName:7"
+    #   "8, defaultName:8"
+    #   "9, defaultName:9"
+    # ];
  };
 }
--- a/system/hosts/vega/hardware-configuration.nix
+++ b/system/hosts/vega/hardware-configuration.nix
@@ -55,4 +55,5 @@
  # Graphics settings
  # Using the default production drivers.
  graphics.enable = true;
+
 }
Author	SHA1	Message	Date
Drew Haven	7bbb5ea812	[Neovim] Adds Sidekick plugin.	2026-06-13 10:22:28 -07:00
Drew Haven	f177f112ce	[Eww] Fix launcher command	2026-06-11 10:31:36 -07:00
Drew Haven	fdae46f7a0	[mcp] Use legacy Nvidia driver.	2026-06-04 16:52:35 -07:00
Drew Haven	c23eba7e66	[Grafana] Remove Promtail because it's EoL	2026-06-04 12:11:57 -07:00
Drew Haven	9d2af374c1	[sops] Update age config	2026-06-04 11:45:04 -07:00
Drew Haven	50b2993488	[Altair] Adds some window rules	2026-06-04 11:43:55 -07:00
Drew Haven	8276c65d0f	[Hyprland] Adds window rules and introduces per-system config.	2026-06-03 10:32:43 -07:00
Drew Haven	59de16ea4c	[Browser] Switch back to Firefox	2026-06-02 14:24:30 -07:00
Drew Haven	9261ce133b	[Hyprpaper] Remove splash message	2026-06-02 13:54:27 -07:00
Drew Haven	7fd462a791	[Hyprland] Merges monitor configuration	2026-06-01 17:06:17 -07:00
Drew Haven	e936b9da8f	[Hyprland,Eww] Refactors configs so that I can share more between Vega and Altair	2026-06-01 16:54:06 -07:00
Drew Haven	e078067a5e	[Hyprland] Switch to hyprpaper instead of wpaperd because the latter causes up-side-down images	2026-06-01 10:13:49 -07:00
Drew Haven	fc1698a5d9	[ly] Switch back to Matrix animation	2026-05-31 21:53:57 -07:00
Drew Haven	3d2bb28eec	[archive] Remove auto-start	2026-05-31 16:42:51 -07:00
Drew Haven	2b33bbca32	[Hyprland] Fixes split workspace binds	2026-05-31 16:41:53 -07:00
Drew Haven	8d2fa682b3	[Hyprland] A bit more config stuff	2026-05-31 14:52:52 -07:00
Drew Haven	32393d5ffe	[Hyprland] Migrates to new lua-based config	2026-05-31 14:41:17 -07:00
Drew Haven	07280e20ea	[hyprland,eww] Fixes settings after version upgrade	2026-05-30 14:14:44 -07:00
Drew Haven	a357e7a622	[Foot] Fix config.	2026-05-30 13:21:14 -07:00
Drew Haven	78a9638228	[gui] Switch to Ly since GDM seems to fail to start on 26.05	2026-05-30 13:21:05 -07:00