wallpapers

update flake
2026-04-16 23:09:15 -05:00 · 2026-04-12 21:22:35 -05:00 · 2026-04-12 20:58:58 -05:00 · 2026-04-12 20:54:17 -05:00 · 2026-04-12 20:51:08 -05:00 · 2026-04-12 20:49:29 -05:00
171 changed files with 5375 additions and 6885 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "machines/laptop"]
 	path = machines/laptop
 	url = ssh://gitea@gitea.esotericbytes.com:2222/Blunkall-Technologies/laptop
-[submodule "machines/android"]
-	path = machines/android
-	url = ssh://gitea@gitea.esotericbytes.com:2222/Blunkall-Technologies/android
--- a/flake-parts.nix
+++ b/flake-parts.nix
@@ -0,0 +1,12 @@
+{ inputs, ... }: {
+
+    imports = [
+        inputs.home-manager.flakeModules.home-manager
+        inputs.disko.flakeModules.default
+    ];
+
+    systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+    ];
+}
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769428758,
-        "narHash": "sha256-0G/GzF7lkWs/yl82bXuisSqPn6sf8YGTnbEdFOXvOfU=",
+        "lastModified": 1775558810,
+        "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "def5e74c97370f15949a67c62e61f1459fcb0e15",
+        "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2",
        "type": "github"
      },
      "original": {
@@ -33,6 +33,27 @@
        "type": "github"
      }
    },
+    "aurora": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "home-manager": "home-manager",
+        "import-tree": "import-tree",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1776046854,
+        "narHash": "sha256-cxX5DzXikwGhHalyOOkll1vGgCdhTfTgReSXIJlQ0AY=",
+        "ref": "refs/heads/master",
+        "rev": "b2ec3d9cd0a6e52c4922b26d8b8e25823afd89d1",
+        "revCount": 52,
+        "type": "git",
+        "url": "file:///home/nathan/Projects/Aurora"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/nathan/Projects/Aurora"
+      }
+    },
    "disko": {
      "inputs": {
        "nixpkgs": [
@@ -40,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769524058,
-        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
+        "lastModified": 1773889306,
+        "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
+        "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347",
        "type": "github"
      },
      "original": {
@@ -61,11 +82,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1770091431,
-        "narHash": "sha256-9Sqq/hxq8ZDLRSzu+edn0OfWG+FAPWFpwMKaJobeLec=",
+        "lastModified": 1775880170,
+        "narHash": "sha256-63PLZ7lspPAqpV/+d0oNtDHLCWQf1MVFRG2DOeDK+nU=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "4f827ff035c6ddc58d04c45abe5b777d356b926a",
+        "rev": "28b164d30b5ab6820ef7e17281ae55c539ae9ff5",
        "type": "gitlab"
      },
      "original": {
@@ -91,32 +112,16 @@
        "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",
-        "type": "github"
-      }
-    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1768135262,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
        "type": "github"
      },
      "original": {
@@ -126,6 +131,42 @@
      }
    },
    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_3"
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
      "inputs": {
        "nixpkgs-lib": [
          "nixvim",
@@ -134,11 +175,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1768135262,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
        "type": "github"
      },
      "original": {
@@ -170,17 +211,35 @@
      }
    },
    "home-manager": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1775900011,
+        "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1769580047,
-        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
+        "lastModified": 1775425411,
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
        "type": "github"
      },
      "original": {
@@ -206,11 +265,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753964049,
-        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "lastModified": 1772461003,
+        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
        "type": "github"
      },
      "original": {
@@ -235,11 +294,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769284023,
-        "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=",
+        "lastModified": 1775496928,
+        "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "13c536659d46893596412d180449353a900a1d31",
+        "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e",
        "type": "github"
      },
      "original": {
@@ -259,17 +318,17 @@
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
        "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
        "pre-commit-hooks": "pre-commit-hooks",
        "systems": "systems",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1770079745,
-        "narHash": "sha256-rQ4no/+LHuHlqDbJopj6fgS9GUsv1NSycrVhIoLPnbs=",
+        "lastModified": 1775828308,
+        "narHash": "sha256-mKW54+ilZNBVsU3GnzHhZUb041H7L/R8aPA0GD+1oKQ=",
        "ref": "refs/heads/main",
-        "rev": "30756d871845a6058a840642ab1a4c3979f6d782",
-        "revCount": 6859,
+        "rev": "f7755322fc515108cc9eed8113c09492d4a352c1",
+        "revCount": 7141,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -313,11 +372,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1767023960,
-        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
+        "lastModified": 1774710575,
+        "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=",
        "owner": "hyprwm",
        "repo": "hyprland-guiutils",
-        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
+        "rev": "0703df899520001209646246bef63358c9881e36",
        "type": "github"
      },
      "original": {
@@ -338,11 +397,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765214753,
-        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
+        "lastModified": 1772460177,
+        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
+        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
        "type": "github"
      },
      "original": {
@@ -367,11 +426,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1767983607,
-        "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
+        "lastModified": 1772459629,
+        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
+        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
        "type": "github"
      },
      "original": {
@@ -419,11 +478,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764592794,
-        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "lastModified": 1772462885,
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
        "owner": "hyprwm",
        "repo": "hyprtoolkit",
-        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
        "type": "github"
      },
      "original": {
@@ -444,11 +503,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766253372,
-        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
+        "lastModified": 1774911391,
+        "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
+        "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d",
        "type": "github"
      },
      "original": {
@@ -469,11 +528,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763640274,
-        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
+        "lastModified": 1772459835,
+        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
+        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
        "type": "github"
      },
      "original": {
@@ -498,11 +557,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769202094,
-        "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=",
+        "lastModified": 1775414057,
+        "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=",
        "owner": "hyprwm",
        "repo": "hyprwire",
-        "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c",
+        "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490",
        "type": "github"
      },
      "original": {
@@ -511,33 +570,43 @@
        "type": "github"
      }
    },
-    "nix-minecraft": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_2",
-        "systems": "systems_2"
-      },
+    "import-tree": {
      "locked": {
-        "lastModified": 1770000653,
-        "narHash": "sha256-QO/twGynxjOSUDtxbqJLshc/Q5/wImLH5O6KV2p9eoE=",
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
-        "rev": "6a2ddb643aaf7949caa6158e718c5efc3dda7dc1",
+        "lastModified": 1773693634,
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
        "type": "github"
      },
      "original": {
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
+        "owner": "vic",
+        "repo": "import-tree",
+        "type": "github"
+      }
+    },
+    "import-tree_2": {
+      "locked": {
+        "lastModified": 1773693634,
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vic",
+        "repo": "import-tree",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
        "type": "github"
      },
      "original": {
@@ -549,11 +618,41 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1765674936,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_3": {
+      "locked": {
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
        "type": "github"
      },
      "original": {
@@ -564,11 +663,11 @@
    },
    "nixpkgs-us": {
      "locked": {
-        "lastModified": 1770019141,
-        "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
        "type": "github"
      },
      "original": {
@@ -580,11 +679,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
        "type": "github"
      },
      "original": {
@@ -596,11 +695,27 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1770056022,
-        "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=",
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d04d8548aed39902419f14a8537006426dc1e4fa",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
        "type": "github"
      },
      "original": {
@@ -610,13 +725,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
        "type": "github"
      },
      "original": {
@@ -626,13 +741,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1768875095,
-        "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
+        "lastModified": 1774701658,
+        "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
+        "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe",
        "type": "github"
      },
      "original": {
@@ -644,36 +759,36 @@
    },
    "nixvim": {
      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_5",
        "nixvim": "nixvim_2"
      },
      "locked": {
-        "lastModified": 1770129756,
-        "narHash": "sha256-af2N+bI5NBmvRosFQNpjKE15GjjZq+6QP7q1X0cgdag=",
+        "lastModified": 1775908700,
+        "narHash": "sha256-LCKSjajVfYyjsw1k1oNZPrDblPHt36jyJZWS2+1XybU=",
        "ref": "refs/heads/master",
-        "rev": "9d263b8208af5c1ffd4a3c639a34bfe290bce931",
-        "revCount": 38,
+        "rev": "a62d8ce7f86424a297adead378be5f5a441add3c",
+        "revCount": 39,
        "type": "git",
-        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
+        "url": "file:///home/nathan/Projects/Moirai"
      },
      "original": {
        "type": "git",
-        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
+        "url": "file:///home/nathan/Projects/Moirai"
      }
    },
    "nixvim_2": {
      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_5",
-        "systems": "systems_3"
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": "nixpkgs_6",
+        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1769644746,
-        "narHash": "sha256-1X9o0GjCzku03magX4pM+1OZXA0aUTN7KvEReZ9t3OU=",
+        "lastModified": 1775837497,
+        "narHash": "sha256-L17VI03w/wVXvc1SK7EI1muLqHxD3+esYPPzgQvvdOE=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "3c27e1b35ca0fee6a89bfc20840654361ffe888d",
+        "rev": "a587a96a48c705609bfd2ad23f9ae5961eb0d373",
        "type": "github"
      },
      "original": {
@@ -692,11 +807,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769069492,
-        "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+        "lastModified": 1775036584,
+        "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
+        "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
        "type": "github"
      },
      "original": {
@@ -707,12 +822,14 @@
    },
    "root": {
      "inputs": {
+        "aurora": "aurora",
        "disko": "disko",
        "firefox-addons": "firefox-addons",
-        "home-manager": "home-manager",
+        "flake-parts": "flake-parts_2",
+        "home-manager": "home-manager_2",
        "hyprland": "hyprland",
-        "nix-minecraft": "nix-minecraft",
-        "nixpkgs": "nixpkgs_3",
+        "import-tree": "import-tree_2",
+        "nixpkgs": "nixpkgs_4",
        "nixpkgs-us": "nixpkgs-us",
        "nixvim": "nixvim",
        "sops-nix": "sops-nix"
@@ -725,11 +842,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769921679,
-        "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=",
+        "lastModified": 1775682595,
+        "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f",
+        "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
        "type": "github"
      },
      "original": {
@@ -768,21 +885,6 @@
        "type": "github"
      }
    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": [
@@ -811,11 +913,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761431178,
-        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
+        "lastModified": 1773601989,
+        "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
+        "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -21,187 +21,31 @@
            inputs.nixpkgs.follows = "nixpkgs";
        };

+        flake-parts.url = "github:hercules-ci/flake-parts";
+
+        import-tree.url = "github:vic/import-tree";

        firefox-addons = {
            url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
            inputs.nixpkgs.follows = "nixpkgs";
        };

-        nix-minecraft.url = "github:Infinidoge/nix-minecraft";
-
-        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
-
        hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";

-        nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
+        #nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
+        nixvim.url = "git+file:///home/nathan/Projects/Moirai";

-        self.submodules = true;
+        #aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
+        aurora.url = "git+file:///home/nathan/Projects/Aurora";
    };

-    outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
-
-        profiles = let 
-            dir = builtins.readDir ./profiles;
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-        in (builtins.listToAttrs 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... }: {
-                        imports = [
+    outputs = { ... } @ inputs: 
+    inputs.flake-parts.lib.mkFlake { inherit inputs; }
+    (inputs.import-tree [ 
+        ./profiles 
+        ./homes 
        ./system 
-                            ./profiles/${name}
-                        ];
-                    };
-                })) filtered)
-            );
-
-        homes = let 
-            dir = builtins.readDir ./homes;
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-        in (builtins.listToAttrs 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... } @ exputs: {
-                        imports = [ (import ./homes/${name}/home-manager (exputs // inputs)) ];
-                    };
-
-                })) filtered)
-            );
-        
-        iso = (nixpkgs.lib.nixosSystem {
-                system = "x86_64-linux";
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = self.homes.nathan;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    self.profiles.iso
-                ];
-            }).config.system.build.isoImage;
-
-        templates = {
-            nixos = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/nixos;
-
-            };
-
-            home-manager = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/home-manager;
-
-            };
-
-            nix-on-droid = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/nix-on-droid;
-
-            };
-
-            machines = let 
-                dir = builtins.readDir ./machines;
-                filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = {
-                            welcomeText = ''
-                                #Welcome to Olympus!
-
-                                ##Warning:
-                                This is a config for ${name}, an established machine!
-                                It may require significant alterations to be usable!
-                            '';
-
-                            description = ''
-                                Generate this where you want your config.
-                            '';
-
-                            path = ./machines/${name};
-                        };
-
-                    })) filtered)
-               );
-
-            homes = let 
-                dir = builtins.readDir ./homes;
-                filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = {
-                            welcomeText = ''
-                                #Welcome home, ${name}!
-                                Your config is right here.
-                            '';
-
-                            description = ''
-                                Generate this where you want your config.
-                            '';
-
-                            path = ./homes/${name};
-                        };
-
-                    })) filtered)
-               );
-
-            default = self.templates.nixos;
-        };
-
-
-        nixosConfigurations = let 
-                dir = builtins.readDir ./machines;
-                filtered = builtins.filter (x: dir.${x} == "directory" && x != "android") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = nixpkgs.lib.nixosSystem {
-                            specialArgs = inputs;
-
-                            modules = [
-                                { sysconfig.host = name; }
-                                ./machines/${name}
-                                self.profiles.${name}
-                            ];
-                        };
-
-                    })) filtered)
-               );
-    };
+        ./templates/default.nix
+        ./flake-parts.nix
+    ]);
 }
--- a/homes/nathan/flake.nix
+++ b/homes/nathan/flake.nix
@@ -1,40 +0,0 @@
-{
-
-    description = "Home-Manager Configuration";
-
-    inputs = {
-
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-
-        home-manager = {
-            url = "github:nix-community/home-manager/release-25.11";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
-
-        olympus = {
-            url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Olympus";
-            inputs.nixpkgs.follows = "nixpkgs";
-            inputs.home-manager.follows = "home-manager";
-        };
-    };
-
-    outputs = { self, nixpkgs, home-manager, olympus, ... } @ inputs: {
-
-        homeConfigurations = {
-            nathan = home-manager.lib.homeManagerConfiguration {
-                pkgs = import nixpkgs {
-                    system = builtins.currentSystem;
-                };
-
-                modules = [
-                    olympus.homes.nathan
-                    ./home.nix
-                ];
-
-                extraSpecialArgs = {
-                    inherit inputs;
-                };
-            };
-        };
-    };
-}
--- a/homes/nathan/home-manager/default.nix
+++ b/homes/nathan/home-manager/default.nix
@@ -1,11 +1,8 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ inputs, ... }: {

-    imports = let 
-        dir = builtins.readDir ./.;
-    in (builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    )) ++ [
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        imports = [
            inputs.sops-nix.homeManagerModules.sops
        ];

@@ -45,11 +42,12 @@

                minimal = lib.mkDefault false;
                hyprland.enable = lib.mkDefault config.homeconfig.graphical;
-            hyprlock.enable = lib.mkDefault config.homeconfig.hyprland.enable;
+                hypridle.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                wal.enable = lib.mkDefault config.homeconfig.graphical;
-            hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                rofi.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                firefox.enable = lib.mkDefault config.homeconfig.graphical;
+
+                aurora.enable = lib.mkDefault config.homeconfig.hyprland.enable;
            };

            home.username = lib.mkDefault config.homeconfig.name;
