From d4e12d46b30626118ff2b1bf5f2b2e89c6b9316e Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Wed, 19 Nov 2025 09:19:43 -0800
Subject: [PATCH 01/15] Flake, flake-part+easy-host, remove unused inputs

IF YOU ARE NOT ME: I would not use this configuration. In the past I
would feel confident telling you to drop in your own host and be off to
the races, but right now users are in a state which required hard coding
some of my nominal preferences. Read on for more specifics

Completely refactors the flake.nix part of the repo. This removes my
strange legacy code for directory-based hosts+users in favor of using
easy-host and flake-parts.

As a result of this some specialArgs were lost, namely the list of users
and the username being passed. I think this is the right way to go in
the short term, but it has lead to some hardcoded values. Namely "pan"
is created as a user regardless of configuration

In tandem with this is the deprecation of some modules which had inputs
in flake which I wasn't using. I'm sure there is a better way to do
this, but I didn't like downloading and caching them every time when I
knew I wasn't using them.

I'm currently very unhappy with the users part of this change, but that
wasn't the goal of this branch. I will revisit in a larger commit.
---
 flake.lock                                    | 773 ++----------------
 flake.nix                                     | 159 ++--
 hmModules/apps/hypr/app.nix                   | 436 +++++-----
 hmModules/apps/lf/app.nix                     |   2 +-
 hmModules/automatic/default.nix               |  10 +-
 hmModules/services/widgets/ags/default.nix    |  39 +-
 hosts/jibril/{host.nix => default.nix}        |   0
 hosts/juri/{host.nix => default.nix}          |   0
 hosts/onizuka/{host.nix => default.nix}       |   2 -
 nixosModules/apps/animelauncher/app.nix       |  27 +-
 nixosModules/automatic/default.nix            |  39 +-
 nixosModules/services/hyprland/service.nix    |  24 +-
 .../users/badtz => users/badtz@juri}/user.nix |   0
 .../pan/user.nix => users/jibril/default.nix  |   0
 .../pan/user.nix => users/juri/default.nix    |   0
 .../pan/user.nix => users/onizuka/default.nix |   0
 16 files changed, 444 insertions(+), 1067 deletions(-)
 rename hosts/jibril/{host.nix => default.nix} (100%)
 rename hosts/juri/{host.nix => default.nix} (100%)
 rename hosts/onizuka/{host.nix => default.nix} (91%)
 rename {hosts/juri/users/badtz => users/badtz@juri}/user.nix (100%)
 rename hosts/jibril/users/pan/user.nix => users/jibril/default.nix (100%)
 rename hosts/juri/users/pan/user.nix => users/juri/default.nix (100%)
 rename hosts/onizuka/users/pan/user.nix => users/onizuka/default.nix (100%)

diff --git a/flake.lock b/flake.lock
index 50598c2..0e7d694 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,140 +1,50 @@
 {
   "nodes": {
-    "aagl": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      },
+    "easy-hosts": {
       "locked": {
-        "lastModified": 1762188647,
-        "narHash": "sha256-OAXK4p7WIYUcp8xx9m0RZUpV6XUDEhkoM4efI8dzPiU=",
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
-        "rev": "1172be1377bc65581004f4d5927b58c5c7d96639",
+        "lastModified": 1755470564,
+        "narHash": "sha256-KB1ZryVDoQcbIsItOf4WtxkHhh3ppj+XwMpSnt/2QHc=",
+        "owner": "tgirlcloud",
+        "repo": "easy-hosts",
+        "rev": "d0422bc7b3db26268982aa15d07e60370e76ee1d",
         "type": "github"
       },
       "original": {
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
+        "owner": "tgirlcloud",
+        "repo": "easy-hosts",
         "type": "github"
       }
     },
-    "ags": {
+    "flake-parts": {
       "inputs": {
-        "astal": "astal",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1762046771,
-        "narHash": "sha256-baVZvZZN0t9F3fvVhxmQA1/oNykXGd/YhlF19JqCLc8=",
-        "owner": "Aylur",
-        "repo": "ags",
-        "rev": "fe13af2daec716226ccdb3158606a8577853e0ff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Aylur",
-        "repo": "ags",
-        "type": "github"
-      }
-    },
-    "aquamarine": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1761420899,
-        "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=",
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "rev": "62479232aae42c1ef09c2c027c8cfd91df060897",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "type": "github"
-      }
-    },
-    "astal": {
-      "inputs": {
-        "nixpkgs": [
-          "ags",
+        "nixpkgs-lib": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1762012522,
-        "narHash": "sha256-ncEN4OVFM5M9VFc4oR3gOI5K8r99GcYxtU+Cf4Z8pbs=",
-        "owner": "aylur",
-        "repo": "astal",
-        "rev": "671d4229c798834190a50fb8b8d8addd19b529e9",
+        "lastModified": 1762980239,
+        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
         "type": "github"
       },
       "original": {
-        "owner": "aylur",
-        "repo": "astal",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
         "type": "github"
       }
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -158,38 +68,18 @@
         "type": "github"
       }
     },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "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": "nixpkgs_4"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1762351818,
-        "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=",
+        "lastModified": 1763416652,
+        "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea",
+        "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
         "type": "github"
       },
       "original": {
@@ -198,331 +88,60 @@
         "type": "github"
       }
     },
-    "hyprcursor": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1753964049,
-        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "type": "github"
-      }
-    },
-    "hyprgraphics": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1760445448,
-        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "type": "github"
-      }
-    },
-    "hyprland": {
-      "inputs": {
-        "aquamarine": "aquamarine",
-        "hyprcursor": "hyprcursor",
-        "hyprgraphics": "hyprgraphics",
-        "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
-        "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_5",
-        "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems",
-        "xdph": "xdph"
-      },
-      "locked": {
-        "lastModified": 1762269308,
-        "narHash": "sha256-3fTMnF1E7BsZ7NlmFmPo6+SRFm4FELP45IDLHcGLZ1s=",
-        "ref": "refs/heads/main",
-        "rev": "46b71eda6423cc9c3b19cb310c3344e81ac624c5",
-        "revCount": 6551,
-        "type": "git",
-        "url": "https://github.com/hyprwm/Hyprland"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://github.com/hyprwm/Hyprland"
-      }
-    },
-    "hyprland-contrib": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_6"
-      },
-      "locked": {
-        "lastModified": 1759613406,
-        "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=",
-        "owner": "hyprwm",
-        "repo": "contrib",
-        "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "contrib",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759610243,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "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": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1758927902,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprutils": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762208756,
-        "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "164a30b3d8b3174a32ac7326782476f1188e6118",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprwayland-scanner": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1755184602,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1729298361,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "lastModified": 1763570812,
+        "narHash": "sha256-A42G8ulTZ1MFCR0VsLF21CoKi0XKGUYwtVBHGm5mFgQ=",
+        "rev": "f3b2f3496bd6d346cba475d0ba152a9d3a83dec7",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3b2f3496bd6d346cba475d0ba152a9d3a83dec7.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
       }
     },
     "lix-module": {
       "inputs": {
         "flake-utils": "flake-utils",
         "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": "nixpkgs_7"
+        "lix": [
+          "lix"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1732605668,
-        "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
-        "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",
+        "lastModified": 1763435414,
+        "narHash": "sha256-i2467FddWfd19q5Qoj+1/BAeg6LZmM5m4mYGRSQn/as=",
+        "rev": "192c92b603731fbc1bade6c1b18c8d8a0086f703",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/192c92b603731fbc1bade6c1b18c8d8a0086f703.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
       }
     },
     "niri": {
       "inputs": {
         "niri-stable": "niri-stable",
         "niri-unstable": "niri-unstable",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nixpkgs-stable": "nixpkgs-stable",
         "xwayland-satellite-stable": "xwayland-satellite-stable",
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1762341801,
-        "narHash": "sha256-zx7UxreMz646qikxw+So7eGRQeWccKFZxuMvJowJuFs=",
+        "lastModified": 1763538184,
+        "narHash": "sha256-6umNY06L6ZUjinthjVZIwyWyAjxOXSPhXfY0U1CVTWw=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "20aadad64b8b8cbebc71371713c141d91d7f8172",
+        "rev": "85a16f400641eed912431efcec16f12e2100d46a",
         "type": "github"
       },
       "original": {
@@ -551,11 +170,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1762146685,
-        "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=",
+        "lastModified": 1763531615,
+        "narHash": "sha256-cMi8tz+0+gWtlYqVnyMv7phOeQ0/4WmzZ/lxCyraUVw=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943",
+        "rev": "c722634c269ae97a5ea185691bcd0b8c73a600e5",
         "type": "github"
       },
       "original": {
@@ -566,27 +185,24 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761672384,
-        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
-        "type": "github"
+        "lastModified": 1763464769,
+        "narHash": "sha256-mU85VDFRIgKGq1EhT71bLjhvjJ5yuMEe0Ip1kwCbR80=",
+        "rev": "6f374686605df381de8541c072038472a5ea2e2d",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre898015.6f374686605d/nixexprs.tar.xz"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1762233356,
-        "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=",
+        "lastModified": 1763334038,
+        "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
+        "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c",
         "type": "github"
       },
       "original": {
@@ -596,213 +212,30 @@
         "type": "github"
       }
     },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1760596604,
-        "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1761907660,
-        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1729070438,
-        "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5785b6bb5eaae44e627d541023034e1601455827",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1760663237,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "aagl": "aagl",
-        "ags": "ags",
+        "easy-hosts": "easy-hosts",
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager",
-        "hyprland": "hyprland",
-        "hyprland-contrib": "hyprland-contrib",
+        "lix": "lix",
         "lix-module": "lix-module",
         "niri": "niri",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1761791894,
-        "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "59c45eb69d9222a4362673141e00ff77842cd219",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1760998189,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "lastModified": 1763509310,
+        "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e",
         "type": "github"
       },
       "original": {
@@ -812,21 +245,6 @@
       }
     },
     "systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_2": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -841,47 +259,6 @@
         "type": "github"
       }
     },
