users/jordan: add niri config

flake.lock: Update
Flake lock file updates: • Updated input 'hyprland': 'github:hyprwm/Hyprland/f7f357f15f83612078eb0919ca08b71cac01c25e?narHash=sha256-y0bopy/Hob48/q71u4yJo2S0g90JFUJqq3rfh2DgKkk%3D' (2025-12-23) → 'github:hyprwm/Hyprland/33df518f97b930316742736ecb07dc322da4c5d3?narHash=sha256-m9VZ9cxYUl9Q9%2BROSKmYpVeyIAvz1faqNqBKZ4WamWI%3D' (2025-12-26) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/76701a179d3a98b07653e2b0409847499b2a07d3?narHash=sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv%2Bn5GX6Qto%3D' (2025-12-23) → 'github:NixOS/nixpkgs/f560ccec6b1116b22e6ed15f4c510997d99d5852?narHash=sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ%3D' (2025-12-26) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/a6531044f6d0bef691ea18d4d4ce44d0daa6e816?narHash=sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC%2B2IVK0NoVEzDoOh4DA4%3D' (2025-12-21) → 'github:NixOS/nixpkgs/3e2499d5539c16d0d173ba53552a4ff8547f4539?narHash=sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU%3D' (2025-12-25) • Updated input 'nixvim': 'github:nix-community/nixvim/35688970083857d26bf6c57934541eb906f96249?narHash=sha256-aajoMAR81hZX4PZho2Hvx8Y95M1MtgQHF/8CwyJquZ4%3D' (2025-12-23) → 'github:nix-community/nixvim/2d3184cd3dd31f6eb57eb4ddfe2387ebd141f1e5?narHash=sha256-JG0KvKmVyAQZ4PxKVDy7FGGUirt1lLhWwGwy9ExLCoI%3D' (2025-12-26)
2025-12-26 23:09:37 +00:00 · 2025-12-26 20:53:58 +00:00 · 2025-12-24 11:19:02 +00:00 · 2025-12-23 01:59:19 +00:00 · 2025-12-23 01:58:15 +00:00 · 2025-12-23 01:57:37 +00:00
47 changed files with 1029 additions and 439 deletions
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@ System and user configuration for NixOS-based systems.
 | | |
 |-|-|
 | **Shell:** | zsh |
-| **DE:** | GNOME |
+| **WM:** | Hyprland |
 | **Theme:** | Adwaita |
-| **Terminal:** | Ghostty |
+| **Terminal:** | kitty |

 ## Provisioning a new host

--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1754433428,
-        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+        "lastModified": 1762618334,
+        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
        "type": "github"
      },
      "original": {
@@ -71,11 +71,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759499898,
-        "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
+        "lastModified": 1765900596,
+        "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
+        "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace",
        "type": "github"
      },
      "original": {
@@ -131,11 +131,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1756719547,
-        "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=",
+        "lastModified": 1766051518,
+        "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2",
+        "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
        "type": "github"
      },
      "original": {
@@ -172,11 +172,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741473158,
-        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "lastModified": 1764011051,
+        "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071",
        "type": "github"
      },
      "original": {
@@ -213,11 +213,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760701190,
-        "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
+        "lastModified": 1766150702,
+        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
+        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
        "type": "github"
      },
      "original": {
@@ -229,11 +229,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1759418614,
-        "narHash": "sha256-0E3TqvXAy81qeM/jZXWWOTZ14Hs1RT7o78UyZM+Jbr4=",
+        "lastModified": 1764873433,
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "afd438034bf91089cfeb9e6b5cb987bdf5442d0f",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
        "type": "github"
      },
      "original": {
@@ -261,11 +261,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
        "type": "github"
      },
      "original": {
@@ -277,11 +277,11 @@
    "flake-compat_3": {
      "flake": false,
      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
        "type": "github"
      },
      "original": {
@@ -293,11 +293,11 @@
    "flake-compat_4": {
      "flake": false,
      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
        "type": "github"
      },
      "original": {
@@ -332,11 +332,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
        "type": "github"
      },
      "original": {
@@ -353,11 +353,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
        "type": "github"
      },
      "original": {
@@ -415,11 +415,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "lastModified": 1763319842,
+        "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
        "type": "github"
      },
      "original": {
@@ -517,16 +517,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1766553861,
+        "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
        "repo": "home-manager",
        "type": "github"
      }
@@ -576,11 +576,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759490292,
-        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
+        "lastModified": 1763733840,
+        "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
+        "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
        "type": "github"
      },
      "original": {
@@ -594,22 +594,23 @@
        "aquamarine": "aquamarine",
        "hyprcursor": "hyprcursor",
        "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
        "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
        "hyprlang": "hyprlang",
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
        "nixpkgs": "nixpkgs",
        "pre-commit-hooks": "pre-commit-hooks",
        "systems": "systems_3",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1760621586,
-        "narHash": "sha256-sIbe3te3RrL9PY4ASKGwv1KuJs0pyn4Zvo3xIF3jFms=",
+        "lastModified": 1766761711,
+        "narHash": "sha256-m9VZ9cxYUl9Q9+ROSKmYpVeyIAvz1faqNqBKZ4WamWI=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "8164b90bc2839d4d2a10c0d2b26c4a413ecf90b2",
+        "rev": "33df518f97b930316742736ecb07dc322da4c5d3",
        "type": "github"
      },
      "original": {
@@ -618,6 +619,52 @@
        "type": "github"
      }
    },
+    "hyprland-guiutils": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1765643131,
+        "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=",
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "rev": "e50ae912813bdfa8372d62daf454f48d6df02297",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "type": "github"
+      }
+    },
    "hyprland-plugins": {
      "inputs": {
        "hyprland": [
@@ -635,11 +682,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760659005,
-        "narHash": "sha256-wyS6tXYJuzbwckOeaCoRtT4qIG2UZ0YvSZx7EBNjTV0=",
+        "lastModified": 1766258034,
+        "narHash": "sha256-0EoL8X+sYexDBusF9XyY2WoGKRqnARA+vfh/3uAi/j0=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "a5a6f93d72d5fb37e78b98c756cfd8b340e71a19",
+        "rev": "3e29d68d5a830c542643a52d4be726661eaa85e7",
        "type": "github"
      },
      "original": {
@@ -660,11 +707,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749046714,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "lastModified": 1765214753,
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
        "type": "github"
      },
      "original": {
@@ -673,74 +720,6 @@
        "type": "github"
      }
    },
-    "hyprland-qt-support": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-qtutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-qtutils",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749154592,
-        "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "type": "github"
-      }
-    },
-    "hyprland-qtutils": {
-      "inputs": {
-        "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759080228,
-        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "type": "github"
-      }
-    },
    "hyprlang": {
      "inputs": {
        "hyprutils": [
@@ -757,11 +736,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758927902,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
+        "lastModified": 1764612430,
+        "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
+        "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
        "type": "github"
      },
      "original": {
@@ -770,6 +749,58 @@
        "type": "github"
      }
    },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764592794,
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
    "hyprutils": {
      "inputs": {
        "nixpkgs": [
@@ -782,11 +813,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759619523,
-        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
+        "lastModified": 1766160771,
+        "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
+        "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f",
        "type": "github"
      },
      "original": {
@@ -807,11 +838,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1755184602,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "lastModified": 1763640274,
+        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
        "type": "github"
      },
      "original": {
@@ -820,6 +851,35 @@
        "type": "github"
      }
    },
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1766253200,
+        "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "1079777525b30a947c8d657fac158e00ae85de9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "type": "github"
+      }
+    },
    "impermanence": {
      "locked": {
        "lastModified": 1737831083,
@@ -879,6 +939,64 @@
        "type": "github"
      }
    },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1766765523,