@@ -111,4 +109,5 @@
            };

        };
+    };
 }
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/chainsaw_man.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/chainsaw_man.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/eighty-six1.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/eighty-six1.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/eighty-six2.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/eighty-six2.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/eighty-six3.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/eighty-six3.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/frieren.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/frieren.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/goblin_slayer1.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/goblin_slayer1.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/goblin_slayer2.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/goblin_slayer2.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/goblin_slayer3.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/goblin_slayer3.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/higuruma.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/higuruma.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/higuruma1.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/higuruma1.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/nier_automata.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/nier_automata.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/recoil1.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/recoil1.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/recoil2.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/recoil2.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/rimuru.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/rimuru.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/shield_hero.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/shield_hero.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/sinon.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/sinon.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/tanya.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/tanya.png
--- a/homes/nathan/home-manager/dotfiles/default.nix
+++ b/homes/nathan/home-manager/dotfiles/default.nix
@@ -1,12 +1,13 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        home.file = {
            ".config/hypr" = lib.mkIf config.homeconfig.hyprland.enable { source = ./hypr; recursive = true; };
-		".config/hyprpanel" = lib.mkIf config.homeconfig.hyprpanel.enable { source = ./hyprpanel; recursive = true; };
            ".config/wal/templates" = lib.mkIf config.homeconfig.wal.enable { source = ./wal/templates; recursive = true; };
            ".config/ohmyposh" = { source = ./ohmyposh; recursive = true; };
-		".config/quickshell" = lib.mkIf config.homeconfig.quickshell.enable { source = ./quickshell; recursive = true; };
            "Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
        };

+    };
 }
--- a/homes/nathan/home-manager/dotfiles/hypr/dwindle.conf
+++ b/homes/nathan/home-manager/dotfiles/hypr/dwindle.conf
@@ -0,0 +1,35 @@
+dwindle {
+	# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+        preserve_split = yes # you probably want this
+}
+
+bind = $mainMod, F1, submap, dwindle
+
+submap = master
+
+bind = $mainMod, F2, submap, master
+bind = $mainMod, F3, submap, scrolling
+bind = $mainMod, End, submap, reset
+
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
+
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
+bind = $mainMod, J, workspace, e+1
+bind = $mainMod, K, workspace, e-1
+bind = $mainMod, L, layoutmsg, focus r
+
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
+bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, K, movetoworkspace, e-1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
+
+submap = reset
--- a/homes/nathan/home-manager/dotfiles/hypr/hyprlock.conf
+++ b/homes/nathan/home-manager/dotfiles/hypr/hyprlock.conf
@@ -1,108 +0,0 @@
-# sample hyprlock.conf
-# for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
-#
-# rendered text in all widgets supports pango markup (e.g. <b> or <i> tags)
-# ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#general-remarks
-#
-# shortcuts to clear password buffer: ESC, Ctrl+U, Ctrl+Backspace
-#
-# you can get started by copying this config to ~/.config/hypr/hyprlock.conf
-#
-
-$font = Monospace
-
-source = ~/.cache/wal/colors-hypr.conf
-
-general {
-    hide_cursor = false
-}
-
-# uncomment to enable fingerprint authentication
-# auth {
-#     fingerprint {
-#         enabled = true
-#         ready_message = Scan fingerprint to unlock
-#         present_message = Scanning...
-#         retry_delay = 250 # in milliseconds
-#     }
-# }
-
-animations {
-    enabled = true
-    bezier = linear, 1, 1, 0, 0
-    animation = fadeIn, 1, 5, linear
-    animation = fadeOut, 1, 5, linear
-    animation = inputFieldDots, 1, 2, linear
-}
-
-background {
-    monitor =
-    path = screenshot
-    blur_passes = 3
-}
-
-input-field {
-    monitor =
-    size = 20%, 5%
-    outline_thickness = 3
-    inner_color = rgba(0, 0, 0, 0.0) # no fill
-
-    outer_color = $color1 $color5 100deg
-    check_color = $color2 $color6 120deg
-    fail_color = $color3 $color7 40deg
-
-    font_color = rgb(143, 143, 143)
-    fade_on_empty = false
-    rounding = 15
-
-    font_family = $font
-    placeholder_text = Input password...
-    fail_text = $PAMFAIL
-
-    # uncomment to use a letter instead of a dot to indicate the typed password
-    # dots_text_format = *
-    # dots_size = 0.4
-    dots_spacing = 0.3
-
-    # uncomment to use an input indicator that does not show the password length (similar to swaylock's input indicator)
-    # hide_input = true
-
-    position = 0, -20
-    halign = center
-    valign = center
-}
-
-# TIME
-label {
-    monitor =
-    text = $TIME # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#variable-substitution
-    font_size = 90
-    font_family = $font
-
-    position = -30, 0
-    halign = right
-    valign = top
-}
-
-# DATE
-label {
-    monitor =
-    text = cmd[update:60000] date +"%A, %d %B %Y" # update every 60 seconds
-    font_size = 25
-    font_family = $font
-
-    position = -30, -150
-    halign = right
-    valign = top
-}
-
-label {
-    monitor =
-    text = $LAYOUT[en,ru]
-    font_size = 24
-    onclick = hyprctl switchxkblayout all next
-
-    position = 250, -20
-    halign = center
-    valign = center
-}
--- a/homes/nathan/home-manager/dotfiles/hypr/main.conf
+++ b/homes/nathan/home-manager/dotfiles/hypr/main.conf
@@ -10,13 +10,15 @@
 #                                                #
 #------------------------------------------------#

-exec-once = hyprrun onSystemStart
+exec-once = onSystemStart

 # Some default env vars.
 env = XCURSOR_SIZE,16

+$mainMod = ALT
+
 source = ~/.config/hypr/otf.conf
-source = ~/.cache/wal/colors-hypr.conf
+source = ~/.cache/wal/colors-hyprland.conf

 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -48,7 +50,7 @@ general {
        col.active_border = $color1 $color5 100deg
        col.inactive_border = $color0

-        layout = master
+        layout = scrolling
 }
 decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more 

@@ -77,21 +79,16 @@ animations {
        animation = border, 1, 10, default
        animation = borderangle, 1, 8, default
        animation = fade, 1, 7, default
-        animation = workspaces, 1, 6, default
+        animation = workspaces, 1, 6, default, slidevert
 }


+source = ~/.config/hypr/dwindle.conf

-dwindle {
-	# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-        preserve_split = yes # you probably want this
-}
+source = ~/.config/hypr/master.conf
+
+source = ~/.config/hypr/scroll.conf

-master {
-        # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-        new_status = "master"
-}

 misc {
        disable_hyprland_logo = false
@@ -105,13 +102,12 @@ ecosystem {
 }

 # Binds
-$mainMod = ALT

-bind = $mainMod SHIFT, E, exec, colorPrefix hyprrun kitty
+bind = $mainMod SHIFT, E, exec, colorPrefix kitty

-bind = $mainMod, B, exec, hyprrun firefox
+bind = $mainMod, B, exec, firefox

-bind = $mainMod SHIFT, B, exec, hyprrun firefox --private-window
+bind = $mainMod SHIFT, B, exec, firefox --private-window

 bind = $mainMod, Q, killactive,

@@ -119,20 +115,20 @@ bind = $mainMod, Q, killactive,

 #bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild

-bind = $mainMod, F, exec, hyprrun thunar
+bind = $mainMod, F, exec, thunar
 bind = $mainMod SHIFT, F, fullscreen

-bind = $mainMod SHIFT, semicolon, exec, colorPrefix hyprrun kitty -e lf
+bind = $mainMod SHIFT, semicolon, exec, colorPrefix kitty -e yazi

-bind = $mainMod, Insert, exec, hyprrun libreoffice
+bind = $mainMod, Insert, exec, libreoffice

 bind = $mainMod, V, togglefloating,

-bind = $mainMod SHIFT, V, exec, hyprrun vlc
+bind = $mainMod SHIFT, V, exec, vlc

-bind = , Menu, exec, rofi -show drun -show-icons -run-command 'hyprrun {cmd}'
+bind = , Menu, exec, rofi -show drun -show-icons -run-command '{cmd}'

-bind = $mainMod, Menu, exec, hyprrun hyprpanel -q; hyprrun hyprpanel
+bind = $mainMod, Menu, exec, systemctl restart --user quickshell

 #bind = $mainMod, P, pseudo, # dwindle
 #bind = $mainMod, Z, togglesplit, # dwindle
@@ -140,34 +136,34 @@ bind = $mainMod, Menu, exec, hyprrun hyprpanel -q; hyprrun hyprpanel
 bind = $mainMod, N, layoutmsg, rollnext # master
 bind = $mainMod, P, layoutmsg, rollprev # master

-bind = $mainMod, M, exec, hyprrun spotify
+bind = $mainMod, M, exec, spotify

-bind = $mainMod SHIFT, M, exec, hyprrun firefox soundcloud.com/you/library
+bind = $mainMod SHIFT, M, exec, firefox soundcloud.com/you/library

-bind = $mainMod CTRL, M, exec, colorPrefix hyprrun kitty -e ncmpcpp -s browser
+bind = $mainMod CTRL, M, exec, colorPrefix kitty -e ncmpcpp -s browser

-bind = $mainMod, XF86AudioPlay, exec, hyprrun mpc load casual
+bind = $mainMod, XF86AudioPlay, exec, mpc load casual

-bind = , XF86AudioPlay, exec, hyprrun playerctl play-pause
+bind = , XF86AudioPlay, exec, playerctl play-pause

-bind = , XF86AudioPause, exec, hyprrun playerctl pause
+bind = , XF86AudioPause, exec, playerctl pause

-bind = , XF86AudioNext, exec, hyprrun playerctl next
+bind = , XF86AudioNext, exec, playerctl next

-bind = , XF86AudioPrev, exec, hyprrun playerctl previous
+bind = , XF86AudioPrev, exec, playerctl previous

-bind = , XF86Launch2, exec, hyprrun steam
-bind = $mainMod, XF86Launch2, exec, hyprrun prismlauncher
+bind = , XF86Launch2, exec, steam
+bind = $mainMod, XF86Launch2, exec, prismlauncher

-bind = , XF86Calculator, exec, hyprrun geogebra
+bind = , XF86Calculator, exec, geogebra

-bind = $mainMod SHIFT, Print, exec, hyprrun firefox localhost:631
+bind = $mainMod SHIFT, Print, exec, firefox localhost:631

-bind = $mainMod, Return, exec, hyprrun discord --enable-features=UseOzonePlatform --ozone-platform=wayland
+bind = $mainMod, Return, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland

-bind = $mainMod CTRL, Return, exec, hyprrun firefox https://discord.com/app
+bind = $mainMod CTRL, Return, exec, firefox https://discord.com/app

-bind = , Home, exec, hyprrun setWallpaper
+bind = , Home, exec, setWallpaper

 # Move focus with mainMod + arrow keys
 bind = $mainMod, W, movefocus, u
@@ -203,26 +199,25 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod SHIFT, Home, movetoworkspace, 11

 # Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, right, workspace, e+1
-bind = $mainMod, left, workspace, e-1
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col

-bind = $mainMod, H, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod, H, workspace, e-1
-bind = $mainMod, J, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
 bind = $mainMod, J, workspace, e+1
-bind = $mainMod, K, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
 bind = $mainMod, K, workspace, e-1
-bind = $mainMod, L, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod, L, workspace, e+1
+bind = $mainMod, L, layoutmsg, focus r

-bind = $mainMod SHIFT, H, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod SHIFT, H, movetoworkspace, e-1
-bind = $mainMod SHIFT, J, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
 bind = $mainMod SHIFT, J, movetoworkspace, e+1
-bind = $mainMod SHIFT, K, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
 bind = $mainMod SHIFT, K, movetoworkspace, e-1
-bind = $mainMod SHIFT, L, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod SHIFT, L, movetoworkspace, e+1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r

 #switch network connections
 bind = CTRL SHIFT, Escape, exec, nmcli device down wlo1
@@ -232,14 +227,18 @@ bind = CTRL SHIFT, 2, exec, nmcli connection up CXNK00813829
 bind = CTRL SHIFT, 3, exec, nmcli connection up ATT9MhT2ql

 #brightness keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl set +10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
+binde = SHIFT, XF86MonBrightnessUp, exec, brightnessctl set +2%
+binde = SHIFT, XF86MonBrightnessDown, exec, brightnessctl set 2%-
+binde = , XF86MonBrightnessUp, exec, brightnessctl set +10%
+binde = , XF86MonBrightnessDown, exec, brightnessctl set 10%-

 #volume keys
+binde = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%+
+binde = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%-
 binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%+
 binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%-
 bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle
-bind = $mainMod, F9, exec, hyprrun pavucontrol
+bind = $mainMod, F9, exec, pavucontrol

 #screen lock key
 #bind = $mainMod, F12, exec, swaylock
@@ -257,29 +256,9 @@ bind = $mainMod SHIFT, D, movewindow, r
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod SHIFT, mouse:272, resizewindow

-$scratchpadsize = size (monitor_w*0.6) (monitor_h*0.8)
+source = ~/.config/hypr/pypr.conf

-$kitty = ^(scratchpad-kitty)$
-windowrule = float on, match:class $kitty
-windowrule = $scratchpadsize, match:class $kitty
-windowrule = workspace special silent, match:class $kitty
-
-$lf = ^(scratchpad-lf)$
-windowrule = float on, match:class $lf
-windowrule = $scratchpadsize, match:class $lf
-windowrule = workspace special silent, match:class $lf
-
-$cal = ^(scratchpad-cal)$
-windowrule = float on, match:class $cal
-windowrule = $scratchpadsize, match:class $cal
-windowrule = workspace special silent, match:class $cal
-
-bind = $mainMod, semicolon, exec, pypr toggle lf
-bind = $mainMod, E, exec, pypr toggle kitty
-bind = $mainMod, C, exec, pypr toggle calendar
-
-
-bind = CTRL SHIFT, Home, exec, hyprrun ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
+bind = CTRL SHIFT, Home, exec, ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
 bind = CTRL SHIFT, Home, submap, clean


--- a/homes/nathan/home-manager/dotfiles/hypr/master.conf
+++ b/homes/nathan/home-manager/dotfiles/hypr/master.conf
@@ -0,0 +1,35 @@
+
+master {
+        # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+        new_status = "master"
+}
+
+bind = $mainMod, F2, submap, master
+
+submap = master
+
+bind = $mainMod, F1, submap, dwindle
+bind = $mainMod, F3, submap, scrolling
+bind = $mainMod, End, submap, reset
+
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
+
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
+bind = $mainMod, J, workspace, e+1
+bind = $mainMod, K, workspace, e-1
+bind = $mainMod, L, layoutmsg, focus r
+
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
+bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, K, movetoworkspace, e-1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
+
+submap = reset
--- a/homes/nathan/home-manager/dotfiles/hypr/pypr.conf
+++ b/homes/nathan/home-manager/dotfiles/hypr/pypr.conf
@@ -0,0 +1,21 @@
+
+$scratchpadsize = size (monitor_w*0.6) (monitor_h*0.8)
+
+$kitty = ^(scratchpad-kitty)$
+windowrule = float on, match:class $kitty
+windowrule = $scratchpadsize, match:class $kitty
+windowrule = workspace special silent, match:class $kitty
+
+$files = ^(scratchpad-files)$
+windowrule = float on, match:class $files
+windowrule = $scratchpadsize, match:class $files
+windowrule = workspace special silent, match:class $files
+
+$cal = ^(scratchpad-cal)$
+windowrule = float on, match:class $cal
+windowrule = $scratchpadsize, match:class $cal
+windowrule = workspace special silent, match:class $cal
+
+bind = $mainMod, semicolon, exec, pypr toggle files
+bind = $mainMod, E, exec, pypr toggle kitty
+bind = $mainMod, C, exec, pypr toggle calendar
--- a/homes/nathan/home-manager/dotfiles/hypr/pyprland.toml
+++ b/homes/nathan/home-manager/dotfiles/hypr/pyprland.toml
@@ -3,11 +3,11 @@
        "scratchpads"
 	]