-    "xdph": {
-      "inputs": {
-        "hyprland-protocols": [
-          "hyprland",
-          "hyprland-protocols"
-        ],
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1761431178,
-        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
-    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
@@ -902,11 +279,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1762302024,
-        "narHash": "sha256-F+4W0J5r7fbEl+VmATFqAA5+4dFSNAmLJB7tAtrTIkY=",
+        "lastModified": 1762747449,
+        "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "53b6072bd995b5b4017999cf247f9eb6660c72a2",
+        "rev": "6338574bc5c036487486acde264f38f39ea15fad",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index eeb4bd0..37dafc1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,94 +1,89 @@
 {
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+    imports = with inputs; [
+      easy-hosts.flakeModule
+      home-manager.flakeModules.home-manager
+    ];
 
-    home-manager.url = "github:nix-community/home-manager";
+    systems = [ "x86_64-linux" ];
+    easy-hosts = {
+      autoConstruct = true;
+      path = ./hosts;
+      onlySystem = "x86_64-nixos";
 
-    lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
+      shared = {
+        modules = [
+          inputs.lix-module.nixosModules.default
+          ./nixosModules
+        ];
+      };
+    };
 
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland";
-    hyprland-contrib.url = "github:hyprwm/contrib";
-
-    niri.url = "github:sodiboo/niri-flake";
-
-    sops-nix.url = "github:Mic92/sops-nix";
-    ags.url = "github:Aylur/ags";
-    aagl.url = "github:ezKEa/aagl-gtk-on-nix";
+    flake = {
+      homeConfigurations = let
+        userConfig = system: extraModules:
+          inputs.home-manager.lib.homeManagerConfiguration {
+            extraSpecialArgs = { inherit inputs; };
+            pkgs = inputs.nixpkgs.legacyPackages.${system};
+            modules = [ ./hmModules ] ++ extraModules;
+        };
+      in {
+        "pan@juri" = userConfig "x86_64-linux" [ ./users/juri ];
+        "pan@jibril" = userConfig "x86_64-linux" [ ./users/jibril ];
+        "pan@onizuka" = userConfig "x86_64-linux" [ ./users/onizuka ];
+      };
+    };
   };
 
-  outputs = { self, home-manager, nixpkgs, lix-module, ... }@inputs: let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    fs = pkgs.lib.fileset;
-    st = pkgs.lib.strings;
-    as = pkgs.lib.attrsets;
+  inputs = {
+    # Save data with this url. Source:
+    # at://did:plc:mojgntlezho4qt7uvcfkdndg/app.bsky.feed.post/3loogwsoqok2w
+    # cid: bafyreidhuuxs3cuabneygtxir65hnd7hvy4hwj5rwrylpwmp7jhxciasve
+    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
 
-    hosts = let 
-      hostFilter = { name, ...}: name == "host.nix";
-      hostPaths = fs.toList (fs.fileFilter hostFilter ./hosts);
-      # Assumes dir structure is start_of_path/hosts/hostname/host.nix
-      extractHostName = path: builtins.unsafeDiscardStringContext (
-        st.removeSuffix "/host.nix" (
-          builtins.elemAt (st.splitString "/hosts/" path) 1
-        )
-      );
-    in builtins.listToAttrs (map (path: {
-      value = path;
-      name = extractHostName path;
-    }) hostPaths);
-
-    users = let
-      userFilter = { name, ...}: name == "user.nix";
-      userPaths = fs.toList (fs.fileFilter userFilter ./hosts);
-    in builtins.listToAttrs (map (path: let
-        dirsAndFiles = st.splitString "/" path;
-        dAFLength = builtins.length dirsAndFiles;
-        # Assumes dir structure is start_of_path/hosts/hostname/users/username/user.nix
-        hostname = builtins.unsafeDiscardStringContext (
-          builtins.elemAt dirsAndFiles (dAFLength - 4));
-        username = builtins.unsafeDiscardStringContext (
-          builtins.elemAt dirsAndFiles (dAFLength - 2));
-      in {
-        name = username + "@" + hostname;
-        value = path;
-      }
-    ) userPaths);
-
-    userConfig = usernameAtHostname: userpath: home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      extraSpecialArgs = { 
-        inherit inputs; 
-        inherit usernameAtHostname;
-      };
-      modules = [
-        ./hmModules
-        userpath
-      ];
+    home-manager = {
+      type = "github";
+      owner = "nix-community";
+      repo = "home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hostConfig = hostname: hostpath: nixpkgs.lib.nixosSystem {
-      specialArgs = let
-        hostFilteredUsers = as.filterAttrs (
-          name: value: let
-            userHostname = builtins.elemAt (st.splitString "@" name) 1;
-          in userHostname == hostname
-        ) users;
-
-        hostUsers = as.mapAttrsToList (
-          name: value: builtins.elemAt (st.splitString "@" name) 0
-        ) hostFilteredUsers;
-      in {
-        inherit inputs;
-        inherit hostname;
-        "usernameList" = hostUsers;
-      };
-      modules = [
-        ./nixosModules
-        hostpath
-      ];
+    flake-parts = {
+      type = "github";
+      owner = "hercules-ci";
+      repo = "flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
+
+    easy-hosts = {
+      type = "github";
+      owner = "tgirlcloud";
+      repo = "easy-hosts";
+    };
+
+    lix = {
+      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+      flake = false;
+    };
+
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.lix.follows = "lix";
+    };
+
+    niri = {
+      type = "github";
+      owner = "sodiboo";
+      repo = "niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    sops-nix = {
+      type = "github";
+      owner = "Mic92";
+      repo = "sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-  in {
-    nixosConfigurations = builtins.mapAttrs (name: path: hostConfig name path) hosts;
-    homeConfigurations = builtins.mapAttrs (name: path: userConfig name path) users;
   };
 }
diff --git a/hmModules/apps/hypr/app.nix b/hmModules/apps/hypr/app.nix
index 85e7b6f..8bdc848 100644
--- a/hmModules/apps/hypr/app.nix
+++ b/hmModules/apps/hypr/app.nix
@@ -1,5 +1,5 @@
-{ config, inputs, pkgs, lib, ... }:
-let rootPath = ./.; in
+{ config, lib, ... }:
+# let rootPath = ./.; in
 {
   options.hypr = {
     enable = lib.mkEnableOption "Enables hyprland";
@@ -34,220 +34,224 @@ let rootPath = ./.; in
     polkit.enable = lib.mkEnableOption "Enables polkit agent";
     screenshot.enable = lib.mkEnableOption "Enables Screenshotting";
   };
+  
+  config.warnings = lib.mkIf config.hypr.enable [''
+      hypr.* has been deprecated to allow the removal of hyprland from flake inputs.
+    ''];
 
-  imports = [ inputs.hyprland.homeManagerModules.default ];
+  # imports = [ inputs.hyprland.homeManagerModules.default ];
 
-  config = let 
-    lopts = lib.lists.optionals;
-  in {
-    nix.settings = {
-      substituters = ["https://hyprland.cachix.org"];
-      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
-    };
-  } // lib.mkIf config.hypr.enable {
-    wayland.windowManager.hyprland = let
-      mod = config.hypr.mod_key;
-      # p-s = let
-      #   chw = config.hypr.workspace;
-      #   findDefaultWs = id: if (builtins.hasAttr id chw.workspaces) 
-      #     then (builtins.head (builtins.getAttr id chw.workspaces))
-      #     else "";
-      # in with config.hypr.workspace; lib.mkIf primary-secondary.enable {
-      #   primaryWs = findDefaultWs primary-secondary.primary;
-      #   secondaryWs = findDefaultWs primary-secondary.secondary;
-      # };
-    in {
-      enable = true;
-      settings = {
-        monitor = config.hypr.monitor.details;
-        workspace = let
-          wsMonitor = monitor: wrksps: map (ws:
-            if ws == (builtins.head wrksps)
-            then "name:"+ws+", monitor:"+monitor+", persistent:true, default:true"
-            else "name:"+ws+", monitor:"+monitor+", persistent:true"
-          ) wrksps;
-          makeRules = wsAttr: builtins.concatLists (builtins.attrValues (
-            builtins.mapAttrs wsMonitor wsAttr
-          ));
-        in makeRules config.hypr.workspace.workspaces
-        ++ [
-          "w[t1], gapsout:0, gapsin:0"
-          "w[tg1], gapsout:0, gapsin:0"
-          "f[1], gapsout:0, gapsin:0"
-        ]
-        ++ lopts config.hypr.workspace.scratchpad.enable [
-          "special:scratch, on-created-empty: [float; size 50% 50%; center] ${config.defaultApps.terminal}"
-        ];
-        input = {
-          accel_profile = "flat";
-          sensitivity = config.hypr.mouse.sensitivity;
-        };
-        general = {
-          gaps_in = 3;
-          gaps_out = 3;
-          border_size = 2;
-          "col.active_border" = "rgb(F5C2E7)";
-          "col.inactive_border" = "rgb(1E1D2F)";
-          layout = "master";
-        };
-        decoration = {
-          rounding = 2;
-          blur = {
-              enabled = true;
-              size = 12;
-              passes = 2;
-              special = true;
-          };
-        };
-        animation = [
-          "windows, 1, 4, default, popin 50%"
-          "windowsOut, 1, 4, default, popin 50%"
-          "windowsMove, 1, 3, default"
-          "border, 1, 3, default"
-          "fade, 1, 3, default"
-          "workspaces, 1, 3, default"
-        ];
-        master = {
-            mfact = config.hypr.master.mfact;
-        };
-        misc = {
-          focus_on_activate = true;
-        };
-
-        exec-once = lopts config.hypr.polkit.enable [
-          "${pkgs.kdePackages.polkit-kde-agent-1}/bin/libexec/polkit-kde-authentication-agent-1"
-        ] ++ lopts config.hypr.background.enable [
-          "${pkgs.swww}/bin/swww-daemon"
-          "${pkgs.swww}/bin/swww img ${config.hypr.background.path}"
-        ] ++ lopts config.ags.enable [
-          "ags"
-        ] ++ lopts config.beeper.enable [
-          "[workspace name:chat silent] Beeper"
-        ];
-
-        env = with config.hypr; [
-          # "HYPR_MON_PRIMARY, ${workspace.primary-secondary.primary}"
-          # "HYPR_MON_SECONDARY, ${workspace.primary-secondary.secondary}"
-          "HYPR_WORK_DB, ${config.xdg.cacheHome}/hypr/workspace.db"
-        ] ++ lopts cursor.enable [
-          "HYPRCURSOR_THEME,${cursor.theme}"
-          "HYPRCURSOR_SIZE,${cursor.size}"
-        ] ++ lopts config.nvidia.enable [
-          "LIBVA_DRIVER_NAME,nvidia"
-          "XDG_SESSION_TYPE,wayland"
-          "GBM_BACKEND,nvidia-drm"
-          "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-          "WLR_RENDERER_ALLOW_SOFTWARE,1"
-          "WLR_DRM_DEVICES,/dev/dri/card1"
-        ];
-
-        windowrulev2 = let
-            workspaceDefaults = wsname: applist: map (
-                app: "workspace " + wsname + ", " + app
-              ) applist;
-            allDefault = wsAttr: builtins.concatLists (builtins.attrValues (
-                builtins.mapAttrs workspaceDefaults wsAttr
-              ));
-        in allDefault config.hypr.workspace.defaults
-        ++ [
-          "bordersize 0, floating:0, onworkspace:w[t1]"
-          "rounding 0, floating:0, onworkspace:w[t1]"
-          "bordersize 0, floating:0, onworkspace:w[tg1]"
-          "rounding 0, floating:0, onworkspace:w[tg1]"
-          "bordersize 0, floating:0, onworkspace:f[1]"
-          "rounding 0, floating:0, onworkspace:f[1]"
-        ]
-          ++ lopts config.hypr.xwayland.videobridge.enable [
-            "opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
-            "noanim,class:^(xwaylandvideobridge)$"
-            "noinitialfocus,class:^(xwaylandvideobridge)$"
-            "maxsize 1 1,class:^(xwaylandvideobridge)$"
-            "noblur,class:^(xwaylandvideobridge)$"
-          ] ++ map (id: "opacity 1 override, " + id) config.hypr.windows.opaque 
-          ++ [
-            "opacity 0.94 fullscreen:0"
-            "opacity 0.79 override, class:^(${config.defaultApps.terminal})$"
-          ];
-
-        # 1, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh home
-        # 2, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh web
-        # 3, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh med
-        # 4, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh game
-        # 5, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh etc
-        # _, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh hell
-        # TAB, exec, $XDG_CONFIG_HOME/hypr/scripts/changesecondary.xsh
-        #
-        # SHIFT, 1, movetoworkspacesilent, name:home
-        # SHIFT, 2, movetoworkspacesilent, name:web
-        # SHIFT, 3, movetoworkspacesilent, name:med
-        # SHIFT, 4, movetoworkspacesilent, name:game
-        # SHIFT, TAB, movetoworkspacesilent, r-1
-
-        bind = let
-          modPrefix = kb: if (lib.strings.hasPrefix "&" kb)
-            then ("${mod}" + kb)
-            else ("${mod}, " + kb);
-        in map modPrefix ([
-          "Return, exec, ${config.defaultApps.terminal}"
-          "&SHIFT, Q, exit"
-          "h, focusmonitor, l"
-          "l, focusmonitor, r"
-          "j, cyclenext,"
-          "k, cyclenext, prev"
-          "&SHIFT, h, movecurrentworkspacetomonitor, -1"
-          "&SHIFT, l, movecurrentworkspacetomonitor, +1"
-          "&SHIFT, j, swapnext,"
-          "&SHIFT, k, swapnext, prev"
-          "c, killactive"
-          "f, togglefloating"
-          "&SHIFT, f, fullscreen"
-        ] ++ (let
-          workspaces = builtins.concatLists (
-            builtins.attrValues config.hypr.workspace.workspaces);
-          wsBinds = with builtins; wrksps: depth: if depth > (length wrksps)
-            then []
-            else let ws = builtins.elemAt wrksps (depth -1); in [
-              "${toString depth}, workspace, name:${ws}"
-              "&SHIFT, ${toString depth}, movetoworkspacesilent, name:${ws}"
-            ] ++ wsBinds wrksps (depth + 1);
-        in wsBinds workspaces 1) ++ lopts config.rofi.enable [
-          "&SHIFT, return, exec, ${pkgs.rofi}/bin/rofi -show run"
-        ] ++ lopts config.hypr.screenshot.enable [
-          "P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copy area"
-          "&SHIFT, P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copysave area"
-        ] ++ lopts config.hypr.workspace.scratchpad.enable [
-          "i, togglespecialworkspace, scratch"
-        ]);
-
-        bindm = map (kb: "${mod}, " + kb) [
-          "mouse:272, movewindow"
-          "mouse:273, movewindow"
-        ];
-      };
-    };
-
-    home.packages = with pkgs; [
-      wlr-randr # Xrandr for wayland
-      wl-clipboard # Clipboard manager for wayland
-    ] ++ lopts config.hypr.xwayland.videobridge.enable [
-      kdePackages.xwaylandvideobridge
-    ] ++ lopts config.hypr.cursor.enable [
-      hyprcursor
-    ] ++ lopts config.hypr.screenshot.enable [
-      hyprpicker # Colorpicker, needed for screenshot tool
-      inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
-    ];
-
-    xdg.configFile."hypr-scripts" = {
-      source = rootPath + "/scripts";
-      target = "hypr/scripts";
-      executable = true;
-    };
-
-    xdg.dataFile."hypr-icons" = lib.mkIf config.hypr.cursor.enable {
-      source = rootPath + "/icons";
-      target = "icons/";
-      recursive = true;
-    };
-  };
+  # config = let 
+  #   lopts = lib.lists.optionals;
+  # in {
+  #   nix.settings = {
+  #     substituters = ["https://hyprland.cachix.org"];
+  #     trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+  #   };
+  # } // lib.mkIf config.hypr.enable {
+  #   wayland.windowManager.hyprland = let
+  #     mod = config.hypr.mod_key;
+  #     # p-s = let
+  #     #   chw = config.hypr.workspace;
+  #     #   findDefaultWs = id: if (builtins.hasAttr id chw.workspaces) 
+  #     #     then (builtins.head (builtins.getAttr id chw.workspaces))
+  #     #     else "";
+  #     # in with config.hypr.workspace; lib.mkIf primary-secondary.enable {
+  #     #   primaryWs = findDefaultWs primary-secondary.primary;
+  #     #   secondaryWs = findDefaultWs primary-secondary.secondary;
+  #     # };
+  #   in {
+  #     enable = true;
+  #     settings = {
+  #       monitor = config.hypr.monitor.details;
+  #       workspace = let
+  #         wsMonitor = monitor: wrksps: map (ws:
+  #           if ws == (builtins.head wrksps)
+  #           then "name:"+ws+", monitor:"+monitor+", persistent:true, default:true"
+  #           else "name:"+ws+", monitor:"+monitor+", persistent:true"
+  #         ) wrksps;
+  #         makeRules = wsAttr: builtins.concatLists (builtins.attrValues (
+  #           builtins.mapAttrs wsMonitor wsAttr
+  #         ));
+  #       in makeRules config.hypr.workspace.workspaces
+  #       ++ [
+  #         "w[t1], gapsout:0, gapsin:0"
+  #         "w[tg1], gapsout:0, gapsin:0"
+  #         "f[1], gapsout:0, gapsin:0"
+  #       ]
+  #       ++ lopts config.hypr.workspace.scratchpad.enable [
+  #         "special:scratch, on-created-empty: [float; size 50% 50%; center] ${config.defaultApps.terminal}"
+  #       ];
+  #       input = {
+  #         accel_profile = "flat";
+  #         sensitivity = config.hypr.mouse.sensitivity;
+  #       };
+  #       general = {
+  #         gaps_in = 3;
+  #         gaps_out = 3;
+  #         border_size = 2;
+  #         "col.active_border" = "rgb(F5C2E7)";
+  #         "col.inactive_border" = "rgb(1E1D2F)";
+  #         layout = "master";
+  #       };
+  #       decoration = {
+  #         rounding = 2;
+  #         blur = {
+  #             enabled = true;
+  #             size = 12;
+  #             passes = 2;
+  #             special = true;
+  #         };
+  #       };
+  #       animation = [
+  #         "windows, 1, 4, default, popin 50%"
+  #         "windowsOut, 1, 4, default, popin 50%"
+  #         "windowsMove, 1, 3, default"
+  #         "border, 1, 3, default"
+  #         "fade, 1, 3, default"
+  #         "workspaces, 1, 3, default"
+  #       ];
+  #       master = {
+  #           mfact = config.hypr.master.mfact;
+  #       };
+  #       misc = {
+  #         focus_on_activate = true;
+  #       };
+  #
+  #       exec-once = lopts config.hypr.polkit.enable [
+  #         "${pkgs.kdePackages.polkit-kde-agent-1}/bin/libexec/polkit-kde-authentication-agent-1"
+  #       ] ++ lopts config.hypr.background.enable [
+  #         "${pkgs.swww}/bin/swww-daemon"
+  #         "${pkgs.swww}/bin/swww img ${config.hypr.background.path}"
+  #       ] ++ lopts config.ags.enable [
+  #         "ags"
+  #       ] ++ lopts config.beeper.enable [
+  #         "[workspace name:chat silent] Beeper"
+  #       ];
+  #
+  #       env = with config.hypr; [
+  #         # "HYPR_MON_PRIMARY, ${workspace.primary-secondary.primary}"
+  #         # "HYPR_MON_SECONDARY, ${workspace.primary-secondary.secondary}"
+  #         "HYPR_WORK_DB, ${config.xdg.cacheHome}/hypr/workspace.db"
+  #       ] ++ lopts cursor.enable [
+  #         "HYPRCURSOR_THEME,${cursor.theme}"
+  #         "HYPRCURSOR_SIZE,${cursor.size}"
+  #       ] ++ lopts config.nvidia.enable [
+  #         "LIBVA_DRIVER_NAME,nvidia"
+  #         "XDG_SESSION_TYPE,wayland"
+  #         "GBM_BACKEND,nvidia-drm"
+  #         "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+  #         "WLR_RENDERER_ALLOW_SOFTWARE,1"
+  #         "WLR_DRM_DEVICES,/dev/dri/card1"
+  #       ];
+  #
+  #       windowrulev2 = let
+  #           workspaceDefaults = wsname: applist: map (
+  #               app: "workspace " + wsname + ", " + app
+  #             ) applist;
+  #           allDefault = wsAttr: builtins.concatLists (builtins.attrValues (
+  #               builtins.mapAttrs workspaceDefaults wsAttr
+  #             ));
+  #       in allDefault config.hypr.workspace.defaults
+  #       ++ [
+  #         "bordersize 0, floating:0, onworkspace:w[t1]"
+  #         "rounding 0, floating:0, onworkspace:w[t1]"
+  #         "bordersize 0, floating:0, onworkspace:w[tg1]"
+  #         "rounding 0, floating:0, onworkspace:w[tg1]"
+  #         "bordersize 0, floating:0, onworkspace:f[1]"
+  #         "rounding 0, floating:0, onworkspace:f[1]"
+  #       ]
+  #         ++ lopts config.hypr.xwayland.videobridge.enable [
+  #           "opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
+  #           "noanim,class:^(xwaylandvideobridge)$"
+  #           "noinitialfocus,class:^(xwaylandvideobridge)$"
+  #           "maxsize 1 1,class:^(xwaylandvideobridge)$"
+  #           "noblur,class:^(xwaylandvideobridge)$"
+  #         ] ++ map (id: "opacity 1 override, " + id) config.hypr.windows.opaque 
+  #         ++ [
+  #           "opacity 0.94 fullscreen:0"
+  #           "opacity 0.79 override, class:^(${config.defaultApps.terminal})$"
+  #         ];
+  #
+  #       # 1, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh home
+  #       # 2, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh web
+  #       # 3, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh med
+  #       # 4, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh game
+  #       # 5, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh etc
+  #       # _, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh hell
+  #       # TAB, exec, $XDG_CONFIG_HOME/hypr/scripts/changesecondary.xsh
+  #       #
+  #       # SHIFT, 1, movetoworkspacesilent, name:home
+  #       # SHIFT, 2, movetoworkspacesilent, name:web
+  #       # SHIFT, 3, movetoworkspacesilent, name:med
+  #       # SHIFT, 4, movetoworkspacesilent, name:game
+  #       # SHIFT, TAB, movetoworkspacesilent, r-1
+  #
+  #       bind = let
+  #         modPrefix = kb: if (lib.strings.hasPrefix "&" kb)
+  #           then ("${mod}" + kb)
+  #           else ("${mod}, " + kb);
+  #       in map modPrefix ([
+  #         "Return, exec, ${config.defaultApps.terminal}"
+  #         "&SHIFT, Q, exit"
+  #         "h, focusmonitor, l"
+  #         "l, focusmonitor, r"
+  #         "j, cyclenext,"
+  #         "k, cyclenext, prev"
+  #         "&SHIFT, h, movecurrentworkspacetomonitor, -1"
+  #         "&SHIFT, l, movecurrentworkspacetomonitor, +1"
+  #         "&SHIFT, j, swapnext,"
+  #         "&SHIFT, k, swapnext, prev"
+  #         "c, killactive"
+  #         "f, togglefloating"
+  #         "&SHIFT, f, fullscreen"
+  #       ] ++ (let
+  #         workspaces = builtins.concatLists (
+  #           builtins.attrValues config.hypr.workspace.workspaces);
+  #         wsBinds = with builtins; wrksps: depth: if depth > (length wrksps)
+  #           then []
+  #           else let ws = builtins.elemAt wrksps (depth -1); in [
+  #             "${toString depth}, workspace, name:${ws}"
+  #             "&SHIFT, ${toString depth}, movetoworkspacesilent, name:${ws}"
+  #           ] ++ wsBinds wrksps (depth + 1);
+  #       in wsBinds workspaces 1) ++ lopts config.rofi.enable [
+  #         "&SHIFT, return, exec, ${pkgs.rofi}/bin/rofi -show run"
+  #       ] ++ lopts config.hypr.screenshot.enable [
+  #         "P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copy area"
+  #         "&SHIFT, P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copysave area"
+  #       ] ++ lopts config.hypr.workspace.scratchpad.enable [
+  #         "i, togglespecialworkspace, scratch"
+  #       ]);
+  #
+  #       bindm = map (kb: "${mod}, " + kb) [
+  #         "mouse:272, movewindow"
+  #         "mouse:273, movewindow"
+  #       ];
+  #     };
+  #   };
+  #
+  #   home.packages = with pkgs; [
+  #     wlr-randr # Xrandr for wayland
+  #     wl-clipboard # Clipboard manager for wayland
+  #   ] ++ lopts config.hypr.xwayland.videobridge.enable [
+  #     kdePackages.xwaylandvideobridge
+  #   ] ++ lopts config.hypr.cursor.enable [
+  #     hyprcursor
+  #   ] ++ lopts config.hypr.screenshot.enable [
+  #     hyprpicker # Colorpicker, needed for screenshot tool
+  #     inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
+  #   ];
+  #
+  #   xdg.configFile."hypr-scripts" = {
+  #     source = rootPath + "/scripts";
+  #     target = "hypr/scripts";
+  #     executable = true;
+  #   };
+  #
+  #   xdg.dataFile."hypr-icons" = lib.mkIf config.hypr.cursor.enable {
+  #     source = rootPath + "/icons";
+  #     target = "icons/";
+  #     recursive = true;
+  #   };
+  # };
 }
diff --git a/hmModules/apps/lf/app.nix b/hmModules/apps/lf/app.nix
index 25a3b89..ecc428e 100644
--- a/hmModules/apps/lf/app.nix
+++ b/hmModules/apps/lf/app.nix
@@ -33,7 +33,7 @@
         relativenumber = true;
       };
       commands = {
-        dragon-out = ''%${pkgs.dragon-drop}/bin/dragon -a -x "$fx"'';
+        dragon-out = ''%${pkgs.dragon-drop}/bin/dragon-drop -a -x "$fx"'';
         trash = lib.mkIf config.trash.enable ''
           %${pkgs.trash-cli}/bin/trash "$fx"
         '';
diff --git a/hmModules/automatic/default.nix b/hmModules/automatic/default.nix
index f974b21..18c78ef 100644
--- a/hmModules/automatic/default.nix
+++ b/hmModules/automatic/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, usernameAtHostname, ... }:
+{ config, lib, ... }:
 
 {
   options = {
@@ -9,17 +9,15 @@
       browser = lib.mkOption { default = ""; };
     };
   };
-  config = let
-    st = lib.strings;
-  in {
+  config = {
     # Let Home Manager install and manage itself.
     programs.home-manager.enable = true;
     nixpkgs.config.allowUnfree = true;
     home.stateVersion = "23.05";
 
     home = {
-      username = builtins.elemAt (st.splitString "@" usernameAtHostname) 0;
-      homeDirectory = "/home/" + config.home.username;
+      username = "pan";
+      homeDirectory = "/home/pan";
       packages = config.extraPkgs;
     };
 
diff --git a/hmModules/services/widgets/ags/default.nix b/hmModules/services/widgets/ags/default.nix
index 5d248d1..5403b1e 100644
--- a/hmModules/services/widgets/ags/default.nix
+++ b/hmModules/services/widgets/ags/default.nix
@@ -1,25 +1,30 @@
-{ config, inputs, pkgs, lib, ... }:
+{ config, lib, ... }:
 {
 
   options.ags = {
     enable = lib.mkEnableOption "Enable ags";
   };
+  
+  config.warnings = lib.mkIf config.ags.enable [''
+      ags.enable has been deprecated to allow the removal of ags from flake 
+      inputs.
+    ''];
 
-  imports = [ inputs.ags.homeManagerModules.default ];
+  # imports = [ inputs.ags.homeManagerModules.default ];
 
-  config = lib.mkIf config.ags.enable {
-    home.packages = with pkgs; [
-      libnotify # Notifications through ags
-    ];
-    programs.ags = {
-      enable = true;
-      configDir = ./config;
-
-      extraPackages = with pkgs; [
-        gtksourceview
-        webkitgtk
-        accountsservice
-      ];
-    };
-  };
+  # config = lib.mkIf config.ags.enable {
+  #   home.packages = with pkgs; [
+  #     libnotify # Notifications through ags
+  #   ];
+  #   programs.ags = {
+  #     enable = true;
+  #     configDir = ./config;
+  #
+  #     extraPackages = with pkgs; [
+  #       gtksourceview
+  #       webkitgtk
+  #       accountsservice
+  #     ];
+  #   };
+  # };
 }
diff --git a/hosts/jibril/host.nix b/hosts/jibril/default.nix
similarity index 100%
rename from hosts/jibril/host.nix
rename to hosts/jibril/default.nix
diff --git a/hosts/juri/host.nix b/hosts/juri/default.nix
similarity index 100%
rename from hosts/juri/host.nix
rename to hosts/juri/default.nix
diff --git a/hosts/onizuka/host.nix b/hosts/onizuka/default.nix
similarity index 91%
rename from hosts/onizuka/host.nix
rename to hosts/onizuka/default.nix
index d2dbc49..46a9717 100644
--- a/hosts/onizuka/host.nix
+++ b/hosts/onizuka/default.nix
@@ -20,8 +20,6 @@
 
   steam.enable = true;
   steam.gamemode = true;
-  aagl.enable = true;
-  aagl.honkai-rail = true;
   input-remapper.enable = true;
 
   postgres.enable = true;
diff --git a/nixosModules/apps/animelauncher/app.nix b/nixosModules/apps/animelauncher/app.nix
index 5cf1a9b..27f1406 100644
--- a/nixosModules/apps/animelauncher/app.nix
+++ b/nixosModules/apps/animelauncher/app.nix
@@ -1,4 +1,4 @@
-{ config, inputs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.aagl = {
@@ -12,16 +12,21 @@
       "Enables honkai 3rd impact";
   };
 
-  imports =  [ inputs.aagl.nixosModules.default ];
+  # imports =  [ inputs.aagl.nixosModules.default ];
 
-  config = lib.mkIf config.aagl.enable {
-    nix.settings = inputs.aagl.nixConfig;
+  config.warnings = lib.mkIf (config.aagl.enable || config.aagl.honkai-rail ||
+    config.aagl.genshin || config.aagl.honkai-3rd) [''
+      aagl.* has been deprecated to allow the removal of aagl from flake inputs.
+    ''];
 
-    programs.honkers-railway-launcher.enable =
-      lib.mkIf config.aagl.honkai-rail true;
-    programs.anime-game-launcher.enable =
-      lib.mkIf config.aagl.genshin true;
-    programs.honkers-launcher.enable =
-      lib.mkIf config.aagl.honkai-3rd true;
-  };
+  # config = lib.mkIf config.aagl.enable {
+  #   nix.settings = inputs.aagl.nixConfig;
+  #
+  #   programs.honkers-railway-launcher.enable =
+  #     lib.mkIf config.aagl.honkai-rail true;
+  #   programs.anime-game-launcher.enable =
+  #     lib.mkIf config.aagl.genshin true;
+  #   programs.honkers-launcher.enable =
+  #     lib.mkIf config.aagl.honkai-3rd true;
+  # };
 }
diff --git a/nixosModules/automatic/default.nix b/nixosModules/automatic/default.nix
index 2f80ace..2bbeffd 100644
--- a/nixosModules/automatic/default.nix
+++ b/nixosModules/automatic/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, hostname, usernameList, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   options.system = {
@@ -22,7 +22,6 @@
       boot.loader.efi.canTouchEfiVariables = true;
     })
     {
-      networking.hostName = hostname;
       system.stateVersion = lib.mkDefault "23.05";
 
       time.timeZone = config.system.timezone;
@@ -39,24 +38,24 @@
       # XDG Compliance
       nix.settings.use-xdg-base-directories = true;
 
-      users = {
-        users = builtins.listToAttrs (map (
-          user: {
-            name = user;
-            value = {
-              name = user;
-              isNormalUser = true;
-              extraGroups = [ "network" ];
-            };
-          }
-        ) usernameList);
-        groups = {
-          wheel = {
-            members = config.system.users.bigWheels;
-          };
-          network = { };
-        };
-      };
+      # users = {
+      #   users = builtins.listToAttrs (map (
+      #     user: {
+      #       name = user;
+      #       value = {
+      #         name = user;
+      #         isNormalUser = true;
+      #         extraGroups = [ "network" ];
+      #       };
+      #     }
+      #   ) usernameList);
+      #   groups = {
+      #     wheel = {
+      #       members = config.system.users.bigWheels;
+      #     };
+      #     network = { };
+      #   };
+      # };
 
       fonts = {
         enableDefaultPackages = true;
diff --git a/nixosModules/services/hyprland/service.nix b/nixosModules/services/hyprland/service.nix
index 779a8fe..3d13ac0 100644
--- a/nixosModules/services/hyprland/service.nix
+++ b/nixosModules/services/hyprland/service.nix
@@ -1,4 +1,4 @@
-{ inputs, config, lib, ... }:
+{ config, lib, ... }:
 
 {
 
@@ -6,18 +6,14 @@
     enable = lib.mkEnableOption "Enables hyprland";
   };
 
-  imports = [
-    inputs.hyprland.nixosModules.default
-  ];
+  # imports = [
+  #   inputs.hyprland.nixosModules.default
+  # ];
 
-  config = {
-    nix.settings = {
-      substituters = [ "https://hyprland.cachix.org" ];
-      trusted-public-keys = [ 
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" 
-      ];
-      experimental-features = [ "nix-command" "flakes" ];
-    };
-    programs.hyprland.enable = lib.mkIf config.hyprland.enable true;
-  };
+  config.warnings = lib.mkIf config.hyprland.enable [''
+    hyprland.enable has been deprecated to allow the removal of hyprland from 
+    flake inputs.
+  ''];
+
+  # config.programs.hyprland.enable = lib.mkIf config.hyprland.enable true;
 }
diff --git a/hosts/juri/users/badtz/user.nix b/users/badtz@juri/user.nix
similarity index 100%
rename from hosts/juri/users/badtz/user.nix
rename to users/badtz@juri/user.nix
diff --git a/hosts/jibril/users/pan/user.nix b/users/jibril/default.nix
similarity index 100%
rename from hosts/jibril/users/pan/user.nix
rename to users/jibril/default.nix
diff --git a/hosts/juri/users/pan/user.nix b/users/juri/default.nix
similarity index 100%
rename from hosts/juri/users/pan/user.nix
rename to users/juri/default.nix
diff --git a/hosts/onizuka/users/pan/user.nix b/users/onizuka/default.nix
similarity index 100%
rename from hosts/onizuka/users/pan/user.nix
rename to users/onizuka/default.nix

From 7340d694f88e1b61adcc5b6b5c313649af5392f5 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Wed, 19 Nov 2025 09:19:43 -0800
Subject: [PATCH 02/15] Flake, flake-part+easy-host, remove unused inputs

IF YOU ARE NOT ME: I would not use this configuration. In the past I
would feel confident telling you to drop in your own host and be off to
the races, but right now users are in a state which required hard coding
some of my nominal preferences. Read on for more specifics

Completely refactors the flake.nix part of the repo. This removes my
strange legacy code for directory-based hosts+users in favor of using
easy-host and flake-parts.

As a result of this some specialArgs were lost, namely the list of users
and the username being passed. I think this is the right way to go in
the short term, but it has lead to some hardcoded values. Namely "pan"
is created as a user regardless of configuration

In tandem with this is the deprecation of some modules which had inputs
in flake which I wasn't using. I'm sure there is a better way to do
this, but I didn't like downloading and caching them every time when I
knew I wasn't using them.

I'm currently very unhappy with the users part of this change, but that
wasn't the goal of this branch. I will revisit in a larger commit.
---
 flake.lock                                    | 773 ++----------------
 flake.nix                                     | 159 ++--
 hmModules/apps/hypr/app.nix                   | 436 +++++-----
 hmModules/apps/lf/app.nix                     |   2 +-
 hmModules/automatic/default.nix               |  10 +-
 hmModules/services/widgets/ags/default.nix    |  39 +-
 hosts/jibril/{host.nix => default.nix}        |   0
 hosts/juri/{host.nix => default.nix}          |   0
 hosts/juri/users/badtz/user.nix               |  10 -
 hosts/onizuka/{host.nix => default.nix}       |   2 -
 nixosModules/apps/animelauncher/app.nix       |  27 +-
 nixosModules/automatic/default.nix            |   5 +-
 nixosModules/services/caddy/service.nix       |   2 +-
 nixosModules/services/hyprland/service.nix    |  24 +-
 .../pan/user.nix => users/jibril/default.nix  |   0
 .../pan/user.nix => users/juri/default.nix    |   0
 .../pan/user.nix => users/onizuka/default.nix |   0
 17 files changed, 428 insertions(+), 1061 deletions(-)
 rename hosts/jibril/{host.nix => default.nix} (100%)
 rename hosts/juri/{host.nix => default.nix} (100%)
 delete mode 100644 hosts/juri/users/badtz/user.nix
 rename hosts/onizuka/{host.nix => default.nix} (91%)
 rename hosts/jibril/users/pan/user.nix => users/jibril/default.nix (100%)
 rename hosts/juri/users/pan/user.nix => users/juri/default.nix (100%)
 rename hosts/onizuka/users/pan/user.nix => users/onizuka/default.nix (100%)

diff --git a/flake.lock b/flake.lock
index 50598c2..0e7d694 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,140 +1,50 @@
 {
   "nodes": {
-    "aagl": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      },
+    "easy-hosts": {
       "locked": {
-        "lastModified": 1762188647,
-        "narHash": "sha256-OAXK4p7WIYUcp8xx9m0RZUpV6XUDEhkoM4efI8dzPiU=",
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
-        "rev": "1172be1377bc65581004f4d5927b58c5c7d96639",
+        "lastModified": 1755470564,
+        "narHash": "sha256-KB1ZryVDoQcbIsItOf4WtxkHhh3ppj+XwMpSnt/2QHc=",
+        "owner": "tgirlcloud",
+        "repo": "easy-hosts",
+        "rev": "d0422bc7b3db26268982aa15d07e60370e76ee1d",
         "type": "github"
       },
       "original": {
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
+        "owner": "tgirlcloud",
+        "repo": "easy-hosts",
         "type": "github"
       }
     },
-    "ags": {
+    "flake-parts": {
       "inputs": {
-        "astal": "astal",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1762046771,
-        "narHash": "sha256-baVZvZZN0t9F3fvVhxmQA1/oNykXGd/YhlF19JqCLc8=",
-        "owner": "Aylur",
-        "repo": "ags",
-        "rev": "fe13af2daec716226ccdb3158606a8577853e0ff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Aylur",
-        "repo": "ags",
-        "type": "github"
-      }
-    },
-    "aquamarine": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1761420899,
-        "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=",
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "rev": "62479232aae42c1ef09c2c027c8cfd91df060897",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "type": "github"
-      }
-    },
-    "astal": {
-      "inputs": {
-        "nixpkgs": [
-          "ags",
+        "nixpkgs-lib": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1762012522,
-        "narHash": "sha256-ncEN4OVFM5M9VFc4oR3gOI5K8r99GcYxtU+Cf4Z8pbs=",
-        "owner": "aylur",
-        "repo": "astal",
-        "rev": "671d4229c798834190a50fb8b8d8addd19b529e9",
+        "lastModified": 1762980239,
+        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
         "type": "github"
       },
       "original": {
-        "owner": "aylur",
-        "repo": "astal",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
         "type": "github"
       }
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -158,38 +68,18 @@
         "type": "github"
       }
     },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "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": "nixpkgs_4"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1762351818,
-        "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=",
+        "lastModified": 1763416652,
+        "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea",
+        "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
         "type": "github"
       },
       "original": {
@@ -198,331 +88,60 @@
         "type": "github"
       }
     },
-    "hyprcursor": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1753964049,
-        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "type": "github"
-      }
-    },
-    "hyprgraphics": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1760445448,
-        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "type": "github"
-      }
-    },
-    "hyprland": {
-      "inputs": {
-        "aquamarine": "aquamarine",
-        "hyprcursor": "hyprcursor",
-        "hyprgraphics": "hyprgraphics",
-        "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
-        "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_5",
-        "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems",
-        "xdph": "xdph"
-      },
-      "locked": {
-        "lastModified": 1762269308,
-        "narHash": "sha256-3fTMnF1E7BsZ7NlmFmPo6+SRFm4FELP45IDLHcGLZ1s=",
-        "ref": "refs/heads/main",
-        "rev": "46b71eda6423cc9c3b19cb310c3344e81ac624c5",
-        "revCount": 6551,
-        "type": "git",
-        "url": "https://github.com/hyprwm/Hyprland"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://github.com/hyprwm/Hyprland"
-      }
-    },
-    "hyprland-contrib": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_6"
-      },
-      "locked": {
-        "lastModified": 1759613406,
-        "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=",
-        "owner": "hyprwm",
-        "repo": "contrib",
-        "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "contrib",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759610243,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "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": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1758927902,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprutils": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762208756,
-        "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "164a30b3d8b3174a32ac7326782476f1188e6118",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprwayland-scanner": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1755184602,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1729298361,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "lastModified": 1763570812,
+        "narHash": "sha256-A42G8ulTZ1MFCR0VsLF21CoKi0XKGUYwtVBHGm5mFgQ=",
+        "rev": "f3b2f3496bd6d346cba475d0ba152a9d3a83dec7",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3b2f3496bd6d346cba475d0ba152a9d3a83dec7.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
       }
     },
     "lix-module": {
       "inputs": {
         "flake-utils": "flake-utils",
         "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": "nixpkgs_7"
+        "lix": [
+          "lix"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1732605668,
-        "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
-        "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",
+        "lastModified": 1763435414,
+        "narHash": "sha256-i2467FddWfd19q5Qoj+1/BAeg6LZmM5m4mYGRSQn/as=",
+        "rev": "192c92b603731fbc1bade6c1b18c8d8a0086f703",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/192c92b603731fbc1bade6c1b18c8d8a0086f703.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
       }
     },
     "niri": {
       "inputs": {
         "niri-stable": "niri-stable",
         "niri-unstable": "niri-unstable",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nixpkgs-stable": "nixpkgs-stable",
         "xwayland-satellite-stable": "xwayland-satellite-stable",
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1762341801,
-        "narHash": "sha256-zx7UxreMz646qikxw+So7eGRQeWccKFZxuMvJowJuFs=",
+        "lastModified": 1763538184,
+        "narHash": "sha256-6umNY06L6ZUjinthjVZIwyWyAjxOXSPhXfY0U1CVTWw=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "20aadad64b8b8cbebc71371713c141d91d7f8172",
+        "rev": "85a16f400641eed912431efcec16f12e2100d46a",
         "type": "github"
       },
       "original": {
@@ -551,11 +170,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1762146685,
-        "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=",
+        "lastModified": 1763531615,
+        "narHash": "sha256-cMi8tz+0+gWtlYqVnyMv7phOeQ0/4WmzZ/lxCyraUVw=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943",
+        "rev": "c722634c269ae97a5ea185691bcd0b8c73a600e5",
         "type": "github"
       },
       "original": {
@@ -566,27 +185,24 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761672384,
-        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
-        "type": "github"
+        "lastModified": 1763464769,
+        "narHash": "sha256-mU85VDFRIgKGq1EhT71bLjhvjJ5yuMEe0Ip1kwCbR80=",
+        "rev": "6f374686605df381de8541c072038472a5ea2e2d",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre898015.6f374686605d/nixexprs.tar.xz"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1762233356,
-        "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=",
+        "lastModified": 1763334038,
+        "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
+        "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c",
         "type": "github"
       },
       "original": {
@@ -596,213 +212,30 @@
         "type": "github"
       }
     },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1760596604,
-        "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1761907660,
-        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1729070438,
-        "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5785b6bb5eaae44e627d541023034e1601455827",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1760663237,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "aagl": "aagl",
-        "ags": "ags",
+        "easy-hosts": "easy-hosts",
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager",
-        "hyprland": "hyprland",
-        "hyprland-contrib": "hyprland-contrib",
+        "lix": "lix",
         "lix-module": "lix-module",
         "niri": "niri",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1761791894,
-        "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "59c45eb69d9222a4362673141e00ff77842cd219",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1760998189,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "lastModified": 1763509310,
+        "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e",
         "type": "github"
       },
       "original": {
@@ -812,21 +245,6 @@
       }
     },
     "systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_2": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -841,47 +259,6 @@
         "type": "github"
       }
     },