+        "narHash": "sha256-DCk3GKdKZNjpvNuDy9ZVfVwCy3tlm96/UZnYkJO7N44=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "a3e638c75d07de759421e6f34bd69c3f9a0a3567",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1766751930,
+        "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
    "nix-topology": {
      "inputs": {
        "devshell": "devshell_3",
@@ -891,11 +1009,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752093877,
-        "narHash": "sha256-P0TySh6sQl1EhfxjW9ZqGxEyUBSsEpdnchOe1QB0pLA=",
+        "lastModified": 1765969653,
+        "narHash": "sha256-qVpQxyvdByeDfb+d+jhbyNna2Ie+w85iHpt4Qu0rv/E=",
        "owner": "oddlama",
        "repo": "nix-topology",
-        "rev": "6a536c4b686ee4bcf07a7b0f8b823584560e2633",
+        "rev": "0ed73e5a1b65eb8ed388d070ebe8dedb9182f466",
        "type": "github"
      },
      "original": {
@@ -906,11 +1024,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1760106635,
-        "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
+        "lastModified": 1766568855,
+        "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
+        "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
        "type": "github"
      },
      "original": {
@@ -926,31 +1044,30 @@
        "git-hooks": "git-hooks",
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "nixpkgs-25_05": "nixpkgs-25_05"
+        ]
      },
      "locked": {
-        "lastModified": 1755110674,
-        "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=",
+        "lastModified": 1766537863,
+        "narHash": "sha256-HEt+wbazRgJYeY+lgj65bxhPyVc4x7NEB2bs5NU6DF8=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "f5936247dbdb8501221978562ab0b302dd75456c",
+        "rev": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixos-mailserver",
        "type": "gitlab"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1766070988,
+        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
        "type": "github"
      },
      "original": {
@@ -960,44 +1077,44 @@
        "type": "github"
      }
    },
-    "nixpkgs-25_05": {
+    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1747610100,
-        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
        "type": "github"
      }
    },
-    "nixpkgs-lib": {
+    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1754788789,
-        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
+        "lastModified": 1766736597,
+        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1760524057,
-        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
+        "lastModified": 1766651565,
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
        "type": "github"
      },
      "original": {
@@ -1008,16 +1125,16 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1760580664,
-        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
+        "lastModified": 1766736597,
+        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
+        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "type": "indirect"
      }
    },
@@ -1031,16 +1148,16 @@
        "systems": "systems_6"
      },
      "locked": {
-        "lastModified": 1760736138,
-        "narHash": "sha256-be+mZwwpSHj43K6bqWXOGZztNpt5kkXh9FekW10nbdk=",
+        "lastModified": 1766725080,
+        "narHash": "sha256-JG0KvKmVyAQZ4PxKVDy7FGGUirt1lLhWwGwy9ExLCoI=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "249d109fa88cf0d7a51737993806227c40012707",
+        "rev": "2d3184cd3dd31f6eb57eb4ddfe2387ebd141f1e5",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixvim",
        "type": "github"
      }
@@ -1055,11 +1172,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758662783,
-        "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
+        "lastModified": 1761730856,
+        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
+        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
        "type": "github"
      },
      "original": {
@@ -1078,11 +1195,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758108966,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "lastModified": 1765911976,
+        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
        "type": "github"
      },
      "original": {
@@ -1100,11 +1217,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760663237,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "lastModified": 1765911976,
+        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
        "type": "github"
      },
      "original": {
@@ -1128,6 +1245,7 @@
        "hyprland-plugins": "hyprland-plugins",
        "impermanence": "impermanence",
        "kvlibadwaita": "kvlibadwaita",
+        "niri": "niri",
        "nix-topology": "nix-topology",
        "nixos-hardware": "nixos-hardware",
        "nixos-mailserver": "nixos-mailserver",
@@ -1143,11 +1261,11 @@
    "secrets": {
      "flake": false,
      "locked": {
-        "lastModified": 1756051653,
-        "narHash": "sha256-JJkQliqI7zn+esLnKQP82eQEuolNz8IELm/BYGPTvEw=",
+        "lastModified": 1764864420,
+        "narHash": "sha256-14xW9M1JHKQ55DadtHCKDfvNoRtVnof8mz6hiUtqxtE=",
        "ref": "refs/heads/master",
-        "rev": "01cf200f61946ac9f259f9163933ea1749cb3531",
-        "revCount": 41,
+        "rev": "b445b0d0f9261ae5500fcdc799ee638d46159691",
+        "revCount": 43,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
@@ -1290,11 +1408,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760120816,
-        "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=",
+        "lastModified": 1766000401,
+        "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "761ae7aff00907b607125b2f57338b74177697ed",
+        "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
        "type": "github"
      },
      "original": {
@@ -1349,11 +1467,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1755354946,
-        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+        "lastModified": 1761431178,
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
        "type": "github"
      },
      "original": {
@@ -1361,6 +1479,39 @@
        "repo": "xdg-desktop-portal-hyprland",
        "type": "github"
      }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1766429945,
+        "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
    };

    home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@@ -62,19 +62,24 @@

    nixos-hardware.url = "github:NixOS/nixos-hardware";

-    nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
+    niri = {
+      url = "github:sodiboo/niri-flake";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixos-mailserver = {
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nixpkgs.url = "nixpkgs/nixos-25.11";

    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";

    # nixpkgs-master.url = "nixpkgs";

    nixvim = {
-      url = "github:nix-community/nixvim/nixos-25.05";
+      url = "github:nix-community/nixvim/nixos-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };

--- a/hosts/artemis/default.nix
+++ b/hosts/artemis/default.nix
@@ -23,6 +23,9 @@ in

  nixpkgs = {
    hostPlatform = "x86_64-linux";
+    config.permittedInsecurePackages = [
+      "qtwebengine-5.15.19"
+    ];
  };

  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
@@ -102,7 +105,7 @@ in
      };
      desktop = {
        gnome.enable = lib.mkForce false;
-        hyprland.enable = true;
+        hyprland.enable = false;
      };
    };
  };
--- a/hosts/artemis/hardware-configuration.nix
+++ b/hosts/artemis/hardware-configuration.nix
@@ -68,7 +68,7 @@ in
      "amdgpu.sched_hw_submission=4"
      "audit=0"
    ];
