proper ssh port

use ssh for submodules
2026-01-22 12:15:03 -06:00 · 2026-01-22 12:10:02 -06:00 · 2026-01-22 10:20:51 -06:00 · 2026-01-22 09:18:06 -06:00 · 2026-01-22 09:15:41 -06:00 · 2026-01-21 22:23:00 -06:00
952 changed files with 8651 additions and 10688 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "machines/homebox"]
+	path = machines/homebox
+	url = ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/homebox
+[submodule "machines/laptop"]
+	path = machines/laptop
+	url = ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/laptop
+[submodule "machines/android"]
+	path = machines/android
+	url = ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/android
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,12 +1,11 @@
 keys:
  - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
  - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
+  - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
 creation_rules:
-  - path_regex: homebox/secrets.yaml$
-    key_groups:
-    - age:
-      - *homebox
-  - path_regex: laptop/secrets.yaml$
+  - path_regex: system/secrets.yaml$
    key_groups:
    - age:
      - *laptop
+      - *homebox
+      - *android
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,5 @@
 {
  "nodes": {
-    "ags": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1735346349,
-        "narHash": "sha256-n/VeEnc6fra2SPgm2ppzwQ52ggYDhpzmBnIBrVD/f+0=",
-        "owner": "Aylur",
-        "repo": "ags",
-        "rev": "237601999d65a4663bcbab934f4f6ce1f579d728",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Aylur",
-        "ref": "v1",
-        "repo": "ags",
-        "type": "github"
-      }
-    },
    "aquamarine": {
      "inputs": {
        "hyprutils": [
@@ -40,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752743471,
-        "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=",
+        "lastModified": 1767024902,
+        "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506",
+        "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
        "type": "github"
      },
      "original": {
@@ -60,11 +40,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753140376,
-        "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
+        "lastModified": 1766150702,
+        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
+        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
        "type": "github"
      },
      "original": {
@@ -81,11 +61,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1753761817,
-        "narHash": "sha256-FE908x/ihUlr5yn1f+PTMyOjcwotGUodzn7Ej6zZf5U=",
+        "lastModified": 1768150501,
+        "narHash": "sha256-601j0FWA9UzEaDF3xj+12n94bkuVF/zkpLIOt6EfRK0=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "b657cfddb78408e9b53b4a8aaeaac71fc7ea182e",
+        "rev": "1b848102f204ce846360009d193ea6d0280c814a",
        "type": "gitlab"
      },
      "original": {
@@ -98,15 +78,15 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
        "type": "github"
      },
      "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
        "repo": "flake-compat",
        "type": "github"
      }
@@ -132,11 +112,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1741352980,
-        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+        "lastModified": 1754487366,
+        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
        "type": "github"
      },
      "original": {
@@ -154,11 +134,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738453229,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "lastModified": 1754487366,
+        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
        "type": "github"
      },
      "original": {
@@ -169,7 +149,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -187,7 +167,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -232,37 +212,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1753592768,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "lastModified": 1767910483,
+        "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager-us": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-us"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754263839,
-        "narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-25.11",
        "repo": "home-manager",
        "type": "github"
      }
@@ -283,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749155331,
-        "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
+        "lastModified": 1753964049,
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
        "type": "github"
      },
      "original": {
@@ -312,11 +271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752149140,
-        "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=",
+        "lastModified": 1766946335,
+        "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a",
+        "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
        "type": "github"
      },
      "original": {
@@ -330,22 +289,23 @@
        "aquamarine": "aquamarine",
        "hyprcursor": "hyprcursor",
        "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
        "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
        "hyprlang": "hyprlang",
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_2",
+        "hyprwire": "hyprwire",
+        "nixpkgs": "nixpkgs",
        "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_2",
+        "systems": "systems",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1754039866,
-        "narHash": "sha256-g8aR1h4GZ1vms7kOTD9u1A4nKa4dqzOSATRy2HQqGS0=",
+        "lastModified": 1768144432,
+        "narHash": "sha256-lLV0egdN9VF6BjhG6GVEVMviFuM05XCv35YNsfLzS9w=",
        "ref": "refs/heads/main",
-        "rev": "314a0ea441e33122836965c50d4c5bcf9acd0cdd",
-        "revCount": 6331,
+        "rev": "fbf421df889ceff3bac08a9f4b9493def5eecc4d",
+        "revCount": 6805,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -356,6 +316,52 @@
        "url": "https://github.com/hyprwm/Hyprland"
      }
    },
+    "hyprland-guiutils": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1767023960,
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "type": "github"
+      }
+    },
    "hyprland-protocols": {
      "inputs": {
        "nixpkgs": [
@@ -368,11 +374,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749046714,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "lastModified": 1765214753,
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
        "type": "github"
      },
      "original": {
@@ -381,74 +387,6 @@
        "type": "github"
      }
    },
-    "hyprland-qt-support": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-qtutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-qtutils",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749154592,
-        "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "type": "github"
-      }
-    },
-    "hyprland-qtutils": {
-      "inputs": {
-        "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750371812,
-        "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "type": "github"
-      }
-    },
    "hyprlang": {
      "inputs": {
        "hyprutils": [
@@ -465,11 +403,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750371198,
-        "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
+        "lastModified": 1764612430,
+        "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
+        "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
        "type": "github"
      },
      "original": {
@@ -478,6 +416,58 @@
        "type": "github"
      }
    },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764592794,
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
    "hyprutils": {
      "inputs": {
        "nixpkgs": [
@@ -490,11 +480,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753800567,
-        "narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=",
+        "lastModified": 1766253372,
+        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7",
+        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
        "type": "github"
      },
      "original": {
@@ -515,11 +505,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751897909,
-        "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=",
+        "lastModified": 1763640274,
+        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "fcca0c61f988a9d092cbb33e906775014c61579d",
+        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
        "type": "github"
      },
      "original": {
@@ -528,18 +518,32 @@
        "type": "github"
      }
    },
-    "impermanence": {
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
      "locked": {
-        "lastModified": 1737831083,
-        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+        "lastModified": 1767473322,
+        "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "repo": "impermanence",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
        "type": "github"
      }
    },
@@ -559,16 +563,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "lastModified": 1754860581,
+        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
        "owner": "NuschtOS",
        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
        "type": "github"
      },
      "original": {
        "owner": "NuschtOS",
-        "ref": "v0.0.6",
+        "ref": "v0.1.1",
        "repo": "ixx",
        "type": "github"
      }
@@ -577,14 +581,14 @@
      "inputs": {
        "flake-compat": "flake-compat_2",
        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1754015684,
-        "narHash": "sha256-5Aet3ANxlrWFUqT65+W2esoo9eWp14EGsTdUQFbzqt8=",
+        "lastModified": 1767838769,
+        "narHash": "sha256-KCLU6SUU80tEBKIVZsBrSjRYX6kn1eVIYI3fEEqOp24=",
        "owner": "Infinidoge",
        "repo": "nix-minecraft",
-        "rev": "880dac6903961763770d507ce363ae0cc1da9444",
+        "rev": "4da21f019f6443f513f16af7f220ba4db1cdfc04",
        "type": "github"
      },
      "original": {
@@ -595,11 +599,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1725634671,
-        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
+        "lastModified": 1767379071,
+        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
        "type": "github"
      },
      "original": {
@@ -611,11 +615,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1740877520,
-        "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
+        "lastModified": 1753579242,
+        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
+        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
        "type": "github"
      },
      "original": {
@@ -626,11 +630,11 @@
    },
    "nixpkgs-us": {
      "locked": {
-        "lastModified": 1753939845,
-        "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
+        "lastModified": 1767892417,
+        "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "94def634a20494ee057c76998843c015909d6311",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
        "type": "github"
      },
      "original": {
@@ -641,22 +645,6 @@
      }
    },
    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1752687322,
-        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
      "locked": {
        "lastModified": 1748929857,
        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
@@ -672,29 +660,29 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1753749649,
-        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
+        "lastModified": 1768028080,
+        "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
+        "rev": "d03088749a110d52a4739348f39a63f84bb0be14",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1742069588,
-        "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
+        "lastModified": 1755615617,
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
        "type": "github"
      },
      "original": {
@@ -704,13 +692,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1738797219,
-        "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
+        "lastModified": 1755577059,
+        "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1da52dd49a127ad74486b135898da2cef8c62665",
+        "rev": "97eb7ee0da337d385ab015a23e15022c865be75c",
        "type": "github"
      },
      "original": {
@@ -723,35 +711,36 @@
    "nixvim": {
      "inputs": {
        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
        "nixvim": "nixvim_2"
      },
      "locked": {
-        "lastModified": 1742321392,
-        "narHash": "sha256-gqpGnLGwgVih4sa9tNsTjApy5PrAwOWLalAHQy0oPxM=",
+        "lastModified": 1760575893,
+        "narHash": "sha256-u6eyhxtlxgG29uI2VCSt5Ir6/BW9hkhglCTfbJ14Hgg=",
        "ref": "refs/heads/master",
-        "rev": "24f67e26762b5ce7d1eabac6535aac004896c842",
-        "revCount": 32,
+        "rev": "bcc5185ef433a77b18f5aa585ee79d97f9a8e69c",
+        "revCount": 36,
        "type": "git",
-        "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
      },
      "original": {
        "type": "git",
-        "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
      }
    },
    "nixvim_2": {
      "inputs": {
        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_6",
-        "nuschtosSearch": "nuschtosSearch"
+        "nixpkgs": "nixpkgs_5",
+        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1741814789,
-        "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=",
+        "lastModified": 1755741137,
+        "narHash": "sha256-YnpE/fOL3H8cJZ9by/YmeNhIqOQdKuZRYA1L3+w6WsI=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "33097dcf776d1fad0ff3842096c4e3546312f251",
+        "rev": "91a38e66240c338e683421a4ee3f525d329fc4ad",
        "type": "github"
      },
      "original": {
@@ -771,11 +760,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738508923,
-        "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
+        "lastModified": 1755555503,
+        "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
+        "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea",
        "type": "github"
      },
      "original": {
@@ -794,11 +783,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750779888,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
+        "lastModified": 1767281941,
+        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
+        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
        "type": "github"
      },
      "original": {
@@ -809,21 +798,15 @@
    },
    "root": {
      "inputs": {
-        "ags": "ags",
        "disko": "disko",
        "firefox-addons": "firefox-addons",
        "home-manager": "home-manager",
-        "home-manager-us": "home-manager-us",
        "hyprland": "hyprland",
-        "impermanence": "impermanence",
        "nix-minecraft": "nix-minecraft",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
        "nixpkgs-us": "nixpkgs-us",
        "nixvim": "nixvim",
-        "sops-nix": "sops-nix",
-        "sugar-dark-sddm": "sugar-dark-sddm",
-        "themecord": "themecord",
-        "tokyo-night-sddm": "tokyo-night-sddm"
+        "sops-nix": "sops-nix"
      }
    },
    "sops-nix": {
@@ -833,11 +816,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752544651,
-        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
+        "lastModified": 1768104471,
+        "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
+        "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004",
        "type": "github"
      },
      "original": {
@@ -846,22 +829,6 @@
        "type": "github"
      }
    },
-    "sugar-dark-sddm": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1661321743,
-        "narHash": "sha256-flOspjpYezPvGZ6b4R/Mr18N7N3JdytCSwwu6mf4owQ=",
-        "owner": "MarianArlt",
-        "repo": "sddm-sugar-dark",
-        "rev": "ceb2c455663429be03ba62d9f898c571650ef7fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MarianArlt",
-        "repo": "sddm-sugar-dark",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1689347949,
@@ -879,16 +846,16 @@
    },
    "systems_2": {
      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
        "type": "github"
      }
    },
@@ -922,42 +889,6 @@
        "type": "github"
      }
    },