-    "xdph": {
-      "inputs": {
-        "hyprland-protocols": [
-          "hyprland",
-          "hyprland-protocols"
-        ],
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1761431178,
-        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
-    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
@@ -902,11 +279,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1762302024,
-        "narHash": "sha256-F+4W0J5r7fbEl+VmATFqAA5+4dFSNAmLJB7tAtrTIkY=",
+        "lastModified": 1762747449,
+        "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "53b6072bd995b5b4017999cf247f9eb6660c72a2",
+        "rev": "6338574bc5c036487486acde264f38f39ea15fad",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index eeb4bd0..37dafc1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,94 +1,89 @@
 {
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+    imports = with inputs; [
+      easy-hosts.flakeModule
+      home-manager.flakeModules.home-manager
+    ];
 
-    home-manager.url = "github:nix-community/home-manager";
+    systems = [ "x86_64-linux" ];
+    easy-hosts = {
+      autoConstruct = true;
+      path = ./hosts;
+      onlySystem = "x86_64-nixos";
 
-    lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
+      shared = {
+        modules = [
+          inputs.lix-module.nixosModules.default
+          ./nixosModules
+        ];
+      };
+    };
 
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland";
-    hyprland-contrib.url = "github:hyprwm/contrib";
-
-    niri.url = "github:sodiboo/niri-flake";
-
-    sops-nix.url = "github:Mic92/sops-nix";
-    ags.url = "github:Aylur/ags";
-    aagl.url = "github:ezKEa/aagl-gtk-on-nix";
+    flake = {
+      homeConfigurations = let
+        userConfig = system: extraModules:
+          inputs.home-manager.lib.homeManagerConfiguration {
+            extraSpecialArgs = { inherit inputs; };
+            pkgs = inputs.nixpkgs.legacyPackages.${system};
+            modules = [ ./hmModules ] ++ extraModules;
+        };
+      in {
+        "pan@juri" = userConfig "x86_64-linux" [ ./users/juri ];
+        "pan@jibril" = userConfig "x86_64-linux" [ ./users/jibril ];
+        "pan@onizuka" = userConfig "x86_64-linux" [ ./users/onizuka ];
+      };
+    };
   };
 
-  outputs = { self, home-manager, nixpkgs, lix-module, ... }@inputs: let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    fs = pkgs.lib.fileset;
-    st = pkgs.lib.strings;
-    as = pkgs.lib.attrsets;
+  inputs = {
+    # Save data with this url. Source:
+    # at://did:plc:mojgntlezho4qt7uvcfkdndg/app.bsky.feed.post/3loogwsoqok2w
+    # cid: bafyreidhuuxs3cuabneygtxir65hnd7hvy4hwj5rwrylpwmp7jhxciasve
+    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
 
-    hosts = let 
-      hostFilter = { name, ...}: name == "host.nix";
-      hostPaths = fs.toList (fs.fileFilter hostFilter ./hosts);
-      # Assumes dir structure is start_of_path/hosts/hostname/host.nix
-      extractHostName = path: builtins.unsafeDiscardStringContext (
-        st.removeSuffix "/host.nix" (
-          builtins.elemAt (st.splitString "/hosts/" path) 1
-        )
-      );
-    in builtins.listToAttrs (map (path: {
-      value = path;
-      name = extractHostName path;
-    }) hostPaths);
-
-    users = let
-      userFilter = { name, ...}: name == "user.nix";
-      userPaths = fs.toList (fs.fileFilter userFilter ./hosts);
-    in builtins.listToAttrs (map (path: let
-        dirsAndFiles = st.splitString "/" path;
-        dAFLength = builtins.length dirsAndFiles;
-        # Assumes dir structure is start_of_path/hosts/hostname/users/username/user.nix
-        hostname = builtins.unsafeDiscardStringContext (
-          builtins.elemAt dirsAndFiles (dAFLength - 4));
-        username = builtins.unsafeDiscardStringContext (
-          builtins.elemAt dirsAndFiles (dAFLength - 2));
-      in {
-        name = username + "@" + hostname;
-        value = path;
-      }
-    ) userPaths);
-
-    userConfig = usernameAtHostname: userpath: home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      extraSpecialArgs = { 
-        inherit inputs; 
-        inherit usernameAtHostname;
-      };
-      modules = [
-        ./hmModules
-        userpath
-      ];
+    home-manager = {
+      type = "github";
+      owner = "nix-community";
+      repo = "home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hostConfig = hostname: hostpath: nixpkgs.lib.nixosSystem {
-      specialArgs = let
-        hostFilteredUsers = as.filterAttrs (
-          name: value: let
-            userHostname = builtins.elemAt (st.splitString "@" name) 1;
-          in userHostname == hostname
-        ) users;
-
-        hostUsers = as.mapAttrsToList (
-          name: value: builtins.elemAt (st.splitString "@" name) 0
-        ) hostFilteredUsers;
-      in {
-        inherit inputs;
-        inherit hostname;
-        "usernameList" = hostUsers;
-      };
-      modules = [
-        ./nixosModules
-        hostpath
-      ];
+    flake-parts = {
+      type = "github";
+      owner = "hercules-ci";
+      repo = "flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
+
+    easy-hosts = {
+      type = "github";
+      owner = "tgirlcloud";
+      repo = "easy-hosts";
+    };
+
+    lix = {
+      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+      flake = false;
+    };
+
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.lix.follows = "lix";
+    };
+
+    niri = {
+      type = "github";
+      owner = "sodiboo";
+      repo = "niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    sops-nix = {
+      type = "github";
+      owner = "Mic92";
+      repo = "sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-  in {
-    nixosConfigurations = builtins.mapAttrs (name: path: hostConfig name path) hosts;
-    homeConfigurations = builtins.mapAttrs (name: path: userConfig name path) users;
   };
 }
diff --git a/hmModules/apps/hypr/app.nix b/hmModules/apps/hypr/app.nix
index 85e7b6f..8bdc848 100644
--- a/hmModules/apps/hypr/app.nix
+++ b/hmModules/apps/hypr/app.nix
@@ -1,5 +1,5 @@
-{ config, inputs, pkgs, lib, ... }:
-let rootPath = ./.; in
+{ config, lib, ... }:
+# let rootPath = ./.; in
 {
   options.hypr = {
     enable = lib.mkEnableOption "Enables hyprland";
@@ -34,220 +34,224 @@ let rootPath = ./.; in
     polkit.enable = lib.mkEnableOption "Enables polkit agent";
     screenshot.enable = lib.mkEnableOption "Enables Screenshotting";
   };
+  
+  config.warnings = lib.mkIf config.hypr.enable [''
+      hypr.* has been deprecated to allow the removal of hyprland from flake inputs.
+    ''];
 
-  imports = [ inputs.hyprland.homeManagerModules.default ];
+  # imports = [ inputs.hyprland.homeManagerModules.default ];
 
-  config = let 
-    lopts = lib.lists.optionals;
-  in {
-    nix.settings = {
-      substituters = ["https://hyprland.cachix.org"];
-      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
-    };
-  } // lib.mkIf config.hypr.enable {
-    wayland.windowManager.hyprland = let
-      mod = config.hypr.mod_key;
-      # p-s = let
-      #   chw = config.hypr.workspace;
-      #   findDefaultWs = id: if (builtins.hasAttr id chw.workspaces) 
-      #     then (builtins.head (builtins.getAttr id chw.workspaces))
-      #     else "";
-      # in with config.hypr.workspace; lib.mkIf primary-secondary.enable {
-      #   primaryWs = findDefaultWs primary-secondary.primary;
-      #   secondaryWs = findDefaultWs primary-secondary.secondary;
-      # };
-    in {
-      enable = true;
-      settings = {
-        monitor = config.hypr.monitor.details;
-        workspace = let
-          wsMonitor = monitor: wrksps: map (ws:
-            if ws == (builtins.head wrksps)
-            then "name:"+ws+", monitor:"+monitor+", persistent:true, default:true"
-            else "name:"+ws+", monitor:"+monitor+", persistent:true"
-          ) wrksps;
-          makeRules = wsAttr: builtins.concatLists (builtins.attrValues (
-            builtins.mapAttrs wsMonitor wsAttr
-          ));
-        in makeRules config.hypr.workspace.workspaces
-        ++ [
-          "w[t1], gapsout:0, gapsin:0"
-          "w[tg1], gapsout:0, gapsin:0"
-          "f[1], gapsout:0, gapsin:0"
-        ]
-        ++ lopts config.hypr.workspace.scratchpad.enable [
-          "special:scratch, on-created-empty: [float; size 50% 50%; center] ${config.defaultApps.terminal}"
-        ];
-        input = {
-          accel_profile = "flat";
-          sensitivity = config.hypr.mouse.sensitivity;
-        };
-        general = {
-          gaps_in = 3;
-          gaps_out = 3;
-          border_size = 2;
-          "col.active_border" = "rgb(F5C2E7)";
-          "col.inactive_border" = "rgb(1E1D2F)";
-          layout = "master";
-        };
-        decoration = {
-          rounding = 2;
-          blur = {
-              enabled = true;
-              size = 12;
-              passes = 2;
-              special = true;
-          };
-        };
-        animation = [
-          "windows, 1, 4, default, popin 50%"
-          "windowsOut, 1, 4, default, popin 50%"
-          "windowsMove, 1, 3, default"
-          "border, 1, 3, default"
-          "fade, 1, 3, default"
-          "workspaces, 1, 3, default"
-        ];
-        master = {
-            mfact = config.hypr.master.mfact;
-        };
-        misc = {
-          focus_on_activate = true;
-        };
-
-        exec-once = lopts config.hypr.polkit.enable [
-          "${pkgs.kdePackages.polkit-kde-agent-1}/bin/libexec/polkit-kde-authentication-agent-1"
-        ] ++ lopts config.hypr.background.enable [
-          "${pkgs.swww}/bin/swww-daemon"
-          "${pkgs.swww}/bin/swww img ${config.hypr.background.path}"
-        ] ++ lopts config.ags.enable [
-          "ags"
-        ] ++ lopts config.beeper.enable [
-          "[workspace name:chat silent] Beeper"
-        ];
-
-        env = with config.hypr; [
-          # "HYPR_MON_PRIMARY, ${workspace.primary-secondary.primary}"
-          # "HYPR_MON_SECONDARY, ${workspace.primary-secondary.secondary}"
-          "HYPR_WORK_DB, ${config.xdg.cacheHome}/hypr/workspace.db"
-        ] ++ lopts cursor.enable [
-          "HYPRCURSOR_THEME,${cursor.theme}"
-          "HYPRCURSOR_SIZE,${cursor.size}"
-        ] ++ lopts config.nvidia.enable [
-          "LIBVA_DRIVER_NAME,nvidia"
-          "XDG_SESSION_TYPE,wayland"
-          "GBM_BACKEND,nvidia-drm"
-          "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-          "WLR_RENDERER_ALLOW_SOFTWARE,1"
-          "WLR_DRM_DEVICES,/dev/dri/card1"
-        ];
-
-        windowrulev2 = let
-            workspaceDefaults = wsname: applist: map (
-                app: "workspace " + wsname + ", " + app
-              ) applist;
-            allDefault = wsAttr: builtins.concatLists (builtins.attrValues (
-                builtins.mapAttrs workspaceDefaults wsAttr
-              ));
-        in allDefault config.hypr.workspace.defaults
-        ++ [
-          "bordersize 0, floating:0, onworkspace:w[t1]"
-          "rounding 0, floating:0, onworkspace:w[t1]"
-          "bordersize 0, floating:0, onworkspace:w[tg1]"
-          "rounding 0, floating:0, onworkspace:w[tg1]"
-          "bordersize 0, floating:0, onworkspace:f[1]"
-          "rounding 0, floating:0, onworkspace:f[1]"
-        ]
-          ++ lopts config.hypr.xwayland.videobridge.enable [
-            "opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
-            "noanim,class:^(xwaylandvideobridge)$"
-            "noinitialfocus,class:^(xwaylandvideobridge)$"
-            "maxsize 1 1,class:^(xwaylandvideobridge)$"
-            "noblur,class:^(xwaylandvideobridge)$"
-          ] ++ map (id: "opacity 1 override, " + id) config.hypr.windows.opaque 
-          ++ [
-            "opacity 0.94 fullscreen:0"
-            "opacity 0.79 override, class:^(${config.defaultApps.terminal})$"
-          ];
-
-        # 1, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh home
-        # 2, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh web
-        # 3, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh med
-        # 4, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh game
-        # 5, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh etc
-        # _, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh hell
-        # TAB, exec, $XDG_CONFIG_HOME/hypr/scripts/changesecondary.xsh
-        #
-        # SHIFT, 1, movetoworkspacesilent, name:home
-        # SHIFT, 2, movetoworkspacesilent, name:web
-        # SHIFT, 3, movetoworkspacesilent, name:med
-        # SHIFT, 4, movetoworkspacesilent, name:game
-        # SHIFT, TAB, movetoworkspacesilent, r-1
-
-        bind = let
-          modPrefix = kb: if (lib.strings.hasPrefix "&" kb)
-            then ("${mod}" + kb)
-            else ("${mod}, " + kb);
-        in map modPrefix ([
-          "Return, exec, ${config.defaultApps.terminal}"
-          "&SHIFT, Q, exit"
-          "h, focusmonitor, l"
-          "l, focusmonitor, r"
-          "j, cyclenext,"
-          "k, cyclenext, prev"
-          "&SHIFT, h, movecurrentworkspacetomonitor, -1"
-          "&SHIFT, l, movecurrentworkspacetomonitor, +1"
-          "&SHIFT, j, swapnext,"
-          "&SHIFT, k, swapnext, prev"
-          "c, killactive"
-          "f, togglefloating"
-          "&SHIFT, f, fullscreen"
-        ] ++ (let
-          workspaces = builtins.concatLists (
-            builtins.attrValues config.hypr.workspace.workspaces);
-          wsBinds = with builtins; wrksps: depth: if depth > (length wrksps)
-            then []
-            else let ws = builtins.elemAt wrksps (depth -1); in [
-              "${toString depth}, workspace, name:${ws}"
-              "&SHIFT, ${toString depth}, movetoworkspacesilent, name:${ws}"
-            ] ++ wsBinds wrksps (depth + 1);
-        in wsBinds workspaces 1) ++ lopts config.rofi.enable [
-          "&SHIFT, return, exec, ${pkgs.rofi}/bin/rofi -show run"
-        ] ++ lopts config.hypr.screenshot.enable [
-          "P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copy area"
-          "&SHIFT, P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copysave area"
-        ] ++ lopts config.hypr.workspace.scratchpad.enable [
-          "i, togglespecialworkspace, scratch"
-        ]);
-
-        bindm = map (kb: "${mod}, " + kb) [
-          "mouse:272, movewindow"
-          "mouse:273, movewindow"
-        ];
-      };
-    };
-
-    home.packages = with pkgs; [
-      wlr-randr # Xrandr for wayland
-      wl-clipboard # Clipboard manager for wayland
-    ] ++ lopts config.hypr.xwayland.videobridge.enable [
-      kdePackages.xwaylandvideobridge
-    ] ++ lopts config.hypr.cursor.enable [
-      hyprcursor
-    ] ++ lopts config.hypr.screenshot.enable [
-      hyprpicker # Colorpicker, needed for screenshot tool
-      inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
-    ];
-
-    xdg.configFile."hypr-scripts" = {
-      source = rootPath + "/scripts";
-      target = "hypr/scripts";
-      executable = true;
-    };
-
-    xdg.dataFile."hypr-icons" = lib.mkIf config.hypr.cursor.enable {
-      source = rootPath + "/icons";
-      target = "icons/";
-      recursive = true;
-    };
-  };
+  # config = let 
+  #   lopts = lib.lists.optionals;
+  # in {
+  #   nix.settings = {
+  #     substituters = ["https://hyprland.cachix.org"];
+  #     trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+  #   };
+  # } // lib.mkIf config.hypr.enable {
+  #   wayland.windowManager.hyprland = let
+  #     mod = config.hypr.mod_key;
+  #     # p-s = let
+  #     #   chw = config.hypr.workspace;
+  #     #   findDefaultWs = id: if (builtins.hasAttr id chw.workspaces) 
+  #     #     then (builtins.head (builtins.getAttr id chw.workspaces))
+  #     #     else "";
+  #     # in with config.hypr.workspace; lib.mkIf primary-secondary.enable {
+  #     #   primaryWs = findDefaultWs primary-secondary.primary;
+  #     #   secondaryWs = findDefaultWs primary-secondary.secondary;
+  #     # };
+  #   in {
+  #     enable = true;
+  #     settings = {
+  #       monitor = config.hypr.monitor.details;
+  #       workspace = let
+  #         wsMonitor = monitor: wrksps: map (ws:
+  #           if ws == (builtins.head wrksps)
+  #           then "name:"+ws+", monitor:"+monitor+", persistent:true, default:true"
+  #           else "name:"+ws+", monitor:"+monitor+", persistent:true"
+  #         ) wrksps;
+  #         makeRules = wsAttr: builtins.concatLists (builtins.attrValues (
+  #           builtins.mapAttrs wsMonitor wsAttr
+  #         ));
+  #       in makeRules config.hypr.workspace.workspaces
+  #       ++ [
+  #         "w[t1], gapsout:0, gapsin:0"
+  #         "w[tg1], gapsout:0, gapsin:0"
+  #         "f[1], gapsout:0, gapsin:0"
+  #       ]
+  #       ++ lopts config.hypr.workspace.scratchpad.enable [
+  #         "special:scratch, on-created-empty: [float; size 50% 50%; center] ${config.defaultApps.terminal}"
+  #       ];
+  #       input = {
+  #         accel_profile = "flat";
+  #         sensitivity = config.hypr.mouse.sensitivity;
+  #       };
+  #       general = {
+  #         gaps_in = 3;
+  #         gaps_out = 3;
+  #         border_size = 2;
+  #         "col.active_border" = "rgb(F5C2E7)";
+  #         "col.inactive_border" = "rgb(1E1D2F)";
+  #         layout = "master";
+  #       };
+  #       decoration = {
+  #         rounding = 2;
+  #         blur = {
+  #             enabled = true;
+  #             size = 12;
+  #             passes = 2;
+  #             special = true;
+  #         };
+  #       };
+  #       animation = [
+  #         "windows, 1, 4, default, popin 50%"
+  #         "windowsOut, 1, 4, default, popin 50%"
+  #         "windowsMove, 1, 3, default"
+  #         "border, 1, 3, default"
+  #         "fade, 1, 3, default"
+  #         "workspaces, 1, 3, default"
+  #       ];
+  #       master = {
+  #           mfact = config.hypr.master.mfact;
+  #       };
+  #       misc = {
+  #         focus_on_activate = true;
+  #       };
+  #
+  #       exec-once = lopts config.hypr.polkit.enable [
+  #         "${pkgs.kdePackages.polkit-kde-agent-1}/bin/libexec/polkit-kde-authentication-agent-1"
+  #       ] ++ lopts config.hypr.background.enable [
+  #         "${pkgs.swww}/bin/swww-daemon"
+  #         "${pkgs.swww}/bin/swww img ${config.hypr.background.path}"
+  #       ] ++ lopts config.ags.enable [
+  #         "ags"
+  #       ] ++ lopts config.beeper.enable [
+  #         "[workspace name:chat silent] Beeper"
+  #       ];
+  #
+  #       env = with config.hypr; [
+  #         # "HYPR_MON_PRIMARY, ${workspace.primary-secondary.primary}"
+  #         # "HYPR_MON_SECONDARY, ${workspace.primary-secondary.secondary}"
+  #         "HYPR_WORK_DB, ${config.xdg.cacheHome}/hypr/workspace.db"
+  #       ] ++ lopts cursor.enable [
+  #         "HYPRCURSOR_THEME,${cursor.theme}"
+  #         "HYPRCURSOR_SIZE,${cursor.size}"
+  #       ] ++ lopts config.nvidia.enable [
+  #         "LIBVA_DRIVER_NAME,nvidia"
+  #         "XDG_SESSION_TYPE,wayland"
+  #         "GBM_BACKEND,nvidia-drm"
+  #         "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+  #         "WLR_RENDERER_ALLOW_SOFTWARE,1"
+  #         "WLR_DRM_DEVICES,/dev/dri/card1"
+  #       ];
+  #
+  #       windowrulev2 = let
+  #           workspaceDefaults = wsname: applist: map (
+  #               app: "workspace " + wsname + ", " + app
+  #             ) applist;
+  #           allDefault = wsAttr: builtins.concatLists (builtins.attrValues (
+  #               builtins.mapAttrs workspaceDefaults wsAttr
+  #             ));
+  #       in allDefault config.hypr.workspace.defaults
+  #       ++ [
+  #         "bordersize 0, floating:0, onworkspace:w[t1]"
+  #         "rounding 0, floating:0, onworkspace:w[t1]"
+  #         "bordersize 0, floating:0, onworkspace:w[tg1]"
+  #         "rounding 0, floating:0, onworkspace:w[tg1]"
+  #         "bordersize 0, floating:0, onworkspace:f[1]"
+  #         "rounding 0, floating:0, onworkspace:f[1]"
+  #       ]
+  #         ++ lopts config.hypr.xwayland.videobridge.enable [
+  #           "opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
+  #           "noanim,class:^(xwaylandvideobridge)$"
+  #           "noinitialfocus,class:^(xwaylandvideobridge)$"
+  #           "maxsize 1 1,class:^(xwaylandvideobridge)$"
+  #           "noblur,class:^(xwaylandvideobridge)$"
+  #         ] ++ map (id: "opacity 1 override, " + id) config.hypr.windows.opaque 
+  #         ++ [
+  #           "opacity 0.94 fullscreen:0"
+  #           "opacity 0.79 override, class:^(${config.defaultApps.terminal})$"
+  #         ];
+  #
+  #       # 1, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh home
+  #       # 2, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh web
+  #       # 3, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh med
+  #       # 4, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh game
+  #       # 5, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh etc
+  #       # _, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh hell
+  #       # TAB, exec, $XDG_CONFIG_HOME/hypr/scripts/changesecondary.xsh
+  #       #
+  #       # SHIFT, 1, movetoworkspacesilent, name:home
+  #       # SHIFT, 2, movetoworkspacesilent, name:web
+  #       # SHIFT, 3, movetoworkspacesilent, name:med
+  #       # SHIFT, 4, movetoworkspacesilent, name:game
+  #       # SHIFT, TAB, movetoworkspacesilent, r-1
+  #
+  #       bind = let
+  #         modPrefix = kb: if (lib.strings.hasPrefix "&" kb)
+  #           then ("${mod}" + kb)
+  #           else ("${mod}, " + kb);
+  #       in map modPrefix ([
+  #         "Return, exec, ${config.defaultApps.terminal}"
+  #         "&SHIFT, Q, exit"
+  #         "h, focusmonitor, l"
+  #         "l, focusmonitor, r"
+  #         "j, cyclenext,"
+  #         "k, cyclenext, prev"
+  #         "&SHIFT, h, movecurrentworkspacetomonitor, -1"
+  #         "&SHIFT, l, movecurrentworkspacetomonitor, +1"
+  #         "&SHIFT, j, swapnext,"
+  #         "&SHIFT, k, swapnext, prev"
+  #         "c, killactive"
+  #         "f, togglefloating"
+  #         "&SHIFT, f, fullscreen"
+  #       ] ++ (let
+  #         workspaces = builtins.concatLists (
+  #           builtins.attrValues config.hypr.workspace.workspaces);
+  #         wsBinds = with builtins; wrksps: depth: if depth > (length wrksps)
+  #           then []
+  #           else let ws = builtins.elemAt wrksps (depth -1); in [
+  #             "${toString depth}, workspace, name:${ws}"
+  #             "&SHIFT, ${toString depth}, movetoworkspacesilent, name:${ws}"
+  #           ] ++ wsBinds wrksps (depth + 1);
+  #       in wsBinds workspaces 1) ++ lopts config.rofi.enable [
+  #         "&SHIFT, return, exec, ${pkgs.rofi}/bin/rofi -show run"
+  #       ] ++ lopts config.hypr.screenshot.enable [
+  #         "P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copy area"
+  #         "&SHIFT, P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copysave area"
+  #       ] ++ lopts config.hypr.workspace.scratchpad.enable [
+  #         "i, togglespecialworkspace, scratch"
+  #       ]);
+  #
+  #       bindm = map (kb: "${mod}, " + kb) [
+  #         "mouse:272, movewindow"
+  #         "mouse:273, movewindow"
+  #       ];
+  #     };
+  #   };
+  #
+  #   home.packages = with pkgs; [
+  #     wlr-randr # Xrandr for wayland
+  #     wl-clipboard # Clipboard manager for wayland
+  #   ] ++ lopts config.hypr.xwayland.videobridge.enable [
+  #     kdePackages.xwaylandvideobridge
+  #   ] ++ lopts config.hypr.cursor.enable [
+  #     hyprcursor
+  #   ] ++ lopts config.hypr.screenshot.enable [
+  #     hyprpicker # Colorpicker, needed for screenshot tool
+  #     inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
+  #   ];
+  #
+  #   xdg.configFile."hypr-scripts" = {
+  #     source = rootPath + "/scripts";
+  #     target = "hypr/scripts";
+  #     executable = true;
+  #   };
+  #
+  #   xdg.dataFile."hypr-icons" = lib.mkIf config.hypr.cursor.enable {
+  #     source = rootPath + "/icons";
+  #     target = "icons/";
+  #     recursive = true;
+  #   };
+  # };
 }
diff --git a/hmModules/apps/lf/app.nix b/hmModules/apps/lf/app.nix
index 25a3b89..ecc428e 100644
--- a/hmModules/apps/lf/app.nix
+++ b/hmModules/apps/lf/app.nix
@@ -33,7 +33,7 @@
         relativenumber = true;
       };
       commands = {
-        dragon-out = ''%${pkgs.dragon-drop}/bin/dragon -a -x "$fx"'';
+        dragon-out = ''%${pkgs.dragon-drop}/bin/dragon-drop -a -x "$fx"'';
         trash = lib.mkIf config.trash.enable ''
           %${pkgs.trash-cli}/bin/trash "$fx"
         '';
diff --git a/hmModules/automatic/default.nix b/hmModules/automatic/default.nix
index f974b21..18c78ef 100644
--- a/hmModules/automatic/default.nix
+++ b/hmModules/automatic/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, usernameAtHostname, ... }:
+{ config, lib, ... }:
 
 {
   options = {
@@ -9,17 +9,15 @@
       browser = lib.mkOption { default = ""; };
     };
   };
-  config = let
-    st = lib.strings;
-  in {
+  config = {
     # Let Home Manager install and manage itself.
     programs.home-manager.enable = true;
     nixpkgs.config.allowUnfree = true;
     home.stateVersion = "23.05";
 
     home = {
-      username = builtins.elemAt (st.splitString "@" usernameAtHostname) 0;
-      homeDirectory = "/home/" + config.home.username;
+      username = "pan";
+      homeDirectory = "/home/pan";
       packages = config.extraPkgs;
     };
 
diff --git a/hmModules/services/widgets/ags/default.nix b/hmModules/services/widgets/ags/default.nix
index 5d248d1..5403b1e 100644
--- a/hmModules/services/widgets/ags/default.nix
+++ b/hmModules/services/widgets/ags/default.nix
@@ -1,25 +1,30 @@
-{ config, inputs, pkgs, lib, ... }:
+{ config, lib, ... }:
 {
 
   options.ags = {
     enable = lib.mkEnableOption "Enable ags";
   };
+  
+  config.warnings = lib.mkIf config.ags.enable [''
+      ags.enable has been deprecated to allow the removal of ags from flake 
+      inputs.
+    ''];
 
-  imports = [ inputs.ags.homeManagerModules.default ];
+  # imports = [ inputs.ags.homeManagerModules.default ];
 
-  config = lib.mkIf config.ags.enable {
-    home.packages = with pkgs; [
-      libnotify # Notifications through ags
-    ];
-    programs.ags = {
-      enable = true;
-      configDir = ./config;
-
-      extraPackages = with pkgs; [
-        gtksourceview
-        webkitgtk
-        accountsservice
-      ];
-    };
-  };
+  # config = lib.mkIf config.ags.enable {
+  #   home.packages = with pkgs; [
+  #     libnotify # Notifications through ags
+  #   ];
+  #   programs.ags = {
+  #     enable = true;
+  #     configDir = ./config;
+  #
+  #     extraPackages = with pkgs; [
+  #       gtksourceview
+  #       webkitgtk
+  #       accountsservice
+  #     ];
+  #   };
+  # };
 }
diff --git a/hosts/jibril/host.nix b/hosts/jibril/default.nix
similarity index 100%
rename from hosts/jibril/host.nix
rename to hosts/jibril/default.nix
diff --git a/hosts/juri/host.nix b/hosts/juri/default.nix
similarity index 100%
rename from hosts/juri/host.nix
rename to hosts/juri/default.nix
diff --git a/hosts/juri/users/badtz/user.nix b/hosts/juri/users/badtz/user.nix
deleted file mode 100644
index 5972fdb..0000000
--- a/hosts/juri/users/badtz/user.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  fish.enable = true;
-  git = {
-    enable = true;
-    username = "Badtz";
-    email = "may@badtz.dev";
-  };
-}
diff --git a/hosts/onizuka/host.nix b/hosts/onizuka/default.nix
similarity index 91%
rename from hosts/onizuka/host.nix
rename to hosts/onizuka/default.nix
index d2dbc49..46a9717 100644
--- a/hosts/onizuka/host.nix
+++ b/hosts/onizuka/default.nix
@@ -20,8 +20,6 @@
 
   steam.enable = true;
   steam.gamemode = true;
-  aagl.enable = true;
-  aagl.honkai-rail = true;
   input-remapper.enable = true;
 
   postgres.enable = true;
diff --git a/nixosModules/apps/animelauncher/app.nix b/nixosModules/apps/animelauncher/app.nix
index 5cf1a9b..27f1406 100644
--- a/nixosModules/apps/animelauncher/app.nix
+++ b/nixosModules/apps/animelauncher/app.nix
@@ -1,4 +1,4 @@
-{ config, inputs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.aagl = {
@@ -12,16 +12,21 @@
       "Enables honkai 3rd impact";
   };
 
-  imports =  [ inputs.aagl.nixosModules.default ];
+  # imports =  [ inputs.aagl.nixosModules.default ];
 
-  config = lib.mkIf config.aagl.enable {
-    nix.settings = inputs.aagl.nixConfig;
+  config.warnings = lib.mkIf (config.aagl.enable || config.aagl.honkai-rail ||
+    config.aagl.genshin || config.aagl.honkai-3rd) [''
+      aagl.* has been deprecated to allow the removal of aagl from flake inputs.
+    ''];
 
-    programs.honkers-railway-launcher.enable =
-      lib.mkIf config.aagl.honkai-rail true;
-    programs.anime-game-launcher.enable =
-      lib.mkIf config.aagl.genshin true;
-    programs.honkers-launcher.enable =
-      lib.mkIf config.aagl.honkai-3rd true;
-  };
+  # config = lib.mkIf config.aagl.enable {
+  #   nix.settings = inputs.aagl.nixConfig;
+  #
+  #   programs.honkers-railway-launcher.enable =
+  #     lib.mkIf config.aagl.honkai-rail true;
+  #   programs.anime-game-launcher.enable =
+  #     lib.mkIf config.aagl.genshin true;
+  #   programs.honkers-launcher.enable =
+  #     lib.mkIf config.aagl.honkai-3rd true;
+  # };
 }
diff --git a/nixosModules/automatic/default.nix b/nixosModules/automatic/default.nix
index 2f80ace..05d82c7 100644
--- a/nixosModules/automatic/default.nix
+++ b/nixosModules/automatic/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, hostname, usernameList, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   options.system = {
@@ -22,7 +22,6 @@
       boot.loader.efi.canTouchEfiVariables = true;
     })
     {
-      networking.hostName = hostname;
       system.stateVersion = lib.mkDefault "23.05";
 
       time.timeZone = config.system.timezone;
@@ -49,7 +48,7 @@
               extraGroups = [ "network" ];
             };
           }