-    kernelPackages = pkgs.linuxPackages_6_16;
+    kernelPackages = pkgs.linuxPackages_6_17;
    supportedFilesystems = [ "ntfs" ];
  };

--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -24,6 +24,7 @@
    config.allowUnfree = true;
    overlays = [
      inputs.agenix.overlays.default
+      inputs.niri.overlays.niri
      (final: prev: {
        unstable = import inputs.nixpkgs-unstable {
          config = {
@@ -117,13 +118,14 @@
      dates = "weekly";
      options = "-d --delete-older-than 7d";
    };
+    registry.unstable.flake = inputs.nixpkgs-unstable;
  };

  home-manager = {
    useGlobalPkgs = true;
    useUserPackages = true;
    sharedModules = [
-      inputs.nixvim.homeManagerModules.nixvim
+      inputs.nixvim.homeModules.nixvim
      {
        home.stateVersion = config.system.stateVersion;
      }
--- a/hosts/library/ai.nix
+++ b/hosts/library/ai.nix
@@ -16,6 +16,7 @@ in
    enable = true;
    package = pkgs.unstable.open-webui;
    port = 8081;
+    host = "0.0.0.0";
    environment =
      let
        clientId = "open-webui";
--- a/hosts/library/jellyfin.nix
+++ b/hosts/library/jellyfin.nix
@@ -8,7 +8,7 @@
  hardware.graphics = {
    enable = true;
    extraPackages = with pkgs; [
-      vaapiVdpau
+      libva-vdpau-driver
    ];
  };

--- a/hosts/library/jellysearch.nix
+++ b/hosts/library/jellysearch.nix
@@ -13,7 +13,7 @@
  services.meilisearch = {
    enable = true;
    package = pkgs.meilisearch;
-    masterKeyEnvironmentFile = config.age.secrets."files/services/meilisearch/envfile".path;
+    masterKeyFile = config.age.secrets."files/services/meilisearch/envfile".path;
  };

  users.users.jellysearch = {
--- a/hosts/library/nginx.nix
+++ b/hosts/library/nginx.nix
@@ -33,25 +33,6 @@
            '';
          };
        };
-        "chat.ai.vimium.com" = {
-          listen = [
-            {
-              addr = "127.0.0.1";
-              port = 8001;
-            }
-          ];
-          locations."/" = {
-            proxyPass = "http://localhost:8081";
-            extraConfig = proxyConfig + ''
-              # Disable proxy buffering for better streaming response from models
-              proxy_buffering off;
-
-              # Increase max request size for large attachments and long audio messages
-              client_max_body_size 20M;
-              proxy_read_timeout 10m;
-            '';
-          };
-        };
        "jellyfin.vimium.com" = {
          default = true;
          listen = [
--- a/hosts/odyssey/aws.env
+++ b/hosts/odyssey/aws.env
@@ -0,0 +1 @@
+AWS_REGION=us-east-1
--- a/hosts/odyssey/comfyui-docker.nix
+++ b/hosts/odyssey/comfyui-docker.nix
@@ -0,0 +1,35 @@
+{
+  hardware.graphics.enable32Bit = true;
+  hardware.nvidia-container-toolkit.enable = true;
+
+  virtualisation.docker.enable = true;
+
+  virtualisation.oci-containers = {
+    backend = "docker";
+    containers = {
+      comfyui = {
+        image = "ghcr.io/clsferguson/comfyui-docker:latest";
+        autoStart = true;
+        ports = [ "8188:8188" ];
+        extraOptions = [
+          "--device=nvidia.com/gpu=all"
+          "--ipc=host"
+        ];
+        volumes = [
+          "/home/jordan/ComfyUI/user:/app/ComfyUI/user"
+          "/home/jordan/ComfyUI/custom_nodes:/app/ComfyUI/custom_nodes"
+          "/home/jordan/ComfyUI/models:/app/ComfyUI/models:rw"
+          "/home/jordan/ComfyUI/input:/app/ComfyUI/input:rw"
+          "/home/jordan/ComfyUI/output:/app/ComfyUI/output:rw"
+        ];
+        environment = {
+          TZ = "Europe/London";
+          PUID = "1000";
+          PGID = "1000";
+          COMFY_AUTO_INSTALL = "1";
+          FORCE_SAGE_ATTENTION = "1";
+        };
+      };
+    };
+  };
+}
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@@ -7,7 +7,9 @@
 {
  imports = [
    ./hardware-configuration.nix
+    ./comfyui-docker.nix
    ./gitea-runner.nix
+    ./home-assistant
    ./nix-serve.nix
    ../desktop.nix
    ../../users/jordan
@@ -63,6 +65,24 @@

  services.pcscd.enable = true;

+  security.acme = {
+    acceptTerms = true;
+    defaults = {
+      email = "hostmaster@vimium.com";
+      dnsProvider = "route53";
+      dnsResolver = "9.9.9.9";
+      credentialFiles = {
+        AWS_SHARED_CREDENTIALS_FILE = "/home/jordan/projects/vimium/infra/credentials";
+      };
+      environmentFile = ./aws.env;
+    };
+    certs = {
+      "vimium.com" = {
+        extraDomainNames = [ "*.vimium.com" ];
+      };
+    };
+  };
+
  modules = {
    hardware.presonus-studio.enable = true;
    services = {
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@@ -44,6 +44,7 @@
      powerManagement.enable = true;
      nvidiaSettings = false;
    };
+    nvidia-container-toolkit.enable = true;
  };

  powerManagement.cpuFreqGovernor = "schedutil";
--- a/hosts/odyssey/home-assistant/dashboards.nix
+++ b/hosts/odyssey/home-assistant/dashboards.nix
@@ -0,0 +1,63 @@
+{
+  ...
+}:
+
+{
+  /**
+    *******************
+    - Service Dashboard for stats (energy usage, bandwidth etc.)
+    - Dashboard fragment per room
+    - Tablet in each room can display just its associated fragment
+    - Per user dynamic dashboard that shows the dashboard fragment for the room
+      you are in using Bluetooth presence detection
+
+    Rooms: [Auto, Bedroom, Kitchen, Living Room, Office]
+
+    Shared: Date/time, Guest Override action, Weather, Air quality
+
+    Bedroom:
+    - Temperature
+    - Minimal Lights action
+    - Individual light cards
+    - Sheets last changed
+    - Plant last watered
+
+    Kitchen:
+    - Temperature
+    - Individual light cards
+    - Water filter age
+
+    Living Room:
+    - Temperature
+    - Turn TV on action
+      * dynamic card to start Movie Mode
+    - Individual light cards
+    - Plant last watered
+
+    Office:
+    - Temperature
+    - Individual light cards
+    - Bandwidth usage
+    - Computer stats
+
+    Primary IEEE address: 00:12:4B:00:29:E8:B1:9E
+
+    Random inspiration words:
+    - "Temp Disable Office Motion"
+    - "Main Lights {Bright,Dim,Warm}"
+    - "Robot Vacuum"
+    - "Living Room TV"
+    - "Morning wakeup"
+    - "Going to sleep early"
+    - "Take out bins"
+    - "Video Conference"
+    - "Gaming"
+    - Monitor power usage to tell when something has started/stopped
+    - Vibration sensor for kitchen drawer
+    - Todo list for dinner schedule
+    - Air quality sensor in kitchen
+    - Notification to close vents when outdoor air quality is bad
+    - "TV Lights Lock" - don't auto dim-lights on play/pause
+    *********************
+  */
+}
--- a/hosts/odyssey/home-assistant/default.nix
+++ b/hosts/odyssey/home-assistant/default.nix
@@ -124,13 +124,13 @@
      "folder_watcher"
      "forecast_solar"
      "frontend"
-      "gdacs"
+      # "gdacs"
      "generic"
      "generic_hygrostat"
      "generic_thermostat"
      "geo_json_events"
      "geo_location"
-      "geo_rss_events"
+      # "geo_rss_events"
      "github"
      "group"
      "hardware"
--- a/hosts/odyssey/home-assistant/floorplan/default.nix
+++ b/hosts/odyssey/home-assistant/floorplan/default.nix
--- a/hosts/odyssey/home-assistant/floorplan/style.css
+++ b/hosts/odyssey/home-assistant/floorplan/style.css
--- a/hosts/odyssey/home-assistant/mqtt.nix
+++ b/hosts/odyssey/home-assistant/mqtt.nix
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@@ -8,7 +8,6 @@
  imports = [
    inputs.nixos-hardware.nixosModules.raspberry-pi-4
    ./hardware-configuration.nix
-    ./home-assistant
    ./snapcast.nix
    ../server.nix
  ];
@@ -101,7 +100,7 @@
      ];
    };
    firmware = with pkgs; [
-      firmwareLinuxNonfree
+      linux-firmware
      wireless-regdb
    ];
  };
--- a/hosts/pi/snapcast.nix
+++ b/hosts/pi/snapcast.nix
@@ -19,14 +19,6 @@

  services.snapserver = {
    enable = false;
-    streams = {
-      default = {
-        type = "file";
-        location = "/var/lib/snapserver/test.wav";
-        sampleFormat = "44100:16:2";
-        codec = "flac";
-      };
-    };
  };

  systemd.services.snapclient = {
--- a/hosts/skycam/hardware-configuration.nix
+++ b/hosts/skycam/hardware-configuration.nix
@@ -78,7 +78,7 @@
        ];
    };
    firmware = with pkgs; [
-      firmwareLinuxNonfree
+      linux-firmware
    ];
  };

--- a/hosts/vps1/headscale.nix
+++ b/hosts/vps1/headscale.nix
@@ -36,7 +36,7 @@ in
          {
            name = "home.mesh.vimium.net";
            type = "A";
-            value = "100.64.0.7";
+            value = "100.64.0.5";
          }
        ];
        magic_dns = true;
@@ -60,7 +60,7 @@ in
      forceSSL = true;
      enableACME = true;
      locations."/" = {
-        proxyPass = "http://localhost:${toString config.services.headscale.port}";
+        proxyPass = "http://127.0.0.1:${toString config.services.headscale.port}";
        proxyWebsockets = true;
      };
    };
--- a/hosts/vps1/kanidm.nix
+++ b/hosts/vps1/kanidm.nix
@@ -26,7 +26,7 @@ in
      uri = "https://${domain}";
    in
    {
-      package = pkgs.unstable.kanidmWithSecretProvisioning;
+      package = pkgs.unstable.kanidmWithSecretProvisioning_1_7;
      enableClient = true;
      enableServer = true;
      clientSettings = {
--- a/hosts/vps1/matrix.nix
+++ b/hosts/vps1/matrix.nix
@@ -136,16 +136,16 @@ in
      ];
      locations = {
        "/" = {
-          proxyPass = "http://localhost:8008";
+          proxyPass = "http://127.0.0.1:8008";
          extraConfig = proxyConfig;
        };
        "/_matrix" = {
-          proxyPass = "http://localhost:8008";
+          proxyPass = "http://127.0.0.1:8008";
          extraConfig = proxyConfig + ''
            client_max_body_size 50M;
          '';
        };
-        "/_synapse/client".proxyPass = "http://localhost:8008";
+        "/_synapse/client".proxyPass = "http://127.0.0.1:8008";
      };
    };
    "${serverName}" =
--- a/hosts/vps1/nginx.nix
+++ b/hosts/vps1/nginx.nix
@@ -17,7 +17,7 @@ let
    add_header Expect-CT max-age=30 always;
    add_header Referrer-Policy strict-origin-when-cross-origin always;
    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
-    add_header Vimium-Responding-Instance $hostname;
+    add_header Vimium-Responding-Instance edge-lhr-a0 always;
    add_header X-XSS-Protection "1; mode=block" always;
    add_header X-Content-Type-Options nosniff always;
  '';
@@ -82,14 +82,33 @@ in
        maxSize = "100m";
      };
    };
