test

2026-03-07 09:49:53 -06:00 · 2026-03-07 09:27:49 -06:00 · 2026-03-07 09:18:34 -06:00 · 2026-03-07 09:16:40 -06:00 · 2026-03-06 23:23:42 -06:00 · 2026-03-06 23:17:43 -06:00
60 changed files with 366 additions and 1808 deletions
--- a/flake-parts.nix
+++ b/flake-parts.nix
@@ -4,4 +4,9 @@
        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": 1772292445,
+        "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "def5e74c97370f15949a67c62e61f1459fcb0e15",
+        "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
        "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": 1772849004,
+        "narHash": "sha256-i2QztCyeyCmsbVn3QHaEMBf1gsuJJQ/tobYgWUEG7N4=",
+        "ref": "refs/heads/master",
+        "rev": "8fd87dad5abbf43a599973f75545820a95345f44",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
+      }
+    },
    "disko": {
      "inputs": {
        "nixpkgs": [
@@ -40,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769524058,
-        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
+        "lastModified": 1772699110,
+        "narHash": "sha256-jkyo/9fZVB3F/PHk3fVK1ImxJBZ71DCOYZvAz4R4v4E=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
+        "rev": "42affa9d33750ac0a0a89761644af20d8d03e6ee",
        "type": "github"
      },
      "original": {
@@ -61,11 +82,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1770091431,
-        "narHash": "sha256-9Sqq/hxq8ZDLRSzu+edn0OfWG+FAPWFpwMKaJobeLec=",
+        "lastModified": 1772824881,
+        "narHash": "sha256-NqX+JCA8hRV3GoYrsqnHB2IWKte1eQ8NK2WVbJkORcw=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "4f827ff035c6ddc58d04c45abe5b777d356b926a",
+        "rev": "07e1616c9b13fe4794dad4bcc33cd7088c554465",
        "type": "gitlab"
      },
      "original": {
@@ -91,26 +112,46 @@
        "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": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_3"
+      },
      "locked": {
        "lastModified": 1768135262,
        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
@@ -125,7 +166,7 @@
        "type": "github"
      }
    },
-    "flake-parts_2": {
+    "flake-parts_4": {
      "inputs": {
        "nixpkgs-lib": [
          "nixvim",
@@ -170,17 +211,35 @@
      }
    },
    "home-manager": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1772845525,
+        "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
+        "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": 1772633058,
+        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
+        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
        "type": "github"
      },
      "original": {
@@ -235,11 +294,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769284023,
-        "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=",
+        "lastModified": 1770511807,
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "13c536659d46893596412d180449353a900a1d31",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
        "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": 1772891233,
+        "narHash": "sha256-+cnUpHEmPxu0IizoeLWT/WB7LX5+f5NRShZ0zzpHFOs=",
        "ref": "refs/heads/main",
-        "rev": "30756d871845a6058a840642ab1a4c3979f6d782",
-        "revCount": 6859,
+        "rev": "73fca55e7c9dd19222c8c0cc331ddebf4c4bfddf",
+        "revCount": 7000,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -367,11 +426,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1767983607,
-        "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
+        "lastModified": 1771866172,
+        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
+        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
        "type": "github"
      },
      "original": {
@@ -444,11 +503,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766253372,
-        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
+        "lastModified": 1771271487,
+        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
+        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
        "type": "github"
      },
      "original": {
@@ -469,11 +528,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763640274,
-        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
+        "lastModified": 1770501770,
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
        "type": "github"
      },
      "original": {
@@ -498,11 +557,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769202094,
-        "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=",
+        "lastModified": 1771606233,
+        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
        "owner": "hyprwm",
        "repo": "hyprwire",
-        "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c",
+        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
        "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": 1772344373,
+        "narHash": "sha256-OQQ1MhB9t1J71b2wxRRTdH/Qd8UGG0p+dGspfCf5U1c=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "10fda59eee7d7970ec443b925f32a1bc7526648c",
        "type": "github"
      },
      "original": {
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
+        "owner": "vic",
+        "repo": "import-tree",
+        "type": "github"
+      }
+    },
+    "import-tree_2": {
+      "locked": {
+        "lastModified": 1772344373,
+        "narHash": "sha256-OQQ1MhB9t1J71b2wxRRTdH/Qd8UGG0p+dGspfCf5U1c=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "10fda59eee7d7970ec443b925f32a1bc7526648c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vic",
+        "repo": "import-tree",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1772542754,
+        "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
        "type": "github"
      },
      "original": {
@@ -548,6 +617,36 @@
      }
    },
    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_3": {
      "locked": {
        "lastModified": 1765674936,
        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
@@ -564,11 +663,11 @@
    },
    "nixpkgs-us": {
      "locked": {
-        "lastModified": 1770019141,
-        "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
+        "lastModified": 1772624091,
+        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
+        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
        "type": "github"
      },
      "original": {
@@ -580,11 +679,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1772433332,
+        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
        "type": "github"
      },
      "original": {
@@ -596,11 +695,27 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1770056022,
-        "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=",
+        "lastModified": 1772198003,
+        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1772598333,
+        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d04d8548aed39902419f14a8537006426dc1e4fa",
+        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
        "type": "github"
      },
      "original": {
@@ -610,7 +725,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1769461804,
        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
@@ -626,7 +741,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
      "locked": {
        "lastModified": 1768875095,
        "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
@@ -644,8 +759,8 @@
    },
    "nixvim": {
      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_5",
        "nixvim": "nixvim_2"
      },
      "locked": {
@@ -664,9 +779,9 @@
    },
    "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,
@@ -692,11 +807,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769069492,
-        "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+        "lastModified": 1772024342,
+        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
+        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
        "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": 1772495394,
+        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f",
+        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
        "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": [
--- a/flake.nix
+++ b/flake.nix
@@ -30,8 +30,6 @@
            inputs.nixpkgs.follows = "nixpkgs";
        };

-        nix-minecraft.url = "github:Infinidoge/nix-minecraft";
-
        hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";

        nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
@@ -49,5 +47,6 @@
        ./machines 
        ./system 
        ./templates/default.nix
+        ./flake-parts.nix
    ]);
 }