-        ) usernameList);
+        ) [ "pan" ]);
         groups = {
           wheel = {
             members = config.system.users.bigWheels;
diff --git a/nixosModules/services/caddy/service.nix b/nixosModules/services/caddy/service.nix
index ee722b3..eaf0965 100644
--- a/nixosModules/services/caddy/service.nix
+++ b/nixosModules/services/caddy/service.nix
@@ -20,7 +20,7 @@
       '';
       package = pkgs.caddy.withPlugins {
         plugins = [ "github.com/caddy-dns/porkbun@v0.3.1" ];
-        hash = "sha256-j/GODingW5BhfjQRajinivX/9zpiLGgyxvAjX0+amRU=";
+        hash = "sha256-NlZY/EEY9TbqrMAkSHK2aGm5AjFTvpvBXV1GW1PnXCc=";
       };
       virtualHosts = config.caddy.vhosts;
       email = config.caddy.adminEmail;
diff --git a/nixosModules/services/hyprland/service.nix b/nixosModules/services/hyprland/service.nix
index 779a8fe..3d13ac0 100644
--- a/nixosModules/services/hyprland/service.nix
+++ b/nixosModules/services/hyprland/service.nix
@@ -1,4 +1,4 @@
-{ inputs, config, lib, ... }:
+{ config, lib, ... }:
 
 {
 
@@ -6,18 +6,14 @@
     enable = lib.mkEnableOption "Enables hyprland";
   };
 
-  imports = [
-    inputs.hyprland.nixosModules.default
-  ];
+  # imports = [
+  #   inputs.hyprland.nixosModules.default
+  # ];
 
-  config = {
-    nix.settings = {
-      substituters = [ "https://hyprland.cachix.org" ];
-      trusted-public-keys = [ 
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" 
-      ];
-      experimental-features = [ "nix-command" "flakes" ];
-    };
-    programs.hyprland.enable = lib.mkIf config.hyprland.enable true;
-  };
+  config.warnings = lib.mkIf config.hyprland.enable [''
+    hyprland.enable has been deprecated to allow the removal of hyprland from 
+    flake inputs.
+  ''];
+
+  # config.programs.hyprland.enable = lib.mkIf config.hyprland.enable true;
 }
diff --git a/hosts/jibril/users/pan/user.nix b/users/jibril/default.nix
similarity index 100%
rename from hosts/jibril/users/pan/user.nix
rename to users/jibril/default.nix
diff --git a/hosts/juri/users/pan/user.nix b/users/juri/default.nix
similarity index 100%
rename from hosts/juri/users/pan/user.nix
rename to users/juri/default.nix
diff --git a/hosts/onizuka/users/pan/user.nix b/users/onizuka/default.nix
similarity index 100%
rename from hosts/onizuka/users/pan/user.nix
rename to users/onizuka/default.nix

From c95d776b632aaee9ff7c4166aca7f901605b90c3 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Mon, 15 Dec 2025 22:49:14 -0800
Subject: [PATCH 03/15] Jibril, add tailscale

---
 hosts/jibril/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hosts/jibril/default.nix b/hosts/jibril/default.nix
index efc1452..92f7e4b 100644
--- a/hosts/jibril/default.nix
+++ b/hosts/jibril/default.nix
@@ -27,7 +27,8 @@
 
   tuigreet.enable = true;
   niri.enable = true;
-  
+  tailscale.enable = true;
+
   postgres.enable = true;
 
   shell.enabledShells = [ "fish" ];

From 2e808eb8b8981ebff0fae22d78027a7bb8e8d524 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Mon, 15 Dec 2025 22:49:34 -0800
Subject: [PATCH 04/15] Jibril, update Kabal internet

---
 hosts/jibril/networks.toml |  2 +-
 hosts/jibril/secrets.yaml  | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/hosts/jibril/networks.toml b/hosts/jibril/networks.toml
index 860bdd1..762a2f2 100644
--- a/hosts/jibril/networks.toml
+++ b/hosts/jibril/networks.toml
@@ -1,4 +1,4 @@
-["TheKabal2.4"]
+[Kabal]
 
 ["DropboxGuest3.0"]
 
diff --git a/hosts/jibril/secrets.yaml b/hosts/jibril/secrets.yaml
index fcde584..a1dbefb 100644
--- a/hosts/jibril/secrets.yaml
+++ b/hosts/jibril/secrets.yaml
@@ -1,9 +1,5 @@
-wireless: ENC[AES256_GCM,data:pQv+gdAW8W9nSEJkbXWex47iuuqgJMEELldFsmgk2Y08MDZ1ytXqlphTK/jbewD3tpz4v29fSuWamv1uZpxM2+c2zCuMVTdrhAf0i/Sjqd9CWP8NQvTDI3v8ps9REFzR7n7hywnkfOkDNwRkmavSfCxK5k9SQLNC7De6P811/Fundb9r6oeIH2OEDBkZEHw8gYndjy6cLDUE2SY/cmxRsKWhATsCLcWKOpQa86zlT9dr9nMtYVF1AN5T4JR/7QKqJ8UT4mvhAA0OEfKv0Cf3euH24vtBrv5YxwDT6tQpOABOyOy9mWLc+bXDID/HX4akeU1O6+eBSpNeRgpAcMfD6b/eqKAvDvnixHubu9GemVspmeoA/91i5B70u3kjm0EKup7KLXCp5RutLnLRczDPdfbCB7bEipeRyF8P+UCuhQ==,iv:WN7mGyHpaMDdLRpFGyDUQ2D9a0t/rucfyKroJYqaHPs=,tag:7KTzBEt30nqCJclDgiWuKg==,type:str]
+wireless: ENC[AES256_GCM,data:VU8tpeCgEFSUC490q1hGgBrdFFscL2QybywlpiFG3suofj2Q2VVXKLK4EpF2ebpf/nBf/ggHv/uoSFxuQYYvIsMIo1bYOKvM5QNMi9HO2KmfFbmQYYzmt5CNNh9tno9wmiekeDOnKjQDGK5CoGLD4+y+VW1IVrN9XL+xRxAszgYM4qdSim7CJ1hgU89OgzVL9poVsmqxbiuWY88+ZErIspSHO0QwGOJ5Pc4OixEK2N3EtcYDhV5fBvlFv7t4b8P6BJZIn2NVXCVaW4UcEsefcxHqohd5AuYXJH7wt9aPwJRJehxd9GhVJeQ6QtPXuqZaEspd+dSvlYrvdO8pFTrIklrty30CJg3WberWmI111T8ZNFlNBghSu6nXzO9YkKfDuAYUEPVERL9jG9xF8tGb1JxhOmg33Kg6fg==,iv:07Reckni7LSfDL3qVUv4v80IOVQSbFpz49UsyiIDGWk=,tag:iMgCspLUWNCjjYT0pkMwDw==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
         - recipient: age1ey3wr2wnkgny3dfgvnyrf0cptwzr7s5x464p2y9ya58lpay8lfrsds3y68
           enc: |
@@ -23,8 +19,7 @@ sops:
             Ky83VFhiVE9wK01UMDlSbnIrd2d2SHcKp6mF8PaR0ItrvLHpEgMe6fwuboyrrs9y
             7Ct6qZ1SN/4f/xJpDP2qiaQ4KTZzY1BlC3isT3CWeajOQhL/y5JCOw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-11-07T21:12:36Z"
-    mac: ENC[AES256_GCM,data:z0ePEvsEKvcMca2x2qjTsSBwk+qI3jd8h2uAnSsGtJL5UI1OdBL8oVIGKty0pGaCvtrF01UN1ncKBGe5y12Vij2yuyv7LK4ANArxQ4+O583NdYHYeD+T75yGu4SAYjcoM23RD1h+W0SLQpCen2J3WYmJaOjtqMBv/gaFYl/DV7I=,iv:VJjZTd1g4oJCDLEp8+jH15Y2svTNtQUE1vc3WQoJJZU=,tag:4U7uh6U5PwHJ2r6/WFUbnw==,type:str]
-    pgp: []
+    lastmodified: "2025-08-27T05:30:04Z"
+    mac: ENC[AES256_GCM,data:hoSykxuHPAofdbXNJCyozeQYYhg3yXLOVx+K9PsSctUMrIc9ii76SDGY2h+6gFNy1rGkPxmYHueqHEJHvvoxLHcwkwoN8AddOVrnXNoIpOvwcn0GfpPIPf5rCvxSxvcsZwPW+affMMVRyRR8aJ3llj7ojuuuyTnm+HL9H9vY1PQ=,iv:pUXl49AqRerTlGoOzoWt0NrEo8rqPmBF7yiB4ZufC3M=,tag:1mP3jsP2O6yKlJVmaA7EMQ==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.9.1
+    version: 3.10.2

From d833f04aa3891f64654e4ac38f63166027d7a567 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Mon, 9 Feb 2026 17:17:25 -0800
Subject: [PATCH 05/15] Flake update 2026-02-09

---
 flake.lock | 139 ++++++++++-------------------------------------------
 flake.nix  |  22 ++++-----
 2 files changed, 37 insertions(+), 124 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0e7d694..9d751ae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762980239,
-        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -35,39 +35,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -75,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763416652,
-        "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
+        "lastModified": 1770654520,
+        "narHash": "sha256-mg5WZMIPGsFu9MxSrUcuJUPMbfMsF77el5yb/7rc10k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
+        "rev": "6c4fdbe1ad198fac36c320fd45c5957324a80b8e",
         "type": "github"
       },
       "original": {
@@ -88,43 +55,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1763570812,
-        "narHash": "sha256-A42G8ulTZ1MFCR0VsLF21CoKi0XKGUYwtVBHGm5mFgQ=",
-        "rev": "f3b2f3496bd6d346cba475d0ba152a9d3a83dec7",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3b2f3496bd6d346cba475d0ba152a9d3a83dec7.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "flakey-profile": "flakey-profile",
-        "lix": [
-          "lix"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763435414,
-        "narHash": "sha256-i2467FddWfd19q5Qoj+1/BAeg6LZmM5m4mYGRSQn/as=",
-        "rev": "192c92b603731fbc1bade6c1b18c8d8a0086f703",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/192c92b603731fbc1bade6c1b18c8d8a0086f703.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
-      }
-    },
     "niri": {
       "inputs": {
         "niri-stable": "niri-stable",
@@ -137,11 +67,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1763538184,
-        "narHash": "sha256-6umNY06L6ZUjinthjVZIwyWyAjxOXSPhXfY0U1CVTWw=",
+        "lastModified": 1770620836,
+        "narHash": "sha256-HPoMvo/EqIr6xDDRlk6DGZYdu1Hte7lGLZaGZ5017Uc=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "85a16f400641eed912431efcec16f12e2100d46a",
+        "rev": "ff1edce403a67cfac7bf1038d348f2ef457ac691",
         "type": "github"
       },
       "original": {
@@ -170,11 +100,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1763531615,
-        "narHash": "sha256-cMi8tz+0+gWtlYqVnyMv7phOeQ0/4WmzZ/lxCyraUVw=",
+        "lastModified": 1770394959,
+        "narHash": "sha256-if7bIsomdceIufOhkFwN74rFY/pLCWPynRxGyol2viQ=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "c722634c269ae97a5ea185691bcd0b8c73a600e5",
+        "rev": "ab47f5cec4c1c5758afeb91c0c98554ffd3433db",
         "type": "github"
       },
       "original": {
@@ -185,11 +115,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763464769,
-        "narHash": "sha256-mU85VDFRIgKGq1EhT71bLjhvjJ5yuMEe0Ip1kwCbR80=",
-        "rev": "6f374686605df381de8541c072038472a5ea2e2d",
+        "lastModified": 1770537093,
+        "narHash": "sha256-XV30uo8tXuxdzuV8l3sojmlPRLd/8tpMsOp4lNzLGUo=",
+        "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre898015.6f374686605d/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre942631.fef9403a3e4d/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -198,16 +128,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1763334038,
-        "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=",
+        "lastModified": 1770464364,
+        "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c",
+        "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -217,8 +147,6 @@
         "easy-hosts": "easy-hosts",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
-        "lix": "lix",
-        "lix-module": "lix-module",
         "niri": "niri",
         "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix"
@@ -231,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763509310,
-        "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=",
+        "lastModified": 1770683991,
+        "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e",
+        "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
         "type": "github"
       },
       "original": {
@@ -244,21 +172,6 @@
         "type": "github"
       }
     },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
@@ -279,11 +192,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1762747449,
-        "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=",
+        "lastModified": 1770583271,
+        "narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "6338574bc5c036487486acde264f38f39ea15fad",
+        "rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 37dafc1..e469f38 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
 
       shared = {
         modules = [
-          inputs.lix-module.nixosModules.default
+          # inputs.lix-module.nixosModules.default
           ./nixosModules
         ];
       };
@@ -61,16 +61,16 @@
       repo = "easy-hosts";
     };
 
-    lix = {
-      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
-      flake = false;
-    };
-
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.lix.follows = "lix";
-    };
+    # lix = {
+    #   url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+    #   flake = false;
+    # };
+    #
+    # lix-module = {
+    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    #   inputs.lix.follows = "lix";
+    # };
 
     niri = {
       type = "github";

From d02533517f5181f594379a9c1b37400323c1234e Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Wed, 26 Nov 2025 15:21:12 -0800
Subject: [PATCH 06/15] OSAuto, sane nix defaults

---
 nixosModules/automatic/default.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nixosModules/automatic/default.nix b/nixosModules/automatic/default.nix
index 05d82c7..f6b9a74 100644
--- a/nixosModules/automatic/default.nix
+++ b/nixosModules/automatic/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
 {
   options.system = {
@@ -9,7 +9,7 @@
       "Enable if you are running a non-EFI system";
     users.bigWheels = lib.mkOption { default = []; };
   };
-  
+
   config = lib.mkMerge [
     (lib.mkIf config.system.isNonEFI {
       boot.loader.grub.enable = false;
@@ -29,15 +29,26 @@
 
       # Packages & Default Packages
       nixpkgs.config.allowUnfree = true;
+      nix = {
+        registry.nixpkgs.flake = inputs.nixpkgs;
+        gc = { automatic = true; options = "--delete-older-than 5d"; };
+        channel.enable = false;
+        settings = {
+          auto-optimise-store = true;
+          keep-going = true;
+          use-xdg-base-directories = true;
+          experimental-features = [
+            "flakes"
+            "nix-command"
+          ];
+        };
+      };
       environment.systemPackages = with pkgs; [
         git
         neovim
         xdg-user-dirs
       ] ++ config.system.extraPkgs;
 
-      # XDG Compliance
-      nix.settings.use-xdg-base-directories = true;
-
       users = {
         users = builtins.listToAttrs (map (
           user: {

From 085e8e45acb7724984276aa8f6b92a6724417d8a Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Tue, 10 Feb 2026 23:35:37 -0800
Subject: [PATCH 07/15] sddm, with silentsddm

---
 flake.lock                                    | 21 +++++++++++++++
 flake.nix                                     |  7 +++++
 nixosModules/services/sddm/service.nix        | 27 +++++++++++++++++++
 .../{displaymanager => tuigreet}/service.nix  |  0
 4 files changed, 55 insertions(+)
 create mode 100644 nixosModules/services/sddm/service.nix
 rename nixosModules/services/{displaymanager => tuigreet}/service.nix (100%)

diff --git a/flake.lock b/flake.lock
index 9d751ae..01c0331 100644
--- a/flake.lock
+++ b/flake.lock
@@ -149,9 +149,30 @@
         "home-manager": "home-manager",
         "niri": "niri",
         "nixpkgs": "nixpkgs",
+        "silentSDDM": "silentSDDM",
         "sops-nix": "sops-nix"
       }
     },
+    "silentSDDM": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769900466,
+        "narHash": "sha256-WeoJBj/PhqFCCJEIycTipqPbKm5BpQT2uzFTYcYZ30I=",
+        "owner": "uiriansan",
+        "repo": "SilentSDDM",
+        "rev": "a44caf771b4cb72f5c2514f7d488455b0fa860d2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "uiriansan",
+        "repo": "SilentSDDM",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index e469f38..936cb1d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -85,5 +85,12 @@
       repo = "sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    silentSDDM = {
+      type = "github";
+      owner = "uiriansan";
+      repo = "SilentSDDM";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 }
diff --git a/nixosModules/services/sddm/service.nix b/nixosModules/services/sddm/service.nix
new file mode 100644
index 0000000..bde0724
--- /dev/null
+++ b/nixosModules/services/sddm/service.nix
@@ -0,0 +1,27 @@
+{ config, pkgs, lib, inputs', ... }:
+
+{
+  options.sddm = {
+    enable = lib.mkEnableOption "enables sddm";
+  };
+
+  config = lib.mkIf config.sddm.enable (let
+    sddm-theme = inputs'.silentSDDM.packages.default.override {
+      theme = "catppuccin-macchiato";
+     };
+  in {
+    qt.enable = true;
+    environment.systemPackages = [ sddm-theme sddm-theme.test ];
+    services.displayManager.sddm = {
+      wayland.enable = true;
+      package = pkgs.kdePackages.sddm;
+      enable = true;
+      theme = sddm-theme.pname;
+      extraPackages = sddm-theme.propagatedBuildInputs;
+      settings.General = {
+        GreeterEnvironment = "QML2_IMPORT_PATH=${sddm-theme}/share/sddm/themes/${sddm-theme.pname}/components/,QT_IM_MODULE=qtvirtualkeyboard";
+        InputMethod = "qtvirtualkeyboard";
+      };
+    };
+  });
+}
diff --git a/nixosModules/services/displaymanager/service.nix b/nixosModules/services/tuigreet/service.nix
similarity index 100%
rename from nixosModules/services/displaymanager/service.nix
rename to nixosModules/services/tuigreet/service.nix

From 29c2b1ce80a2d0b50480e0df0dc7f1f4258ca9bd Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Tue, 10 Feb 2026 23:36:38 -0800
Subject: [PATCH 08/15] Onizuka, enable sddm, remove old packages, flip screen

---
 hosts/onizuka/default.nix | 2 +-
 users/onizuka/default.nix | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/hosts/onizuka/default.nix b/hosts/onizuka/default.nix
index 46a9717..dbff8d3 100644
--- a/hosts/onizuka/default.nix
+++ b/hosts/onizuka/default.nix
@@ -15,7 +15,7 @@
   sshd.enable = true;
   tailscale.enable = true;
 
-  tuigreet.enable = true;
+  sddm.enable = true;
   niri.enable = true;
 
   steam.enable = true;
diff --git a/users/onizuka/default.nix b/users/onizuka/default.nix
index 7a03bfb..fd6988c 100644
--- a/users/onizuka/default.nix
+++ b/users/onizuka/default.nix
@@ -28,9 +28,8 @@
     mouse.accel = -0.53;
     outputs = {
       "DP-1" = {
-        position = { x = 2560; y = -100; };
+        position = { x = 2560; y = 0; };
         mode = { width = 2560; height = 1440; refresh = 144.000; };
-        transform.rotation = 270;
       };
       "DP-2" = {
         position = { x = 0; y = 0; };
@@ -108,10 +107,4 @@
   discord.enable = true;
 
   lutris.enable = true;
-
-  extraPkgs = with pkgs; [
-    # Applications
-    logseq
-    claude-code
-  ];
 }

From 544bb630a0d92df0afc47ede3b40eddf5130c464 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Tue, 10 Feb 2026 23:03:02 -0800
Subject: [PATCH 09/15] Nvidia, add option to use stable drivers

---
 hosts/onizuka/default.nix                |  5 ++++-
 nixosModules/services/nvidia/service.nix | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/hosts/onizuka/default.nix b/hosts/onizuka/default.nix
index dbff8d3..b9c5717 100644
--- a/hosts/onizuka/default.nix
+++ b/hosts/onizuka/default.nix
@@ -4,7 +4,10 @@
   imports = [
     ./hardware.nix
   ];
-  nvidia.enable = true;
+  nvidia = {
+    enable = true;
+    stable = true;
+  };
   pipewire.enable = true;
   polkit.enable = true;
   tablet.enable = true;
diff --git a/nixosModules/services/nvidia/service.nix b/nixosModules/services/nvidia/service.nix
index 78e4ef2..b6647f9 100644
--- a/nixosModules/services/nvidia/service.nix
+++ b/nixosModules/services/nvidia/service.nix
@@ -2,22 +2,22 @@
 
 {
   options.nvidia = {
-    enable = lib.mkEnableOption
-      "Enables nvidia with proprietary drivers";
+    enable = lib.mkEnableOption "Enables nvidia with proprietary drivers";
     open = lib.mkEnableOption "Use open nvidia option for newer cards";
+    stable = lib.mkEnableOption "Use stable instead of beta";
   };
 
   config = lib.mkIf config.nvidia.enable {
-    hardware.graphics = {
-      enable = true;
-    };
+    hardware.graphics.enable = true;
 
     services.xserver.videoDrivers = ["nvidia"];
 
     hardware.nvidia = {
       open = if config.nvidia.open then true else false;
       modesetting.enable = true;
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
+      package = if config.nvidia.stable
+        then config.boot.kernelPackages.nvidiaPackages.stable
+        else config.boot.kernelPackages.nvidiaPackages.beta;
     };
 
     boot.kernelParams = [ "nvidia_drm.fbdev=1" ];

From 09ae6daec055163b6219a1ec2dc0b4f69e5f2cba Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Tue, 10 Feb 2026 09:50:06 -0800
Subject: [PATCH 10/15] Beets, initial commit

Sets up beets with my preferred defaults.

Configures the program for the following plugins:
- embedart
- fetchart
- ftintitle
- info
- lyrics
- the
---
 hmModules/apps/beets/app.nix | 52 ++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 hmModules/apps/beets/app.nix

diff --git a/hmModules/apps/beets/app.nix b/hmModules/apps/beets/app.nix
new file mode 100644
index 0000000..cb983ec
--- /dev/null
+++ b/hmModules/apps/beets/app.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, lib, ... }:
+
+{
+  options.beets = {
+    enable = lib.mkEnableOption "Enables beets music";
+    plugins = {
+      the.enable = lib.mkOption { default = true; };
+      ftintitle.enable = lib.mkOption { default = true; };
+      lyrics.enable = lib.mkOption { default = true; };
+      fetchart = {
+        enable = lib.mkOption { default = true; };
+        embed = lib.mkOption { default = true; };
+      };
+    };
+  };
+
+  config = lib.mkIf config.beets.enable {
+    programs.beets.enable = true;
+
+    programs.beets.settings = {
+      directory = "${config.xdg.userDirs.music}";
+      library = "${config.xdg.userDirs.music}.db";
+
+      paths.default = with config.beets.plugins; let
+        # raw_artist = if ftintitle.enable
+        #   then "$album_artist_no_feat"
+        #   else "$albumartist";
+        raw_artist = "$albumartist";
+        artist = if the.enable
+          then "%the{${raw_artist}}/"
+          else raw_artist;
+
+        the_rest = "$album%aunique{}/$track $title";
+      in artist + the_rest;
+
+      embedart = with config.beets.plugins.fetchart;
+        lib.mkIf (enable && embed) {
+        maxwidth = 500;
+      };
+
+      plugins = with lib; with config.beets.plugins;
+        optional (the.enable) "the" ++
+        optional (ftintitle.enable) "ftintitle" ++
+        optional (lyrics.enable) "lyrics" ++
+        optional (fetchart.enable) "fetchart" ++
+        optional (fetchart.embed) "embedart" ++ [
+        "musicbrainz"
+        "info"
+      ];
+    };
+  };
+}

From 2ebd936994e4b9a297e4bdc24cc661a741980404 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Tue, 10 Feb 2026 10:44:05 -0800
Subject: [PATCH 11/15] Onizuka, remove beeper, add Beets

---
 users/onizuka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/users/onizuka/default.nix b/users/onizuka/default.nix
index fd6988c..f5ea837 100644
--- a/users/onizuka/default.nix
+++ b/users/onizuka/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   # "DP-2" = [
@@ -66,6 +66,7 @@
   mpv.enable = true;
   zathura.enable = true;
   feh.enable = true;
+  beets.enable = true;
 
   neovim.enable = true;
   neovim.languages = {
@@ -103,7 +104,6 @@
 
   gimp.enable = true;
 
-  beeper.enable = true;
   discord.enable = true;
 
   lutris.enable = true;

From dcc7b97cfce9114335826c0e74556ceb1090057c Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Thu, 12 Feb 2026 14:37:08 -0800
Subject: [PATCH 12/15] Flake, add nixvim

---
 flake.lock | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix  | 12 ++++++++++-
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index 01c0331..23c561f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -35,6 +35,27 @@
         "type": "github"
       }
     },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -142,6 +163,28 @@
         "type": "github"
       }
     },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1770630823,
+        "narHash": "sha256-5SEmOnJ61vmbap39vzWEsCX5UQ+3Ul8J4mXWKdqSn3w=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "6acc964664ac916c64fe4e394edd467af4d90790",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "easy-hosts": "easy-hosts",
@@ -149,6 +192,7 @@
         "home-manager": "home-manager",
         "niri": "niri",
         "nixpkgs": "nixpkgs",
+        "nixvim": "nixvim",
         "silentSDDM": "silentSDDM",
         "sops-nix": "sops-nix"
       }
@@ -193,6 +237,21 @@
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 936cb1d..9cee2ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,10 @@
           inputs.home-manager.lib.homeManagerConfiguration {
             extraSpecialArgs = { inherit inputs; };
             pkgs = inputs.nixpkgs.legacyPackages.${system};
-            modules = [ ./hmModules ] ++ extraModules;
+            modules = [
+              ./hmModules
+              inputs.nixvim.homeModules.nixvim
+            ] ++ extraModules;
         };
       in {
         "pan@juri" = userConfig "x86_64-linux" [ ./users/juri ];
@@ -79,6 +82,13 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixvim = {
+      type = "github";
+      owner = "nix-community";
+      repo = "nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     sops-nix = {
       type = "github";
       owner = "Mic92";

From 61e3753bf80a4741d0f69a530ef6103c6b0e6379 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Wed, 18 Feb 2026 11:48:11 -0800
Subject: [PATCH 13/15] Neovim, switch to nixvim and mono file

This merges all the different files into one app.nix using nixvim
instead of the manual home-manager nvim management.

Behavior should be almost unchanged, with the following changes:
- Plugins now have defaults for my own personal sane default experience
- The highlighted line is now 81 instead of 80
- Treesitter plugins may not be integrated correctly
---
 hmModules/apps/neovim/app.nix               | 280 +++++++++++---------
 hmModules/apps/neovim/options.lua           |  60 -----
 hmModules/apps/neovim/plugin/lsp.nix        |  53 ----
 hmModules/apps/neovim/plugin/nvimcmp.nix    |  72 -----
 hmModules/apps/neovim/plugin/telescope.nix  |  43 ---
 hmModules/apps/neovim/plugin/treesitter.nix |  38 ---
 6 files changed, 153 insertions(+), 393 deletions(-)
 delete mode 100644 hmModules/apps/neovim/options.lua
 delete mode 100644 hmModules/apps/neovim/plugin/lsp.nix
 delete mode 100644 hmModules/apps/neovim/plugin/nvimcmp.nix
 delete mode 100644 hmModules/apps/neovim/plugin/telescope.nix
 delete mode 100644 hmModules/apps/neovim/plugin/treesitter.nix

diff --git a/hmModules/apps/neovim/app.nix b/hmModules/apps/neovim/app.nix
index d655103..4f27fdd 100644
--- a/hmModules/apps/neovim/app.nix
+++ b/hmModules/apps/neovim/app.nix
@@ -14,156 +14,182 @@
       catppuccin.enable = lib.mkEnableOption "Enables catppuccin theme";
     };
     plugins = {
-      comments.enable = lib.mkEnableOption "Enables nvim-comment";
-      fugitive.enable = lib.mkEnableOption "Enables git-fugitive";
-      lualine.enable = lib.mkEnableOption "Enables lualine";
-      luasnip.enable = lib.mkEnableOption "Enables luasnip snippets";
-      nvimcmp.enable = lib.mkEnableOption "Enables nvim completion";
+      comments.enable = lib.mkOption { default = true; };
+      fugitive.enable = lib.mkOption { default = true; };
+      lualine.enable = lib.mkOption { default = true; };
+      luasnip.enable = lib.mkOption { default = false; };
+      nvimcmp.enable = lib.mkOption { default = true; };
       telescope = {
-        enable = lib.mkEnableOption "Enables telescope";
-        fzf.enable = lib.mkEnableOption "Enables telescope-fzf";
+        enable = lib.mkOption { default = true; };
+        fzf.enable = lib.mkOption { default = true; };
       };
-      treesitter.enable = lib.mkEnableOption "Enables treesitter";
-      wiki.enable = lib.mkEnableOption "Enables a wiki";
+      treesitter.enable = lib.mkOption { default = true; };
+      wiki.enable = lib.mkOption { default = false; };
     };
   };
 
-  imports = [
-    ./plugin/lsp.nix
-    ./plugin/nvimcmp.nix
-    ./plugin/telescope.nix
-    ./plugin/treesitter.nix
-  ];
-
   config = lib.mkIf config.neovim.enable {
     home.sessionVariables = {
       EDITOR = "nvim";
       VISUAL = "nvim";
     };
 
-    programs.neovim = {
+    programs.nixvim = {
       enable = true;
       viAlias = true;
       vimAlias = true;
-      vimdiffAlias = true;
 
-      extraLuaConfig = ''
-        ${builtins.readFile ./options.lua}
-      '';
+      globals = {
+        mapleader = " ";
+        maplocalleader = " ";
+        rust_recommended_style = 0;
+      };
 
-      extraPackages = with pkgs; [
-        (lib.mkIf config.neovim.languages.c.enable libclang)
-        (lib.mkIf config.neovim.languages.go.enable gopls)
-        (lib.mkIf config.neovim.languages.nix.enable nil)
-        (lib.mkIf config.neovim.languages.rust.enable rust-analyzer)
+      opts = {
+        list = true;
+        updatetime = 750;
+
+        tabstop = 2;
+        softtabstop = 0;
+        shiftwidth = 2;
+        smarttab = true;
+        expandtab = true;
+
+        colorcolumn = "81";
+        showmatch = true;
+        number = true;
+        relativenumber = true;
+
+        swapfile = false;
+        backup = false;
+        undofile = true;
+        undodir = "${config.xdg.configHome}/nvim/undodir";
+
+        smartcase = true;
+      };
+
+      keymaps = with config.lib.nixvim; [
+        {
+          key = "<leader>d";
+          mode = "n";
+          action = mkRaw "vim.diagnostic.open_float";
+        }
+        # -- Easy Split Navigation
+        # -- nnoremap <C-J> <C-W><C-J>
+        # -- nnoremap <C-K> <C-W><C-K>
+        # -- nnoremap <C-L> <C-W><C-L>
+        # -- nnoremap <C-H> <C-W><C-H>
+        #
+        # -- Easy copy and pasting to external programs
+        # -- map <C-y> "+yy
+        # -- map <C-p> "+P
       ];
+    };
 
-      # Additional packages are added through imports
-      plugins = let
-        lopts = lib.lists.optionals;
-        cfgp = config.neovim.plugins;
-        cfgl = config.neovim.languages;
-        cfgt = config.neovim.themes;
+    programs.nixvim.colorschemes = with config.neovim.themes; {
+      catppuccin = lib.mkIf catppuccin.enable {
+        enable = true;
+        flavour = "mocha";
+        integrations.vimwiki = lib.mkIf wiki.enable true;
+      };
+    };
 
-        comments = lopts cfgp.comments.enable (with pkgs.vimPlugins; [
+    programs.nixvim.plugins = with config.neovim.plugins; {
+      comment.enable = comments.enable;
+
+      fugitive.enable = fugitive.enable;
+
+      lualine = lib.mkIf lualine.enable {
+        enable = true;
+        icons_enabled = true;
+      };
+      web-devicons.enable = lualine.enable;
+
+      luasnip.enable = luasnip.enable;
+      friendly-snippets.enable = luasnip.enable;
+
+      cmp = {
+        enable = nvimcmp.enable;
+        autoEnableSources = true;
+          settings = {
+            sources = [
+            { name = "nvim_lsp"; }
+            { name = "path"; }
+            { name = "buffer"; }
+          ] ++ lib.optional luasnip.enable { name = "cmp-luasnip"; };
+
+          mapping = with config.lib.nixvim; {
+            "<C-Space>" = mkRaw "cmp.mapping.abort()";
+            "<Tab>" = mkRaw
+              "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+            "<S-Tab>" = mkRaw
+              "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+            };
+        };
+      };
+
+      telescope = {
+        enable = telescope.enable;
+        keymaps = {
+          "<leader>ff" = "find_files";
+          "<leader>fg" = "git_files";
+        };
+        extensions = {
+          fzf = lib.mkIf telescope.fzf.enable {
+            enable = true;
+            fuzzy = true;
+            override_generic_sorter = true;
+            override_file_sorter = true;
+            case_mode = "smart_case";
+          };
+        };
+      };
+
+      treesitter = {
+        enable = treesitter.enable;
+        highlight.enable = true;
+        indent.enable = true;
+        folding.enable = false;
+      };
+
+      vimwiki = {
+        enable = wiki.enable;
+        list = [
           {
-            plugin = comment-nvim;
-            type = "lua";
-            config = "require(\"Comment\").setup()";
+            path = "${config.xdg.userDirs.documents}/wiki";
+            links_space_char = "_";
+            ext = ".md";
+            syntax = "markdown";
           }
-        ]);
+        ];
+      };
 
-        fugitive = lopts cfgp.fugitive.enable (with pkgs.vimPlugins; [
-          vim-fugitive
-        ]);
+      nvim-lspconfig.enable = true;
+      nix.enable = config.neovim.languages.nix.enable;
+      rustaceanvim.enable = config.neovim.languages.rust.enable;
+      typsecript-tools.enable = config.neovim.languages.typescript.enable;
+    };
 
-        luasnip-pkg = lopts cfgp.luasnip.enable (with pkgs.vimPlugins; [
-          luasnip
-          friendly-snippets
-          (lib.mkIf cfgp.nvimcmp.enable cmp_luasnip)
-        ]);
-
-        lualine = lopts cfgp.lualine.enable (with pkgs.vimPlugins; [
-          {
-            plugin = lualine-nvim;
-            type = "lua";
-            config = ''
-              require("lualine").setup {
-                options = {
-                  icons_enabled = true,
-            '' + lib.strings.optionalString cfgt.catppuccin.enable ''
-                  theme = "catppuccin"
-            '' + ''
-                }
-              }
-            '';
-          }
-          nvim-web-devicons
-        ]);
-
-        nix-pkg = lopts cfgl.nix.enable (with pkgs.vimPlugins; [
-          vim-nix
-        ]);
-
-        rust-pkg = lopts cfgl.rust.enable (with pkgs.vimPlugins; [
-          {
-            plugin = rustaceanvim;
-            type = "lua";
-            config = ''
-              vim.g.rust_recommended_style = 0
-            '';
-          }
-        ]);
-
-        go-pkg = lopts cfgl.go.enable (with pkgs.vimPlugins; [
-          go-nvim
-        ]);
-
-        typescript-pkg = lopts cfgl.typescript.enable (with pkgs.vimPlugins; [
-          {
-            plugin = typescript-tools-nvim;
-            type = "lua";
-            config = ''
-              require("typescript-tools").setup {}
-            '';
-          }
-        ]);
-
-        catppuccin-pkg = lopts cfgt.catppuccin.enable (with pkgs.vimPlugins; [
-          {
-            plugin = catppuccin-nvim;
-            type = "lua";
-            config = ''
-              vim.cmd.colorscheme "catppuccin-mocha"
-              require('catppuccin').setup({
-                integrations = {
-            '' + lib.strings.optionalString cfgp.wiki.enable ''
-                  vimwiki = true
-            '' + ''
-                }
-              })
-            '';
-          }
-        ]);
-
-        wiki = lopts cfgp.wiki.enable (with pkgs.vimPlugins; [
-          {
-            plugin = vimwiki;
-            type = "lua";
-            config = ''
-              vim.g.vimwiki_list = {
-                {
-                  path = '${config.xdg.userDirs.documents}/wiki',
-                  links_space_char = '_',
-                  ext = '.md',
-                  syntax = 'markdown',
-                }
-              }
-            '';
-          }
-        ]);
-      in comments ++ fugitive ++ luasnip-pkg ++ lualine ++ nix-pkg ++ rust-pkg
-      ++ go-pkg ++ wiki ++ catppuccin-pkg ++ typescript-pkg;
+    programs.nixvim.lsp = {
+      enable = true;
+      servers = with config.neovim.languages; {
+        clangd.enable = c.enable;
+        gopls.enable = go.enable;
+        nil_ls.enable = nix.enable;
+        rust_analyzer.enable = rust.enable;
+        tsserver.enable = typescript.enable;
+      };
+      keymaps = [
+        { key = "gd"; lspBufAction = "definition"; }
+        { key = "gD"; lspBufAction = "declaration"; }
+        { key = "gi"; lspBufAction = "implementation"; }
+        { key = "gt"; lspBufAction = "type_definition"; }
+        { key = "K"; lspBufAction = "hover"; }
+      ] ++ lib.optional config.neovim.plugins.telescope.enable {
+        key = "gr";
+        action = config.lib.nixvim.mkRaw
+          "require('telescope.builtin').lsp_references";
+      };
     };
   };
 }
diff --git a/hmModules/apps/neovim/options.lua b/hmModules/apps/neovim/options.lua
deleted file mode 100644
index db669e2..0000000
--- a/hmModules/apps/neovim/options.lua
+++ /dev/null
@@ -1,60 +0,0 @@
--- Globals
-vim.g.mapleader = ' '
-vim.g.maplocalleader = ' '
-vim.opt.list = true
-vim.bo.filetype = "on"
-vim.opt.updatetime = 300
-
--- Indentations
-vim.opt.tabstop = 2
-vim.opt.softtabstop = 0
-vim.opt.shiftwidth = 2
-vim.opt.smarttab = true
-vim.opt.expandtab = true
-
--- Style
-vim.opt.colorcolumn = "80"
-vim.opt.showmatch = true
-vim.opt.number = true
-vim.opt.relativenumber = true
-
--- Easy Split Navigation
--- nnoremap <C-J> <C-W><C-J>
--- nnoremap <C-K> <C-W><C-K>
--- nnoremap <C-L> <C-W><C-L>
--- nnoremap <C-H> <C-W><C-H>
-
--- Searching
-vim.opt.smartcase = true
-
--- Backups
-vim.opt.swapfile = false
-vim.opt.backup = false
-vim.opt.undofile = true
-vim.opt.undodir = '/home/pan/.config/nvim/undodir'
-
--- Error viewing
-vim.keymap.set('n', '<Leader>d', function() vim.diagnostic.open_float() end)
-
--- Easy copy and pasting to external programs
--- map <C-y> "+yy
--- map <C-p> "+P
-
--- autocmd BufRead,BufNewFile *.md call WritingMode()
--- autocmd BufRead,BufNewFile *.tex call WritingMode()
--- autocmd BufRead,BufNewFile *.svx call WritingMode()
-
--- autocmd BufRead,BufNewFile *.py call PythonMode()
-
--- function! WritingMode()
-  -- setlocal textwidth=80
-  -- setlocal wrap linebreak nolist
-  -- setlocal whichwrap+=<,>,h,l
-  -- nnoremap j gj
-  -- nnoremap k gk
-  -- setlocal spell spelllang=en_us
--- endfunction
--- function! PythonMode()
-  -- setlocal foldmethod=indent
-  -- setlocal foldlevel=99
--- endfunction
diff --git a/hmModules/apps/neovim/plugin/lsp.nix b/hmModules/apps/neovim/plugin/lsp.nix
deleted file mode 100644
index f5a66c5..0000000
--- a/hmModules/apps/neovim/plugin/lsp.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  config = lib.mkIf config.neovim.enable {
-    programs.neovim.plugins = let
-      cfgp = config.neovim.plugins;
-      cfgl = config.neovim.languages;
-
-      configText = ''
-        local on_attach = function(_, bufnr)
-
-          local bufmap = function(keys, func)
-            vim.keymap.set('n', keys, func, { buffer = bufnr })
-          end
-
-          bufmap('<leader>r', vim.lsp.buf.rename)
-          bufmap('<leader>a', vim.lsp.buf.code_action)
-
-          bufmap('gd', vim.lsp.buf.definition)
-          bufmap('gD', vim.lsp.buf.declaration)
-          bufmap('gI', vim.lsp.buf.implementation)
-          bufmap('<leader>D', vim.lsp.buf.type_definition)
-
-      '' + lib.strings.optionalString cfgp.telescope.enable ''
-          bufmap('gr', require('telescope.builtin').lsp_references)
-          bufmap('<leader>s', require('telescope.builtin').lsp_document_symbols)
-          bufmap('<leader>S', require('telescope.builtin').lsp_dynamic_workspace_symbols)
-      '' + ''
-
-          bufmap('K', vim.lsp.buf.hover)
-
-          vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-            vim.lsp.buf.format()
-          end, {})
-        end
-
-        local capabilities = vim.lsp.protocol.make_client_capabilities()
-      '' + lib.strings.optionalString cfgl.c.enable ''
-        require('lspconfig').clangd.setup {}
-      '' + lib.strings.optionalString cfgl.go.enable ''
-        require('lspconfig').gopls.setup {}
-      '' + lib.strings.optionalString cfgl.nix.enable ''
-        require('lspconfig').nil_ls.setup {}
-      '';
-    in with pkgs.vimPlugins; [
-      {
-        plugin = nvim-lspconfig;
-        type = "lua";
-        config = configText;
-      }
-    ];
-  };
-}
diff --git a/hmModules/apps/neovim/plugin/nvimcmp.nix b/hmModules/apps/neovim/plugin/nvimcmp.nix
deleted file mode 100644
index 82098ef..0000000
--- a/hmModules/apps/neovim/plugin/nvimcmp.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfgp = config.neovim.plugins;
-in {
-  config = lib.mkIf (config.neovim.enable && cfgp.nvimcmp.enable)  {
-    programs.neovim.plugins = let
-
-      configText = ''
-        local cmp = require('cmp')
-      '' + lib.strings.optionalString cfgp.luasnip.enable ''
-        local luasnip = require('luasnip')
-
-        require('luasnip.loaders.from_vscode').lazy_load()
-        luasnip.config.setup {}
-      '' + ''
-
-        cmp.setup {
-            mapping = cmp.mapping.preset.insert {
-                ['<C-n>'] = cmp.mapping.select_next_item(),
-                ['<C-p>'] = cmp.mapping.select_prev_item(),
-                ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-                ['<C-f>'] = cmp.mapping.scroll_docs(4),
-                ['<C-Space>'] = cmp.mapping.complete {},
-                ['<CR>'] = cmp.mapping.confirm {
-                    behavior = cmp.ConfirmBehavior.Replace,
-                    select = true,
-                },
-                ['<Tab>'] = cmp.mapping(function(fallback)
-                    if cmp.visible() then
-                        cmp.select_next_item()
-      '' + lib.strings.optionalString cfgp.luasnip.enable ''
-                    elseif luasnip.expand_or_locally_jumpable() then
-                        luasnip.expand_or_jump()
-      '' + ''
-                    else
-                        fallback()
-                    end
-                end, { 'i', 's' }),
-                ['<S-Tab>'] = cmp.mapping(function(fallback)
-                    if cmp.visible() then
-                        cmp.select_prev_item()
-      '' + lib.strings.optionalString cfgp.luasnip.enable ''
-                    elseif luasnip.locally_jumpable(-1) then
-                        luasnip.jump(-1)
-      '' + ''
-                    else
-                        fallback()
-                    end
-                end, { 'i', 's' }),
-            },
-      '' + lib.strings.optionalString cfgp.luasnip.enable ''
-            snippet = {
-                expand = function(args)
-                    luasnip.lsp_expand(args.body)
-                end,
-            },
-            sources = {
-                { name = 'luasnip' },
-            },
-      '' + ''
-        }
-      '';
-    in with pkgs.vimPlugins; [
-      {
-        plugin = nvim-cmp;
-        type = "lua";
-        config = configText;
-      }
-    ];
-  };
-}
diff --git a/hmModules/apps/neovim/plugin/telescope.nix b/hmModules/apps/neovim/plugin/telescope.nix
deleted file mode 100644
index 48a96e9..0000000
--- a/hmModules/apps/neovim/plugin/telescope.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfgp = config.neovim.plugins;
-in {
-  config = lib.mkIf (config.neovim.enable && cfgp.telescope.enable)  {
-    programs.neovim.plugins = let
-      configText = ''
-        require('telescope').setup({
-          extensions = {
-      '' + lib.strings.optionalString cfgp.telescope.fzf.enable ''
-            fzf = {
-              fuzzy = true,                    -- false will only do exact matching
-              override_generic_sorter = true,  -- override the generic sorter
-              override_file_sorter = true,     -- override the file sorter
-              case_mode = "smart_case",        -- or "ignore_case" or "respect_case"
-                                             -- the default case_mode is "smart_case"
-            }
-      '' + ''
-          }
-        })
-        local builtin = require('telescope.builtin')
-        vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-        vim.keymap.set('n', '<leader>fg', builtin.git_files, {})
-
-      '' + lib.strings.optionalString cfgp.telescope.fzf.enable ''
-        require('telescope').load_extension('fzf')
-      '';
-    in with pkgs.vimPlugins; [
-      {
-        plugin = telescope-nvim;
-        type = "lua";
-        config = configText;
-      }
-      (lib.mkIf cfgp.nvimcmp.enable telescope-fzf-native-nvim)
-    ];
-
-    home.packages = with pkgs; [
-      (lib.mkIf cfgp.telescope.fzf.enable fzf)
-    ];
-
-  };
-}
diff --git a/hmModules/apps/neovim/plugin/treesitter.nix b/hmModules/apps/neovim/plugin/treesitter.nix
deleted file mode 100644
index a6bb8c0..0000000
--- a/hmModules/apps/neovim/plugin/treesitter.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfgp = config.neovim.plugins;
-  cfgl = config.neovim.languages;
-in {
-  config = lib.mkIf (config.neovim.enable && cfgp.treesitter.enable)  {
-    programs.neovim.plugins = let
-      configText = ''
-        require('nvim-treesitter.configs').setup {
-          ensure_installed = {},
-
-          auto_install = false,
-
-          highlight = { enable = true },
-
-          indent = { enable = true },
-        }
-      '';
-
-      # I've tried many things, and can't get treesitter plugins changing
-      # dynamically. For not just have them always loaded regardless of config
-      treeplugs = p: [
-        p.tree-sitter-c
-        p.tree-sitter-go
-        p.tree-sitter-nix
-        p.tree-sitter-rust
-        p.tree-sitter-typescript
-      ];
-    in with pkgs.vimPlugins; [
-      {
-        plugin = (nvim-treesitter.withPlugins treeplugs);
-        type = "lua";
-        config = configText;
-      }
-    ];
-  };
-}

From 449cd8bf5065bf68d81c7ad82b67443ca04d4e3b Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Wed, 18 Feb 2026 14:30:01 -0800
Subject: [PATCH 14/15] Onizuka, update neovim config to match update

---
 users/onizuka/default.nix | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/users/onizuka/default.nix b/users/onizuka/default.nix
index f5ea837..ade362c 100644
--- a/users/onizuka/default.nix
+++ b/users/onizuka/default.nix
@@ -68,27 +68,16 @@
   feh.enable = true;
   beets.enable = true;
 
-  neovim.enable = true;
-  neovim.languages = {
-    c.enable = true;
-    nix.enable = true;
-    rust.enable = true;
-    typescript.enable = true;
-  };
-  neovim.plugins = {
-    comments.enable = true;
-    fugitive.enable = true;
-    lualine.enable = true;
-    luasnip.enable = true;
-    nvimcmp.enable = true;
-    telescope = {
-      enable = true;
-      fzf.enable = true;
+  neovim = {
+    enable = true;
+    languages = {
+      c.enable = true;
+      nix.enable = true;
+      rust.enable = true;
+      typescript.enable = true;
     };
-    treesitter.enable = true;
-    wiki.enable = true;
+    themes.catppuccin.enable = true;
   };
-  neovim.themes.catppuccin.enable = true;
 
   lf.enable = true;
   lf.hiddenfiles = [

From e5649b9c8002964e3d1751a1321e028c161b80c0 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Wed, 18 Feb 2026 16:34:20 -0800
Subject: [PATCH 15/15] Ssh, disable DefaultConfig to supress warning

---
 hmModules/services/ssh/service.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hmModules/services/ssh/service.nix b/hmModules/services/ssh/service.nix
index 418ae9c..ed2c9be 100644
--- a/hmModules/services/ssh/service.nix
+++ b/hmModules/services/ssh/service.nix
@@ -6,7 +6,10 @@
   };
 
   config = lib.mkIf config.ssh.enable {
-    programs.ssh.enable = true;
+    programs.ssh = {
+      enable = true;
+      enableDefaultConfig = false;
+    };
     home.packages = with pkgs; [
       sshfs # SSH File system
     ];