+    proxyResolveWhileRunning = true;
+    resolver.addresses = [ "100.100.100.100" ];
+    upstreams = {
+      jellyfin.servers = {
+        "library.mesh.vimium.net:8096" = {
+          fail_timeout = "30s";
+        };
+      };
+      open-webui.servers = {
+        "library.mesh.vimium.net:8081" = {
+          fail_timeout = "30s";
+        };
+      };
+      skycam.servers = {
+        "skycam.mesh.vimium.net:1984" = {
+          fail_timeout = "30s";
+        };
+      };
+    };
    virtualHosts = {
-      ## Static sites
+      ## Proxied sites
      "chat.ai.vimium.com" = {
        forceSSL = true;
        enableACME = true;
        extraConfig = nginxErrorPages + nginxEdgeHeaders;
        locations."/" = {
-          proxyPass = "http://localhost:8001";
+          proxyPass = "http://open-webui";
          extraConfig = ''
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            proxy_set_header X-Forwarded-Proto $scheme;
@@ -114,7 +133,7 @@ in
        enableACME = true;
        extraConfig = nginxErrorPages + nginxEdgeHeaders;
        locations."/" = {
-          proxyPass = "http://localhost:8000";
+          proxyPass = "http://jellyfin";
          extraConfig = ''
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            proxy_set_header X-Forwarded-Proto $scheme;
@@ -129,7 +148,12 @@ in
            proxy_set_header Connection "upgrade";
          '';
        };
+        locations."/metrics" = {
+          return = "404";
+        };
      };
+
+      ## Static sites
      "jdholt.com" = {
        forceSSL = true;
        enableACME = true;
@@ -140,11 +164,8 @@ in
        };
        locations."/skycam/snapshot.jpg" = {
          extraConfig = ''
-            set $backend "skycam.mesh.vimium.net:1984";
-
-            resolver 100.100.100.100;
-
-            proxy_pass http://$backend/api/frame.jpeg?src=rpicam;
+            set $args "";
+            proxy_pass http://skycam/api/frame.jpeg?src=rpicam;
            proxy_cache skycam_cache;
            proxy_cache_valid any 10s;
            proxy_ignore_headers Cache-Control Expires Set-Cookie;
@@ -181,6 +202,7 @@ in
        };
      };
    }