-    "themecord": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743970059,
-        "narHash": "sha256-vwrIULP9VmYqhNtHcNaPat6OjKqbDgwf3qSypOusG9c=",
-        "owner": "danihek",
-        "repo": "themecord",
-        "rev": "2117717f830c4847eafc450319de26ae09ac9277",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danihek",
-        "repo": "themecord",
-        "type": "github"
-      }
-    },
-    "tokyo-night-sddm": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1686823900,
-        "narHash": "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=",
-        "owner": "siddrs",
-        "repo": "tokyo-night-sddm",
-        "rev": "320c8e74ade1e94f640708eee0b9a75a395697c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "siddrs",
-        "repo": "tokyo-night-sddm",
-        "type": "github"
-      }
-    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": [
@@ -986,11 +917,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751300244,
-        "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=",
+        "lastModified": 1761431178,
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -2,44 +2,20 @@
    description = "Nixos config flake";
     
    inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-        #nixpkgs.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.11";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";

        nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
-        #nixpkgs-us.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-unstable";

        home-manager = {
-            url = "github:nix-community/home-manager/release-25.05";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
+            url = "github:nix-community/home-manager/release-25.11";
            inputs.nixpkgs.follows = "nixpkgs";
        };

-        home-manager-us = {
-            url = "github:nix-community/home-manager/master";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
-            inputs.nixpkgs.follows = "nixpkgs-us";
-        };
-
-        #nixpkgs-droid.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.05";
-/*        
-        home-manager-droid = {
-            url = "github:nix-community/home-manager/release-24.11";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.05";
-            inputs.nixpkgs.follows = "nixpkgs-droid";
-        };
-
-        nix-on-droid = {
-            url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nix-on-droid?ref=release-24.05";
-            inputs.nixpkgs.follows = "nixpkgs-droid";
-        };
-*/
        disko = {
            url = "github:nix-community/disko";
            inputs.nixpkgs.follows = "nixpkgs";
        };