--- a/homes/nathan/home-manager/default.nix
+++ b/homes/nathan/home-manager/default.nix
@@ -44,7 +44,6 @@
                hyprland.enable = lib.mkDefault config.homeconfig.graphical;
                hyprlock.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;

--- a/homes/nathan/home-manager/dotfiles/default.nix
+++ b/homes/nathan/home-manager/dotfiles/default.nix
@@ -4,10 +4,8 @@

        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/main.conf
+++ b/homes/nathan/home-manager/dotfiles/hypr/main.conf
@@ -10,7 +10,7 @@
 #                                                #
 #------------------------------------------------#

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

 # Some default env vars.
 env = XCURSOR_SIZE,16
@@ -48,7 +48,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,7 +77,7 @@ 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
 }


@@ -93,6 +93,10 @@ master {
        new_status = "master"
 }

+scrolling {
+    direction = "right"
+}
+
 misc {
        disable_hyprland_logo = false
        disable_splash_rendering = true
@@ -107,11 +111,11 @@ 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 +123,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 lf

-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, hyprpanel -q; hyprpanel

 #bind = $mainMod, P, pseudo, # dwindle
 #bind = $mainMod, Z, togglesplit, # dwindle
@@ -140,34 +144,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 +207,20 @@ 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, e+1
+bind = $mainMod, up, workspace, e-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, H, layoutmsg, move -col
 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, move +col

-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
@@ -239,7 +237,7 @@ bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
 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
@@ -279,7 +277,7 @@ 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/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/packages/scripts/default.nix
+++ b/homes/nathan/home-manager/packages/scripts/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

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

        system = "x86_64-linux";

--- a/homes/nathan/home-manager/programs/aurora/default.nix
+++ b/homes/nathan/home-manager/programs/aurora/default.nix
@@ -1,7 +1,11 @@
-{ ... }: {
+{ inputs, ... }: {

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

+        imports = [
+            inputs.aurora.homeModules.default
+        ];
+
        options.homeconfig.aurora.enable = with lib; mkOption {
            type = with types; bool;
            default = false;
--- a/homes/nathan/home-manager/programs/default.nix
+++ b/homes/nathan/home-manager/programs/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

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

        config = {

--- a/homes/nathan/home-manager/programs/firefox/default.nix
+++ b/homes/nathan/home-manager/programs/firefox/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

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

        options.homeconfig.firefox.enable = lib.options.mkOption {
            type = lib.types.bool;
--- a/homes/nathan/home-manager/programs/hyprland/default.nix
+++ b/homes/nathan/home-manager/programs/hyprland/default.nix
@@ -34,19 +34,17 @@
                enable = true;

                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
-                    '';
+                '';

            };
        };
--- a/homes/nathan/home-manager/programs/hyprpanel/default.nix
+++ b/homes/nathan/home-manager/programs/hyprpanel/default.nix
@@ -1,17 +0,0 @@
-{ ... }: {
-
-    flake.homeModules.nathan = { 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,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

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

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

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

        options.homeconfig.wal.enable = lib.options.mkOption {
            type = lib.types.bool;
--- a/homes/nathan/home-manager/programs/quickshell/default.nix
+++ b/homes/nathan/home-manager/programs/quickshell/default.nix
@@ -1,29 +0,0 @@
-{ ... }: {
-
-    flake.homeModules.nathan = { 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/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.nix
+++ b/homes/nathan/home.nix
@@ -9,7 +9,7 @@
                graphical = lib.mkDefault false;
                minimal = lib.mkDefault false;

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


@@ -18,7 +18,7 @@
                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;
                };
            };

--- a/machines/homebox
+++ b/machines/homebox
--- a/machines/laptop
+++ b/machines/laptop
--- a/profiles/container/default.nix
+++ b/profiles/container/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.container = { config, pkgs, lib, inputs, ... }:
+    flake.nixosModules.container = { config, pkgs, lib, ... }:

    {
        imports =
--- a/profiles/homebox/default.nix
+++ b/profiles/homebox/default.nix
@@ -1,15 +1,15 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.homebox = { config, pkgs, lib, disko, sops-nix, home-manager, ... }:
+    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

            ];

@@ -101,8 +101,6 @@

                    code-server.enable = true;

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

--- a/profiles/iso/default.nix
+++ b/profiles/iso/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.iso = { lib, pkgs, inputs, modulesPath, ... }: {
+    flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: {

        imports = with inputs; [

--- a/profiles/jesstop/default.nix
+++ b/profiles/jesstop/default.nix
@@ -1,12 +1,10 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.jesstop = { config, pkgs, lib, inputs, ... }:
+    flake.nixosModules.jesstop = { config, pkgs, lib, ... }:

    {

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

                inputs.sops-nix.nixosModules.sops
--- a/profiles/laptop/default.nix
+++ b/profiles/laptop/default.nix
@@ -1,13 +1,13 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.laptop = { config, pkgs, lib, home-manager, sops-nix, ... }:
+    flake.nixosModules.laptop = { config, pkgs, lib, ... }:

    {

        imports = [
-            home-manager.nixosModules.default
+            inputs.home-manager.nixosModules.default

-                sops-nix.nixosModules.sops
+            inputs.sops-nix.nixosModules.sops
        ];

        config = {
@@ -61,7 +61,6 @@

                programs = {
                    steam.enable = mkDefault true;
-                    hyprpanel.enable = mkDefault true;
                    hyprland.enable = mkDefault true;
                };

--- a/profiles/live/default.nix
+++ b/profiles/live/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.live = { pkgs, inputs, ... }: {
+    flake.nixosModules.live = { pkgs, ... }: {

        imports = with inputs; [

--- a/profiles/live/disko.nix
+++ b/profiles/live/disko.nix
@@ -65,5 +65,5 @@
                };
            };    
        };
-    }
+    };
 }
--- a/profiles/pi4/default.nix
+++ b/profiles/pi4/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.pi4 = { config, pkgs, inputs, ... }: {
+    flake.nixosModules.pi4 = { config, pkgs, ... }: {

        imports = [
            ./hardware-configuration.nix
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.default = { config, lib, pkgs, nixpkgs, ... }: {
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig = with lib; {
            host = mkOption {
@@ -26,7 +26,7 @@
            networking.hostName = lib.mkDefault config.sysconfig.host;

            nix = {
-                nixPath = [ "nixpkgs=${nixpkgs}" ];
+                nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
                channel.enable = false;
                settings = {
                    experimental-features = [ "nix-command" "flakes" ];
@@ -108,5 +108,5 @@
            };
        };
    };
-};
+}

--- a/system/programs/hyprland/default.nix
+++ b/system/programs/hyprland/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.default = { config, lib, pkgs, hyprland, ... }: {
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.programs.hyprland.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -13,19 +13,45 @@

            environment.sessionVariables.NIXOS_OZONE_WL = "1";

-            programs.hyprland = {
+            programs.hyprland = let
+                system = pkgs.stdenv.hostPlatform.system;
+                pkgs-us = import inputs.nixpkgs-us { inherit system; };
+            in {
                enable = true;

-                withUWSM = true;
+                withUWSM = false;

                xwayland.enable = true;

                systemd.setPath.enable = true;

-                package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+                #package = inputs.hyprland.packages.${system}.hyprland;
+                package = pkgs-us.hyprland;

-                portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+                #portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
+                portalPackage = pkgs-us.xdg-desktop-portal-hyprland;
            };
+
+            services = {
+                upower.enable = true;
+                gvfs.enable = true;
+                power-profiles-daemon.enable = true;
+            };
+
+            environment.systemPackages = with pkgs; [
+                bluez
+                bluez-tools
+                libgtop
+                dart-sass
+                wl-clipboard
+                gtksourceview
+                libsoup_3
+                brightnessctl
+                swww
+                hyprpicker
+                hyprsunset
+                wf-recorder
+            ];
        };
    };
 }
--- a/system/programs/hyprpanel/default.nix
+++ b/system/programs/hyprpanel/default.nix
@@ -1,34 +0,0 @@
-{ ... }: {
-
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
-
-        options.sysconfig.programs.hyprpanel.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.sysconfig.programs.hyprpanel.enable {
-            services = {
-                upower.enable = true;
-                gvfs.enable = true;
-                power-profiles-daemon.enable = true;
-            };
-
-            environment.systemPackages = with pkgs; [
-                bluez
-                    bluez-tools
-                    libgtop
-                    dart-sass
-                    wl-clipboard
-                    gtksourceview
-                    libsoup_3
-                    brightnessctl
-                    swww
-                    hyprpicker
-                    hyprsunset
-                    wf-recorder
-            ];
-        };
-    };
-}
-
--- a/system/services/netbird/default.nix
+++ b/system/services/netbird/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.default = { config, lib, nixpkgs-us, ... }: {
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig = {

@@ -11,7 +11,7 @@
        };

        config = let 
-            pkgs-us = import nixpkgs-us {
+            pkgs-us = import inputs.nixpkgs-us {
                system = "x86_64-linux";
            };
        in lib.mkIf config.sysconfig.services.netbird.enable {
--- a/system/services/ollama/default.nix
+++ b/system/services/ollama/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {

-    flake.nixosModules.default = { config, lib, nixpkgs-us, ... }: {
+    flake.nixosModules.default = { config, lib, ... }: {

        options = {
            sysconfig.services.ollama.enable = lib.options.mkOption {
@@ -17,7 +17,7 @@
                    OLLAMA_CONTEXT_LENGTH = lib.mkDefault "16000";
                };
                package = let 
-                    pkgs-us = import nixpkgs-us { 
+                    pkgs-us = import inputs.nixpkgs-us { 
                        system = "x86_64-linux";
                        config.allowUnfree = true;
                    }; 
--- a/system/users/default.nix
+++ b/system/users/default.nix
@@ -1,6 +1,6 @@
-{ ... }: {
+{ self, ... }: {

-    flake.nixosModules.default = { config, lib, pkgs, ... } @ inputs: {
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig = with lib; {

@@ -92,7 +92,7 @@
        };


-        config = lib.mkIf (config.sysconfig.host != "android") {
+        config = {
            users.users = builtins.mapAttrs (x: y: let
                    cfg = config.sysconfig.users.${x};
                    in {
@@ -110,29 +110,22 @@

            home-manager = {
                backupFileExtension = "backup";
-                extraSpecialArgs = { inherit inputs; };
                useUserPackages = true;
                sharedModules = [];
                users = builtins.listToAttrs (builtins.map 
-                        (x: { 
+                    (x: { 
                         name = x; 
                         value = (lib.mkMerge ([

-                                     (if let 
-                                      dir = builtins.readDir ./.; 
-                                      in dir ? ${x} && dir.${x} == "directory" then 
-                                      import ../../homes/${x}/home-manager 
-                                      else {})
-
-                                     (if inputs ? ${x} then inputs.${x} else {})
+                            (lib.mkIf (self.homeModules ? ${x}) self.homeModules.${x})

                         ] ++ config.sysconfig.users.${x}.home-manager.extraModules));
-                         })
-                        (builtins.filter 
+                    })
+                    (builtins.filter 
                         (y: (config.sysconfig.users.${y}.home-manager.enable && !config.sysconfig.users.${y}.home-manager.standalone))
                         (builtins.attrNames config.sysconfig.users)
-                        )
-                        );
+                    )
+                );

            };
        };
--- a/system/users/nathan/default.nix
+++ b/system/users/nathan/default.nix
@@ -3,8 +3,8 @@
    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        config = lib.mkIf (
-                config.sysconfig.users ? nathan && config.sysconfig.users.nathan.usePresets
-                ) {
+            config.sysconfig.users ? nathan && config.sysconfig.users.nathan.usePresets
+        ) {

            sops.secrets."nathan/pass".neededForUsers = true;

--- a/system/virtualization/containers/gitea/default.nix
+++ b/system/virtualization/containers/gitea/default.nix
@@ -81,6 +81,10 @@
                                ENABLED = true;
                                RUN_AT_START = true;
                            };
+
+                            repository = {
+                                DEFAULT_BRANCH = "master";
+                            };
                        };

                        database = {
--- a/templates/default.nix
+++ b/templates/default.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.templates = {
+    /*flake.templates = {
        nixos = {
            welcomeText = ''
                #Welcome to Olympus!
@@ -28,19 +28,5 @@
            path = ./home-manager;

        };
-
-        nix-on-droid = {
-            welcomeText = ''
-                #Welcome to Olympus!
-                Have Fun!
-            '';
-
-            description = ''
-                Generate this where you want your config.
-            '';
-
-            path = ./nix-on-droid;
-
-        };
-    };
+    };*/
 }
--- a/templates/home-manager/home.nix
+++ b/templates/home-manager/home.nix
@@ -1,90 +1 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).

-{ config, pkgs, ... }:
-
-{
-
-    imports = [ # Include the results of the hardware scan.
-        ./hardware-configuration.nix
-    ];
-
-    config = {
-  
-        boot.kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ];
-
-        hardware.nvidia = {
-            modesetting.enable = true;
-            powerManagement.enable = true;
-            powerManagement.finegrained = true;
-            open = false;
-            nvidiaSettings = true;
-            package = config.boot.kernelPackages.nvidiaPackages.stable;
-
-            prime = {
-# Make sure to use the correct Bus ID values for your system!
-                intelBusId = "PCI:0:2:0";
-                nvidiaBusId = "PCI:1:0:0";
-# WARNING: sync and offload are mutually exclusive.
-# You can only pick one!!
-#sync.enable = true;
-                offload = {
-                    enable = true;
-                    enableOffloadCmd = true;
-                };
-            };
-        };
-
-        sysconfig = {
-            users = {
-                nathan = {
-                    isSuperuser = true;
-                    extraGroups = [ "networkmanager" ];
-                    hashedPasswordFile = config.sops.secrets."nathan/pass".path;
-                    shell = pkgs.zsh;
-                    home-manager = {
-                        enable = true;
-                        standalone = false;
-                        extraModules = [
-                        {
-                            homeconfig = {
-                                minimal = false;
-                                hyprland.enable = true;
-                                hyprlock.enable = true;
-                                wal.enable = true;
-                                mpd.enable = true;
-                                hyprpanel.enable = true;
-                                calcurse.enable = true;
-                                rofi.enable = true;
-                                firefox.enable = true;
-                                git.enable = true;
-                                nh.enable = true;
-                            };
-
-                            #monitor=eDP-1, addreserved, 40,0,0,0
-                            wayland.windowManager.hyprland.extraConfig = ''
-                                monitor=eDP-1,1920x1080@60,0x0,1
-                            '';
-
-                        } 
-                        ];
-                    };
-                };
-            };
-        };
-
-
-        services.xserver.videoDrivers = [ "nvidia" ];
-
-
-# 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/templates/nix-on-droid/.sops.yaml
+++ b/templates/nix-on-droid/.sops.yaml
@@ -1,33 +0,0 @@
-keys:
-  - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
-  - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
-  - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
-creation_rules:
-  - path_regex: homebox/secrets.yaml$
-    key_groups:
-    - age:
-      - *homebox
-  - path_regex: laptop/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: pi4/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: live/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: nathan/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-      - *homebox
-      - *android
-  - path_regex: system-config/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-      - *homebox
-      - *android
--- a/templates/nix-on-droid/configuration.nix
+++ b/templates/nix-on-droid/configuration.nix
@@ -1,90 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-
-    imports = [ # Include the results of the hardware scan.
-        ./hardware-configuration.nix
-    ];
-
-    config = {
-  
-        boot.kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ];
-
-        hardware.nvidia = {
-            modesetting.enable = true;
-            powerManagement.enable = true;
-            powerManagement.finegrained = true;
-            open = false;
-            nvidiaSettings = true;
-            package = config.boot.kernelPackages.nvidiaPackages.stable;
-
-            prime = {
-# Make sure to use the correct Bus ID values for your system!
-                intelBusId = "PCI:0:2:0";
-                nvidiaBusId = "PCI:1:0:0";
-# WARNING: sync and offload are mutually exclusive.
-# You can only pick one!!
-#sync.enable = true;
-                offload = {
-                    enable = true;
-                    enableOffloadCmd = true;
-                };
-            };
-        };
-
-        sysconfig = {
-            users = {
-                nathan = {
-                    isSuperuser = true;
-                    extraGroups = [ "networkmanager" ];
-                    hashedPasswordFile = config.sops.secrets."nathan/pass".path;
-                    shell = pkgs.zsh;
-                    home-manager = {
-                        enable = true;
-                        standalone = false;
-                        extraModules = [
-                        {
-                            homeconfig = {
-                                minimal = false;
-                                hyprland.enable = true;
-                                hyprlock.enable = true;
-                                wal.enable = true;
-                                mpd.enable = true;
-                                hyprpanel.enable = true;
-                                calcurse.enable = true;
-                                rofi.enable = true;
-                                firefox.enable = true;
-                                git.enable = true;
-                                nh.enable = true;
-                            };
-
-                            #monitor=eDP-1, addreserved, 40,0,0,0
-                            wayland.windowManager.hyprland.extraConfig = ''
-                                monitor=eDP-1,1920x1080@60,0x0,1
-                            '';
-
-                        } 
-                        ];
-                    };
-                };
-            };
-        };
-
-
-        services.xserver.videoDrivers = [ "nvidia" ];
-
-
-# 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/templates/nix-on-droid/flake.nix
+++ b/templates/nix-on-droid/flake.nix
@@ -1,50 +0,0 @@
-{
-
-    description = "System Configuration";
-
-    inputs = {
-
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-
-        home-manager = {
-            url = "github:nix-community/home-manager/release-25.05";
-            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, olympus, ... }: let
-        host = "hostname";
-
-    in {
-
-        nixosConfigurations."${host}" = nixpkgs.lib.nixosSystem {
-
-            specialArgs = {
-            };
-
-            modules = [
-                { sysconfig.host = host; }
-                ./configuration.nix
-                olympus.live
-            ];
-        };
-
-        templates.default = {
-            welcomeText = ''
-                # NixOS Configuration Template
-                Have Fun!
-            '';
-            description = ''
-                Generate this where you want your config.
-            '';
-            source = ./.;
-        };
-
-    };
-}
Author	SHA1	Message	Date
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