+
    ## Redirects
    // (mkRedirect "h0lt.com" "jdholt.com")
    // (mkRedirect "jordanholt.xyz" "jdholt.com")
--- a/hosts/vps2/default.nix
+++ b/hosts/vps2/default.nix
@@ -1,33 +0,0 @@
-{
-  inputs,
-  ...
-}:
-
-{
-  imports = [
-    inputs.disko.nixosModules.disko
-    ./hardware-configuration.nix
-    ./disko-config.nix
-    ../server.nix
-  ];
-
-  nixpkgs = {
-    hostPlatform = "x86_64-linux";
-  };
-
-  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
-
-  networking = {
-    hostId = "60de4af8";
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [
-        22 # SSH
-      ];
-    };
-  };
-
-  modules.services.tailscale.isExitNode = true;
-
-  system.stateVersion = "25.05";
-}
--- a/hosts/vps2/disko-config.nix
+++ b/hosts/vps2/disko-config.nix
@@ -1,55 +0,0 @@
-{ lib, ... }:
-{
-  disko.devices = {
-    disk.disk1 = {
-      device = lib.mkDefault "/dev/sda";
-      type = "disk";
-      content = {
-        type = "gpt";
-        partitions = {
-          boot = {
-            name = "boot";
-            size = "2M";
-            type = "EF02";
-          };
-          esp = {
-            name = "ESP";
-            size = "300M";
-            type = "EF00";
-            content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot";
-            };
-          };
-          root = {
-            name = "root";
-            size = "100%";
-            content = {
-              type = "lvm_pv";
-              vg = "pool";
-            };
-          };
-        };
-      };
-    };
-    lvm_vg = {
-      pool = {
-        type = "lvm_vg";
-        lvs = {
-          root = {
-            size = "100%FREE";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-              mountOptions = [
-                "defaults"
-              ];
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/hosts/vps2/hardware-configuration.nix
+++ b/hosts/vps2/hardware-configuration.nix
@@ -1,29 +0,0 @@
-{
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "ata_piix"
-        "uhci_hcd"
-        "xen_blkfront"
-        "vmw_pvscsi"
-      ];
-      kernelModules = [ "nvme" ];
-    };
-    loader.grub = {
-      efiSupport = true;
-      efiInstallAsRemovable = true;
-    };
-    tmp.cleanOnBoot = true;
-  };
-
-  zramSwap.enable = true;
-}
--- a/hosts/vps2/ssh_host_ed25519_key.pub
+++ b/hosts/vps2/ssh_host_ed25519_key.pub
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG1Ee9QHeGSVpmruNaMdaycYyNdTXVRWpwUk1EBEM7UW
--- a/modules/nixos/system/desktop/gnome.nix
+++ b/modules/nixos/system/desktop/gnome.nix
@@ -47,7 +47,6 @@ in
      gnomeExtensions.dash-to-panel
      gnomeExtensions.desktop-cube
      gnomeExtensions.easyScreenCast
-      gnomeExtensions.espresso
      gnomeExtensions.fly-pie
      gnomeExtensions.forge
      gnomeExtensions.gsconnect
--- a/nix/hosts.nix
+++ b/nix/hosts.nix
@@ -54,7 +54,6 @@
          "pi"
          "skycam"
          "vps1"
-          "vps2"
        ] mkDeployNode;
      };
    };
--- a/users/guest/common/optional/graphical/jellyfin.nix
+++ b/users/guest/common/optional/graphical/jellyfin.nix
@@ -17,24 +17,4 @@
    ".local/share/jellyfinmediaplayer"
    ".local/share/Jellyfin Media Player"
  ];
-
-  systemd.user.services.jellyfin-media-player = {
-    Unit = {
-      Description = "Jellyfin Media Player in Gamescope";
-      After = [
-        "graphical.target"
-        "default.target"
-      ];
-    };
-    Service = {
-      ExecStart = ''
-        ${pkgs.gamescope}/bin/gamescope --hdr-enabled --rt --backend drm -- \
-          ${pkgs.jellyfin-media-player}/bin/jellyfinmediaplayer --scale-factor 2 --tv --fullscreen
-      '';
-      Restart = "always";
-    };
-    Install = {
-      WantedBy = [ "default.target" ];
-    };
-  };
 }
--- a/users/guest/common/optional/graphical/steam.nix
+++ b/users/guest/common/optional/graphical/steam.nix
@@ -14,21 +14,4 @@
    ".local/share/vulkan"
    ".steam"
  ];
-
-  systemd.user.services.steam-big-picture = {
-    Unit = {
-      Description = "Steam Big Picture in Gamescope";
-      After = [
-        "graphical.target"
-        "default.target"
-      ];
-    };
-    Service = {
-      ExecStart = ''
-        ${pkgs.gamescope}/bin/gamescope --rt --backend drm --steam -- \
-          ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot
-      '';
-      Restart = "always";
-    };
-  };
 }
--- a/users/guest/default.nix
+++ b/users/guest/default.nix
@@ -22,6 +22,7 @@ in
    ];
    group = "users";
    isNormalUser = true;
+    password = "";
    shell = pkgs.zsh;
  };

@@ -52,10 +53,32 @@ in
      sessionVariables = {
        ZDOTDIR = "~/.config/zsh";
      };
+      pointerCursor = {
+        enable = true;
+        size = 64;
+        name = "macOS";
+        package = pkgs.apple-cursor;
+        gtk.enable = true;
+        x11.enable = true;
+      };
    };

    fonts.fontconfig.enable = true;

+    programs.firefox = {
+      enable = true;
+      profiles.Default = {
+        search = {
+          default = "ddg";
+          privateDefault = "ddg";
+          force = true;
+        };
+        settings = {
+          "layout.css.devPixelsPerPx" = 1.5;
+        };
+      };
+    };
+
    programs.zsh = {
      enable = true;
      enableCompletion = true;
@@ -64,11 +87,99 @@ in
    xdg.enable = true;
  };