-        impermanence.url = "github:nix-community/impermanence";
-
        sops-nix = {
            url = "github:Mic92/sops-nix";
            inputs.nixpkgs.follows = "nixpkgs";
@@ -53,131 +29,179 @@

        nix-minecraft.url = "github:Infinidoge/nix-minecraft";

-        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";

        hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-        #hyprland.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/hyprland?submodules=1";
-    
-        tokyo-night-sddm = {
-            url = "github:siddrs/tokyo-night-sddm";
-            flake = false;
-        };    
-    
-        sugar-dark-sddm = {
-            url = "github:MarianArlt/sddm-sugar-dark";
-            flake = false;
-        };

-        nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai";
-        #nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai";
-
-        ags.url = "github:Aylur/ags/v1";
-    
-        themecord = {
-            url = "github:danihek/themecord";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
+        nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";

+        self.submodules = true;
    };

    outputs = { self, nixpkgs, home-manager, ... } @ inputs: {

-        tokyo-night-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation {
-
-            name = "tokyo-night";
-
-            src = inputs.tokyo-night-sddm;
-
-            installPhase = ''
-                mkdir -p $out
-	            cp -R $src/* $out/
-            '';
-
-        };   
-        
-        sugar-dark-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation {
-
-            name = "sugar-dark";
-
-            src = inputs.sugar-dark-sddm;
-
-            installPhase = ''
-                mkdir -p $out
-	            cp -R $src/* $out/
-            '';
-
-        };
-
-
-        nixosConfigurations = {
-        
-            homebox = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
-                        tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/homebox
-                    ./system-config
-                ];
-            };
-
-            laptop = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
-                        tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/laptop
-                    ./system-config
-                ];
-            };
-
-            jesstop = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/jesstop
-                    ./system-config
-                ];
-            };
-
-            live = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
-                        tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/live
-                    ./system-config
-                ];
-            };
-        };
-/*
-        nixOnDroidConfigurations.default = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
-            pkgs = import nixpkgs { system = "aarch64-linux"; };
-
-            modules = [
-                {
-                    home-manager.extraSpecialArgs = {
-                        inputs = inputs // {
-                            nix-on-droid-home-manager = import ./home-manager/nix-on-droid;
-                        };
+        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 = [
+                            ./system
+                            ./profiles/${name}
+                        ];
                    };
-                }
-                ./system-config/configuration/android 
-                ./system-config
-            ];
+                })) 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)
+               );
    };
 }
--- a/home-manager/nathan/default.nix
+++ b/home-manager/nathan/default.nix
@@ -1,53 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    imports = [
-        ./programs
-        ./services
-        ./packages
-        ./dotfiles
-		./impermanence
-	];
-
-    options.homeconfig = {
-        host = lib.options.mkOption {
-            type = lib.types.str;
-            default = null;
-        };
-        
-        home-manager.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = {
-
-        home.stateVersion = "23.11";
-
-        home.username = "nathan";
-
-        home.homeDirectory = "/home/nathan";
-
-        home.pointerCursor = {
-            gtk.enable = true;
-            package = pkgs.bibata-cursors;
-            name = "Bibata-Modern-Classic";
-            size = 16;
-        };
-
-        gtk = {
-            enable = true;
-            theme.name = "Tokyonight-Dark";
-            theme.package = pkgs.tokyonight-gtk-theme;
-            iconTheme.package = pkgs.rose-pine-icon-theme;
-            iconTheme.name = "rose-pine-moon";
-        };
-
-        services.mpris-proxy.enable = true;
-
-        programs.ssh.enable = true;
-
-        programs.home-manager.enable = config.homeconfig.home-manager.enable;
-
-    };
-}
--- a/home-manager/nathan/dotfiles/ags/README.md
+++ b/home-manager/nathan/dotfiles/ags/README.md
@@ -1,15 +0,0 @@
-
-# Starter Config
-
-if suggestions don't work, first make sure
-you have TypeScript LSP working in your editor
-
-if you do not want typechecking only suggestions
-
-```json
-// tsconfig.json
-"checkJs": false
-```
-
-types are symlinked to:
-/home/nathan/.nix-profile/share/com.github.Aylur.ags/types
--- a/home-manager/nathan/dotfiles/ags/bluetooth.js
+++ b/home-manager/nathan/dotfiles/ags/bluetooth.js
@@ -1,34 +0,0 @@
-const bluetooth = await Service.import("bluetooth")
-
-
-export function ConnectedList() {
-    return Widget.Box({
-        class_name: "btdevices",
-        setup: self => self.hook(bluetooth, self => {
-            self.children = bluetooth.connected_devices
-                .map(({ address, icon_name, name }) => Widget.EventBox({
-                    child: Widget.Icon(icon_name + '-symbolic'),
-                    tooltip_text: name,
-		    on_primary_click: () => {
-			bluetooth.getDevice(address).setConnection(false)
-		    },
-                }));
-    
-            self.visible = bluetooth.connected_devices.length > 0;
-        }, 'notify::connected-devices'),
-    })
-}
-
-
-export default function Bluetooth() {
-
-
-
-    return Widget.EventBox({
-        tooltip_text: bluetooth.bind('enabled').as(on => on ? 'Enabled' : 'Disabled'),
-        child: Widget.Icon({
-            icon: bluetooth.bind('enabled').as(on =>
-                `bluetooth-${on ? 'active' : 'disabled'}-symbolic`),
-        })
-    })
-}
--- a/home-manager/nathan/dotfiles/ags/clock.js
+++ b/home-manager/nathan/dotfiles/ags/clock.js
@@ -1,14 +0,0 @@
-
-
-const date = Variable("", {
-    poll: [1000, 'date "+%H:%M %b %e."'],
-})
-
-function Clock() {
-    return Widget.Label({
-        class_name: "clock",
-        label: date.bind(),
-    })
-}
-
-export default Clock
--- a/home-manager/nathan/dotfiles/ags/config.js
+++ b/home-manager/nathan/dotfiles/ags/config.js
@@ -1,132 +0,0 @@
-
-const hyprland = await Service.import("hyprland")
-//const systemtray = await Service.import("systemtray")
-
-import Clock from './clock.js'
-import Launcher from './launcher.js'
-import Media from './media.js'
-import Notification from './notif.js'
-import Power from './power.js'
-import Workspaces from './workspaces.js'
-import Settings, {SettingsWindow} from './settings.js'
-import { ConnectedList } from './bluetooth.js'
-
-import { NotificationPopups } from './notification.js'
-
-
-// widgets can be only assigned as a child in one container
-// so to make a reuseable widget, make it a function
-// then you can simply instantiate one by calling it
-
-
-
-//////////////////////////////////////////////////////////////
-// layout of the bar
-function Left() {
-    return Widget.Box({
-        spacing: 8,
-        margin_bottom: 5,
-        children: [
-            Launcher(),
-            Workspaces(),
-        ],
-    })
-}
-
-function Center() {
-    return Widget.Box({
-        spacing: 8,
-        margin_bottom: 5,
-        children: [
-            Media(),
-            Clock(),
-            Notification(),
-        ],
-    })
-}
-
-function Right() {
-    return Widget.Box({
-        hpack: "end",
-        spacing: 8,
-        margin_bottom: 5,
-        children: [
-            ConnectedList(),
-            Settings(),
-            Power(),
-        ],
-    })
-}
-
-///////////////////////////////////////////////////////////
-//windows
-
-function Bar(monitor = 0) {
-    return Widget.Window({
-        name: `bar-${monitor}`, // name has to be unique
-        class_name: "bar",
-        monitor,
-        anchor: ["top", "left", "right"],
-        height_request: 32,
-        vexpand: false,
-        exclusivity: "exclusive",
-        child: Widget.CenterBox({
-            start_widget: Left(),
-            center_widget: Center(),
-            end_widget: Right(),
-        }),
-    })
-}
-
-
-
-function pickMonitor() {
-
-    let n = 0
-
-    for(let i = 0; i < hyprland.monitors.length; i++) {
-        print(hyprland.getMonitor(i).name)
-        if(hyprland.getMonitor(i).name == 'eDP-1')
-            n = i
-            break
-    }
-
-    return n;
-}
-
-////////////////////////////////////////////////////////////
-//App config
-
-let m = 0
-
-App.config({
-    style: "/home/nathan/.cache/wal/colors-ags.css",
-    windows: [
-        Bar(m),
-        SettingsWindow(m),
-        NotificationPopups(m)
-        // you can call it, for each monitor
-        // Bar(0),
-        // Bar(1)
-    ],
-})
-
-App.toggleWindow(App.windows[1].name)
-
-// Utils.timeout(100, () => Utils.notify({
-//     summary: "Notification Popup Example",
-//     iconName: "info-symbolic",
-//     body: "Lorem ipsum dolor sit amet, qui minim labore adipisicing "
-//         + "minim sint cillum sint consectetur cupidatat.",
-//     actions: {
-//         "Cool": () => print("pressed Cool"),
-//     },
-// }))
-
-Utils.monitorFile(`/home/nathan/.cache/wal`, () => {
-    const css = `/home/nathan/.cache/wal/colors-ags.css`
-    App.resetCss()
-    App.applyCss(css)
-})
-
-export { }
--- a/home-manager/nathan/dotfiles/ags/media.js
+++ b/home-manager/nathan/dotfiles/ags/media.js
@@ -1,141 +0,0 @@
-const mpris = await Service.import("mpris")
-
-
-export default function Media() {
-    const track = Utils.watch("", mpris, "player-changed", () => {
-        if (mpris.players[0]) {
-            const { track_artists, track_title } = mpris.players[0]
-            return `${track_artists.join(", ")} -${track_title}`
-        } else {
-            return "Nothing is playing"
-        }
-    })
-
-    return Widget.EventBox({
-        class_name: "media",
-        on_primary_click: () => mpris.getPlayer("")?.playPause(),
-        on_scroll_up: () => mpris.getPlayer("")?.next(),
-        on_scroll_down: () => mpris.getPlayer("")?.previous(),
-        child: Widget.Icon({icon: 'emblem-music-symbolic'}),
-    })
-}
-
-function PlayerImg(player) {
-	return Widget.Box({
-	    hpack: "start",
-            width_request: 80,
-            height_request: 80,
-            css: player.bind("track_cover_url").transform(p => `
-                background-image: url('${p || player.cover_path || '/home/nathan/Pictures/symbols/audio.png'}');
-                background-size: contain;
-                background-repeat: no-repeat;
-                background-position: center;
-            `),
-        })
-
-}
-
-
-function PlayerGUI(player) {
-
-
-    return Widget.Box({
-        class_name: "playerbox",
-        height_request: 200,
-        vexpand: false,
-        vertical: true,
-        children: [
-            Widget.Box({
-                vertical: false,
-                margin: 15,
-                hpack: "start",
-                spacing: 20,
-                children: [
-                    PlayerImg(player),
-                    Widget.Box({
-                        vertical: true,
-                        children: [
-                            Widget.Label({
-                                hpack: "start",
-                                max_width_chars: 30,
-                                truncate: "end",
-                                label: player.bind('track-title').as(t => t)
-                            }),
-                            Widget.Label({
-                                hpack: "start",
-                                max_width_chars: 30,
-                                truncate: "end",
-                                label: player.bind("track_artists").transform(a => a.join(", ")),
-                                wrap: true,
-                            }),
-                            Widget.Label({
-                                hpack: "start",
-                                max_width_chars: 30,
-                                truncate: "end",
-                                label: player.bind('track-album').as(t => t)
-                            }),
-                        ]
-                    })
-                ],
-                
-            }),
-
-            Widget.Slider({
-                class_name: "position",
-                draw_value: false,
-                on_change: ({ value }) => player.position = value * player.length,
-                visible: player.bind("length").as(l => l > 0),
-                setup: self => {
-                    function update() {
-                        const value = player.position / player.length
-                        self.value = value > 0 ? value : 0
-                    }
-                    self.hook(player, update)
-                    self.hook(player, update, "position")
-                    self.poll(1000, update)
-                },
-            }),
-
-            Widget.Box({
-                vertical: false,
-                hpack: "center",
-                spacing: 20,
-                children: [
-                    Widget.Button({
-                        child: Widget.Icon({ icon: 'media-skip-backward-symbolic'}),
-                        on_primary_click: () => player.previous()
-                    }),
-                    Widget.Button({
-                        child: Widget.Icon({ icon: player.bind("play_back_status").transform(s => {
-                                switch (s) {
-                                    case "Playing": return 'media-playback-pause-symbolic'
-                                    case "Paused":
-                                    case "Stopped": return 'media-playback-start-symbolic'
-                                }
-                            }),
-                        }),
-                        on_primary_click: () => player.playPause(),
-                    }),
-                    Widget.Button({
-                        child: Widget.Icon({ icon: 'media-skip-forward-symbolic'}),
-                        on_primary_click: () => player.next()
-                    })
-                ]
-            })
-        ],
-        setup: self => {
-            
-        },
-    })
-}
-
-export function Players() {
-
-    const plrs = mpris.bind('players')
-    .as(p => p.map((v) => PlayerGUI(v)))
-
-    return Widget.Box({
-        vertical: true,
-        children: plrs,
-    })
-}
--- a/home-manager/nathan/dotfiles/ags/notif.js
+++ b/home-manager/nathan/dotfiles/ags/notif.js
@@ -1,22 +0,0 @@
-const notifications = await Service.import("notifications")
-
-
-
-// we don't need dunst or any other notification daemon
-// because the Notifications module is a notification daemon itself
-export default function Notification() {
-    const popups = notifications.bind("popups")
-    return Widget.EventBox({
-        class_name: "notificationbutton",
-        visible: true,
-        on_primary_click: () => {},
-        child: Widget.Icon({
-            icon: "preferences-system-notifications-symbolic",
-        }),
-            
-    })
-}
-
-// Widget.Label({
-//     label: popups.as(p => p[0]?.summary || ""),
-// }),
--- a/home-manager/nathan/dotfiles/ags/notification.js
+++ b/home-manager/nathan/dotfiles/ags/notification.js
@@ -1,131 +0,0 @@
-const notifications = await Service.import("notifications")
-
-/** @param {import('resource:///com/github/Aylur/ags/service/notifications.js').Notification} n */
-function NotificationIcon({ app_entry, app_icon, image }) {
-    if (image) {
-        return Widget.Box({
-            css: `background-image: url("${image}");`
-                + "background-size: contain;"
-                + "background-repeat: no-repeat;"
-                + "background-position: center;",
-        })
-    }
-
-    let icon = "dialog-information-symbolic"
-    if (Utils.lookUpIcon(app_icon))
-        icon = app_icon
-
-    if (app_entry && Utils.lookUpIcon(app_entry))
-        icon = app_entry
-
-    return Widget.Box({
-        child: Widget.Icon(icon),
-    })
-}
-
-/** @param {import('resource:///com/github/Aylur/ags/service/notifications.js').Notification} n */
-function Notification(n) {
-    const icon = Widget.Box({
-        vpack: "start",
-        class_name: "icon",
-        child: NotificationIcon(n),
-    })
-
-    const title = Widget.Label({
-        class_name: "title",
-        xalign: 0,
-        justification: "left",
-        hexpand: true,
-        max_width_chars: 24,
-        truncate: "end",
-        wrap: true,
-        label: n.summary,
-        use_markup: true,
-    })
-
-    const body = Widget.Label({
-        class_name: "body",
-        hexpand: true,
-        use_markup: true,
-        xalign: 0,
-        justification: "left",
-        label: n.body,
-        wrap: true,
-    })
-
-    const actions = Widget.Box({
-        class_name: "actions",
-        children: n.actions.map(({ id, label }) => Widget.Button({
-            class_name: "action-button",
-            on_clicked: () => {
-                n.invoke(id)
-                n.dismiss()
-            },
-            hexpand: true,
-            child: Widget.Label(label),
-        })),
-    })
-
-    return Widget.EventBox(
-        {
-            attribute: { id: n.id },
-            on_primary_click: n.dismiss,
-        },
-        Widget.Box(
-            {
-                class_name: `notification ${n.urgency}`,
-                vertical: true,
-            },
-            Widget.Box([
-                icon,
-                Widget.Box(
-                    { vertical: true },
-                    title,
-                    body,
-                ),
-            ]),
-            actions,
-        ),
-    )
-}
-
-export function NotificationPopups(monitor = 0) {
-    const list = Widget.Box({
-        vertical: true,
-        children: notifications.popups.map(Notification),
-    })
-
-    function onNotified(_, /** @type {number} */ id) {
-        const n = notifications.getNotification(id)
-        if (n)
-            list.children = [Notification(n), ...list.children]
-    }
-
-    function onDismissed(_, /** @type {number} */ id) {
-        list.children.find(n => n.attribute.id === id)?.destroy()
-    }
-
-    list.hook(notifications, onNotified, "notified")
-        .hook(notifications, onDismissed, "dismissed")
-
-    return Widget.Window({
-        monitor,
-        name: `notifications${monitor}`,
-        class_name: "notification-popups",
-        anchor: ["top", "right"],
-        layer: "overlay",
-        child: Widget.Box({
-            css: "min-width: 2px; min-height: 2px;",
-            class_name: "notifications",
-            vertical: true,
-            child: list,
-
-            /** this is a simple one liner that could be used instead of
-                hooking into the 'notified' and 'dismissed' signals.
-                but its not very optimized becuase it will recreate
-                the whole list everytime a notification is added or dismissed */
-            // children: notifications.bind('popups')
-            //     .as(popups => popups.map(Notification))
-        }),
-    })
-}
--- a/home-manager/nathan/dotfiles/ags/power.js
+++ b/home-manager/nathan/dotfiles/ags/power.js
@@ -1,44 +0,0 @@
-
-
-
-function Power() {
-
-
-    return Widget.Box({
-        vertical: false,
-        spacing: 8,
-        children: [
-            Widget.EventBox({
-                child: Widget.Icon({icon: 'system-reboot-symbolic'}),
-                margin_right: 10,
-                class_name: 'restart',
-                tooltip_text: 'restart',
-                on_primary_click: () => {App.Quit(); Utils.execAsync('reboot')},
-            }),
-            Widget.EventBox({
-                child: Widget.Icon({icon: 'system-log-out-symbolic'}),
-                margin_right: 10,
-                class_name: 'logout',
-                tooltip_text: 'log out',
-                on_primary_click: () => {App.Quit(); Utils.execAsync('loginctl kill-session self')},
-            }),
-            Widget.EventBox({
-                child: Widget.Icon({icon: 'system-lock-screen-symbolic'}),
-                margin_right: 10,
-                class_name: 'lockscreen',
-                tooltip_text: 'lock screen',
-                on_primary_click: () => {Utils.exec('swaylock')},
-            }),
-            Widget.EventBox({
-                child: Widget.Icon({icon: 'system-shutdown-symbolic'}),
-                margin_right: 10,
-                class_name: 'poweroff',
-                tooltip_text: 'shutdown',
-                on_primary_click: () => {App.Quit(); Utils.execAsync('shutdown now')},
-            })
-        ],
-    })
-}
-
-
-export default Power
--- a/home-manager/nathan/dotfiles/ags/settings.js
+++ b/home-manager/nathan/dotfiles/ags/settings.js
@@ -1,125 +0,0 @@
-const audio = await Service.import("audio")
-const battery = await Service.import("battery")
-const mpris = await Service.import("mpris")
-
-import Bluetooth from "./bluetooth.js"
-import WifiIndicator from "./wifi.js"
-import { Players } from "./media.js"
-
-export function Volume() {
-    const icons = {
-        101: "high",
-        67: "high",
-        34: "medium",
-        1: "low",
-        0: "muted",
-    }
-
-    function getIcon() {
-        const icon = audio.speaker.is_muted ? 0 : [101, 67, 34, 1, 0].find(
-            threshold => threshold <= audio.speaker.volume * 100)
-
-        return `audio-volume-${icons[icon]}-symbolic`
-    }
-
-
-    return Widget.EventBox({
-        tooltip_text: '',
-        setup: (self) => self.hook(audio.speaker, () => {
-            self.tooltip_text = `Volume: ${(100 * audio.speaker.volume).toFixed(0)}%`
-        }),
-        child: Widget.Icon({
-            class_name: "volume",
-            icon: Utils.watch(getIcon(), audio.speaker, getIcon),
-        })
-    })
-
-}
-
-// const slider = Widget.Slider({
-//     hexpand: true,
-//     draw_value: false,
-//     inverted: true,
-//     on_change: ({ value }) => audio.speaker.volume = value,
-//     setup: (self) => self.hook(audio.speaker, () => {
-//         self.value = audio.speaker.volume || 0
-//     }),
-// })
-
-
-export function BatteryLabel() {
-    const value = battery.bind("percent").as(p => p > 0 ? p / 100 : 0)
-    const icon = battery.bind("percent").as(p => 
-	    `battery-${p > 90 ? "full" : p > 70 ? "good" : p > 50 ? "medium" : p > 30 ? "low" : p > 10 ? "caution" : "empty"}-symbolic`)
-
-    return Widget.Box({
-        class_name: "battery",
-        visible: battery.bind("available"),
-        child: Widget.EventBox({
-            child: Widget.Icon({ icon }), 
-            tooltip_text: value.as(p => `Battery: ${(p * 100).toFixed(0)}%`)
-        }),
-    })
-}
-
-function Panel() {
-  return Widget.Box({
-	  height_request: 200,
-	  css: 'background: black;',
-  })
-}
-
-export function SettingsWindow(monitor = 0) {
-    return Widget.Window({
-        monitor,
-        name: `Settings-${monitor}`,
-        anchor: ["top", "bottom", "right"],
-        margins: [50, 0, 10, 0],
-        width_request: 400,
-        exclusivity: "ignore",
-        layer: "top",
-        class_name: "SettingsWindow",
-        child: Widget.Box({
-            class_name: "settings_window",
-            child: Widget.Scrollable({
-                vscroll: "always",
-                hscroll: "never",
-                hexpand: true,
-                vexpand: true,
-                margin: 20,
-                child: Widget.Box({
-                    vertical: true,
-                    children: [
-			Panel(),
-                        Players()
-                    ]
-                }),
-            }),
-        }),
-    })
-}
-
-
-export default function Settings() {
-
-
-    return Widget.Button({
-        tooltip_text: 'Settings',
-        attribute: false,
-        margin_right: 8,
-        child: Widget.Box({
-            spacing: 8,
-            children: [
-                Bluetooth(),
-                WifiIndicator(),
-                BatteryLabel(),
-                Volume(),
-            ],
-        }),
-        on_clicked: (self) => {
-            self.attribute = !self.attribute
-            
-            App.toggleWindow(App.windows[1].name)
-        },
-    })
-}
--- a/home-manager/nathan/dotfiles/ags/style.css
+++ b/home-manager/nathan/dotfiles/ags/style.css
@@ -1,174 +0,0 @@
-
-
-
-
-window.bar {
-    background-color: rgb(36, 40, 59);
-    color: rgb(200, 200, 200);
-    
-}
-
-window.win {
-    background-color: transparent;
-    color: rgb(200, 200, 200);
-}
-
-.booox {
-    color: white;
-    background-color: white;
-
-}
-
-.playerbox {
-    background-color: rgb(73, 81, 121);
-    color:rgb(73, 81, 121);
-    border: 3px solid black;
-    border-radius: 15px;
-}
-
-.launcher {
-    color: aqua;
-    background: none;
-    border: none;
-    
-}
-
-box {
-    color: aqua;
-}
-
-
-Window.SettingsWindow {
-    background-color: black;
-    color: black;
-}
-.settings_window {
-    background-color: rgb(36, 40, 59);
-    color: teal;
-    border-radius: 15px;
-}
-
-.focused {
-    color: aqua;
-}
-
-.other {
-    color: teal;
-}
-
-.media {
-    color: aqua;
-}
-
-.media:active {
-    background-color: aqua;
-}
-
-button {
-    min-width: 0;
-    padding-top: 0;
-    padding-bottom: 0;
-    background: none;
-    border: none;
-    padding: 0px;
-    padding-left: 5px;
-    padding-right: 5px;
-    color: aqua;
-}
-
-button:active {
-    background-color: aqua;
-}
-
-button:hover {
-    border-bottom: 3px solid teal;
-}
-
-label {
-    font-weight: bold;
-}
-
-.workspaces button.focused {
-    border-bottom: 3px solid aqua;
-}
-
-.client-title {
-    color: rgb(200, 200, 200);
-}
-
-.clock {
-    color: rgb(200, 200, 200);
-}
-
-.notification {
-    color: yellow;
-}
-
-levelbar block,
-highlight {
-    min-height: 4px;
-}
-
-/************************************/
-
-window.notification-popups box.notifications {
-    padding: .5em;
-}
-
-.icon {
-    min-width: 68px;
-    min-height: 68px;
-    margin-right: 1em;
-}
-
-.icon image {
-    font-size: 58px;
-    /* to center the icon */
-    margin: 5px;
-    color: yellow;
-}
-
-.icon box {
-    min-width: 68px;
-    min-height: 68px;
-    border-radius: 7px;
-}
-
-.notificationbutton {
-    color: teal;
-}
-
-.notification {
-    min-width: 350px;
-    border-radius: 11px;
-    padding: 1em;
-    margin: .5em;
-    border: 1px solid blue;
-    background-color: rgb(36, 40, 59);
-}
-
-.notification.critical {
-    border: 1px solid lightcoral;
-}
-
-.title {
-    color: black;
-    font-size: 1.4em;
-}
-
-.body {
-    color: red;
-}
-
-.actions .action-button {
-    margin: 0 .4em;
-    margin-top: .8em;
-}
-
-.actions .action-button:first-child {
-    margin-left: 0;
-}
-
-.actions .action-button:last-child {
-    margin-right: 0;
-}
--- a/home-manager/nathan/dotfiles/ags/wifi.js
+++ b/home-manager/nathan/dotfiles/ags/wifi.js
@@ -1,30 +0,0 @@
-const network = await Service.import('network')
-
-export default function WifiIndicator()  {
-    return Widget.Box({
-        child: Widget.EventBox({
-            child: Widget.Icon({
-                icon: 'network-wireless-disconnected-symbolic',
-            }),
-
-            setup: self => self.hook(network.wifi, () => {
-                self.child.icon = network.wifi.icon_name == 'network-wireless-disabled-symbolic' ? 'network-wireless-disconnected-symbolic' : network.wifi.icon_name
-                self.tooltip_text = network.wifi.ssid ? network.wifi.ssid : network.wifi.internet
-            }),
-
-            tooltip_text: 'disconnected',
-        }),
-    })
-}
-
-// const WiredIndicator = () => Widget.Icon({
-//     icon: network.wired.bind('icon_name'),
-// })
-
-// const NetworkIndicator = () => Widget.Stack({
-//     children: {
-//         wifi: WifiIndicator(),
-//         wired: WiredIndicator(),
-//     },
-//     shown: network.bind('primary').as(p => p || 'wifi'),
-// })
--- a/home-manager/nathan/dotfiles/ags/workspaces.js
+++ b/home-manager/nathan/dotfiles/ags/workspaces.js
@@ -1,37 +0,0 @@
-const hyprland = await Service.import("hyprland")
-
-
-function ClientTitle() {
-    return Widget.Label({
-        class_name: "client-title",
-        max_width_chars: 30,
-        truncate: "end",
-        label: hyprland.active.client.bind("title"),
-    })
-}
-
-
-function Workspaces() {
-    const activeId = hyprland.active.workspace.bind("id")
-    const workspaces = hyprland.bind("workspaces")
-        .as(ws => ws.map(({ id }) => id > 0 ? Widget.Button({
-            on_clicked: () => hyprland.messageAsync(`dispatch workspace ${id}`),
-            child: Widget.Label(`${id}`),
-            class_name: activeId.as(i => `${i === id ? "focused" : "other"}`),
-            margin_left: 10,
-        }) : null
-	).sort((a, b) => { return a && b ? Number(a.child.label) - Number(b.child.label) : a ? -1 : 1 }))
-
-    return Widget.CenterBox({
-        
-        spacing: 8,
-        start_widget: Widget.Box({
-            class_name: "workspaces", 
-            spacing: 0, 
-            children: workspaces
-        }),
-        end_widget: ClientTitle(),
-    })
-}
-
-export default Workspaces
--- a/home-manager/nathan/dotfiles/default.nix
+++ b/home-manager/nathan/dotfiles/default.nix
@@ -1,11 +0,0 @@
-{ config, lib, ... }: {
-
-	home.file = {
-		".config/ags" = { source = ./ags; recursive = true; };
-		".config/hypr" = { source = ./hypr; recursive = true; };
-		".config/swaylock" = { source = ./swaylock; recursive = true; };
-		".config/wal/templates" = { source = ./wal/templates; recursive = true; };
-		"Pictures/Wallpaper" = { source = ./Wallpaper; recursive = true; };
-	};
-
-}
--- a/home-manager/nathan/dotfiles/hypr/otf.conf
+++ b/home-manager/nathan/dotfiles/hypr/otf.conf
@@ -1 +0,0 @@
-
--- a/home-manager/nathan/dotfiles/hypr/pyprland.toml
+++ b/home-manager/nathan/dotfiles/hypr/pyprland.toml
@@ -1,22 +0,0 @@
-    [pyprland]
-	plugins = [
-          "scratchpads"
-	]
-
-	[scratchpads.nvim]
-	animation = "fromTop"
-	command = "kitty --class scratchpad-nvim -e nvim ~/Projects"
-	lazy = false
-	class = "scratchpad-nvim"
-	margin = 100
-	multi = true
-	excludes = "*"
-
-	[scratchpads.free]
-	animation = "fromBottom"
-	command = "kitty --class scratchpad"
-	class = "scratchpad"
-	lazy = false
-	margin = 100
-	multi = true
-	excludes = "*"
--- a/home-manager/nathan/dotfiles/wal/templates/colors-ags.css
+++ b/home-manager/nathan/dotfiles/wal/templates/colors-ags.css
@@ -1,161 +0,0 @@
-
-
-
-
-window.bar {{
-    background-color: {color1.rgba};
-    color: {color1.rgba};
-    opacity: 1;
-    
-}}
-
-.playerbox {{
-    background-color: {color2};
-    color:rgb(73, 81, 121);
-    border: 3px solid black;
-    border-radius: 15px;
-}}
-
-.launcher {{
-    background: none;
-    border: none;
-}}
-
-box {{
-    color: {color11};
-}}
-
-
-Window.SettingsWindow {{
-    background-color: black;
-    color: black;
-}}
-.settings_window {{
-    background-color: {color1.rgba};
-    border-radius: 15px;
-}}
-
-.focused {{
-    color: {color11};
-}}
-
-.other {{
-    color: {color3};
-}}
-
-.media {{
-    color: {color11};
-}}
-
-.media:active {{
-    background-color: {color11};
-}}
-
-button {{
-    min-width: 0;
-    padding-top: 0;
-    padding-bottom: 0;
-    background: none;
-    border: none;
-    padding: 0px;
-    padding-left: 5px;
-    padding-right: 5px;
-    color: {color11};
-}}
-
-button:active {{
-    background-color: {color11};
-}}
-
-button:hover {{
-    border-bottom: 3px solid {color3};
-}}
-
-label {{
-    font-weight: bold;
-}}
-
-.workspaces button.focused {{
-    border-bottom: 3px solid {color11};
-}}
-
-.client-title {{
-    color: {color11};
-}}
-
-.clock {{
-    color: {color11};
-}}
-
-.notification {{
-    color: yellow;
-}}
-
-levelbar block,
-highlight {{
-    min-height: 4px;
-}}
-
-/************************************/
-
-window.notification-popups box.notifications {{
-    padding: .5em;
-}}
-
-.icon {{
-    min-width: 68px;
-    min-height: 68px;
-    margin-right: 1em;
-}}
-
-.icon image {{
-    font-size: 58px;
-    /* to center the icon */
-    margin: 5px;
-    color: yellow;
-}}
-
-.icon box {{
-    min-width: 68px;
-    min-height: 68px;
-    border-radius: 7px;
-}}
-
-.notificationbutton {{
-    color: {color3};
-}}
-
-.notification {{
-    min-width: 350px;
-    border-radius: 11px;
-    padding: 1em;
-    margin: .5em;
-    border: 1px solid blue;
-    background-color: {color2};
-}}
-
-.notification.critical {{
-    border: 1px solid lightcoral;
-}}
-
-.title {{
-    color: aqua;
-    font-size: 1.4em;
-}}
-
-.body {{
-    color: teal;
-}}
-
-.actions .action-button {{
-    margin: 0 .4em;
-    margin-top: .8em;
-}}
-
-.actions .action-button:first-child {{
-    margin-left: 0;
-}}
-
-.actions .action-button:last-child {{
-    margin-right: 0;
-}}
--- a/home-manager/nathan/impermanence/default.nix
+++ b/home-manager/nathan/impermanence/default.nix
@@ -1,33 +0,0 @@
-{ config, lib, inputs, ... }: {
-    
-    imports = [
-        inputs.impermanence.nixosModules.home-manager.impermanence
-    ];
-
-    options.homeconfig.impermanence.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = true;
-    };
-
-    config = lib.mkIf config.homeconfig.impermanence.enable {
-        
-        home.persistence."/persist/home/nathan" = {
-            
-            directories = [
-                "Documents"
-                "Music"
-		        "Pictures/Photos"
-                "Projects"
-                "Videos"
-                ".ssh"
-                ".local/share/zoxide"
-                ".config/sops"
-            ];
-            files = [
-                ".zsh_history"
-            ];
-            allowOther = true;
-        };
-
-    };
-}
--- a/home-manager/nathan/packages/default.nix
+++ b/home-manager/nathan/packages/default.nix
@@ -1,110 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: let 
-    system = "x86_64-linux";
-
-    pkgs-us = import inputs.nixpkgs-us {
-      inherit system;
-      config.allowUnfree = true;
-    };
-
-    in {
-
-    imports = [ 
-	  ./scripts
-	];
-
-    options.homeconfig.minimal = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkMerge [
-
-        {
-            home.packages = with pkgs; [
-                killall
-                btop
-                zip    
-                unzip
-                gcc
-                zulu
-                rsync
-                lxqt.lxqt-policykit
-                blueberry
-                wl-clipboard
-                xfce.thunar
-                grim
-                slurp
-            ];
-        }
-        
-        (lib.mkIf (!config.homeconfig.minimal) {
-
-            nixpkgs.config = {
-                allowUnfree = true;
-            };
-
-            home.packages = with pkgs; let
-                pypkgs = ps: with ps; [
-                    numpy
-                    matplotlib
-                    scipy
-
-                    pandas
-                    pyaudio
-                    pyusb
-                    debugpy
-                    requests
-                ];
-
-            in [
-
-                cava 
-                android-tools
-                neovim-remote
-                handbrake
-                quickemu
-                bottles
-
-                (pkgs.python312.withPackages pypkgs)
-
-                brightnessctl
-                libdbusmenu-gtk3
-                lmms
-                #unfree {
-                geogebra
-                spotify
-                pkgs-us.rustdesk-flutter
-                #}
-
-                neofetch
-                pkgs-us.mpv
-                ncmpcpp
-                playerctl
-                mpc-cli
-                vlc
-                pavucontrol
-                yewtube
-                ytmdl
-                ffmpeg
-                rpi-imager
-                tigervnc
-                keepassxc
-                httplz
-
-                #3D modeling/printing
-                blender
-                freecad
-                #cura
-
-                #productivity
-                libreoffice
-                super-productivity
-
-                #games
-                prismlauncher
-            ];
-
-        })
-    ];
-
-}
--- a/home-manager/nathan/packages/scripts/default.nix
+++ b/home-manager/nathan/packages/scripts/default.nix
@@ -1,96 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeScripts.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = true;
-        };
-    };
-
-    config = lib.mkIf config.homeScripts.enable {
-        home.packages = [
-
-            #scripts
-	        (pkgs.writeShellScriptBin "_systemRebuild" ''
-	            ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/Olympus
-	            echo //////Enter to close//////
-	            read
-	        '')
-	        (pkgs.writeShellScriptBin "_homeRebuild" ''
-	            ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/Olympus
-	            echo //////Enter to close//////
-	            read
-	        '')
-
-	        (pkgs.writeShellScriptBin "randWallpaper" ''
-                file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper /home/nathan/Pictures/Wallpaper/$file
-	        '')
-
-	        (pkgs.writeShellScriptBin "setWallpaper" ''
-	            img=''$(realpath ''${1:-~/.cache/bg})
-                ${pkgs.swww}/bin/swww img ''$img
-                changeColors ''$img ''$2
-	        '')
-
-	        (pkgs.writeShellScriptBin "changeColors" ''
-
-	            if [[ $(ls ~/.cache/ | grep bga) != bga ]]; then
-	            echo 100 > ~/.cache/bga
-	            fi
-
-	            alpha=''${2:-`cat ~/.cache/bga`}
-
-	            img=''$(realpath ''${1:-~/.cache/bg})
-	    
-	            if [[ $alpha -lt 0 ]]; then
-	            $alpha=0
-	            fi
-	    
-	            if [[ $alpha -gt 100 ]]; then
-	            $alpha=100
-	            fi
-            
-	            wal -i $img -a $alpha --cols16 -n
-	    
-	            echo $alpha > ~/.cache/bga
-	    
-	            rm ~/.cache/bg
-	            ln -s $img ~/.cache/bg
-            
-	            sleep 0.4
-            
-	            pywalfox update &
-            
-	            themecord > ~/.cache/_.txt && rm ~/.cache/_.txt
-            
-	            [[ $(pidof cava) != "" ]] && pkill -USR1 cava &
-	    
-	            for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send '<cmd>colorscheme pywal<CR>'; done
-	    
-	            pkill -USR1 kitty
-	        '')
-
-	        (pkgs.writeShellScriptBin "onSystemStart" ''
-                ${pkgs.swww}/bin/swww-daemon &
-		        randWallpaper &
-                ags &
-	            pypr &
-	            lxqt-policykit-agent &
-	           # nmcli device wifi connect EagleNet password '~?C#@ZiH' &
-                hyprctl setcursor Bibata-Modern-Classic 16 &
-                sleep 3
-		        hyprctl reload &
-                novnc &
-                #tmux new-session -s hyprland 
-	        '')
-
-	        (pkgs.writeShellScriptBin "colorPrefix" ''
-                exec -a "$0" "$@" &
-	            sleep 0.4 && changeColors &
-	        '')
-
-        ];
-    };
-}
-
--- a/home-manager/nathan/programs/ags/default.nix
+++ b/home-manager/nathan/programs/ags/default.nix
@@ -1,39 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [ inputs.ags.homeManagerModules.default ];
-
-    options.homeconfig.ags.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.ags.enable {
-        programs.ags = {
-            enable = true;
-
-            extraPackages = with pkgs; [
-                gtksourceview
-                webkitgtk
-                accountsservice
-            ];
-        };
-
-        home.file.".config/ags/launcher.js".text = /*javascript*/ ''
-        function Launcher() {
-            return Widget.EventBox({
-                class_name: "launcher",
-                hpack: "center",
-                child: Widget.Icon({
-                    icon: '${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake.png',
-                    css: 'font-size: 24px;'
-                }),
-                on_primary_click: () => {Utils.execAsync('rofi -show drun')},
-                margin_left: 10,
-            })
-        }
-
-        export default Launcher
-        '';
-
-    };
-}
--- a/home-manager/nathan/programs/ags2/default.nix
+++ b/home-manager/nathan/programs/ags2/default.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.ags2.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.ags2.enable {
-        
-
-    };
-}
--- a/home-manager/nathan/programs/default.nix
+++ b/home-manager/nathan/programs/default.nix
@@ -1,22 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-        ./ags
-        ./hyprland
-	    ./terminal
-        ./rofi
-        ./pywal
-        ./swaylock
-        ./calcurse
-        ./firefox
-    ];
-
-    config = {
-
-        home.packages = [
-            inputs.nixvim.packages.${pkgs.system}.pywal
-        ];
-
-        home.sessionVariables.EDITOR = "nvim";
-    };
-}
--- a/home-manager/nathan/programs/hyprland/default.nix
+++ b/home-manager/nathan/programs/hyprland/default.nix
@@ -1,40 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.hyprland.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprland.enable {
-
-        home.sessionVariables.NIX_OZONE_WL = "1";
-
-        programs.kitty.enable = lib.mkDefault true;
-
-        home.packages = with pkgs; [
-            pyprland
-        ];
-        wayland.windowManager.hyprland = {
-
-            enable = true;
-
-            systemd = {
-                enable = true;
-                variables = [ "--all" ];
-            };
-
-            extraConfig = let 
-                monitor = if config.homeconfig.host == "laptop" then ''
-                    monitor=eDP-1,1920x1080@60,0x0,1
-                '' else if config.homeconfig.host == "homebox" then ''
-                    monitor=HDMI-A-2,1920x1080@60,0x0,1
-                    monitor=HEADLESS-2,1920x1080@60,0x0,1
-                    exec-once=kitty -e tmux new-session -s hypr
-                '' else '''';
-            in ''
-                source = /home/nathan/.config/hypr/main.conf
-            '' + monitor;
-
-        };
-    };
-}
--- a/home-manager/nathan/programs/pywal/default.nix
+++ b/home-manager/nathan/programs/pywal/default.nix
@@ -1,29 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wal.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = let
-        pywalfox-wrapper = pkgs.writeShellScriptBin "pywalfox-wrapper" ''
-            ${pkgs.pywalfox-native}/bin/pywalfox start
-        '';
-    in  lib.mkIf config.homeconfig.wal.enable {
-
-        home.packages = with pkgs; [
-
-            inputs.themecord.packages.${pkgs.system}.default
-            vesktop
-
-            pywal16
-		    imagemagick
-            pywalfox-native
-        ];
-
-        home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = lib.replaceStrings [ "<path>" ] [
-            "${pywalfox-wrapper}/bin/pywalfox-wrapper"
-        ] (lib.readFile "${pkgs.pywalfox-native}/lib/python3.12/site-packages/pywalfox/assets/manifest.json");
-
-    };
-}
--- a/home-manager/nathan/programs/swaylock/default.nix
+++ b/home-manager/nathan/programs/swaylock/default.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.swaylock.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.swaylock.enable {
-
-        home.packages = with pkgs; [ swaylock-effects ];
-    };
-}
--- a/home-manager/nathan/programs/terminal/default.nix
+++ b/home-manager/nathan/programs/terminal/default.nix
@@ -1,12 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./bat
-    ./eza
-    ./fzf
-    ./tmux
-    ./kitty
-    ./zoxide
-    ./zsh
-  ];
-}
--- a/home-manager/nathan/services/custom/default.nix
+++ b/home-manager/nathan/services/custom/default.nix
@@ -1 +0,0 @@
-{}: {}
--- a/home-manager/nathan/services/default.nix
+++ b/home-manager/nathan/services/default.nix
@@ -1,6 +0,0 @@
-{ ... }: {
-    imports = [
-        ./mpd
-        ./wayvnc
-    ];
-}
--- a/home-manager/nathan/services/wayvnc/default.nix
+++ b/home-manager/nathan/services/wayvnc/default.nix
@@ -1,36 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wayvnc.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    disabledModules = [
-    ];
-
-    imports = [
-        (import "${inputs.home-manager-us}/modules/services/wayvnc.nix" { 
-            inherit config; 
-            inherit lib; 
-            pkgs = (import inputs.nixpkgs-us { system = "x86_64-linux"; });
-        })
-    ];
-
-    config = lib.mkIf config.homeconfig.wayvnc.enable {
-        home.packages = with pkgs; [
-            novnc
-        ];
-
-        services.wayvnc = {
-            enable = true;
-
-            autoStart = true;
-
-            settings = {
-                address = "0.0.0.0";
-
-                port = 5900;
-            };
-        };
-    };
-}
--- a/home-manager/nix-on-droid/default.nix
+++ b/home-manager/nix-on-droid/default.nix
@@ -1,47 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-        ./programs
-        ./services
-        ./packages
-        ./dotfiles
-	];
-
-    options.homeconfig = {
-        host = lib.options.mkOption {
-            type = lib.types.str;
-            default = null;
-        };
-        
-        home-manager.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = {
-
-        home.stateVersion = "24.11";
-
-        home.username = "nix-on-droid";
-
-        home.homeDirectory = "/data/data/com.termux.nix/files/home";
-
-        nix = {
-            package = pkgs.nix;
-
-            nixPath = [
-                "nixpkgs=${inputs.nixpkgs}"
-            ];
-
-            settings = {
-                experimental-features = [ "nix-command" "flakes" ];
-            };
-        };
-
-        programs.ssh.enable = true;
-
-        programs.home-manager.enable = config.homeconfig.home-manager.enable;
-
-    };
-}
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/bluescape.jpg
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/bluescape.jpg
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/galaxy.jpg
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/galaxy.jpg
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/kurisu.gif
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/kurisu.gif
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/kurisu.jpg
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/kurisu.jpg
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/llenn.png
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/llenn.png
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/megumin.png
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/megumin.png
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/megumin1.gif
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/megumin1.gif
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/megumin2.gif
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/megumin2.gif
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/ngnl.jpg
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/ngnl.jpg
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/orangescape.jpg
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/orangescape.jpg
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/rezero.gif
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/rezero.gif
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/sao.gif
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/sao.gif
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/sao.png
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/sao.png
--- a/home-manager/nix-on-droid/dotfiles/Wallpaper/sinon.gif
+++ b/home-manager/nix-on-droid/dotfiles/Wallpaper/sinon.gif
--- a/home-manager/nix-on-droid/dotfiles/default.nix
+++ b/home-manager/nix-on-droid/dotfiles/default.nix
@@ -1,8 +0,0 @@
-{ config, lib, ... }: {
-
-	home.file = {
-		".config/wal/templates" = { source = ./wal/templates; recursive = true; };
-		"Pictures/Wallpaper" = { source = ./Wallpaper; recursive = true; };
-	};
-
-}
--- a/home-manager/nix-on-droid/dotfiles/wal/templates/cava_config
+++ b/home-manager/nix-on-droid/dotfiles/wal/templates/cava_config
@@ -1,279 +0,0 @@
-## Configuration file for CAVA.
-# Remove the ; to change parameters.
-
-
-[general]
-
-# Smoothing mode. Can be 'normal', 'scientific' or 'waves'. DEPRECATED as of 0.6.0
-; mode = normal
-
-# Accepts only non-negative values.
-; framerate = 60
-
-# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off
-# new as of 0.6.0 autosens of low values (dynamic range)
-# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens. DEPRECATED as of 0.6.0
-; autosens = 1
-; overshoot = 20
-
-# Manual sensitivity in %. If autosens is enabled, this will only be the initial value.
-# 200 means double height. Accepts only non-negative values.
-; sensitivity = 100
-
-# The number of bars (0-512). 0 sets it to auto (fill up console).
-# Bars' width and space between bars in number of characters.
-; bars = 0
-; bar_width = 2
-; bar_spacing = 1
-# bar_height is only used for output in "noritake" format
-; bar_height = 32
-
-# For SDL width and space between bars is in pixels, defaults are:
-; bar_width = 20
-; bar_spacing = 5
-
-# sdl_glsl have these default values, they are only used to calulate max number of bars.
-; bar_width = 1
-; bar_spacing = 0
-
-
-# Lower and higher cutoff frequencies for lowest and highest bars
-# the bandwidth of the visualizer.
-# Note: there is a minimum total bandwidth of 43Mhz x number of bars.
-# Cava will automatically increase the higher cutoff if a too low band is specified.
-; lower_cutoff_freq = 50
-; higher_cutoff_freq = 10000
-
-
-# Seconds with no input before cava goes to sleep mode. Cava will not perform FFT or drawing and
-# only check for input once per second. Cava will wake up once input is detected. 0 = disable.
-; sleep_timer = 0
-
-
-[input]
-
-# Audio capturing method. Possible methods are: 'fifo', 'portaudio', 'pipewire', 'alsa', 'pulse', 'sndio', 'oss', 'jack' or 'shmem'
-# Defaults to 'oss', 'pipewire', 'sndio', 'jack', 'pulse', 'alsa', 'portaudio' or 'fifo', in that order, dependent on what support cava was built with.
-# On Mac it defaults to 'portaudio' or 'fifo'
-# On windows this is automatic and no input settings are needed.
-#
-# All input methods uses the same config variable 'source'
-# to define where it should get the audio.
-#
-# For pulseaudio and pipewire 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink
-# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them).
-#
-# For pipewire 'source' will be the object name or object.serial of the device to capture from.
-# Both input and output devices are supported.
-#
-# For alsa 'source' will be the capture device.
-# For fifo 'source' will be the path to fifo-file.
-# For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address
-#
-# For sndio 'source' will be a raw recording audio descriptor or a monitoring sub-device, e.g. 'rsnd/2' or 'snd/1'. Default: 'default'.
-# README.md contains further information on how to setup CAVA for sndio.
-#
-# For oss 'source' will be the path to a audio device, e.g. '/dev/dsp2'. Default: '/dev/dsp', i.e. the default audio device.
-# README.md contains further information on how to setup CAVA for OSS on FreeBSD.
-#
-# For jack 'source' will be the name of the JACK server to connect to, e.g. 'foobar'. Default: 'default'.
-# README.md contains further information on how to setup CAVA for JACK.
-#
-; method = pulse
-; source = auto
-
-; method = pipewire
-; source = auto
-
-; method = alsa
-; source = hw:Loopback,1
-
-; method = fifo
-; source = /tmp/mpd.fifo
-
-; method = shmem
-; source = /squeezelite-AA:BB:CC:DD:EE:FF
-
-; method = portaudio
-; source = auto
-
-; method = sndio
-; source = default
-
-; method = oss
-; source = /dev/dsp
-
-; method = jack
-; source = default
-
-# The options 'sample_rate', 'sample_bits', 'channels' and 'autoconnect' can be configured for some input methods:
-#   sample_rate: fifo, pipewire, sndio, oss
-#   sample_bits: fifo, pipewire, sndio, oss
-#   channels:    sndio, oss, jack
-#   autoconnect: jack
-# Other methods ignore these settings.
-#
-# For 'sndio' and 'oss' they are only preferred values, i.e. if the values are not supported
-# by the chosen audio device, the device will use other supported values instead.
-# Example: 48000, 32 and 2, but the device only supports 44100, 16 and 1, then it
-# will use 44100, 16 and 1.
-#
-; sample_rate = 44100
-; sample_bits = 16
-; channels = 2
-; autoconnect = 2
-
-
-[output]
-
-# Output method. Can be 'ncurses', 'noncurses', 'raw', 'noritake', 'sdl'
-# or 'sdl_glsl'.
-# 'noncurses' (default) uses a buffer and cursor movements to only print
-# changes from frame to frame in the terminal. Uses less resources and is less
-# prone to tearing (vsync issues) than 'ncurses'.
-#
-# 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data
-# stream of the bar heights that can be used to send to other applications.
-# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.
-#
-# 'noritake' outputs a bitmap in the format expected by a Noritake VFD display
-#  in graphic mode. It only support the 3000 series graphical VFDs for now.
-#
-# 'sdl' uses the Simple DirectMedia Layer to render in a graphical context.
-# 'sdl_glsl' uses SDL to create an OpenGL context. Write your own shaders or
-# use one of the predefined ones.
-; method = noncurses
-
-# Orientation of the visualization. Can be 'bottom', 'top', 'left' or 'right'.
-# Default is 'bottom'. Other orientations are only supported on sdl and ncruses
-# output. Note: many fonts have weird glyphs for 'top' and 'right' characters,
-# which can make ncurses not look right.
-; orientation = bottom
-
-# Visual channels. Can be 'stereo' or 'mono'.
-# 'stereo' mirrors both channels with low frequencies in center.
-# 'mono' outputs left to right lowest to highest frequencies.
-# 'mono_option' set mono to either take input from 'left', 'right' or 'average'.
-# set 'reverse' to 1 to display frequencies the other way around.
-; channels = stereo
-; mono_option = average
-; reverse = 0
-
-# Raw output target. A fifo will be created if target does not exist.
-; raw_target = /dev/stdout
-
-# Raw data format. Can be 'binary' or 'ascii'.
-; data_format = binary
-
-# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530).
-; bit_format = 16bit
-
-# Ascii max value. In 'ascii' mode range will run from 0 to value specified here
-; ascii_max_range = 1000
-
-# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters.
-# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)).
-; bar_delimiter = 59
-; frame_delimiter = 10
-
-# sdl window size and position. -1,-1 is centered.
-; sdl_width = 1000
-; sdl_height = 500
-; sdl_x = -1
-; sdl_y= -1
-; sdl_full_screen = 0
-
-# set label on bars on the x-axis. Can be 'frequency' or 'none'. Default: 'none'
-# 'frequency' displays the lower cut off frequency of the bar above.
-# Only supported on ncurses and noncurses output.
-; xaxis = none
-
-# enable alacritty synchronized updates. 1 = on, 0 = off
-# removes flickering in alacritty terminal emulator.
-# defaults to off since the behaviour in other terminal emulators is unknown
-; alacritty_sync = 0
-
-# Shaders for sdl_glsl, located in $HOME/.config/cava/shaders
-; vertex_shader = pass_through.vert
-; fragment_shader = bar_spectrum.frag
-
-; for glsl output mode, keep rendering even if no audio
-; continuous_rendering = 0
-
-# disable console blank (screen saver) in tty
-# (Not supported on FreeBSD)
-; disable_blanking = 0
-
-# show a flat bar at the bottom of the screen when idle, 1 = on, 0 = off
-; show_idle_bar_heads = 1
-
-# show waveform instead of frequency spectrum, 1 = on, 0 = off
-; waveform = 0
-
-[color]
-
-# Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow.
-# Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires
-# a terminal that can change color definitions such as Gnome-terminal or rxvt.
-# default is to keep current terminal color
-; background = default
-; foreground = default
-
-# SDL and sdl_glsl only support hex code colors, these are the default:
-; background = '#111111'
-; foreground = '#33ffff'
-
-
-# Gradient mode, only hex defined colors are supported,
-# background must also be defined in hex or remain commented out. 1 = on, 0 = off.
-# You can define as many as 8 different colors. They range from bottom to top of screen
- gradient = 1
- gradient_count = 8
- gradient_color_1 = '{color1}'
- gradient_color_2 = '{color2}'
- gradient_color_3 = '{color3}'
- gradient_color_4 = '{color4}'
- gradient_color_5 = '{color5}'
- gradient_color_6 = '{color6}'
- gradient_color_7 = '{color7}'
- gradient_color_8 = '{color8}'
-
-
-
-[smoothing]
-
-# Percentage value for integral smoothing. Takes values from 0 - 100.
-# Higher values means smoother, but less precise. 0 to disable.
-# DEPRECATED as of 0.8.0, use noise_reduction instead
-; integral = 77
-
-# Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable.
-; monstercat = 0
-; waves = 0
-
-# Set gravity percentage for "drop off". Higher values means bars will drop faster.
-# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off".
-# DEPRECATED as of 0.8.0, use noise_reduction instead
-; gravity = 100
-
-
-# In bar height, bars that would have been lower that this will not be drawn.
-# DEPRECATED as of 0.8.0
-; ignore = 0
-
-# Noise reduction, int 0 - 100. default 77
-# the raw visualization is very noisy, this factor adjusts the integral and gravity filters to keep the signal smooth
-# 100 will be very slow and smooth, 0 will be fast but noisy.
-; noise_reduction = 77
-
-
-[eq]
-
-# This one is tricky. You can have as much keys as you want.
-# Remember to uncomment more than one key! More keys = more precision.
-# Look at readme.md on github for further explanations and examples.
-; 1 = 1 # bass
-; 2 = 1
-; 3 = 1 # midtone
-; 4 = 1
-; 5 = 1 # treble
--- a/home-manager/nix-on-droid/packages/default.nix
+++ b/home-manager/nix-on-droid/packages/default.nix
@@ -1,68 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: let 
-    system = "x86_64-linux";
-
-    pkgs-us = import inputs.nixpkgs-us {
-      inherit system;
-      config.allowUnfree = true;
-    };
-
-    in {
-
-    imports = [ 
-	  ./scripts
-	];
-
-    options.homeconfig.minimal = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkMerge [
-
-        {
-            home.packages = with pkgs; [
-                killall
-                zip    
-                unzip
-                gcc
-                zulu
-                rsync
-                git
-                openssh
-            ];
-        }
-        
-        (lib.mkIf (!config.homeconfig.minimal) {
-
-            nixpkgs.config = {
-                allowUnfree = true;
-            };
-
-            home.packages = with pkgs; let
-                pypkgs = ps: with ps; [
-                    numpy
-                    pandas
-                    torch
-                    torchvision
-                    torchaudio
-                    transformers
-                    datasets
-                    pyaudio
-                    faster-whisper
-                    pyusb
-                ];
-
-            in [
-
-                cava 
-                neovim-remote
-
-                (pkgs.python311.withPackages pypkgs)
-
-                neofetch
-            ];
-
-        })
-    ];
-
-}
--- a/home-manager/nix-on-droid/packages/scripts/default.nix
+++ b/home-manager/nix-on-droid/packages/scripts/default.nix
@@ -1,97 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeScripts.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = true;
-        };
-    };
-
-    config = lib.mkIf config.homeScripts.enable {
-        home.packages = [
-
-            #scripts
-	        (pkgs.writeShellScriptBin "_systemRebuild" ''
-	            ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/System
-	            echo //////Enter to close//////
-	            read
-	        '')
-	        (pkgs.writeShellScriptBin "_homeRebuild" ''
-	            ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/System
-	            echo //////Enter to close//////
-	            read
-	        '')
-
-	        (pkgs.writeShellScriptBin "randWallpaper" ''
-                file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper /home/nathan/Pictures/Wallpaper/$file
-	        '')
-
-	        (pkgs.writeShellScriptBin "setWallpaper" ''
-	            img=''$(realpath ''${1:-~/.cache/bg})
-                p=''$(ps -e | grep mpvpaper | sed -n -e "s/ *//" -e "s/ /\n/" -e "1 P")
-                ${pkgs.mpvpaper}/bin/mpvpaper -f -o "loop" '*' $img && \
-                changeColors $img $2 && \
-                sleep 0.4 && \
-                kill $p
-	        '')
-
-	        (pkgs.writeShellScriptBin "changeColors" ''
-
-	            if [[ $(ls ~/.cache/ | grep bga) != bga ]]; then
-	            echo 100 > ~/.cache/bga
-	            fi
-
-	            alpha=''${2:-`cat ~/.cache/bga`}
-
-	            img=''$(realpath ''${1:-~/.cache/bg})
-	    
-	            if [[ $alpha -lt 0 ]]; then
-	            $alpha=0
-	            fi
-	    
-	            if [[ $alpha -gt 100 ]]; then
-	            $alpha=100
-	            fi
-            
-	            wal -i $img -a $alpha --cols16 -n
-	    
-	            echo $alpha > ~/.cache/bga
-	    
-	            rm ~/.cache/bg
-	            ln -s $img ~/.cache/bg
-            
-	            sleep 0.4
-            
-	            pywalfox update &
-            
-	            themecord > ~/.cache/_.txt && rm ~/.cache/_.txt
-            
-	            [[ $(pidof cava) != "" ]] && pkill -USR1 cava &
-	    
-	            for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send '<cmd>colorscheme pywal<CR>'; done
-	    
-	            pkill -USR1 kitty
-	        '')
-
-	        (pkgs.writeShellScriptBin "onSystemStart" ''
-		        randWallpaper &
-                ags &
-	            pypr &
-	            lxqt-policykit-agent &
-	           # nmcli device wifi connect EagleNet password '~?C#@ZiH' &
-                hyprctl setcursor Bibata-Modern-Classic 16 &
-                wayvnc &
-		        hyprctl reload &
-                novnc &
-	        '')
-
-	        (pkgs.writeShellScriptBin "colorPrefix" ''
-                exec -a "$0" "$@" &
-	            sleep 0.4 && changeColors &
-	        '')
-
-        ];
-    };
-}
-
--- a/home-manager/nix-on-droid/programs/calcurse/default.nix
+++ b/home-manager/nix-on-droid/programs/calcurse/default.nix
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.calcurse.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.calcurse.enable {
-        home.packages = with pkgs; [
-            calcurse
-            libnotify
-        ];
-    };
-}
--- a/home-manager/nix-on-droid/programs/default.nix
+++ b/home-manager/nix-on-droid/programs/default.nix
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-	    ./terminal
-        ./pywal
-        ./calcurse
-    ];
-
-    config = {
-
-        home.packages = [
-            inputs.nixvim.packages.${pkgs.system}.default
-        ];
-
-        home.sessionVariables.EDITOR = "nvim";
-    };
-}
--- a/home-manager/nix-on-droid/programs/terminal/bat/default.nix
+++ b/home-manager/nix-on-droid/programs/terminal/bat/default.nix
@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.bat = {
-
-    enable = true;
-
-    extraPackages = with pkgs.bat-extras; [
-      batman
-      batpipe
-      batgrep
-      batdiff
-      batwatch
-      prettybat
-    ];
-
-
-  };
-}
--- a/home-manager/nix-on-droid/programs/terminal/eza/default.nix
+++ b/home-manager/nix-on-droid/programs/terminal/eza/default.nix
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.eza = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    extraOptions = [
-      "--color=auto"
-    ];
-
-    git = true;
-
-    icons = "auto";
-  };
-}
--- a/home-manager/nix-on-droid/programs/terminal/fzf/default.nix
+++ b/home-manager/nix-on-droid/programs/terminal/fzf/default.nix
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.fzf = {
-  
-    enable = true;
-
-    enableZshIntegration = true;
-
-    tmux = {
-      #enableShellIntegration = true;
-
-      #shellIntegrationOptions = [];
-    };
-  };
-}
--- a/home-manager/nix-on-droid/programs/terminal/kitty/default.nix
+++ b/home-manager/nix-on-droid/programs/terminal/kitty/default.nix
@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: {
-      
-  programs.kitty = {
-    
-    enable = true;
-
-    font = {
-      name = "FiraCode Nerd Font";
-      size = 12;
-    };
-
-    extraConfig = ''
-
-confirm_os_window_close 0
-
-include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
-
-disable_ligatures never
-
-dynamic_background_opacity yes
-
-tab_bar_edge top
-
-map ctrl+shift+t new_tab
-map ctrl+shift+w close_tab
-
-map ctrl+tab next_tab
-map ctrl+shift+tab previous_tab
-
-    '';
-  };
-}
-
--- a/home-manager/nix-on-droid/programs/terminal/tmux/default.nix
+++ b/home-manager/nix-on-droid/programs/terminal/tmux/default.nix
@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.tmux = {
-    
-    enable = true;
-    
-    clock24 = true;
-    
-    mouse = true;
-    
-    baseIndex = 1;
-    
-    keyMode = "vi";
-    
-    prefix = "C-b";
-    
-    shell = "${pkgs.zsh}/bin/zsh";
-  
-  };
-
-}
-
-
--- a/home-manager/nix-on-droid/programs/terminal/zoxide/default.nix
+++ b/home-manager/nix-on-droid/programs/terminal/zoxide/default.nix
@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.zoxide = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    options = [
-      "--cmd cd"
-    ];
-  };
-}
--- a/home-manager/nix-on-droid/services/custom/default.nix
+++ b/home-manager/nix-on-droid/services/custom/default.nix
@@ -1 +0,0 @@
-{}: {}
--- a/home-manager/nix-on-droid/services/default.nix
+++ b/home-manager/nix-on-droid/services/default.nix
@@ -1,4 +0,0 @@
-{ ... }: {
-    imports = [
-    ];
-}
--- a/homes/nathan/flake.nix
+++ b/homes/nathan/flake.nix
@@ -0,0 +1,40 @@
+{
+
+    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/.sops.yaml
+++ b/homes/nathan/home-manager/.sops.yaml
@@ -0,0 +1,11 @@
+keys:
+  - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
+  - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
+  - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
+creation_rules:
+  - path_regex: ^secrets.yaml$
+    key_groups:
+    - age:
+      - *laptop
+      - *homebox
+      - *android
--- a/homes/nathan/home-manager/default.nix
+++ b/homes/nathan/home-manager/default.nix
@@ -0,0 +1,102 @@
+{ config, lib, pkgs, inputs, ... }: {
+
+    imports = let 
+        dir = builtins.readDir ./.;
+    in (builtins.map (x: ./${x}) (builtins.filter 
+        (file: (dir.${file} == "directory"))
+        (builtins.attrNames dir)
+    )) ++ [
+        inputs.sops-nix.homeManagerModules.sops
+    ];
+
+    options.homeconfig = with lib; {
+
+        name = mkOption {
+            type = with types; nullOr str;
+            default = null;
+        };
+
+        graphical = mkOption {
+            type = with types; bool;
+            default = true;
+        };
+
+        standalone = mkOption {
+            type = with types; bool;
+            default = false;
+        };
+    };
+
+
+    config = {
+
+        homeconfig = {
+            name = "nathan";
+
+            mpd.enable = lib.mkDefault true;
+            calcurse.enable = lib.mkDefault true;
+            git.enable = lib.mkDefault true;
+            nh.enable = lib.mkDefault true;
+
+            minimal = lib.mkDefault false;
+            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;
+        };
+
+        home.username = lib.mkDefault config.homeconfig.name;
+
+        home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
+
+        home.stateVersion = "23.11";
+
+        home.pointerCursor = lib.mkIf config.homeconfig.graphical {
+            gtk.enable = true;
+            package = pkgs.bibata-cursors;
+            name = "Bibata-Modern-Classic";
+            size = 16;
+        };
+
+        gtk = lib.mkIf (config.homeconfig.graphical && config.homeconfig.hyprland.enable) {
+            enable = true;
+            theme.name = "Tokyonight-Dark";
+            theme.package = pkgs.tokyonight-gtk-theme;
+            iconTheme.package = pkgs.rose-pine-icon-theme;
+            iconTheme.name = "rose-pine-moon";
+        };
+
+        sops = {
+            age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
+            defaultSopsFile = ./secrets.yaml;
+            defaultSopsFormat = "yaml";
+
+            #secrets."remoteBuildKey" = {};
+        };
+
+        services.mpris-proxy.enable = true;
+
+        programs.ssh = {
+            enable = true;
+
+            matchBlocks = {
+                "builder" = {
+                    hostname = "esotericbytes.com";
+                    user = "remote-builder";
+                    identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
+                    port = 22;
+                };
+                
+                "remote" = {
+                    hostname = "esotericbytes.com";
+                    user = "nathan";
+                    identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
+                    port = 22;
+                };
+            };
+        };
+
+    };
+}
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/Tron.jpg
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/Tron.jpg
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/bluescape.jpg
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/bluescape.jpg
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/galaxy.jpg
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/galaxy.jpg
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/kurisu.gif
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/kurisu.gif
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/kurisu.jpg
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/kurisu.jpg
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/llenn.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/llenn.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/megumin.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/megumin.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/megumin1.gif
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/megumin1.gif
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/megumin2.gif
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/megumin2.gif
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/ngnl.jpg
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/ngnl.jpg
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/orangescape.jpg
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/orangescape.jpg
--- a/system-config/services/minecraft/mods/DungeonsArise-1.21.1-2.1.64-fabric-release.jar
+++ b/system-config/services/minecraft/mods/DungeonsArise-1.21.1-2.1.64-fabric-release.jar
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/rezero.gif
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/rezero.gif
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/sao.gif
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/sao.gif
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/sao.png
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/sao.png
--- a/homes/nathan/home-manager/dotfiles/Wallpaper/sinon.gif
+++ b/homes/nathan/home-manager/dotfiles/Wallpaper/sinon.gif
--- a/homes/nathan/home-manager/dotfiles/default.nix
+++ b/homes/nathan/home-manager/dotfiles/default.nix
@@ -0,0 +1,12 @@
+{ 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/hyprlock.conf
+++ b/homes/nathan/home-manager/dotfiles/hypr/hyprlock.conf
@@ -0,0 +1,108 @@
+# 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,12 +10,12 @@
 #                                                #
 #------------------------------------------------#

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

 # Some default env vars.
 env = XCURSOR_SIZE,16

-source = ~/Projects/Olympus/home-manager/nathan/dotfiles/hypr/otf.conf
+source = ~/.config/hypr/otf.conf
 source = ~/.cache/wal/colors-hypr.conf

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

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

@@ -93,90 +93,87 @@ master {
        new_status = "master"
 }

-gestures {
-        # See https://wiki.hyprland.org/Configuring/Variables/ for more
-        workspace_swipe = off
-}
-
 misc {
        disable_hyprland_logo = false
        disable_splash_rendering = true
-        force_default_wallpaper = 2
+        force_default_wallpaper = 0
+}
+
+ecosystem {
+    no_update_news = true
+    no_donation_nag = true
 }

 # Binds
 $mainMod = ALT

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

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

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

 bind = $mainMod, Q, killactive,

-bind = $mainMod, R, exec, colorPrefix kitty -e _systemRebuild
+#bind = $mainMod, R, exec, colorPrefix kitty -e _systemRebuild

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

-bind = $mainMod, C, exec, colorPrefix kitty -e bash -c "cd ~/Projects/Olympus; nvim ~/Projects/Olympus/"
-
-bind = $mainMod, F, exec, thunar
+bind = $mainMod, F, exec, hyprrun thunar
 bind = $mainMod SHIFT, F, fullscreen

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

-bind = $mainMod, Insert, exec, libreoffice &
-
-bind = $mainMod, H, exec, bluetoothctl connect 88:D0:39:F9:83:CE
+bind = $mainMod, Insert, exec, hyprrun libreoffice

 bind = $mainMod, V, togglefloating,

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

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

-bind = $mainMod, Menu, exec, killall .ags-wrapped; ags &
+bind = $mainMod, Menu, exec, hyprrun hyprpanel -q; hyprrun hyprpanel

-bind = $mainMod, P, pseudo, # dwindle
+#bind = $mainMod, P, pseudo, # dwindle
+#bind = $mainMod, Z, togglesplit, # dwindle

-bind = $mainMod, Z, togglesplit, # dwindle
+bind = $mainMod, N, layoutmsg, rollnext # master
+bind = $mainMod, P, layoutmsg, rollprev # master

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

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

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

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

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

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

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

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

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

-bind = CTRL SHIFT, XF86Launch2, exec, if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then hyprctl keyword monitor eDP-1,1920x1080@60,0x0,1; else hyprctl keyword monitor eDP-1,1920x1080@300,0x0,1; fi
+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 = , Print, exec, grim -g "$(slurp)"
+bind = $mainMod, Return, exec, hyprrun discord --enable-features=UseOzonePlatform --ozone-platform=wayland

-bind = $mainMod, Return, exec, vesktop --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

 # Move focus with mainMod + arrow keys
-bind = $mainMod, A, movefocus, l
-bind = $mainMod, D, movefocus, r
 bind = $mainMod, W, movefocus, u
+bind = $mainMod, A, movefocus, l
 bind = $mainMod, S, movefocus, d
+bind = $mainMod, D, movefocus, r
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
 bind = $mainMod, 2, workspace, 2
@@ -209,12 +206,30 @@ bind = $mainMod SHIFT, Home, movetoworkspace, 11
 bind = $mainMod, right, workspace, e+1
 bind = $mainMod, left, workspace, e-1

+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, 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 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, 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
+
 #switch network connections
 bind = CTRL SHIFT, Escape, exec, nmcli device down wlo1
-bind = CTRL SHIFT, 0, exec, nmcli device down wlo1; nmcli connection up Hotspot
-bind = CTRL SHIFT, 1, exec, nmcli device wifi connect EagleNet password ~?C##@ZiH
-bind = CTRL SHIFT, 2, exec, nmcli device down wlo1; nmcli device wifi connect CXNK00813829 password a8d859c8cfb420ab
-bind = CTRL SHIFT, 3, exec, nmcli device down wlo1; nmcli device wifi connect ATT9MhT2ql password 325qxr89u?3t
+bind = CTRL SHIFT, 0, exec, nmcli connection up Hotspot
+bind = CTRL SHIFT, 1, exec, nmcli connection up EagleNet
+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%
@@ -224,46 +239,47 @@ 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, pavucontrol
+bind = $mainMod, F9, exec, hyprrun pavucontrol

 #screen lock key
-bind = $mainMod, F12, exec, swaylock
+#bind = $mainMod, F12, exec, swaylock

 #logout shortcut
 bind = CTRL ALT, Delete, exec, loginctl kill-session self


 # Move/resize windows with mainMod + LMB/RMB and dragging
-bind = $mainMod SHIFT, J, movewindow, u
-bind = $mainMod SHIFT, K, movewindow, d
-bind = $mainMod SHIFT, H, movewindow, l
-bind = $mainMod SHIFT, L, movewindow, r
+bind = $mainMod SHIFT, W, movewindow, u
+bind = $mainMod SHIFT, A, movewindow, l
+bind = $mainMod SHIFT, S, movewindow, d
+bind = $mainMod SHIFT, D, movewindow, r
+
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod SHIFT, mouse:272, resizewindow

-$scratchpadsize = size 60% 80%
-$scratchpad = class:^(scratchpad)$
+$scratchpadsize = size (monitor_w*0.6) (monitor_h*0.8)

-windowrulev2 = float, $scratchpad
-windowrulev2 = $scratchpadsize, $scratchpad
-windowrulev2 = workspace special silent, $scratchpad
+$kitty = ^(scratchpad-kitty)$
+windowrule = float on, match:class $kitty
+windowrule = $scratchpadsize, match:class $kitty
+windowrule = workspace special silent, match:class $kitty

-$kitty = class:^(scratchpad-kitty)$
+$lf = ^(scratchpad-lf)$
+windowrule = float on, match:class $lf
+windowrule = $scratchpadsize, match:class $lf
+windowrule = workspace special silent, match:class $lf

-windowrulev2 = float, $kitty
-windowrulev2 = $scratchpadsize, $kitty
-windowrulev2 = workspace special silent, $kitty
-$nvim = class:^(scratchpad-nvim)$
+$cal = ^(scratchpad-cal)$
+windowrule = float on, match:class $cal
+windowrule = $scratchpadsize, match:class $cal
+windowrule = workspace special silent, match:class $cal

-windowrulev2 = float, $nvim
-windowrulev2 = $scratchpadsize, $nvim
-windowrulev2 = workspace special silent, $nvim
-
-bind = $mainMod, N, exec, colorPrefix pypr toggle nvim
-bind = $mainMod, E, exec, colorPrefix pypr toggle free
+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, ssh nathan@blunkall.us -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
+bind = CTRL SHIFT, Home, exec, hyprrun 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/pyprland.toml
+++ b/homes/nathan/home-manager/dotfiles/hypr/pyprland.toml
@@ -0,0 +1,31 @@
+    [pyprland]
+	plugins = [
+        "scratchpads"
+	]
+
+	[scratchpads.lf]
+	animation = "fromTop"
+	command = "kitty --class scratchpad-lf lf ~"
+	lazy = true
+	class = "scratchpad-lf"
+	margin = 100
+	multi = true
+	excludes = "*"
+
+	[scratchpads.kitty]
+	animation = "fromBottom"
+	command = "kitty --class scratchpad-kitty"
+	class = "scratchpad-kitty"
+	lazy = true
+	margin = 100
+	multi = true
+	excludes = "*"
+	
+    [scratchpads.calendar]
+	animation = "fromTop"
+	command = "kitty --class scratchpad-cal -e calcurse"
+	class = "scratchpad-cal"
+	lazy = true
+	margin = 100
+	multi = true
+	excludes = "*"
--- a/homes/nathan/home-manager/dotfiles/hyprpanel/config.json
+++ b/homes/nathan/home-manager/dotfiles/hyprpanel/config.json
@@ -0,0 +1,65 @@
+{
+  "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
@@ -0,0 +1 @@
+{}
--- a/homes/nathan/home-manager/dotfiles/hyprpanel/modules.scss
+++ b/homes/nathan/home-manager/dotfiles/hyprpanel/modules.scss
--- a/homes/nathan/home-manager/dotfiles/ohmyposh/ohmyposh.toml
+++ b/homes/nathan/home-manager/dotfiles/ohmyposh/ohmyposh.toml
@@ -0,0 +1,120 @@
+console_title_template = '{{ .Shell }} in {{ .Folder }}'
+version = 3
+final_space = true
+
+[palette]
+  c0 = '#0B0704'
+  c1 = '#846550'
+  c10 = '#636E90'
+  c11 = '#6FAEAC'
+  c12 = '#A5ADA2'
+  c13 = '#F1DCB7'
+  c14 = '#A1E7DA'
+  c15 = '#c2c1c0'
+  c2 = '#4a526c'
+  c3 = '#538281'
+  c4 = '#7b8179'
+  c5 = '#b4a589'
+  c6 = '#78ada3'
+  c7 = '#958d89'
+  c8 = '#665b54'
+  c9 = '#B1876B'
+
+[secondary_prompt]
+  template = '❭❭ '
+  background = 'transparent'
+
+[transient_prompt]
+  template = '{{ if gt .Code 0 }}!❭ {{else}}❭ {{end}}'
+  background = 'transparent'
+  foreground_templates = ['{{ if gt .Code 0 }}p:c13{{end}}', '{{ if eq .Code 0 }}p:c14{{end}}']
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    trailing_diamond = ''
+    template = ' {{ .Icon }} '
+    foreground = 'p:c12'
+    background = 'p:c1'
+    type = 'os'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    trailing_diamond = ''
+    template = '{{ .UserName }}@{{ .HostName }}'
+    foreground = 'p:c14'
+    background = 'p:c2'
+    type = 'session'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    trailing_diamond = ''
+    template = '{{ .Path }}'
+    foreground = 'p:c13'
+    background = 'p:c4'
+    type = 'path'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+      style = 'full'
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'right'
+  overflow = 'hidden'
+
+  [[blocks.segments]]
+    leading_diamond = ''
+    template = '{{ .FormattedMs }}'
+    foreground = 'p:c13'
+    background = 'p:c4'
+    type = 'executiontime'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    leading_diamond = ''
+    foreground = 'p:c14'
+    background = 'p:c2'
+    type = 'time'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    leading_diamond = ''
+    foreground = 'p:c12'
+    background = 'p:c1'
+    type = 'shell'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    template = '{{ if gt .Code 0 }}!❭ {{else}}❭ {{end}}'
+    background = 'transparent'
+    type = 'text'
+    style = 'plain'
+    foreground_templates = ['{{ if gt .Code 0 }}p:c13{{end}}', '{{ if eq .Code 0 }}p:c14{{end}}']
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
--- a/homes/nathan/home-manager/dotfiles/quickshell/modules/ActiveWindow.qml
+++ b/homes/nathan/home-manager/dotfiles/quickshell/modules/ActiveWindow.qml
@@ -0,0 +1,37 @@
+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
@@ -0,0 +1,170 @@
+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
@@ -0,0 +1,71 @@
+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
@@ -0,0 +1,141 @@
+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
@@ -0,0 +1,27 @@
+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
@@ -0,0 +1,30 @@
+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
@@ -0,0 +1,34 @@
+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
@@ -0,0 +1,22 @@
+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
@@ -0,0 +1,48 @@
+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/Show More
+++ b/Show More