-	[scratchpads.lf]
+	[scratchpads.files]
 	animation = "fromTop"
-	command = "kitty --class scratchpad-lf lf ~"
+	command = "kitty --class scratchpad-files yazi ~"
 	lazy = true
-	class = "scratchpad-lf"
+	class = "scratchpad-files"
 	margin = 100
 	multi = true
 	excludes = "*"
--- a/homes/nathan/home-manager/dotfiles/hypr/scroll.conf
+++ b/homes/nathan/home-manager/dotfiles/hypr/scroll.conf
@@ -0,0 +1,35 @@
+
+scrolling {
+    column_width = 0.7
+    direction = "right"
+}
+
+bind = $mainMod, F3, submap, scrolling
+
+submap = scrolling
+
+bind = $mainMod, F1, submap, dwindle
+bind = $mainMod, F2, submap, master
+bind = $mainMod, End, submap, reset
+
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
+
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
+bind = $mainMod, J, workspace, e+1
+bind = $mainMod, K, workspace, e-1
+bind = $mainMod, L, layoutmsg, focus r
+
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
+bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, K, movetoworkspace, e-1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
+
+submap = reset
--- a/homes/nathan/home-manager/dotfiles/hyprpanel/config.json
+++ b/homes/nathan/home-manager/dotfiles/hyprpanel/config.json
@@ -1,65 +0,0 @@
-{
-  "theme.font.name": "FiraCode Nerd Font Mono",
-  "theme.font.label": "FiraCode Nerd Font Mono Medium",
-  "theme.bar.floating": true,
-  "bar.layouts": {
-    "*": {
-      "left": [
-        "dashboard",
-        "workspaces",
-        "windowtitle",
-        "submap",
-        "kbinput"
-      ],
-      "middle": [
-        "volume",
-        "battery",
-        "hyprsunset",
-        "clock",
-        "hypridle",
-        "network",
-        "bluetooth"
-      ],
-      "right": [
-        "ram",
-        "storage",
-        "systray",
-        "cava",
-        "notifications",
-        "power"
-      ]
-    }
-  },
-  "theme.bar.opacity": 50,
-  "wallpaper.image": "/tmp/nathan/bg",
-  "wallpaper.enable": false,
-  "theme.matugen_settings.scheme_type": "content",
-  "theme.matugen_settings.variation": "standard_2",
-  "theme.matugen": true,
-  "bar.launcher.autoDetectIcon": true,
-  "bar.network.truncation_size": 10,
-  "bar.bluetooth.label": false,
-  "bar.clock.showIcon": false,
-  "bar.clock.format": "%A %H:%M:%S %m/%d/%C%y",
-  "bar.notifications.show_total": true,
-  "bar.notifications.hideCountWhenZero": true,
-  "menus.dashboard.shortcuts.left.shortcut2.command": "spotify",
-  "menus.dashboard.shortcuts.left.shortcut1.command": "$BROWSER",
-  "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Browser",
-  "menus.dashboard.shortcuts.left.shortcut1.icon": "󰈹",
-  "menus.dashboard.directories.enabled": false,
-  "menus.dashboard.stats.enable_gpu": true,
-  "menus.power.lowBatteryNotification": true,
-  "bar.customModules.cava.leftClick": "menu:media",
-  "bar.customModules.cava.showIcon": false,
-  "bar.customModules.hypridle.label": false,
-  "bar.customModules.hyprsunset.label": false,
-  "bar.customModules.hyprsunset.temperature": "4000k",
-  "bar.customModules.netstat.dynamicIcon": true,
-  "bar.customModules.netstat.label": true,
-  "bar.workspaces.show_numbered": true,
-  "bar.workspaces.numbered_active_indicator": "highlight",
-  "bar.workspaces.ignored": "-\\d+",
-  "menus.clock.time.military": true,
-  "menus.clock.weather.enabled": false
-}
--- a/homes/nathan/home-manager/dotfiles/hyprpanel/modules.json
+++ b/homes/nathan/home-manager/dotfiles/hyprpanel/modules.json
@@ -1 +0,0 @@
-{}
--- a/homes/nathan/home-manager/dotfiles/hyprpanel/modules.scss
+++ b/homes/nathan/home-manager/dotfiles/hyprpanel/modules.scss
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/ActiveWindow.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/ActiveWindow.qml
@@ -1,37 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import Quickshell
-
-Item {
-    implicitWidth: t.contentWidth + 10 
-    implicitHeight: 30
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        Text {
-            id: t
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            text: {
-                if(hws.toplevels.values.length > 0) {
-                    return Hyprland.activeToplevel.title
-                } else {
-                    return "  Desktop"
-                }
-            }
-
-            property HyprlandWorkspace hws: Hyprland.focusedWorkspace
-
-            onHwsChanged: {
-                Hyprland.refreshToplevels()
-                Hyprland.refreshWorkspaces()
-            }
-
-            font.pointSize: 11
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Bar.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Bar.qml
@@ -1,170 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Wayland
-
-PanelWindow {
-    anchors {
-        top: true
-        //left: true
-        //right: true
-        //bottom: true
-
-    }
-
-    id: bar
-
-    exclusionMode: ExclusionMode.Ignore
-    WlrLayershell.layer: WlrLayer.Background
-
-    color: "#a0706050"
-
-
-    implicitHeight: 40
-    implicitWidth: 1900
-
-    /*RowLayout {
-        width: bar.width
-    }*/
-    RowLayout {
-        //Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-        id: left
-        x: 0
-        y: parent.y + (parent.height - height) / 2
-        //width: center.x
-        spacing: 0
-
-        Launcher { 
-            id: l 
-            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-            Layout.preferredWidth: width
-            Layout.margins: 5
-        }
-
-        Workspaces { 
-            id: ws 
-            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-            Layout.margins: 5
-        }
-
-        /*ActiveWindow {
-            id: aw
-            Layout.margins: 5
-
-            Layout.maximumWidth: Math.min(implicitWidth, center.x - (parent.x + x + Layout.margins))
-        }*/
-
-    }
-
-    RowLayout {
-        //Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-        id: center
-        x: (parent.width - cl.width) / 2 + parent.x - centerLeft.width
-        //y: parent.y + (parent.height - height) / 2
-        y: parent.y + (parent.height - height) / 2
-        spacing: 0
-
-        RowLayout {
-            id: centerLeft
-            spacing: 0
-            
-            Volume { 
-                id: v 
-                window: bar
-                popupOffset: center.x
-                Layout.margins: 5
-            }
-
-            Battery { 
-                id: bat 
-                window: bar
-                popupOffset: center.x
-                Layout.margins: 5
-            }
-
-            Hyprsunset { 
-                id: hs 
-                Layout.margins: 5
-            }
-        }
-
-
-        Clock { 
-            id: cl 
-            Layout.margins: 5
-        }
-
-        IdleInhibitor { 
-            id: ii 
-            Layout.margins: 5
-        }
-
-        Wifi { 
-            id: wifi 
-            window: bar
-            Layout.margins: 5
-        }
-
-        Bluetooth { 
-            id: bt 
-            window: bar
-            popupOffset: center.x + center.width
-            Layout.margins: 5
-        }
-
-    }
-
-
-    RowLayout {
-        //Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-        id: right
-        //implicitWidth: bar.width - (spacer.x + spacer.width)
-        x: bar.width - implicitWidth
-        y: parent.y + (parent.height - height) / 2
-        //Layout.maximumWidth: bar.width - (center.x + center.width)
-        //Layout.preferredWidth: 10
-        spacing: 0
-
-        Media { 
-            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-            id: media
-            
-            implicitWidth: Math.min(textWidth, bar.width - (righter.width) - (center.x + center.width) - 10)
-
-            Layout.margins: 5
-        }
-
-        RowLayout {
-            id: righter
-            spacing: 0
-            Tray { 
-                id: tray
-                window: bar 
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                Layout.margins: 5
-                popupOffset: right.x + righter.x + x
-            }
-
-            Notifications { 
-                id: notif 
-                window: bar
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                Layout.margins: 5
-            }
-
-            Power { 
-                id: power 
-                window: bar
-                popupOffset: bar.width
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                Layout.margins: 5
-            }
-        }
-    }
-
-
-
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Battery.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Battery.qml
@@ -1,71 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import Quickshell.Services.UPower
-
-ClippingWrapperRectangle {
-    radius: 5
-    width: 100; height: 30
-    color: "red"
-    Button {
-        id: button
-        text: "󰁹 " + Math.floor(UPower.displayDevice.percentage * 100) + "%"
-        font.pointSize: 12
-        implicitHeight: parent.height
-        //icon.color: "red"
-        //icon.source: "/nix/store/c4dcn4vl0v5njv4d587sazrad1xgyd9h-rose-pine-icon-theme-unstable-2022-09-01/share/icons/rose-pine/symbolic/devices/battery-symbolic.svg"
-        onClicked: {
-            menu.visible = true
-            grab.active = true
-        }
-    }
-
-    required property var window
-    required property real popupOffset
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: popupOffset
-        anchor.rect.y: 50
-        implicitWidth: 250
-        implicitHeight: 150
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-
-                spacing: 0
-
-                Button {
-                    Layout.topMargin: 5
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-
-                    text: 'shutdown'
-                }
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Bluetooth.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Bluetooth.qml
@@ -1,141 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import Quickshell.Bluetooth
-
-ClippingWrapperRectangle {
-    
-    
-    radius: 5
-    implicitWidth: 30; implicitHeight: 30
-    Button {
-        id: button
-        text: ""
-        font.pointSize: 16
-        
-        onClicked: {
-            menu.visible = true
-            grab.active = true
-        }
-        implicitHeight: parent.height
-    }
-
-    required property PanelWindow window
-    required property real popupOffset
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: popupOffset - width
-        anchor.rect.y: 50
-        implicitWidth: 250
-        implicitHeight: 150
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-
-                spacing: 0
-
-                ClippingWrapperRectangle {
-                    radius: 5
-                    implicitWidth: parent.width - 2 * Layout.margins
-                    implicitHeight: 30
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-                    Layout.margins: 5
-                    color: "#ff3333aa"
-
-                    RowLayout {
-                        Text {
-                            text: 'Bluetooth'
-                            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                            Layout.margins: 5
-                        }
-
-                        Switch {
-                            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                            //Layout.margins: 5
-                            checked: Bluetooth.defaultAdapter.enabled
-                            onClicked: Bluetooth.defaultAdapter.enabled = checked
-                        }
-                    }
-
-                }
-
-                ScrollView {
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-                    Layout.margins: 5
-
-                    implicitWidth: parent.width - 4 * Layout.margins
-                    implicitHeight: menu.height / 2
-
-                    id: scroll
-
-                    ColumnLayout {
-                        spacing: 0
-
-                        Repeater {
-
-                            id: rep
-
-                            model: Bluetooth.devices.values
-
-                            ClippingWrapperRectangle {
-                                radius: 5
-                                color: "#ff3333aa"
-
-                                implicitWidth: menu.width - 3 * scroll.x
-                                implicitHeight: 40
-                                
-                                Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-                                Layout.margins: 5
-
-                                RowLayout {
-                                    Text {
-                                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                                        Layout.margins: 5
-                                        
-                                        text: rep.model[index].name
-                                    }
-
-                                    Button {
-                                        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                                        Layout.rightMargin: 5
-                                        text: 'Connect'
-
-                                        onClicked: rep.model[index].connected = !rep.model[index].connected
-                                    }
-                                }
-
-
-                            }
-
-                        }
-                    }
-
-                }
-
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Clock.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Clock.qml
@@ -1,27 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Widgets
-import Quickshell
-
-Item {
-    implicitWidth: t.contentWidth + 10 
-    implicitHeight: 30
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        Text {
-            id: t
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            text: Qt.formatDateTime(clock.date, "dddd HH:mm:ss MM/dd/yyyy")
-            font.pointSize: 11
-
-            SystemClock {
-                id: clock
-                precision: SystemClock.Seconds
-            }
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Hyprsunset.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Hyprsunset.qml
@@ -1,30 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import Quickshell.Io
-import Quickshell.Widgets
-
-ClippingWrapperRectangle {
-    radius: 5
-    implicitWidth: 30; height: 30
-    Button {
-        id: button
-        text: "󰛨 "
-        font.pointSize: 16
-        Process {
-            id: idlent
-            running: false
-            command: ["hyprsunset", "-t", "4000"]
-
-            onExited: {
-                running = button.text == "󰛨 " ? false : true
-            }
-        }
-
-        onClicked: {
-            idlent.running = button.text == "󰛨 " ? true : false
-            button.text = button.text == "󰛨 " ? "󱩌 " : "󰛨 "
-        }
-        implicitHeight: parent.height
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/IdleInhibitor.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/IdleInhibitor.qml
@@ -1,34 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import Quickshell.Io
-import Quickshell.Widgets
-
-ClippingWrapperRectangle {
-
-    property real interval: 100
-    id: root
-
-    radius: 5
-    implicitWidth: 30; height: 30
-    Button {
-        id: button
-        text: "󰒲 "
-        font.pointSize: 16
-        Process {
-            id: idlent
-            running: false
-            command: ["systemd-inhibit", "--what=idle", "sleep", root.interval.toString()]
-
-            onExited: {
-                running = button.text == "󰒲 " ? false : true
-            }
-        }
-
-        onClicked: {
-            idlent.running = button.text == "󰒲 " ? true : false
-            button.text = button.text == "󰒲 " ? "󰒳 " : "󰒲 "
-        }
-        implicitHeight: parent.height
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Launcher.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Launcher.qml
@@ -1,22 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import Quickshell.Io
-import Quickshell.Widgets
-
-ClippingWrapperRectangle {
-    radius: 5
-    width: 30; height: 30
-    Button {
-        id: button
-        text: " "
-        font.pointSize: 16
-        Process {
-            id: launcher
-            running: false
-            command: ["rofi", "-show", "drun"]
-        }
-        onClicked: launcher.running = true
-        implicitHeight: parent.height
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Media.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Media.qml
@@ -1,48 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Services.Mpris
-import Quickshell.Widgets
-
-Item {
-    id: media
-    height: 30
-
-    readonly property real textWidth: info.contentWidth + 10
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        Text {
-
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-
-            id: info
-
-            text: {
-                let s = ''
-                let players = []
-                
-                Mpris.players.values.forEach((p) => { 
-                    if(p.isPlaying) players.push(p)
-                })
-                
-                if(players[0]?.trackTitle) {
-                    s += players[0].trackTitle
-                }
-                if(players[0]?.trackAlbum) {
-                    s += ' - ' + players[0].trackAlbum
-                }
-                if(players[0]?.trackArtist) {
-                    s += ' - ' + players[0].trackArtist
-                }
-
-                media.visible = players.length > 0
-
-                return s
-            }
-            font.pointSize: 11
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Notif.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Notif.qml
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Notifications.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Notifications.qml
@@ -1,183 +0,0 @@
-import Quickshell
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Services.Notifications
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
-
-Item {
-    width: 50
-    height: 30
-
-    ClippingWrapperRectangle {
-        id: barbutton
-        radius: 5
-        anchors.fill: parent
-        Button {
-            id: button
-            text: "󰂚"
-            //text: server.trackedNotifications.values.length == 0 ? "󰂚" : '󱅫 ' + server.trackedNotifications.values.length
-            //icon.source: ''
-            font.pointSize: 16
-            
-            onClicked: {
-                
-
-                menu.visible = true
-                grab.active = true
-            }
-            implicitHeight: parent.height
-        }
-    }
-
-    NotificationServer {
-        id: server
-        persistenceSupported: true
-        imageSupported: true
-        actionsSupported: true
-        bodyImagesSupported: true
-        bodySupported: true
-        bodyHyperlinksSupported: true
-        inlineReplySupported: true
-        actionIconsSupported: true
-
-        onNotification: (n) => {
-            n.tracked = true
-            console.log(n?.body)
-            button.text = '󱅫 ' + (server.trackedNotifications.values.length + 1)
-        }
-
-    }
-
-    required property PanelWindow window
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: window.width - width
-        anchor.rect.y: 50
-        implicitWidth: 400
-        implicitHeight: 1080 - anchor.rect.y
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-            
-            color: "#ff706050"
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-                id: lay
-
-                spacing: 10
-
-                ClippingWrapperRectangle {
-                    radius: 5
-                    Layout.margins: 5
-                    Layout.alignment: Qt.AlignVCenter | Qt.AlignTop
-                    implicitWidth: menu.width - 2 * Layout.margins
-                    
-                    RowLayout {
-                        width: parent.width
-                        Text {
-                            Layout.margins: 5
-                            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                            text: 'Notifications'
-                        }
-                        Button {
-                            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                            Layout.margins: 5
-                            implicitWidth: 20
-                            implicitHeight: 20
-
-                            text: 'x'
-
-                            onClicked: {
-                                while(server.trackedNotifications.values.length > 0) {
-                                     server.trackedNotifications.values[0].dismiss()
-                                }
-                            }
-                        }
-                    }
-                }
-
-                
-                Repeater {
-                    id: rep
-
-                    model: server.trackedNotifications.values
-                    ClippingWrapperRectangle {
-                        Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-                        Layout.margins: 5
-                        radius: 10
-                        implicitWidth: parent.width - 2 * Layout.margins
-                        implicitHeight: 100
-                        MouseArea {
-                            anchors.fill: parent
-                            
-                            RowLayout {
-                                Image {
-                                    //anchors.fill: parent
-                                    source: {
-                                        let icon = rep.model[index].image
-                                        if (icon.includes("?path=")) {
-                                            const [name, path] = icon.split("?path=");
-                                            icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
-                                        }
-                                        return icon
-                                    }
-
-                                    Layout.maximumWidth: 100
-                                    Layout.maximumHeight: 100
-                                }
-                                
-                                ColumnLayout {
-                                    Layout.topMargin: 10
-                                    Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-                                    Text {
-                                        Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-                                        text: rep.model[index].summary
-                                        Layout.leftMargin: 10
-                                        font.pointSize: 14
-                                    }
-                                    Text {
-                                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                                        text: rep.model[index].body
-                                        Layout.leftMargin: 10
-                                        font.pointSize: 12
-                                    }
-                                }
-                            }
-
-                            acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-                            onClicked: mouse => {
-                                if(mouse.button == Qt.LeftButton) {
-                                    button.text = rep.count - 1 <= 0 ? "󰂚" : '󱅫 ' + (rep.count - 1)
-                                    rep.model[index].dismiss()
-                                    //button.text = server.trackedNotifications.values.length == 0 ? "󰂚" : '󱅫 ' + server.trackedNotifications.values.length
-                                } else if(mouse.button == Qt.RightButton) {
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Power.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Power.qml
@@ -1,96 +0,0 @@
-import Quickshell
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Hyprland
-import Quickshell.Io
-import Quickshell.Widgets
-
-Item {
-    width: 30
-    height: 30
-
-    id: root
-
-    required property PanelWindow window
-    required property real popupOffset
-
-    ClippingWrapperRectangle {
-        radius: 5
-        width: 30; height: 30
-        Button {
-            id: button
-            text: " "
-            font.pointSize: 16
-            
-            onClicked: {
-                menu.visible = true
-                grab.active = true
-            }
-            implicitHeight: parent.height
-        }
-    }
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: popupOffset
-        anchor.rect.y: 50
-        implicitWidth: 150
-        implicitHeight: 250
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-
-                spacing: 0
-
-                Button {
-                    Layout.topMargin: 5
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-
-                    text: 'shutdown'
-                }
-                
-                Button {
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-                    text: 'reboot'
-                }
-                
-                Button {
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-                    text: 'logout'
-                }
-                
-                Button {
-                    Layout.bottomMargin: 10
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-                    text: 'sleep'
-                }
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Tray.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Tray.qml
@@ -1,62 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Services.SystemTray
-import Quickshell.Widgets
-
-Item {
-    implicitWidth: 10 + rep.count * (2 * lay.spacing + 20)
-    height: 30
-    visible: SystemTray.items.values.length != 0
-
-    id: root
-    required property var window
-    required property real popupOffset
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        RowLayout {
-            id: lay
-            spacing: 4
-            Repeater {
-                id: rep
-
-                model: SystemTray.items
-                ClippingWrapperRectangle {
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    radius: 10
-                    implicitWidth: 20
-                    implicitHeight: 20
-                    MouseArea {
-                        anchors.fill: parent
-                        
-                        Image {
-                            anchors.fill: parent
-                            source: {
-                                let icon = SystemTray.items.values[index].icon
-                                if (icon.includes("?path=")) {
-                                    const [name, path] = icon.split("?path=");
-                                    icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
-                                }
-                                return icon
-                            }
-                        }
-
-                        acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-                        onClicked: (mouse) => {
-                            if(mouse.button == Qt.LeftButton) {
-                                SystemTray.items.values[index].activate()
-                            } else if(mouse.button == Qt.RightButton) {
-                                SystemTray.items.values[index].display(root.window, popupOffset, 40)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Volume.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Volume.qml
@@ -1,97 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import Quickshell.Services.Pipewire
-
-ClippingWrapperRectangle {
-    radius: 5
-    width: 100; height: 30
-    Button {
-        id: button
-        text: "   " + Math.floor(Pipewire.defaultAudioSink?.audio?.volume * 100) + "%"
-        font.pointSize: 12
-        implicitHeight: parent.height
-
-        PwObjectTracker {
-            objects: [ Pipewire.defaultAudioSink ]
-        }
-
-        onClicked: {
-            menu.visible = true
-            grab.active = true
-        }
-
-    }
-
-    required property var window
-    required property real popupOffset
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: popupOffset
-        anchor.rect.y: 50
-        implicitWidth: 250
-        implicitHeight: 150
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-
-            ScrollView {
-                ColumnLayout {
-
-                    spacing: 0
-
-                    Text {
-                        text: 'Output Devices'
-                    }
-
-                    ColumnLayout {
-                        
-                    }
-
-                    Text {
-                        text: 'Input Devices'
-                    }
-
-                    ColumnLayout {
-                        /*Repeater {
-                            id: in
-
-                            model: {
-                                set = []
-                                Pipewire.nodes.values.forEach(n => { !n.isSink && !n.isStream ? set.push(n) : return })
-                                return set
-                            }
-
-                            Text {
-                                text: in.model[index].nickname
-                            }
-                        }*/
-                    }
-
-                }
-            }
-            
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Wifi.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Wifi.qml
@@ -1,72 +0,0 @@
-import Quickshell
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Hyprland
-import Quickshell.Io
-import Quickshell.Widgets
-
-Item {
-    implicitWidth: 30
-    implicitHeight: 30
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        Button {
-            id: button
-            text: "󰤨 "
-            font.pointSize: 16
-            
-            onClicked: {
-                menu.visible = true
-                grab.active = true
-            }
-            implicitHeight: parent.height
-        }
-    }
-
-    property var window: null
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: root.parent.x + root.parent.width - width
-        anchor.rect.y: 50
-        implicitWidth: 250
-        implicitHeight: 150
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-
-                spacing: 0
-
-                Button {
-                    Layout.topMargin: 5
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-
-                    text: 'shutdown'
-                }
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/Workspaces.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/Workspaces.qml
@@ -1,46 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Hyprland
-import Quickshell.Widgets
-
-Item {
-    implicitWidth: 10 + rep.count * (2 * lay.spacing + 25)
-    implicitHeight: 30
-
-    Component.onCompleted: Hyprland.refreshWorkspaces()
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        RowLayout {
-            id: lay
-            Repeater {
-                id: rep
-
-                property var ws: {
-                    let arr = [];
-                    Hyprland.workspaces.values.forEach((w) => { if(w.id > 0) arr.push(w) })
-                    return arr;
-                }
-
-                model: ws
-                ClippingWrapperRectangle {
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    radius: 10
-                    implicitWidth: 25
-                    Button {
-                        background: Rectangle {
-                            color: Hyprland.focusedWorkspace.id == rep.model[index].id ? "#ffff00ff" : "#ff7744dd"
-                            anchors.fill: parent
-                        }
-                        text: rep.model[index].id
-                        onClicked: rep.model[index].activate()
-                    }
-                }
-            }
-        }
-
-
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/quickshell/shell.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/shell.qml
@@ -1,14 +0,0 @@
-//@ pragma Env QS_NO_RELOAD_POPUP=1
-//@ pragma Env QSG_RENDER_LOOP=threaded
-//@ pragma Env QT_QUICK_FLICKABLE_WHEEL_DECELERATION=10000
-
-//@ pragma UseQApplication
-
-import Quickshell // for ShellRoot
-import qs.modules
-
-ShellRoot {
-    Bar { 
-        id: bar 
-    }
-}
--- a/homes/nathan/home-manager/dotfiles/wal/templates/colors-hypr.conf
+++ b/homes/nathan/home-manager/dotfiles/wal/templates/colors-hypr.conf
@@ -1,18 +0,0 @@
-$foregroundCol = 0xff{foreground.strip}
-$backgroundCol = 0xff{background.strip}
-$color0 = 0xff{color0.strip}
-$color1 = 0xff{color1.strip}
-$color2 = 0xff{color2.strip}
-$color3 = 0xff{color3.strip}
-$color4 = 0xff{color4.strip}
-$color5 = 0xff{color5.strip}
-$color6 = 0xff{color6.strip}
-$color7 = 0xff{color7.strip}
-$color8 = 0xff{color8.strip}
-$color9 = 0xff{color9.strip}
-$color10 = 0xff{color10.strip}
-$color11 = 0xff{color11.strip}
-$color12 = 0xff{color12.strip}
-$color13 = 0xff{color13.strip}
-$color14 = 0xff{color14.strip}
-$color15 = 0xff{color15.strip}
--- a/homes/nathan/home-manager/dotfiles/wal/templates/colors-tmux.conf
+++ b/homes/nathan/home-manager/dotfiles/wal/templates/colors-tmux.conf
@@ -0,0 +1,14 @@
+set -g status-style 'fg={color0},bg={color3}'
+
+set -g status-interval 1
+
+set -g status-left-length 50
+set -g status-left "#[fg={color12},bg={color1}]  #[fg={color1},bg={color2}]◤#[fg={color14}]#{{user}}@#H#[fg={color2},bg={color4}]◤#[fg={color14}]#{{session_name}}#[fg={color4},bg={color3}]◤"
+
+set -g status-right "#[fg={color2}]◥#[fg={color14},bg={color2}]%A %T#[fg={color1}]◥#[fg={color12},bg={color1}]%D "
+
+set -g window-status-separator '/'
+set -g window-status-format '#[fg={color3},bg={color3}]◢#[fg={color0},bg={color3}] #{{window_index}}: #{{window_name}} #[fg={color3},bg={color3}]◤'
+set -g window-status-current-format '#[fg={color11},bg={color3}]◢#[fg={color0},bg={color11},bold] #{{window_index}}: #{{window_name}} #[fg={color11},bg={color3}]◤'
+
+
--- a/homes/nathan/home-manager/packages/default.nix
+++ b/homes/nathan/home-manager/packages/default.nix
@@ -1,5 +1,7 @@
-{ config, lib, pkgs, inputs, ... }: let 
-    system = "x86_64-linux";
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: let 
+        system = pkgs.stdenv.hostPlatform;

    pkgs-us = import inputs.nixpkgs-us {
        inherit system;
@@ -8,10 +10,6 @@

    in {

-    imports = [ 
-	  ./scripts
-	];
-
        options.homeconfig.minimal = with lib; options.mkOption {
            type = with types; bool;
            default = false;
@@ -26,14 +24,14 @@
                openssh
                sops
                dig
-                toybox
+                #toybox
                btop
                zip    
                unzip
                rsync
                curl

-                (python313.withPackages (ps: with ps; [
+                (python314.withPackages (ps: with ps; [
                    gpustat
                    numpy
                    matplotlib
@@ -41,7 +39,6 @@
                    pandas
                    pyaudio
                    pyusb
-                    debugpy
                    requests
                ]))
            ];
@@ -53,8 +50,8 @@

         grim
         slurp
-            xfce.thunar
         wl-clipboard
+         xfce.thunar
         blueberry
         ];
         })
@@ -85,7 +82,6 @@
         quickemu
         bottles

-            pkgs-us.runapp
         brightnessctl
         libdbusmenu-gtk3
         lmms
@@ -102,6 +98,7 @@
         rpi-imager
         tigervnc
         keepassxc
+         localsend

 #3D modeling/printing
         blender
@@ -116,4 +113,5 @@
         ];
        })
        ];
+    };
 }
--- a/homes/nathan/home-manager/packages/scripts/default.nix
+++ b/homes/nathan/home-manager/packages/scripts/default.nix
@@ -1,13 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: let
+{ ... }: {

-    system = "x86_64-linux";
-
-    pkgs-us = import inputs.nixpkgs-us {
-      inherit system;
-      config.allowUnfree = true;
-    };
-
-    in {
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options = {
            homeconfig.scripts.enable = lib.options.mkOption {
@@ -17,22 +10,6 @@
        };

        config = lib.mkMerge [
-    (lib.mkIf (config.homeconfig.hyprland.enable && config.homeconfig.scripts.enable) {
-        home.packages = [
-            (pkgs.writeShellScriptBin "hyprrun" ''
-                ${pkgs-us.runapp}/bin/runapp ''$@
-                #uwsm app -- ''$@
-            '')
-        ];
-    })
-
-    (lib.mkIf (!config.homeconfig.hyprland.enable && config.homeconfig.scripts.enable) {
-        home.packages = [
-            (pkgs.writeShellScriptBin "hyprrun" ''
-                eval "''$@"
-            '')
-        ];
-    })

        (lib.mkIf config.homeconfig.scripts.enable {
         home.packages = [
@@ -41,57 +18,7 @@

         (pkgs.writeShellScriptBin "randWallpaper" ''
          file=''$(ls ${config.home.homeDirectory}/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/''$file
-	        '')
-
-	        (pkgs.writeShellScriptBin "setWallpaper" ''
-
-	            if [[ ! -d /tmp/nathan ]]; then
-                    mkdir /tmp/nathan
-                fi
-
-	            img=''$(realpath "''${1:-$(find ~/Pictures/Wallpaper/* | rofi -dmenu)}")
-                n=''$(basename "''$img")
-	            ext="''${n''\#''\#*.}"
-                out=''${3:-/dev/null}
-
-                if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then
-                    yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" -vframes 1 /tmp/nathan/tmp.jpg >> ''$out
-                    cp /tmp/nathan/tmp.jpg /tmp/nathan/tmp2.jpg
-                    pidof mpvpaper && pkill mpvpaper
-                    ${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe >> ''$out
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp2.jpg >> ''$out
-                    sleep 0.3
-                    hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop"
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp.jpg >> ''$out
-                    rm /tmp/nathan/tmp2.jpg
-                else
-                    pidof mpvpaper && pkill mpvpaper
-                    hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe" >> ''$out
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw "''$img" >> ''$out
-                fi
-
-                changeColors "''$img" "''$2" >> ''$out
-	        '')
-
-	        (pkgs.writeShellScriptBin "changeColors" ''
-
-                img=''$(realpath "''$1")
-                alpha=''${2:-70}
-
-                if [[ ''$alpha -lt 0 ]]; then
-                alpha=0
-                elif [[ ''$alpha -gt 100 ]]; then
-                alpha=100
-                fi
-
-                if [[ -f ~/.config/wal/colorschemes/dark/''$(basename "''$img")-''$alpha.json ]]; then
-                    ${pkgs.pywal16}/bin/wal -n -f "''$(basename "''$img")-''$alpha"
-                else
-	                ${pkgs.pywal16}/bin/wal -n -i "''$img" -a "''$alpha" --cols16 -p "''$(basename "''$img")-''$alpha"
-                fi
-
-	            colorPrefix 
+          aurora-set-wallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/''$file
          '')

        (pkgs.writeShellScriptBin "colorPrefix" ''
@@ -107,29 +34,38 @@

                  (pkgs.writeShellScriptBin "onSystemStart" ''

-                if [[ ! -d /tmp/nathan ]]; then
-                    mkdir /tmp/nathan
+
+                   if [[ -f /tmp/aurora/tmp.jpg ]]; then
+                        hyprctl --batch "\
+                        dispatch exec aurora-init ;\
+                        dispatch exec aurora-set-wallpaper ;\
+                        dispatch exec ${pkgs.pyprland}/bin/pypr ;\
+                        dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\
+                        dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\
+                        setcursor Bibata-Modern-Classic 16"
+                   else
+                        hyprctl --batch "\
+                        dispatch exec aurora-init ;\
+                        dispatch exec aurora-set-wallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ;\
+                        dispatch exec ${pkgs.pyprland}/bin/pypr ;\
+                        dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\
+                        dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\
+                        setcursor Bibata-Modern-Classic 16"
                   fi

                   if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then
                   rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid
                   fi

-                hyprctl --batch "\
-                dispatch exec ${pkgs.swww}/bin/swww-daemon ;\
-                dispatch exec setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ;\
-	            dispatch exec ${pkgs.pyprland}/bin/pypr ;\
-                dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\
-	            dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\
-                setcursor Bibata-Modern-Classic 16"
                   sleep 3
+
+                   aurora ipc call shell reload
                   hyprctl reload
-                hyprctl dispatch exec ${pkgs.pyprland}/bin/pypr toggle calendar
-                #tmux new-session -s hyprland 
                   '')

                   ];
        })
        ];
+    };
 }

--- a/homes/nathan/home-manager/programs/aurora/default.nix
+++ b/homes/nathan/home-manager/programs/aurora/default.nix
@@ -0,0 +1,33 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
+
+        imports = [
+            inputs.aurora.homeModules.default
+        ];
+
+        options.homeconfig.aurora.enable = with lib; mkOption {
+            type = with types; bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.aurora.enable {
+
+            programs.aurora = {
+                enable = true;
+
+                systemd = {
+                    enable = true;
+                };
+
+                settings = {
+                    wallpaperDir = "${config.home.homeDirectory}/Pictures/Wallpaper";
+
+                    colorsPath = "${config.home.homeDirectory}/.cache/wal/colors.json";
+
+                    changeColorsCmd = "colorPrefix";
+                };
+            };
+        };
+    };
+}
--- a/homes/nathan/home-manager/programs/calcurse/default.nix
+++ b/homes/nathan/home-manager/programs/calcurse/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.calcurse.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -11,4 +13,5 @@
                    libnotify
            ];
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/default.nix
+++ b/homes/nathan/home-manager/programs/default.nix
@@ -1,12 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
+{ inputs, ... }: {

+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        config = {

@@ -16,4 +10,5 @@

            home.sessionVariables.EDITOR = "nvim";
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/firefox/default.nix
+++ b/homes/nathan/home-manager/programs/firefox/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.firefox.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -57,4 +59,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/git/default.nix
+++ b/homes/nathan/home-manager/programs/git/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        options.homeconfig.git.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -44,4 +46,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/hypridle/default.nix
+++ b/homes/nathan/home-manager/programs/hypridle/default.nix
@@ -0,0 +1,51 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        options.homeconfig.hypridle.enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.hypridle.enable {
+
+            services.hypridle = {
+                enable = true;
+
+                settings = {
+
+                    general = {
+                        lock_cmd = "aurora ipc call lockscreen lock";       # avoid starting multiple hyprlock instances.
+                            before_sleep_cmd = "loginctl lock-session";    # lock before suspend.
+                            after_sleep_cmd = "hyprctl --instance 0 dispatch dpms on";  # to avoid having to press a key twice to turn on the display.
+                    };
+
+                    listener = [
+
+                    {
+                        timeout = 150;                                # 2.5min.
+                            on-timeout = "brightnessctl -s set 10";        # set monitor backlight to minimum, avoid 0 on OLED monitor.
+                            on-resume = "brightnessctl -r";                 # monitor backlight restore.
+                    }
+
+                    {
+                        timeout = 300;                                 # 5min
+                            on-timeout = "loginctl lock-session";            # lock screen when timeout has passed
+                    }
+
+                    {
+                        timeout = 330;                                                     # 5.5min
+                            on-timeout = "hyprctl --instance 0 dispatch dpms off";                            # screen off when timeout has passed
+                            on-resume = "hyprctl --instance 0 dispatch dpms on && brightnessctl -r";          # screen on when activity is detected after timeout has fired.
+                    }
+
+                    {
+                        timeout = 1800;                                # 30min
+                            on-timeout = "systemctl suspend";                # suspend pc
+                    }
+                    ];
+                };
+            };
+        };
+    };
+}
--- a/homes/nathan/home-manager/programs/hyprland/default.nix
+++ b/homes/nathan/home-manager/programs/hyprland/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.hyprland.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -19,11 +21,6 @@
                if [[ ! -f ${config.home.homeDirectory}/.config/hypr/otf.conf ]]; then
                    touch ${config.home.homeDirectory}/.config/hypr/otf.conf
                fi
-
-            if [[ ! -f ${config.home.homeDirectory}/.config/background ]]; then
-                cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ${config.home.homeDirectory}/.config/background
-                chmod 600 ${config.home.homeDirectory}/.config/background
-            fi
            '';


@@ -31,16 +28,17 @@

                enable = true;

+                package = null;
+                portalPackage = null;
+
                systemd = {
-                enable = false;
+                    enable = true;
                    variables = [ "--all" ];
                };

-            extraConfig = (if config.homeconfig.hyprpanel.enable then ''
-                    bind = , Print, exec, bash -c ${pkgs.hyprpanel}/share/scripts/screenshot.sh"
-                '' else ''
-                    bind = , Print, exec, grim -g "$(slurp)"
-                '') + ''
+                extraConfig = ''
+                    bind = , Print, exec, grim -g "$(slurp)" > ~/Pictures/screenshots/$(date +"%m-%d-%Y_%H:%M:%S").png
+
                    source = ${config.home.homeDirectory}/.config/hypr/main.conf

                    exec-shutdown = if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid; fi
@@ -48,4 +46,5 @@

            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/hyprlock/default.nix
+++ b/homes/nathan/home-manager/programs/hyprlock/default.nix
@@ -1,52 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.hyprlock.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprlock.enable {
-
-        programs.hyprlock = {
-            enable = true;
-        };
-
-        services.hypridle = {
-            enable = true;
-
-            settings = {
-
-                general = {
-                    lock_cmd = "pidof hyprlock || hyprlock";       # avoid starting multiple hyprlock instances.
-                    before_sleep_cmd = "loginctl lock-session";    # lock before suspend.
-                    after_sleep_cmd = "hyprctl --instance 0 dispatch dpms on";  # to avoid having to press a key twice to turn on the display.
-                };
-
-                listener = [
-
-                {
-                    timeout = 150;                                # 2.5min.
-                    on-timeout = "brightnessctl -s set 10";        # set monitor backlight to minimum, avoid 0 on OLED monitor.
-                    on-resume = "brightnessctl -r";                 # monitor backlight restore.
-                }
-
-                {
-                    timeout = 300;                                 # 5min
-                    on-timeout = "loginctl lock-session";            # lock screen when timeout has passed
-                }
-
-                {
-                    timeout = 330;                                                     # 5.5min
-                    on-timeout = "hyprctl --instance 0 dispatch dpms off";                            # screen off when timeout has passed
-                    on-resume = "hyprctl --instance 0 dispatch dpms on && brightnessctl -r";          # screen on when activity is detected after timeout has fired.
-                }
-
-                {
-                    timeout = 1800;                                # 30min
-                    on-timeout = "systemctl suspend";                # suspend pc
-                }
-                ];
-            };
-        };
-    };
-}
--- a/homes/nathan/home-manager/programs/hyprpanel/default.nix
+++ b/homes/nathan/home-manager/programs/hyprpanel/default.nix
@@ -1,14 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.hyprpanel.enable = with lib; mkOption {
-        type = with types; bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprpanel.enable {
-        
-        programs.hyprpanel = {
-            enable = true;
-        };
-    };
-}
--- a/homes/nathan/home-manager/programs/nh/default.nix
+++ b/homes/nathan/home-manager/programs/nh/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        options.homeconfig.nh.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -19,4 +21,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/pywal/default.nix
+++ b/homes/nathan/home-manager/programs/pywal/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.wal.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -15,5 +17,6 @@
            ];


+        };
    };
 }
--- a/homes/nathan/home-manager/programs/quickshell/default.nix
+++ b/homes/nathan/home-manager/programs/quickshell/default.nix
@@ -1,26 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.quickshell.enable = with lib; mkOption {
-        type = with types; bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.quickshell.enable {
-        
-        programs.quickshell = {
-            enable = true;
-
-            configs = {
-
-                default = config.homeDirectory + "/${config.home.file.".config/quickshell".target}";
-            };
-
-            systemd = {
-                enable = true;
-                target = lib.mkIf config.homeconfig.hyprland.enable "wayland-session@Hyprland.target";
-            };
-
-            activeConfig = "default";
-        };
-    };
-}
--- a/homes/nathan/home-manager/programs/rofi/default.nix
+++ b/homes/nathan/home-manager/programs/rofi/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.rofi.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -16,5 +18,6 @@
                theme = "/home/nathan/.cache/wal/colors-rofi-dark.rasi";
            };
        };
+    };
 }

--- a/homes/nathan/home-manager/programs/terminal/bash/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/bash/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        home.packages = with pkgs; [ oh-my-posh ];

@@ -12,6 +14,7 @@

                ksh = "kitten ssh";

+                v = "nvim";
                vi = "nvim";
                vim = "nvim";

@@ -28,4 +31,5 @@
                eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
            '');
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/bat/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/bat/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        programs.bat = {

@@ -14,5 +16,6 @@
            ];


+        };
    };
 }
--- a/homes/nathan/home-manager/programs/terminal/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/default.nix
@@ -1,17 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./bat
-    ./bash
-    ./eza
-    ./fzf
-    ./lf
-    ./tmux
-    ./kitty
-    ./zoxide
-    ./zsh
-    ./ssh
-    ./ohmyposh
-    ./opencode
-  ];
-}
--- a/homes/nathan/home-manager/programs/terminal/eza/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/eza/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        programs.eza = {

@@ -14,4 +16,5 @@

            icons = "auto";
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/fzf/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/fzf/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        programs.fzf = {

@@ -12,4 +14,5 @@
 #shellIntegrationOptions = [];
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/kitty/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/kitty/default.nix
@@ -1,4 +1,6 @@
-{ config, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, ... }: {

        programs.kitty = {

@@ -27,7 +29,10 @@ map ctrl+shift+w close_tab
                map ctrl+tab next_tab
                map ctrl+shift+tab previous_tab

+                allow_remote_control yes
+
            '';
        };
+    };
 }

--- a/homes/nathan/home-manager/programs/terminal/lf/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/lf/default.nix
@@ -1,7 +0,0 @@
-{ ... }: {
-    config = {
-        programs.lf = {
-            enable = true;
-        };
-    };
-}
--- a/homes/nathan/home-manager/programs/terminal/ohmyposh/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/ohmyposh/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        home.packages = with pkgs; [
            oh-my-posh
@@ -10,6 +12,13 @@
                (mkIf config.homeconfig.wal.enable (mkBefore ''
                    cat ${config.home.homeDirectory}/.cache/wal/sequences
                    eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
+                    
+                    function _colorRefresh() { 
+                        eval $(oh-my-posh init zsh --config ~/.cache/wal/ohmyposh.toml)
+                        zle accept-line
+                    }
+                    zle -N _colorRefresh
+                    bindkey '\r' _colorRefresh
                ''))

                (mkIf (!config.homeconfig.wal.enable) (mkBefore ''
@@ -133,4 +142,5 @@ c13 = "{color13}"
            c14 = "{color14}"
            c15 = "{color15}"
        '';
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/opencode/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/opencode/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        options.homeconfig.opencode.enable = with lib; mkOption {
            type = with types; bool;
@@ -48,4 +50,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/ripgrep/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/ripgrep/default.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
+
+        programs.ripgrep = {
+            enable = true;
+        };
+    };
+}
--- a/homes/nathan/home-manager/programs/terminal/ssh/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/ssh/default.nix
@@ -1,5 +1,7 @@
 { ... }: {

+    flake.homeModules.nathan = { ... }: {
+
        programs.ssh = {

            enable = true;
@@ -20,5 +22,6 @@
            enableDefaultConfig = false;


+        };
    };
 }
--- a/homes/nathan/home-manager/programs/terminal/tmux/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/tmux/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        programs.tmux = {

@@ -8,7 +10,7 @@

            mouse = true;

-    baseIndex = 1;
+            baseIndex = 0;

            keyMode = "vi";

@@ -16,8 +18,51 @@

            shell = "${pkgs.zsh}/bin/zsh";

+            extraConfig = ''
+                set -g status-position top
+
+                set -g @background '#0B0704'
+                set -g @foreground '#c2c1c0'
+                set -g @color0 '#0B0704'
+                set -g @color1 '#846550'
+                set -g @color2 '#4a526c'
+                set -g @color3 '#538281'
+                set -g @color4 '#7b8179'
+                set -g @color5 '#b4a589'
+                set -g @color6 '#78ada3'
+                set -g @color7 '#958d89'
+                set -g @color8 '#665b54'
+                set -g @color9 '#B1876B'
+                set -g @color10 '#636E90'
+                set -g @color11 '#6FAEAC'
+                set -g @color12 '#A5ADA2'
+                set -g @color13 '#F1DCB7'
+                set -g @color14 '#A1E7DA'
+                set -g @color15 '#c2c1c0'
+
+                set -g status-style 'fg=#0B0704,bg=#538281'
+                
+
+                set -g @p '#(pwd)'
+
+                set -g status-interval 1
+
+
+                set -g status-left-length 50
+                set -g status-left "#[fg=@color12,bg=@color1]  #[fg=@color1,bg=@color2]◤#[fg=@color14]#{user}@#H#[fg=@color2,bg=@color4]◤#[fg=@color2]#{s|/home/#{user}|~:@p}#[fg=@color4,bg=@background]◤"
+
+                set -g status-right "#[fg=@color2]◥#[fg=@color14,bg=@color2]%A %T#[fg=@color1]◥#[fg=@color12,bg=@color1]%D "
+
+                set -g window-status-separator '/'
+                set -g window-status-format '#[fg=@color3,bg=@color3]◢#[fg=@background,bg=@color3] #{window_index}: #{window_name} #[fg=@color3,bg=@color3]◤'
+                set -g window-status-current-format '#[fg=@color11,bg=@color3]◢#[fg=@background,bg=@color11,bold] #{window_index}: #{window_name} #[fg=@color11,bg=@color3]◤'
+
+                source ~/.cache/wal/colors-tmux.conf
+            '';
+
        };

+    };
 }


--- a/homes/nathan/home-manager/programs/terminal/yazi/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/yazi/default.nix
@@ -0,0 +1,10 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
+        config = {
+            programs.yazi = {
+                enable = true;
+            };
+        };
+    };
+}
--- a/homes/nathan/home-manager/programs/terminal/zoxide/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/zoxide/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {

        programs.zoxide = {

@@ -10,4 +12,5 @@
                "--cmd cd"
            ];
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/zsh/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/zsh/default.nix
@@ -1,4 +1,6 @@
-{ lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { lib, ... }: {

        programs.zsh = {

@@ -23,8 +25,8 @@
                vi = "nvim";
                vim = "nvim";

-      python = "python3.13";
-      python3 = "python3.13";
+                python = "python3.14";
+                python3 = "python3.14";
            };

            history = {
@@ -34,4 +36,5 @@
                share = true;
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/services/default.nix
+++ b/homes/nathan/home-manager/services/default.nix
@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-}
--- a/homes/nathan/home-manager/services/mpd/default.nix
+++ b/homes/nathan/home-manager/services/mpd/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options = {
            homeconfig.mpd.enable = lib.options.mkOption {
@@ -38,4 +40,5 @@
            };
        };

+    };
 }
--- a/homes/nathan/home.nix
+++ b/homes/nathan/home.nix
@@ -1,4 +1,6 @@
-{ lib, inputs, ... }:
+{ self, inputs, ... }: {
+
+    flake.homeModules.nathan = { lib, ... }:

    {

@@ -7,7 +9,7 @@
                graphical = lib.mkDefault false;
                minimal = lib.mkDefault false;

-            hyprland.enable = false;
+                hyprland.enable = lib.mkDefault false;
            };


@@ -16,10 +18,21 @@
                settings = {
                    experimental-features = [ "nix-command" "flakes" ];
                    builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
-                builders-use-substituters = true;
+                    builders-use-substitutes = true;
                };
            };

            programs.home-manager.enable = true;
        };
+    };
+
+    flake.homeConfigurations.nathan = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = import inputs.nixpkgs {
+            system = builtins.currentSystem;
+        };
+
+        modules = [
+            self.homeModules.nathan
+        ];
+    };
 }
--- a/machines/android
+++ b/machines/android
--- a/machines/homebox
+++ b/machines/homebox
--- a/machines/laptop
+++ b/machines/laptop
--- a/profiles/container/default.nix
+++ b/profiles/container/default.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, lib, inputs, ... }:
+{ inputs, ... }: {
+
+    flake.nixosModules.container = { config, pkgs, lib, ... }:

    {
        imports =
@@ -124,7 +126,6 @@
                                minimal = false;
                                hyprland.enable = false;
                                wal.enable = false;
-                            hyprpanel.enable = false;
                                hyprlock.enable = false;
                                mpd.enable = true;
                                calcurse.enable = true;
@@ -154,4 +155,5 @@
            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];

        };
+    };
 }
--- a/profiles/homebox/.sops.yaml
+++ b/profiles/homebox/.sops.yaml
@@ -0,0 +1,7 @@
+keys:
+  - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
+creation_rules:
+  - path_regex: ^secrets.yaml$
+    key_groups:
+    - age:
+      - *homebox
--- a/profiles/homebox/config.nix
+++ b/profiles/homebox/config.nix
@@ -0,0 +1,131 @@
+{ self, inputs, ... }: {
+
+    flake.nixosConfigurations."homebox" = inputs.nixpkgs.lib.nixosSystem {
+
+        modules = [
+            self.nixosModules.homebox
+            self.nixosModules.default
+        ];
+    };
+
+    flake.nixosModules.homebox = { config, lib, pkgs, ... }:
+
+    {
+
+        imports = [ # Include the results of the hardware scan.
+
+            (import ./disko.nix { device1 = "/dev/nvme0n1"; device2 = "/dev/nvme1n1"; device3 = "/dev/sda"; })
+        ];
+
+        config = {
+
+            services = {
+                xserver = {
+                    enable = false;
+                    videoDrivers = ["nvidia"];
+                };
+                displayManager = {
+                    enable = false;
+                    defaultSession = "hyprland";
+                    autoLogin = {
+                        enable = true;
+                        user = "nathan";
+                    };
+                };
+                pulseaudio.enable = false;
+
+                hardware.openrgb = {
+                    enable = true;
+                    motherboard = "amd";
+                };
+            };
+
+            hardware = {
+                nvidia = {
+                    open = true;
+                    modesetting.enable = true;
+                    nvidiaPersistenced = true;
+                };
+
+                bluetooth = {
+                    enable = true;
+                    powerOnBoot = false;
+                };
+            };
+
+            sops = {
+                age.keyFile = "/var/lib/sops/age/keys.txt";
+                defaultSopsFile = ./secrets.yaml;
+                defaultSopsFormat = "yaml";
+
+                secrets = {
+                    "nathan/pass" = {
+                        neededForUsers = true;
+                    };
+                };
+            };
+
+            sysconfig = {
+
+                host = "homebox";
+
+                docker.nvidia = true;
+
+                remoteBuildClient = false;
+
+                users = {
+                    nathan = {
+                        isSuperuser = true;
+                        extraGroups = [ "networkmanager" "docker" ];
+                        ssh.keys = [
+                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
+                                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost"
+                                "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCM7ZgIu4+ntHZbzo9iQPq5pUt7AhpOnfvvI0lWDgO4CgtkPGvyFrDnW87wjAKGKYkgKeHWHIkwq2hkEDqlPD+7xxtPpwzfyo7ZS23xlP31rL14HcG21jGHgx9SO7RmGDHHylu4PwJzz/KX59hcVmpSSV4hgB/mYA9UKe6VHv39X4y3HsjmiHwNBOKXltG4V+VkxOZD6HcZ62sgkyDTaqDpE7p+q8vHPbm6dVTKC9cMjtJmjB5EesMGKcEAy3VN2tA9M0EndtaLcBKM39vDXGpBsjURYZTu7NbQnncnO7L8kVL0nT4vA/d4mCjB51dPoXIcxn1ise0TOb9G7TxMbBQQO5YMOpiB2iuZRRvB3sYoKwbO8YfSxZi0EhvLcxkF9GBFw+pWPl0p0D2fPBbW88YQfEpoAt2EWvEu/pgaMJsTHpgaIuDwPLVQmDciX4MRoi324oElGSK8yN0P8IaCHhFchuehLBWvTi34Qot0GpnxeTzmlLzImICO9Yq0I7dk2rk= nathan@rpi-3dp"
+                        ];
+                        shell = pkgs.zsh;
+                        hashedPasswordFile = config.sops.secrets."nathan/pass".path;
+                        home-manager = {
+                            enable = true;
+                            standalone = false;
+                            extraModules = [
+                            {
+                                homeconfig = {
+                                    minimal = false;
+                                    virtual-machines = true;
+                                    hyprland.enable = false;
+                                    hypridle.enable = false;
+                                    wal.enable = true;
+                                    mpd.enable = true;
+                                    calcurse.enable = true;
+                                    rofi.enable = false;
+                                    firefox.enable = false;
+                                    git.enable = true;
+                                    nh.enable = true;
+                                };
+
+                                services.hypridle.enable = lib.mkForce false;
+
+                                home.packages = with pkgs; [
+                                    wayvnc
+                                        openrgb
+                                ];
+                            } 
+                            ];
+                        };
+                    };
+                };
+            };
+
+
+
+# This value determines the NixOS release from which the default
+# settings for stateful data, like file locations and database versions
+# on your system were taken. It‘s perfectly fine and recommended to leave
+# this value at the release version of the first install of this system.
+# Before changing this value read the documentation for this option
+# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+            system.stateVersion = "23.05"; # Did you read the comment?
+        };
+
+    };
+}
--- a/profiles/homebox/default.nix
+++ b/profiles/homebox/default.nix
@@ -1,13 +1,15 @@
-{ config, pkgs, lib, disko, sops-nix, home-manager, ... }:
+{ inputs, ... }: {
+
+    flake.nixosModules.homebox = { config, pkgs, lib, ... }:

    {
        imports =
            [
-      disko.nixosModules.default
+                inputs.disko.nixosModules.default

-      sops-nix.nixosModules.sops
+                inputs.sops-nix.nixosModules.sops

-      home-manager.nixosModules.default
+                inputs.home-manager.nixosModules.default

            ];

@@ -58,6 +60,7 @@
                    netbird.enable = true;

                    ollama.enable = false;
+                    avahi.enable = true;
                    wyoming = {
                        enable = true;
                        piper = true;
@@ -68,7 +71,6 @@

                programs = {
                    hyprland.enable = false;
-                hyprpanel.enable = false;
                    steam.enable = false;
                };

@@ -87,7 +89,7 @@
                    home-assistant.enable = true;
                    n8n.enable = true;

-                nextcloud.enable = true;
+                    nextcloud.enable = false;
                    jellyfin.enable = true;
                };

@@ -98,8 +100,6 @@

                    code-server.enable = true;

-                minecraft.enable = true;
-
                    sandbox.enable = false;
                };

@@ -112,4 +112,5 @@

        };

+    };
 }
--- a/profiles/homebox/disko.nix
+++ b/profiles/homebox/disko.nix
@@ -0,0 +1,148 @@
+{ ... }: {
+
+    flake.diskoConfigurations.homebox = {
+        device1 ? throw "Set this to your disk device, e.g. /dev/sda",
+        device2,
+        device3,
+        ...
+    }: {
+        disko.devices = {
+            disk = {
+                main = {
+                    device = device1;
+                    type = "disk";
+                    content = {
+                        type = "gpt";
+                        partitions = {
+                            boot = {
+                                name = "boot";
+                                size = "1M";
+                                type = "EF02";
+                            };
+                            esp = {
+                                name = "ESP";
+                                size = "500M";
+                                type = "EF00";
+                                content = {
+                                    type = "filesystem";
+                                    format = "vfat";
+                                    mountpoint = "/boot";
+                                };
+                            };
+                            swap = {
+                                size = "4G";
+                                content = {
+                                    type = "swap";
+                                    resumeDevice = true;
+                                };
+                            };
+                            root = {
+                                name = "root";
+                                size = "100%";
+                                content = {
+                                    type = "lvm_pv";
+                                    vg = "root_vg";
+                                };
+                            };
+                        };
+                    };
+                };
+                ssd1 = {
+                    device = device2;
+                    type = "disk";
+                    content = {
+                        type = "gpt";
+                        partitions = {
+                            ssd1 = {
+                                name = "ssd1";
+                                size = "100%";
+                                content = {
+                                    type = "lvm_pv";
+                                    vg = "ssd1_vg";
+                                };
+                            };
+                        };
+                    };
+                };
+                hdd1 = {
+                    device = device3;
+                    type = "disk";
+                    content = {
+                        type = "gpt";
+                        partitions = {
+                            hdd1 = {
+                                name = "hdd1";
+                                size = "100%";
+                                content = {
+                                    type = "lvm_pv";
+                                    vg = "hdd1_vg";
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+            lvm_vg = {
+                root_vg = {
+                    type = "lvm_vg";
+                    lvs = {
+                        root = {
+                            size = "100%FREE";
+                            content = {
+                                type = "btrfs";
+                                extraArgs = ["-f"];
+
+                                subvolumes = {
+                                    "/root" = {
+                                        mountpoint = "/";
+                                    };
+
+                                    "/nix" = {
+                                        mountOptions = ["subvol=nix" "noatime"];
+                                        mountpoint = "/nix";
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+                ssd1_vg = {
+                    type = "lvm_vg";
+                    lvs = {
+                        ssd1 = {
+                            size = "100%FREE";
+                            content = {
+                                type = "btrfs";
+                                extraArgs = [ "-f" ];
+                                subvolumes = {
+                                    "/ssd1" = {
+                                        mountOptions = [ "subvol=ssd1" "noatime" ];
+                                        mountpoint = "/ssd1";
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+                hdd1_vg = {
+                    type = "lvm_vg";
+                    lvs = {
+                        hdd1 = {
+                            size = "100%FREE";
+                            content = {
+                                type = "btrfs";
+                                extraArgs = [ "-f" ];
+                                subvolumes = {
+                                    "/hdd1" = {
+                                        mountOptions = [ "subvol=hdd1" "noatime" ];
+                                        mountpoint = "/hdd1";
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };    
+        };
+    };
+}
--- a/profiles/homebox/hardware-configuration.nix
+++ b/profiles/homebox/hardware-configuration.nix
@@ -0,0 +1,24 @@
+{ ... }: {
+
+    flake.nixosModules.homebox = { config, lib, pkgs, modulesPath, ... }:
+
+    {
+        imports =
+            [ (modulesPath + "/installer/scan/not-detected.nix")
+            ];
+
+        boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ];
+        boot.initrd.kernelModules = [ "dm-snapshot" ];
+        boot.kernelModules = [ "kvm-amd" ];
+        boot.extraModulePackages = [ ];
+
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# (the default) this is the recommended approach. When using systemd-networkd it's
+# still possible to use this option, but it's recommended to use it in conjunction
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+        networking.useDHCP = lib.mkDefault true;
+
+        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+        hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
+}
--- a/profiles/homebox/secrets.yaml
+++ b/profiles/homebox/secrets.yaml
@@ -0,0 +1,44 @@
+nathan:
+    pass: ENC[AES256_GCM,data:HP/kF665VvIUybXmqaluJikeHWR0lvTXjA8Ry/dpbjDd3VUfiDuWFKlBkUzIZ1brAc86PV1xl4JWu2CNEz7uc3TmPuJ+GsFFOA==,iv:uPQZE7s3PvfShOaVCNRnnhXlcvA5aIiXRxi7UPbXfdU=,tag:Wg0IuCm4ljSPBmB/H2OSFA==,type:str]
+traefik:
+    cf_email: ENC[AES256_GCM,data:ujvdfobp/aTcyC+kUYeYYeaiXQnQhoHYhg==,iv:LBzvuMMt76jX70a68rzaMgkmzHtVE2TlbrJlWE7I6o8=,tag:cTO1ApZQ214zjJyumunvPg==,type:str]
+    cf_api_key: ENC[AES256_GCM,data:CrtkBlhUZT3rlZAqiEHz7/OhPaoQ5nAz+deWmrh2zmwJfAp95lGZCA==,iv:qPXTm5zjTVYupot/hUkI/pSe0QNs17rapDrvdweRDTQ=,tag:VL2Cnig8Ih0iSL7myqlTgA==,type:str]
+authentik:
+    pass: ENC[AES256_GCM,data:pTjpwRgdUVU5543T199P7Zoy,iv:93WpIK6qq+A1LhaQdBvMQ4jzuAOmMUt575y/p8m8Ugk=,tag:jTg/JED3vpdOVHF8LdIyLg==,type:str]
+    secret_key: ENC[AES256_GCM,data:tIWDGtB/z7Ysizz9FPQJe2EeSTAxDPkeHJnaDfytDvbqvRaiCgg7qGpEF6hAQFdZ,iv:gloup5aI0qY+SYJt8V6lvUdE+18IWH09BXtz8dRi6JE=,tag:vFwF9h1Rsa/X1bjvdSRSfQ==,type:str]
+pihole:
+    pass: ENC[AES256_GCM,data:hintZA==,iv:HA5K8mHYlLtf5s8iaLI/QRolYgcKwG8DWCH+LXnWI4k=,tag:DlnXxG0n9dBVpk2kILlPKg==,type:str]
+gitea:
+    dbpass: ENC[AES256_GCM,data:hVRLXACRECNSnXRn8BEP0ZFT,iv:zuIvzStek6OEu+P4Nh8Wsq9eRVt/zP8KGVXYZWjSvW0=,tag:m4t8vKNGhz8NqkDWbCRgnA==,type:str]
+keycloak:
+    dbpass: ENC[AES256_GCM,data:tc4wIAqzY7nonBhz8s+YdAux,iv:Wg0b0/xnl6cANLTOJWBsX+gw1iF8Q/GvO/iKyKwqJrM=,tag:LORKRmo4RjcrVbPNhk2A9Q==,type:str]
+netbird:
+    secret_key: ENC[AES256_GCM,data:isJHGh/InvgJUSqISqxpWhZH0OMN/QG7WBbSS7WqHaWTdfZDBOh//PBP8g==,iv:j0D6feM3qnDjXijXRHgZPboFLHzPwWIhT5bYz3M+QMU=,tag:pOHRxOEdOUrL3n6DgqGDsA==,type:str]
+gitlab:
+    db_pass: ENC[AES256_GCM,data:N3KvXkXql/PDjxZSpGo/Apr/,iv:OOzhR4BEmV3T01PA50vqdJMg7D2OGKHn/8hiqKEaOd4=,tag:jzdonXH/D/5kZ5Cld2W//w==,type:str]
+    root_pass: ENC[AES256_GCM,data:bALaUkoJw3N0ugZP/4MCnEsD,iv:LJdJpXlyzA6o00UVlK+l5WCCFIL/sT/fQNjI8wA5LAg=,tag:BYk1o/rjubyEpeHbgYA1Sg==,type:str]
+    secrets:
+        secret: ENC[AES256_GCM,data:3/26giCD58RErtEDxQ90KxRl3aa8oH4co2Urw21r7hHCKaoSti1VpYoBtlvHdr5j,iv:SwliwLWSFfTZoc31JSm9YKBDGKiPQE7ujkiGaZmCQUc=,tag:2KT5BpJukixvhb6tnZb6lw==,type:str]
+        otp: ENC[AES256_GCM,data:RWOkQVPRsrJgPVtx49hiWRMAxVOszKxaDl40XQDL+QoDuoZi03wSxHiu4Ix9X2BR,iv:uO+CTR5S4r1q7n1ycQw0hYdu8JflSrvkgLiBbCmT8mk=,tag:gqCwNOqD78lFtgxUPyUw3A==,type:str]
+        db: ENC[AES256_GCM,data:rF4IIp1uFSGa67LVm8fy4/qFOmZLInRcG2IAfnuZG3+xtS9Z2RXpNcTZNFBDdOaD,iv:/KYwf3ZH6w48L49rY/FmaGQOt3jGdOUTZ9vFhmLZG60=,tag:f38iYIgpgdjWF34qD1fz2w==,type:str]
+        jws: ENC[AES256_GCM,data:C+GVDeO319QGjq2+fBMr1LaY6/6Tuz6jWomkvFVul6ydJjmMFO3A9dYI66WWY6g2iZgYEWDKUikW1qDK5sGgU5ZAZzaqS01LUsSsPHUcMqIg/AjtcRfaEvHYODYPPSEwdISzhceDaim8yqhrNTIOHUHvOxcILvtUmsI61hNfVSnOQbqifIJDgGP7bKaf96t8+qcBvp/UBwP1qHj/m4jD83yc8Pdih+ZuPmyNdo3Ew0nbLTykYVX3XsrO1RlJ/Gp+KPfRSJzVGAnqUKr8mI+32LUpXSJ96bEGA67/blSh1dbBxSVo3K83aZYuY6vvXb+Et6qd4piZYKGCxA+waSrTkYHvSgS5vJRbCGWauXKCYFASxxqmdJ3cu+rbphbshBVA3SIPHhZxun6BWaP0qTYZyfB/YsSU4J+kYiE3UEYX9GYEAY9bsO89IYZSsTsmYke2EI4KMcjyUFstZ2WTYqCpwJ6CMAuerDEMHP6N3xCO5MVDZfE4sKKHpfSCVQg8ak7IxV+3jZvZi2tUbvZZf/tYORzPeTUSEpcC4cGwwAJd3XKUetaiuDwQVkLa13xotfL0d+Lwc6eZil0e/sureLqvQM6kpWhK7yscu2hKGOzxx/OZClry2Uyc1fL5iWWxvM8Djg+ShoAS5m3Nt0R+mcLdgaylkZvMl9gNWFO1uzlnhGnJQtekVaXCJ9f9QZt5RizJYwM9pMKhSDTZ0vd4y69iZpz3YXhKtkvYX02RIFtTiqsbyU0pXVjK0SpKsb5T+yphacGeZRwQS9QadW9dE6xQsxwwYC//swm5l6ke+DyZrcsc/J+MBHFuN71D2st+jtfywZYg/YT9EcCFOMjqEgfDq7YICgyqfqRGAdVWQy660T5Mi+gYKcHqbYXaaB3VNL2RGIu/uybih/7ynGRM2+0ro9oKJ+fEbdi1alSFFJ0IvA5lU6XHd2CSyizEC9ak+HBLkYeSqOPfItfLH82jRiUtrY5u4fIlioLQTA1aKHax6q8cIf30FCGenhjM6jMj2WpXKI16+1xK9Om9mg94YmFjM+erQh3o/fbPuMbkNaNJQwabupshBK2h3caaE0cDUnDukUFUANHz9q5LVxSkw39GTjGpovxQJiZHbSdeIC/AzFXRVA1ojhzkeuefygdP27Aa+fLjEBn2x8AcdhyP1n8lQyjy0Wnxq9hJDbVXJF93FIdcCmF/JGejgHcr3YZUMY4OFG9gzISDEdgR99fYvKM+A9Pj2JNtCQ5iKCctg5opIEKA1z4RIpRQs0KmXq3JgjWhU1LeOWaX2YzS5rCJWyhxnTJXGk4a/cMvhbLRjFOKcDNNMp8yJrXk1pth7nFOJ4Put6o67jtjbgpgnPuEdelnXEEaReCfJEo2z8zka63kYqbIvcG4W2pKwsA4tT0QctVwltRdYU8YyKuOpQJtKvVdlZL0oxOwxPioTT8fOebRBaecKhQKF4fp9UGlE/GStud6oFSbN685U2TKihvYNmfLRSWQk1Y/APyCRlhOmhFLaIzJxogdlKzpg4AEg/2SRoEZPsqyZThI8uhCIT1qG0UBiZBTjey322fsEEZtNxO5nX/JeBDOVty3sIGs1OKBTjMXSZ+nzU9AIH6dek9Bz+Fix7a90IkQUB5xtgrIYgCH34L4a0o1jWy5bzT9fl53VnbzrICcT/wdRU/GznYYjxlF2uRBKIu7s0glDmsPXCZuorqvJlr2hySgN/hJKOlrCghraUD14pRk4OfRVKULkPQ7betgaCVbsihXplodrAgJ0BdIbf3tKRC8Ghx8+mYAWNXj+PtWBydEjEirCH70SJu53gjF5mNgl2EIaHNK7jqBgXhDr2/7uH97Tl+S9ue+TDlpr067T5JAqU3fOqq+ZS4wqEvqMYRfXd/V2FjNbBpoH8UW6pMuFaM06DBI+6p9O9xBl1eP3Sy3vrBwK2pCwLbi0LdJ2apQTl/51ZXp2xaaUAAh1Fu/bM21V7ENa5sGxpSTYwdSLyPnd8usqECw9W1XDNUI2EmJnp9AelD/joNwuL6U7pydrNUCguCjxHfbd+m0vc/te53GerJlSXbjEWz53f3RjSB90AaA6sOGhi1BFiHYSAjzMdqVSj4M68r+UF3YIuEuoaOzrVrkb5st3tYD0dz+ORhxo44aKEzgohseha5fg0wcTz9orqkeP/FyoOeItG2UwNVAWWGh/lBtXh8c4ILUMolZ1m2DWiYj/pyDvODVnP96u6TvyMC0H8aolgGHn7nDMTi+mCIvNFQYeXdVrRCpWS9aQik=,iv:cxdargXx2a7pET7BjCSZ/yXL7AnxNqncyDQ7CR3E3AA=,tag:2xKXfhBjynDqlvH377lpSA==,type:str]
+    oidc:
+        id: ENC[AES256_GCM,data:b6o2cCCSXJ5bIhA47InfhqwjO5Tjr0Mls+7VT5cunFfEHkdOInxplw==,iv:txren/8jnAUvCI/k9cxN29ZkSgCuPEAo0IpyREf2E9A=,tag:BFOZrM18zUJMEACpLz7KRw==,type:str]
+        secret: ENC[AES256_GCM,data:4HPPbVBOeDjdL81d402Rz6Luk1DZbk8InHfO+Sx/OJIvUf/shkCRyp3hStIDC03bA8HV66GeejvWFte+vQ2b5X3Fl2GXfHQi7brMFVEYfYdR2XRdra0aOeSrHtW5uUn0MpVCRwYDb1JahIWhLyqcYyOpV91xjNiIVg8S3MHr+mo=,iv:c3Q4qPMxZJuoO5XRzUDZh5XJOtff9eiMTlOx+MDMSaE=,tag:07fIkN9YXXJMEV59QEFIag==,type:str]
+nextcloud:
+    pass: ENC[AES256_GCM,data:U/VI/uHDT1a5O4iAHUVwsz/h,iv:W0hAXBddFKhXmDWHpCB2JhjPPTEGer7721WtIRxg4Zo=,tag:OE4wzibNaaXsbfFuk0dwTA==,type:str]
+sops:
+    age:
+        - recipient: age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDVFhtcWkreVV6UmJkcW1P
+            WUluUTlOcjYzME1yVVNpVWJldXVsWG1vN3dNCmlvYURNV285anlIa3FrbXRVTERB
+            dXZDWHhEbFp3YWw5d2w4Y09vbUVCNHcKLS0tIEF4ZU5ZdWI5MVBtN0FOUUZDQUR4
+            S0NMRGJSeks0Q0UrVnZmUVdyU2NqVm8KLu2kQpD1fJdU0fTdR9A2cTQzRp+waJ6M
+            8vA+E8xYb2U4d7m0YnwKkGzw0CBPb0BvdEgvWvqpFViftoDwRv5KGA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2026-02-01T12:56:37Z"
+    mac: ENC[AES256_GCM,data:clu/WnwHAQaowQ99Z8tNlIKKcVnLHYeYsgQK0meftXgiQKnLyLzqNipwfaU3qjITdm6fB7wY+TcySygpwFbY2f2TKrqAk7RxdnTFa61vQDqMF7rYPG90Ub79P+R5URZI8yjv69Hmrav0Y6z92vH8ItbPSRBLtgrbYZx36IFq0LU=,iv:qzBVA0xATM979tzu6cTvMrX77firvA5K0WU2hoUggoA=,tag:Fm3IqH0GUHBq9Din6ZW6ng==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.11.0
--- a/profiles/iso/default.nix
+++ b/profiles/iso/default.nix
@@ -1,4 +1,6 @@
-{ lib, pkgs, inputs, modulesPath, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: {

        imports = with inputs; [

@@ -61,11 +63,12 @@
                                    hyprlock.enable = true;
                                    wal.enable = true;
                                    mpd.enable = true;
-                                hyprpanel.enable = true;
                                    rofi.enable = true;
                                    firefox.enable = true;
                                    git.enable = false;
                                    nh.enable = true;
+
+                                    aurora.enable = true;
                                };
                            } 
                            ];
@@ -102,5 +105,6 @@
            };


+        };
    };
 }
--- a/profiles/jesstop/default.nix
+++ b/profiles/jesstop/default.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, lib, inputs, ... }:
+{ inputs, ... }: {
+
+    flake.nixosModules.jesstop = { config, pkgs, lib, ... }:

    {

        imports = [
-        ./hardware-configuration.nix
-
 #inputs.home-manager.nixosModules.default

                inputs.sops-nix.nixosModules.sops
@@ -63,17 +63,6 @@

            services.displayManager.enable = true;

-        services.avahi = {
-
-            enable = true;
-            ipv4 = true;
-            ipv6 = true;
-            openFirewall = true;
-            nssmdns4 = true;
-            wideArea = true;
-
-        };
-
 # Enable CUPS to print documents.
            services.printing.enable = true;

@@ -138,5 +127,6 @@
            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];


+        };
    };
 }
--- a/profiles/jesstop/hardware-configuration.nix
+++ b/profiles/jesstop/hardware-configuration.nix
@@ -1,7 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ ... }: {
+
+    flake.nixosModules.jesstop = { config, lib, pkgs, modulesPath, ... }:

    {
        imports =
@@ -36,4 +35,5 @@

        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
        hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
 }
--- a/profiles/laptop/.sops.yaml
+++ b/profiles/laptop/.sops.yaml
@@ -0,0 +1,7 @@
+keys:
+  - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
+creation_rules:
+  - path_regex: ^secrets.yaml$
+    key_groups:
+    - age:
+      - *laptop
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nathan	fada73a69c	wallpapers	2026-04-16 23:09:15 -05:00
Nathan	cd1392517a	update flake	2026-04-12 21:22:35 -05:00
Nathan	04e238810c	update flake	2026-04-12 20:58:58 -05:00
Nathan	a727cf8722	update flake	2026-04-12 20:54:17 -05:00
Nathan	8016b58416	update flake	2026-04-12 20:51:08 -05:00
Nathan	1ccbb3eb6c	update flake	2026-04-12 20:49:29 -05:00
Nathan	55783a7780	update flake	2026-04-12 20:39:46 -05:00
Nathan	c0443e73e6	update flake	2026-04-11 20:03:23 -05:00
Nathan	1316fe9169	update flake	2026-04-11 20:02:04 -05:00
Nathan	f5cba81ace	update flake	2026-04-11 07:39:15 -05:00
Nathan	e6d45592df	fix	2026-04-11 07:31:13 -05:00
Nathan	f1637d0497	renamed package	2026-04-11 07:28:44 -05:00
Nathan	ab691de708	update flake	2026-04-11 07:24:41 -05:00
Nathan	f8e4ddce82	update flake	2026-04-11 07:03:09 -05:00
Nathan	64b5a8c65b	test	2026-04-10 16:57:01 -05:00
Nathan	41ebb79c2a	test	2026-04-10 16:53:50 -05:00
Nathan	068d260470	test	2026-04-10 16:48:57 -05:00
Nathan	b34ad76811	test	2026-04-10 16:45:23 -05:00
Nathan	c79f76efa1	test	2026-04-10 16:41:39 -05:00
Nathan	87a4cc6455	test	2026-04-10 16:30:54 -05:00
Nathan	0bcab64638	test	2026-04-10 16:26:34 -05:00
Nathan	59fe61b835	test	2026-04-10 16:22:50 -05:00
Nathan	c25a1c26f5	test	2026-04-10 16:19:17 -05:00
Nathan	5cc628cfd9	test	2026-04-10 13:12:29 -05:00
Nathan	8b67d7b8fb	test	2026-04-10 12:04:24 -05:00
Nathan	69797b6b01	test	2026-04-10 11:48:37 -05:00
Nathan	7853bc389d	test	2026-04-10 11:43:02 -05:00
Nathan	a1417b9514	test	2026-04-10 11:21:59 -05:00
Nathan	dcc347a717	test	2026-04-09 19:02:59 -05:00
Nathan	4b32b5a3e7	test	2026-04-09 18:44:48 -05:00
Nathan	a87eb1994f	test	2026-04-09 16:59:41 -05:00
Nathan	bdac2cafee	test	2026-04-09 14:40:53 -05:00
Nathan	86a1071b1b	test	2026-04-09 14:27:19 -05:00
Nathan	11048faa79	test	2026-04-09 14:25:40 -05:00
Nathan	58eec1d59d	test	2026-04-09 11:23:51 -05:00
Nathan	00a830c3c4	test	2026-04-09 11:20:46 -05:00
Nathan	94a2ed6c8a	test	2026-04-09 11:20:15 -05:00
Nathan	42d2399c42	test	2026-04-01 07:44:13 -05:00
Nathan	8704160c10	test	2026-03-31 22:45:28 -05:00
Nathan	74d813c5e8	test	2026-03-31 20:28:21 -05:00
Nathan	0c7291d3eb	test	2026-03-31 20:25:04 -05:00
Nathan	10e69d4eff	test	2026-03-31 20:20:01 -05:00
Nathan	72ecac11b7	test aurora	2026-03-31 20:14:04 -05:00
Nathan	db8f72308b	test	2026-03-31 20:08:30 -05:00
Nathan	59a6dc79f0	test	2026-03-31 20:07:15 -05:00
Nathan	297b993992	update aurora	2026-03-21 16:20:01 -05:00
Nathan	0df6aee231	debugpy 3.14 broken	2026-03-20 13:29:11 -05:00
Nathan	33d139bdf6	update aurora	2026-03-20 13:04:13 -05:00
Nathan	effeddf963	name	2026-03-20 12:58:09 -05:00
Nathan	79c8e5061b	test aurora	2026-03-20 11:28:20 -05:00
Nathan	1636b715b5	update aurora	2026-03-07 17:38:02 -06:00
Nathan	c00be80234	latest hyprland	2026-03-07 11:32:02 -06:00
Nathan	7fb7498acc	scrolling	2026-03-07 11:17:29 -06:00
Nathan	449dbcff24	scrolling	2026-03-07 11:14:33 -06:00
Nathan	317bc368e9	scrolling	2026-03-07 11:13:07 -06:00
Nathan	d3689592e8	update aurora	2026-03-07 10:59:59 -06:00
Nathan	e6a810d833	test	2026-03-07 10:42:51 -06:00
Nathan	21579b281f	test	2026-03-07 10:29:59 -06:00
Nathan	68bdc0c85e	test	2026-03-07 10:23:56 -06:00
Nathan	64973efb33	test	2026-03-07 10:21:52 -06:00
Nathan	bed86c50dd	test	2026-03-07 10:19:59 -06:00
Nathan	df6268f8c3	test	2026-03-07 10:15:43 -06:00
Nathan	09ff97278c	test	2026-03-07 10:04:58 -06:00
Nathan	445e6a8c8b	test	2026-03-07 10:03:45 -06:00
Nathan	b860c0ead1	test	2026-03-07 10:02:43 -06:00
Nathan	ed863b4ab1	test	2026-03-07 09:49:53 -06:00
Nathan	498fd77851	test	2026-03-07 09:27:49 -06:00
Nathan	19537a1499	test	2026-03-07 09:18:34 -06:00
Nathan	b7c9ca3ccc	test	2026-03-07 09:16:40 -06:00
Nathan	8c66096e81	test	2026-03-06 23:23:42 -06:00
Nathan	e6b2a1d3ee	test	2026-03-06 23:17:43 -06:00
Nathan	93b4b2730f	test	2026-03-06 21:55:48 -06:00
Nathan	e9988b21ff	test	2026-03-06 21:47:12 -06:00
Nathan	d6e9904bfc	test	2026-03-06 21:32:57 -06:00
Nathan	aea1919a44	test	2026-03-06 21:27:24 -06:00
Nathan	da7ad42da9	test	2026-03-06 20:04:38 -06:00
Nathan	13e5c8410e	test	2026-03-06 19:42:47 -06:00
Nathan	c8cfd433ae	test	2026-03-06 19:39:21 -06:00
Nathan	60dd114bcc	update aurora	2026-03-06 19:35:52 -06:00
Nathan	ac12242060	update aurora	2026-03-06 19:31:03 -06:00
Nathan	c3f12243d8	Begin Dendritic rewrite	2026-03-06 19:17:00 -06:00
Nathan	e296f298b1	Begin Dendritic rewrite	2026-03-06 19:07:55 -06:00
Nathan	f656be3dfb	Begin Dendritic rewrite	2026-03-06 19:05:37 -06:00
Nathan	eb5b08c8f0	Begin Dendritic rewrite	2026-03-06 18:46:38 -06:00
Nathan	fa9ca0ec63	Begin Dendritic rewrite	2026-03-06 18:37:21 -06:00
Nathan	fd10360294	Begin Dendritic rewrite	2026-03-06 18:27:39 -06:00
Nathan	0237820306	Begin Dendritic rewrite	2026-03-06 18:26:41 -06:00
Nathan	64b6b6b763	Begin Dendritic rewrite	2026-03-06 18:23:19 -06:00
Nathan	78b1b26b91	Begin Dendritic rewrite	2026-03-06 16:34:10 -06:00
Nathan	44eb6492f2	Begin Dendritic rewrite	2026-03-06 16:32:07 -06:00
Nathan	597f51e7b2	Begin Dendritic rewrite	2026-03-06 16:25:23 -06:00
Nathan	c1684a80f7	Begin Dendritic rewrite	2026-03-06 16:24:53 -06:00
Nathan	f3a90a0fe8	test	2026-02-28 19:01:49 -06:00
Nathan	11089070ba	test	2026-02-28 18:05:10 -06:00
Nathan	8697469f5f	add authentik middleware	2026-02-28 17:56:12 -06:00
Nathan	fa6abcfd98	add ssh key	2026-02-28 17:26:54 -06:00
Nathan	7f0629f313	work on docker gitea	2026-02-25 09:03:17 -06:00
Nathan	1a088bc501	no nextcloud for now	2026-02-20 21:35:52 -06:00
Nathan	0f70cf9bbc	add localsend	2026-02-14 18:02:53 -06:00
Nathan	fbf6864350	ollama ip	2026-02-04 00:15:51 -06:00