-  services.getty = {
-    autologinOnce = true;
-    autologinUser = "guest";
+  services.displayManager = {
+    enable = true;
+    sessionPackages =
+      let
+        firefoxDesktopFile = pkgs.writeTextFile {
+          name = "firefox-desktop-entry";
+          destination = "/share/wayland-sessions/firefox.desktop";
+          text = ''
+            [Desktop Entry]
+            Name=Firefox
+            Comment=Desktop session for web browsing
+            Exec=${pkgs.gamescope}/bin/gamescope --rt --backend drm --expose-wayland -W 3840 -H 2160 -- MOZ_ENABLE_WAYLAND=1 ${pkgs.firefox}/bin/firefox https://www.youtube.com/
+            Type=Application
+          '';
+        };
+
+        jellyfinDesktopFile = pkgs.writeTextFile {
+          name = "jellyfin-desktop-entry";
+          destination = "/share/wayland-sessions/jellyfin.desktop";
+          text = ''
+            [Desktop Entry]
+            Name=Jellyfin
+            Comment=Desktop session for music, movies, and TV
+            Exec=${pkgs.gamescope}/bin/gamescope --rt --backend drm -W 3840 -H 2160 -- ${pkgs.jellyfin-media-player}/bin/jellyfinmediaplayer --scale-factor 2 --tv --fullscreen
+            Type=Application
+          '';
+        };
+
+        steamDesktopFile = pkgs.writeTextFile {
+          name = "steam-desktop-entry";
+          destination = "/share/wayland-sessions/steam.desktop";
+          text = ''
+            [Desktop Entry]
+            Name=Steam
+            Comment=Desktop session for gaming
+            Exec=${pkgs.gamescope}/bin/gamescope --rt --backend drm --steam -- ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot
+            Type=Application
+          '';
+        };
+
+        firefoxSession = pkgs.symlinkJoin {
+          name = "firefox-session";
+          paths = [ firefoxDesktopFile ];
+          passthru.providedSessions = [ "firefox" ];
+        };
+
+        jellyfinSession = pkgs.symlinkJoin {
+          name = "jellyfin-session";
+          paths = [ jellyfinDesktopFile ];
+          passthru.providedSessions = [ "jellyfin" ];
+        };
+
+        steamSession = pkgs.symlinkJoin {
+          name = "steam-session";
+          paths = [ steamDesktopFile ];
+          passthru.providedSessions = [ "steam" ];
+        };
+      in
+      [
+        firefoxSession
+        jellyfinSession
+        steamSession
+      ];
  };

+  services.greetd =
+    let
+      desktops = config.services.displayManager.sessionData.desktops;
+    in
+    {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions";
+        };
+      };
+    };
+
+  # security.pam.services = {
+  #   greetd.text = ''
+  #     auth      requisite     pam_nologin.so
+  #     auth      sufficient    pam_succeed_if.so user = ${name} quiet_success
+  #     auth      required      pam_unix.so
+  #
+  #     account   sufficient    pam_unix.so
+  #
+  #     password  required      pam_deny.so
+  #
+  #     session   optional      pam_keyinit.so revoke
+  #     session   include       login
+  #   '';
+  # };
+
  # Workaround: https://github.com/nix-community/home-manager/issues/7166
  systemd.services."home-manager-${name}".serviceConfig = {
    RemainAfterExit = "yes";
--- a/users/jordan/artemis.nix
+++ b/users/jordan/artemis.nix
@@ -12,9 +12,9 @@
  ];

  home.packages = with pkgs; [
-    jellyfin-media-player
-    lutris
-    unstable.pcsx2
+    # jellyfin-media-player
+    unstable.lutris
+    pcsx2
    xemu
  ];
 }
--- a/users/jordan/atlas.nix
+++ b/users/jordan/atlas.nix
@@ -10,7 +10,7 @@
  ];

  home.packages = with pkgs; [
-    jellyfin-media-player
+    # jellyfin-media-player
    qbittorrent
  ];
 }
--- a/users/jordan/common/git.nix
+++ b/users/jordan/common/git.nix
@@ -5,12 +5,18 @@
 {
  programs.git = {
    enable = true;
-    aliases = {
-      amend = "commit --amend";
-      lg = "log --color --graph --abbrev-commit --";
-      ls = "ls-files";
-      unadd = "reset HEAD";
-      undo-commit = "reset --soft \"HEAD^\"";
+    settings = {
+      aliases = {
+        amend = "commit --amend";
+        lg = "log --color --graph --abbrev-commit --";
+        ls = "ls-files";
+        unadd = "reset HEAD";
+        undo-commit = "reset --soft \"HEAD^\"";
+      };
+      user = {
+        email = "jordan@vimium.com";
+        name = "Jordan Holt";
+      };
    };
    ignores = [
      ".Trash-*"
@@ -27,8 +33,6 @@
      "[._]*.un~"
      "cmake-build-*/"
    ];
-    userEmail = "jordan@vimium.com";
-    userName = "Jordan Holt";
    signing = {
      key = "B8CFFF61F1CCF520";
      signByDefault = true;
--- a/users/jordan/common/gpg.nix
+++ b/users/jordan/common/gpg.nix
@@ -9,7 +9,6 @@

  services.gpg-agent = {
    enable = true;
-    enableSshSupport = true;
  };

  home.persistence."/persist".directories = [
--- a/users/jordan/common/neovim.nix
+++ b/users/jordan/common/neovim.nix
@@ -11,6 +11,17 @@
    viAlias = true;
    vimAlias = true;

+    extraConfigLua = ''
+      if vim.g.neovide then
+        vim.g.neovide_opacity = 0.8
+        vim.g.neovide_normal_opacity = 0.8
+        -- vim.g.neovide_cursor_vfx_mode = "pixiedust"
+        vim.g.neovide_floating_blur_amount_x = 2.0
+        vim.g.neovide_floating_blur_amount_y = 2.0
+        vim.g.neovide_floating_corner_radius = 0.2
+      end
+    '';
+
    opts = {
      number = true;
      tabstop = 2;
@@ -35,6 +46,14 @@
      providers.wl-copy.enable = true;
    };

+    colorschemes.onedark = {
+      enable = true;
+      settings = {
+        style = "darker";
+        transparent = true;
+      };
+    };
+
    plugins.cmp = {
      enable = true;
      autoEnableSources = true;
@@ -58,7 +77,7 @@
      settings = {
        adapters = {
          http.opts.show_defaults = false;
-          openwebui.__raw = ''
+          http.openwebui.__raw = ''
            function()
              return require("codecompanion.adapters").extend("openai_compatible", {
                name = "openwebui",
@@ -157,9 +176,9 @@

    plugins.treesitter-refactor = {
      enable = true;
-      highlightDefinitions = {
+      settings.highlight_definitions = {
        enable = true;
-        clearOnCursorMove = false;
+        clear_on_cursor_move = false;
      };
    };

--- a/users/jordan/common/optional/graphical/firefox.nix
+++ b/users/jordan/common/optional/graphical/firefox.nix
@@ -8,6 +8,39 @@

  programs.firefox = {
    enable = true;
+    policies = {
+      DisableFirefoxAccounts = true;
+      DisableFirefoxStudies = true;
+      DisableTelemetry = true;
+      DisableFeedbackCommands = true;
+      DisablePocket = true;
+      DisableSetDesktopBackground = true;
+      DontCheckDefaultBrowser = true;
+      NoDefaultBookmarks = true;
+      SkipTermsOfUse = true;
+      GenerativeAI = {
+        Chatbot = false;
+        LinkPreviews = false;
+        TabGroups = false;
+      };
+      ExtensionSettings = {
+        "uBlock0@raymondhill.net" = {
+          installation_mode = "force_installed";
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          private_browsing = true;
+        };
+      };
+      SearchEngines = {
+        Default = "DuckDuckGo";
+        Remove = [
+          "Amazon.com"
+          "Bing"
+          "eBay"
+          "Google"
+          "Perplexity"
+        ];
+      };
+    };
    profiles.Default = {
      search = {
        default = "ddg";
@@ -47,6 +80,9 @@
        "browser.urlbar.suggest.calculator" = true;
        "browser.urlbar.trending.featureGate" = false;
        "browser.urlbar.unitConversion.enabled" = true;
+        "browser.aboutConfig.showWarning" = false;
+        "browser.aboutwelcome.enabled" = false;
+        "browser.shell.checkDefaultBrowser" = false;
        "cookiebanners.service.mode" = 1;
        "cookiebanners.service.mode.privateBrowsing" = 1;
        "network.IDN_show_punycode" = true;
@@ -99,6 +135,7 @@
        ## Privacy
        "dom.private-attribution.submission.enabled" = false;
        # "privacy.resistFingerprinting" = true;
+        "privacy.resistFingerprinting.randomization.daily_reset.enabled" = true;
        "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = false;
        "privacy.trackingprotection.enabled" = true;
        "privacy.trackingprotection.pbmode.enabled" = true;
@@ -135,6 +172,13 @@
        "dom.webnotifications.serviceworker.enabled" = false;
        "permissions.default.desktop-notification" = 2;

+        ## ML
+        "browser.ml.enable" = false;
+        "browser.ml.chat.enable" = false;
+        "browser.ml.chat.menu" = false;
+        "browser.ml.linkPreview.enable" = false;
+        "browser.tabs.groups.smart.enabled" = false;
+
        ## DOM / JavaScript
        # "dom.event.clipboardevents.enabled" = false;
        "middlemouse.paste" = false;
@@ -202,6 +246,31 @@
        "plugin.state.flash" = 0;
        "plugin.state.java" = 0;

+        # Fullscreen
+        "full-screen-api.transition-duration.enter" = "0 0";
+        "full-screen-api.transition-duration.leave" = "0";
+        "full-screen-api.warning.timeout" = 0;
+
+        # Update management
+        "app.update.auto" = false;
+        "app.update.background.enabled" = false;
+        "app.update.url" = "";
+
+        # Sync
+        "services.sync.engine.addresses" = false;
+        "services.sync.engine.creditcards" = false;
+        "services.sync.engine.addons" = false;
+        "services.sync.engine.bookmarks" = false;
+        "services.sync.engine.history" = false;
+        "services.sync.engine.passwords" = false;
+        "services.sync.engine.prefs" = false;
+        "services.sync.engine.tabs" = false;
+        "identity.fxaccounts.enabled" = false;
+
+        # Notifications and CFR
+        "browser.messaging-system.whatsNewPanel.enabled" = false;
+        "browser.cfr.enabled" = false;
+
        ## Misc
        "browser.selfsupport.url" = "";
      };
--- a/users/jordan/common/optional/graphical/hyprland/default.nix
+++ b/users/jordan/common/optional/graphical/hyprland/default.nix
@@ -66,8 +66,8 @@ in
    ];
    settings = {
      general = {
-        gaps_in = 5;
-        gaps_out = 20;
+        gaps_in = 0;
+        gaps_out = 0;

        border_size = 2;

@@ -115,7 +115,7 @@ in
      };

      decoration = {
-        rounding = 10;
+        rounding = 0;

        active_opacity = 1.0;
        inactive_opacity = 1.0;
@@ -299,7 +299,15 @@ in
    enable = true;
    settings = {
      background = "#000000";
-      background_opacity = 0.7;
+      background_opacity = 0.8;
+    };
+  };
+
+  programs.neovide = {
+    enable = true;
+    package = pkgs.unstable.neovide;
+    settings = {
+      font.size = 16.0;
    };
  };

--- a/users/jordan/common/optional/graphical/niri.nix
+++ b/users/jordan/common/optional/graphical/niri.nix
@@ -0,0 +1,261 @@
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    getExe
+    ;
+in
+{
+  imports = [
+    inputs.niri.homeModules.niri
+  ];
+
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    config.niri = {
+      default = [
+        "gnome"
+        "gtk"
+      ];
+      "org.freedesktop.impl.portal.Access" = "gtk";
+      "org.freedesktop.impl.portal.Notification" = "gtk";
+      "org.freedesktop.impl.portal.Secret" = "gnome-keyring";
+      "org.freedesktop.impl.portal.FileChooser" = "gtk";
+      "org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
+      "org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
+    };
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+      xdg-desktop-portal-gnome
+    ];
+  };
+
+  programs.niri = {
+    enable = true;
+    package = pkgs.niri-unstable;
+
+    settings = {
+      xwayland-satellite.path = getExe pkgs.xwayland-satellite-stable;
+      input = {
+        keyboard = {
+          xkb = {
+            layout = "us";
+            variant = "intl";
+          };
+
+          repeat-delay = 235;
+          repeat-rate = 60;
+        };
+
+        touchpad = {
+          tap = true;
+          dwt = true;
+          dwtp = true;
+          natural-scroll = true;
+          accel-profile = "flat";
+        };
+
+        mouse = {
+          accel-speed = 0.2;
+          accel-profile = "flat";
+        };
+
+        power-key-handling.enable = false;
+        workspace-auto-back-and-forth = true;
+      };
+
+      gestures.hot-corners.enable = false;
+      debug.honor-xdg-activation-with-invalid-serial = true;
+      binds = with config.lib.niri.actions; {
+        "Mod+T".action = spawn "kitty";
+        "Mod+b".action = spawn "firefox";
+        "Super+Alt+L".action = spawn "systemctl suspend";
+        XF86AudioRaiseVolume = {
+          action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+";
+          allow-when-locked = true;
+        };
+        XF86AudioLowerVolume = {
+          action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-";
+          allow-when-locked = true;
+        };
+        XF86AudioMute = {
+          action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
+          allow-when-locked = true;
+        };
+        XF86AudioMicMute = {
+          action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
+          allow-when-locked = true;
+        };
+        "Mod+Q".action = close-window;
+
+        "Mod+n".action = focus-column-left;
+        "Mod+left".action = focus-column-left;
+        "Mod+Shift+n".action = move-column-left;
+        "Mod+Shift+left".action = move-column-left;
+
+        "Mod+r".action = focus-window-or-workspace-down;
+        "Mod+down".action = focus-window-or-workspace-down;
+        "Mod+Shift+r".action = move-window-down;
+        "Mod+Shift+down".action = move-window-down;
+
+        "Mod+l".action = focus-window-or-workspace-up;
+        "Mod+up".action = focus-window-or-workspace-up;
+        "Mod+Shift+l".action = move-window-up;
+        "Mod+Shift+up".action = move-window-up;
+
+        "Mod+s".action = focus-column-right;
+        "Mod+right".action = focus-column-right;
+        "Mod+Shift+s".action = move-column-right;
+        "Mod+Shift+right".action = move-column-right;
+
+        "Mod+h".action = focus-column-first;
+        "Mod+Shift+h".action = consume-or-expel-window-left;
+        "Mod+m".action = focus-column-last;
+        "Mod+Shift+m".action = consume-or-expel-window-right;
+
+        "Mod+Ctrl+n".action = focus-monitor-left;
+        "Mod+Shift+Ctrl+n".action = move-column-to-monitor-left;
+        "Mod+Ctrl+r".action = focus-monitor-down;
+        "Mod+Shift+Ctrl+r".action = move-column-to-monitor-down;
+        "Mod+Ctrl+l".action = focus-monitor-up;
+        "Mod+Shift+Ctrl+l".action = move-column-to-monitor-up;
+        "Mod+Ctrl+s".action = focus-monitor-right;
+        "Mod+Shift+Ctrl+s".action = move-column-to-monitor-right;
+
+        "Mod+Period".action = focus-workspace-down;
+        "Mod+Shift+Period".action = move-column-to-workspace-down;
+        "Mod+Ctrl+Period".action = move-workspace-down;
+        "Mod+comma".action = focus-workspace-up;
+        "Mod+Shift+comma".action = move-column-to-workspace-up;
+        "Mod+Ctrl+comma".action = move-workspace-up;
+
+        "Mod+WheelScrollDown" = {
+          action = focus-workspace-down;
+          cooldown-ms = 150;
+        };
+        "Mod+WheelScrollUp" = {
+          action = focus-workspace-up;
+          cooldown-ms = 150;
+        };
+        "Mod+Ctrl+WheelScrollDown" = {
+          action = move-column-to-workspace-down;
+          cooldown-ms = 150;
+        };
+        "Mod+Ctrl+WheelScrollUp" = {
+          action = move-column-to-workspace-up;
+          cooldown-ms = 150;
+        };
+        "Mod+WheelScrollRight".action = focus-column-right;
+        "Mod+WheelScrollLeft".action = focus-column-left;
+        "Mod+Ctrl+WheelScrollRight".action = move-column-right;
+        "Mod+Ctrl+WheelScrollLeft".action = move-column-left;
+        "Mod+Shift+WheelScrollDown".action = focus-column-right;
+        "Mod+Shift+WheelScrollUp".action = focus-column-left;
+        "Mod+Ctrl+Shift+WheelScrollDown".action = move-column-right;
+        "Mod+Ctrl+Shift+WheelScrollUp".action = move-column-left;
+
+        "Mod+V".action = maximize-column;
+        "Mod+Ctrl+V".action = expand-column-to-available-width;
+        "Mod+return".action = fullscreen-window;
+        "Mod+Minus".action = set-column-width "-10%";
+        "Mod+Shift+0".action = set-column-width "+10%";
+
+        "Mod+F".action = toggle-window-floating;
+        "Mod+Ctrl+F".action = switch-focus-between-floating-and-tiling;
+
+        "Mod+y".action = toggle-column-tabbed-display;
+
+        #"Print".action = screenshot;
+        #"Ctrl+Print".action = screenshot-screen {};
+        #"Alt+Print".action = screenshot-window;
+
+        "Mod+Escape" = {
+          action = toggle-keyboard-shortcuts-inhibit;
+          allow-inhibiting = false;
+        };
+
+        # The quit action will show a confirmation dialog to avoid accidental exits.
+        "Mod+Ctrl+Escape".action = quit;
+        # Powers off the monitors. To turn them back on, do any input like
+        # moving the mouse or pressing any other key.
+        "Mod+Shift+P".action = power-off-monitors;
+      };
+
+      spawn-at-startup = [
+        { command = [ "firefox" ]; }
+      ];
+
+      prefer-no-csd = true;
+      hotkey-overlay = {
+        skip-at-startup = true;
+      };
+      layout = {
+        gaps = 1;
+        center-focused-column = "never";
+        empty-workspace-above-first = true;
+        preset-column-widths = [
+          { proportion = 0.33333; }
+          { proportion = 0.5; }
+          { proportion = 0.66667; }
+        ];
+        default-column-width = {
+          proportion = 0.5;
+        };
+        preset-window-heights = [
+          { proportion = 0.33333; }
+          { proportion = 0.5; }
+          { proportion = 0.66667; }
+        ];
+        focus-ring = {
+          enable = true;
+          width = 2;
+          active.color = "#7fc8ff";
+          inactive.color = "#505050";
+        };
+        border = {
+          enable = false;
+          width = 2;
+          active.color = "#ffc87f";
+          inactive.color = "#505050";
+        };
+        shadow = {
+          # on
+          softness = 30;
+          spread = 5;
+          offset = {
+            x = 0;
+            y = 5;
+          };
+          draw-behind-window = true;
+          color = "#00000070";
+          # inactive-color "#00000054"
+        };
+        tab-indicator = {
+          # off
+          hide-when-single-tab = true;
+          place-within-column = true;
+          gap = 5;
+          width = 4;
+          length = {
+            total-proportion = 1.0;
+          };
+          position = "right";
+          gaps-between-tabs = 2;
+          corner-radius = 8;
+          active.color = "red";
+          inactive.color = "gray";
+        };
+        insert-hint = {
+          # off
+          display.color = "#ffc87f80";
+        };
+      };
+    };
+  };
+}
--- a/users/jordan/common/shell.nix
+++ b/users/jordan/common/shell.nix
@@ -190,9 +190,12 @@ in
    bat
    btop
    fd
+    file
    jq
    ncdu
    nix-zsh-completions
+    p7zip-rar
    ripgrep
+    unzip
  ];
 }
--- a/users/jordan/common/ssh.nix
+++ b/users/jordan/common/ssh.nix
@@ -3,11 +3,8 @@
 }:

 {
-  services.ssh-agent.enable = true;
-
  programs.ssh = {
    enable = true;
-    addKeysToAgent = "yes";
  };

  home.persistence."/state".files = [
--- a/users/jordan/helios.nix
+++ b/users/jordan/helios.nix
@@ -7,13 +7,13 @@
  imports = [
    ./common/optional/graphical/firefox.nix
    ./common/optional/graphical/fonts.nix
-    ./common/optional/graphical/hyprland
+    ./common/optional/graphical/niri.nix
    ./common/optional/graphical/mimeapps.nix
  ];

  programs.nh.enable = true;

  home.packages = with pkgs; [
-    jellyfin-media-player
+    # jellyfin-media-player
  ];
 }
--- a/users/jordan/odyssey.nix
+++ b/users/jordan/odyssey.nix
@@ -22,12 +22,12 @@
    gimp
    handbrake
    inkscape
-    jellyfin-media-player
+    # jellyfin-media-player
    krita
-    lutris
+    unstable.lutris
    mkvtoolnix
    # obs-studio
-    unstable.pcsx2
+    pcsx2
    qbittorrent
    xemu
  ];
				`@@ -1 +0,0 @@`
				`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG1Ee9QHeGSVpmruNaMdaycYyNdTXVRWpwUk1EBEM7UW`