iso package test

This reverts commit c6a21aee85.

.gitmodules

@@ -1,9 +0,0 @@
-[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
-[submodule "machines/homebox"]
-	path = machines/homebox
-	url = ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/homebox

.sops.yaml

@@ -3,28 +3,6 @@ keys:
   - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
   - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
 creation_rules:
-  - path_regex: homebox/secrets.yaml$
-    key_groups:
-    - age:
-      - *homebox
-  - path_regex: laptop/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: pi4/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: live/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: nathan/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-      - *homebox
-      - *android
   - path_regex: system/secrets.yaml$
     key_groups:
     - age:

flake-parts.nix

@@ -0,0 +1,12 @@
+{ inputs, ... }: {
+
+    imports = [
+        inputs.home-manager.flakeModules.home-manager
+        inputs.disko.flakeModules.default
+    ];
+
+    systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+    ];
+}

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767024902,
-        "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
+        "lastModified": 1775558810,
+        "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
+        "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2",
         "type": "github"
       },
       "original": {
@@ -33,6 +33,27 @@
         "type": "github"
       }
     },
+    "aurora": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "home-manager": "home-manager",
+        "import-tree": "import-tree",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1776046854,
+        "narHash": "sha256-cxX5DzXikwGhHalyOOkll1vGgCdhTfTgReSXIJlQ0AY=",
+        "ref": "refs/heads/master",
+        "rev": "b2ec3d9cd0a6e52c4922b26d8b8e25823afd89d1",
+        "revCount": 52,
+        "type": "git",
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -40,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766150702,
-        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
+        "lastModified": 1773889306,
+        "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
+        "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347",
         "type": "github"
       },
       "original": {
@@ -61,11 +82,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1767585814,
-        "narHash": "sha256-7iodv57Ppq05AHVKnS9/IdhhgBYTVpTDZmz2u2enr/E=",
+        "lastModified": 1775880170,
+        "narHash": "sha256-63PLZ7lspPAqpV/+d0oNtDHLCWQf1MVFRG2DOeDK+nU=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "66bfeb87deb83ca2f9fa2045704b72de52c6433a",
+        "rev": "28b164d30b5ab6820ef7e17281ae55c539ae9ff5",
         "type": "gitlab"
       },
       "original": {
@@ -91,32 +112,16 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1754487366,
-        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -126,6 +131,42 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_3"
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -134,11 +175,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754487366,
-        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
         "type": "github"
       },
       "original": {
@@ -147,42 +188,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -206,17 +211,35 @@
       }
     },
     "home-manager": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1775900011,
+        "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1767619900,
-        "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=",
+        "lastModified": 1775425411,
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
         "type": "github"
       },
       "original": {
@@ -242,11 +265,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753964049,
-        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "lastModified": 1772461003,
+        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
         "type": "github"
       },
       "original": {
@@ -271,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766946335,
-        "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
+        "lastModified": 1775496928,
+        "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
+        "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e",
         "type": "github"
       },
       "original": {
@@ -295,17 +318,17 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1767654014,
-        "narHash": "sha256-1RG4xtr1FOX7mtSGBR9BcCsTrlRkXbygPaCSFNdT3bs=",
+        "lastModified": 1775828308,
+        "narHash": "sha256-mKW54+ilZNBVsU3GnzHhZUb041H7L/R8aPA0GD+1oKQ=",
         "ref": "refs/heads/main",
-        "rev": "9817553c664b0b7f6776671383a6368c74ee8dee",
-        "revCount": 6789,
+        "rev": "f7755322fc515108cc9eed8113c09492d4a352c1",
+        "revCount": 7141,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -349,11 +372,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767023960,
-        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
+        "lastModified": 1774710575,
+        "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
+        "rev": "0703df899520001209646246bef63358c9881e36",
         "type": "github"
       },
       "original": {
@@ -374,11 +397,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765214753,
-        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
+        "lastModified": 1772460177,
+        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
+        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
         "type": "github"
       },
       "original": {
@@ -403,11 +426,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764612430,
-        "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
+        "lastModified": 1772459629,
+        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
+        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
         "type": "github"
       },
       "original": {
@@ -455,11 +478,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764592794,
-        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "lastModified": 1772462885,
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
         "owner": "hyprwm",
         "repo": "hyprtoolkit",
-        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
         "type": "github"
       },
       "original": {
@@ -480,11 +503,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766253372,
-        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
+        "lastModified": 1774911391,
+        "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
+        "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d",
         "type": "github"
       },
       "original": {
@@ -505,11 +528,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763640274,
-        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
+        "lastModified": 1772459835,
+        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
+        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
         "type": "github"
       },
       "original": {
@@ -534,11 +557,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767473322,
-        "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
+        "lastModified": 1775414057,
+        "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
+        "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490",
         "type": "github"
       },
       "original": {
@@ -547,63 +570,43 @@
         "type": "github"
       }
     },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
+    "import-tree": {
       "locked": {
-        "lastModified": 1754860581,
-        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
+        "lastModified": 1773693634,
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.1.1",
-        "repo": "ixx",
+        "owner": "vic",
+        "repo": "import-tree",
         "type": "github"
       }
     },
-    "nix-minecraft": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
-      },
+    "import-tree_2": {
       "locked": {
-        "lastModified": 1767147099,
-        "narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
-        "rev": "01f571579edd64433f97c4294137fbc366deef4b",
+        "lastModified": 1773693634,
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
         "type": "github"
       },
       "original": {
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
+        "owner": "vic",
+        "repo": "import-tree",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767379071,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
         "type": "github"
       },
       "original": {
@@ -615,11 +618,41 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1753579242,
-        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_3": {
+      "locked": {
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
         "type": "github"
       },
       "original": {
@@ -630,11 +663,11 @@
     },
     "nixpkgs-us": {
       "locked": {
-        "lastModified": 1767379071,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "lastModified": 1776548001,
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
         "type": "github"
       },
       "original": {
@@ -646,11 +679,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1748929857,
-        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -662,11 +695,27 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1767480499,
-        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
         "type": "github"
       },
       "original": {
@@ -676,13 +725,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
-        "lastModified": 1755615617,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -692,13 +741,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
-        "lastModified": 1755577059,
-        "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=",
+        "lastModified": 1774701658,
+        "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "97eb7ee0da337d385ab015a23e15022c865be75c",
+        "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe",
         "type": "github"
       },
       "original": {
@@ -710,16 +759,16 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_5",
         "nixvim": "nixvim_2"
       },
       "locked": {
-        "lastModified": 1760575893,
-        "narHash": "sha256-u6eyhxtlxgG29uI2VCSt5Ir6/BW9hkhglCTfbJ14Hgg=",
+        "lastModified": 1775908700,
+        "narHash": "sha256-LCKSjajVfYyjsw1k1oNZPrDblPHt36jyJZWS2+1XybU=",
         "ref": "refs/heads/master",
-        "rev": "bcc5185ef433a77b18f5aa585ee79d97f9a8e69c",
-        "revCount": 36,
+        "rev": "a62d8ce7f86424a297adead378be5f5a441add3c",
+        "revCount": 39,
         "type": "git",
         "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
       },
@@ -730,17 +779,16 @@
     },
     "nixvim_2": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_5",
-        "nuschtosSearch": "nuschtosSearch",
-        "systems": "systems_4"
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": "nixpkgs_6",
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1755741137,
-        "narHash": "sha256-YnpE/fOL3H8cJZ9by/YmeNhIqOQdKuZRYA1L3+w6WsI=",
+        "lastModified": 1775837497,
+        "narHash": "sha256-L17VI03w/wVXvc1SK7EI1muLqHxD3+esYPPzgQvvdOE=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "91a38e66240c338e683421a4ee3f525d329fc4ad",
+        "rev": "a587a96a48c705609bfd2ad23f9ae5961eb0d373",
         "type": "github"
       },
       "original": {
@@ -749,30 +797,6 @@
         "type": "github"
       }
     },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixvim",
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1755555503,
-        "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -783,11 +807,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767281941,
-        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
+        "lastModified": 1775036584,
+        "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
+        "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
         "type": "github"
       },
       "original": {
@@ -798,12 +822,14 @@
     },
     "root": {
       "inputs": {
+        "aurora": "aurora",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
-        "home-manager": "home-manager",
+        "flake-parts": "flake-parts_2",
+        "home-manager": "home-manager_2",
         "hyprland": "hyprland",
-        "nix-minecraft": "nix-minecraft",
-        "nixpkgs": "nixpkgs_3",
+        "import-tree": "import-tree_2",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-us": "nixpkgs-us",
         "nixvim": "nixvim",
         "sops-nix": "sops-nix"
@@ -816,11 +842,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767499857,
-        "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
+        "lastModified": 1775682595,
+        "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
+        "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
         "type": "github"
       },
       "original": {
@@ -859,36 +885,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -917,11 +913,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761431178,
-        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
+        "lastModified": 1773601989,
+        "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
+        "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -21,164 +21,31 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
+        flake-parts.url = "github:hercules-ci/flake-parts";
+
+        import-tree.url = "github:vic/import-tree";
 
         firefox-addons = {
             url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        nix-minecraft.url = "github:Infinidoge/nix-minecraft";
-
-        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
-
         hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
 
         nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
+        #nixvim.url = "git+file:///home/nathan/Projects/Moirai";
+
+        aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
+        #aurora.url = "git+file:///home/nathan/Projects/Aurora";
     };
 
-    outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
-
-        profiles = let 
-            dir = builtins.readDir ./system/profiles;
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-        in (builtins.listToAttrs 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... }: {
-                        imports = [
-                            ./system
-                            ./system/profiles/${name}
-                        ];
-                    };
-                })) filtered)
-            );
-
-        homes = let 
-            dir = builtins.readDir ./system/users;
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-        in (builtins.listToAttrs 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... } @ exputs: {
-                        imports = [
-                            (./system/users/${name}/home-manager (inputs // exputs))
-                        ];
-                    };
-                })) 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;
-        };
-    };
+    outputs = { ... } @ inputs: 
+    inputs.flake-parts.lib.mkFlake { inherit inputs; }
+    (inputs.import-tree [ 
+        ./profiles 
+        ./homes 
+        ./system 
+        ./templates/default.nix
+        ./flake-parts.nix
+    ]);
 }

homes/nathan/flake.nix

@@ -1,40 +0,0 @@
-{
-
-    description = "Home-Manager Configuration";
-
-    inputs = {
-
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-
-        home-manager = {
-            url = "github:nix-community/home-manager/release-25.05";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
-
-        olympus = {
-            url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Olympus";
-            inputs.nixpkgs.follows = "nixpkgs";
-            inputs.home-manager.follows = "home-manager";
-        };
-    };
-
-    outputs = { self, nixpkgs, 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;
-                };
-            };
-        };
-    };
-}

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

homes/nathan/home-manager/default.nix

@@ -0,0 +1,113 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        imports = [
+            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;
+            };
+
+            virtual-machines = 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;
+                hypridle.enable = lib.mkDefault config.homeconfig.hyprland.enable;
+                wal.enable = lib.mkDefault config.homeconfig.graphical;
+                rofi.enable = lib.mkDefault config.homeconfig.hyprland.enable;
+                firefox.enable = lib.mkDefault config.homeconfig.graphical;
+
+                aurora.enable = lib.mkDefault config.homeconfig.hyprland.enable;
+            };
+
+            home.username = lib.mkDefault config.homeconfig.name;
+
+            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;
+            };
+
+            dconf.settings = lib.mkIf config.homeconfig.virtual-machines {
+                "org/virt-manager/virt-manager/connections" = {
+                    autoconnect = ["qemu:///system"];
+                    uris = ["qemu:///system"];
+                };
+            };
+
+            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;
+                    };
+                };
+            };
+
+        };
+    };
+}

homes/nathan/home-manager/dotfiles/default.nix

@@ -0,0 +1,13 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
+
+        home.file = {
+            ".config/hypr" = lib.mkIf config.homeconfig.hyprland.enable { source = ./hypr; recursive = true; };
+            ".config/wal/templates" = lib.mkIf config.homeconfig.wal.enable { source = ./wal/templates; recursive = true; };
+            ".config/ohmyposh" = { source = ./ohmyposh; recursive = true; };
+            "Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
+        };
+
+    };
+}

homes/nathan/home-manager/dotfiles/hypr/dwindle.conf

@@ -0,0 +1,35 @@
+dwindle {
+	# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+        preserve_split = yes # you probably want this
+}
+
+bind = $mainMod, F1, submap, dwindle
+
+submap = master
+
+bind = $mainMod, F2, submap, master
+bind = $mainMod, F3, submap, scrolling
+bind = $mainMod, End, submap, reset
+
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
+
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
+bind = $mainMod, J, workspace, e+1
+bind = $mainMod, K, workspace, e-1
+bind = $mainMod, L, layoutmsg, focus r
+
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
+bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, K, movetoworkspace, e-1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
+
+submap = reset

homes/nathan/home-manager/dotfiles/hypr/main.conf

@@ -10,13 +10,15 @@
 #                                                #
 #------------------------------------------------#
 
-exec-once = hyprrun onSystemStart
+exec-once = onSystemStart
 
 # Some default env vars.
 env = XCURSOR_SIZE,16
 
+$mainMod = ALT
+
 source = ~/.config/hypr/otf.conf
-source = ~/.cache/wal/colors-hypr.conf
+source = ~/.cache/wal/colors-hyprland.conf
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -48,7 +50,7 @@ general {
         col.active_border = $color1 $color5 100deg
         col.inactive_border = $color0
 
-        layout = master
+        layout = scrolling
 }
 decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more 
 
@@ -77,21 +79,16 @@ animations {
         animation = border, 1, 10, default
         animation = borderangle, 1, 8, default
         animation = fade, 1, 7, default
-        animation = workspaces, 1, 6, default
+        animation = workspaces, 1, 6, default, slidevert
 }
 
 
+source = ~/.config/hypr/dwindle.conf
 
-dwindle {
-	# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-        preserve_split = yes # you probably want this
-}
+source = ~/.config/hypr/master.conf
+
+source = ~/.config/hypr/scroll.conf
 
-master {
-        # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-        new_status = "master"
-}
 
 misc {
         disable_hyprland_logo = false
@@ -105,13 +102,12 @@ ecosystem {
 }
 
 # Binds
-$mainMod = ALT
 
-bind = $mainMod SHIFT, E, exec, hyprrun colorPrefix kitty
+bind = $mainMod SHIFT, E, exec, colorPrefix kitty
 
-bind = $mainMod, B, exec, hyprrun firefox
+bind = $mainMod, B, exec, firefox
 
-bind = $mainMod SHIFT, B, exec, hyprrun firefox --private-window
+bind = $mainMod SHIFT, B, exec, firefox --private-window
 
 bind = $mainMod, Q, killactive,
 
@@ -119,20 +115,20 @@ bind = $mainMod, Q, killactive,
 
 #bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild
 
-bind = $mainMod, F, exec, hyprrun thunar
+bind = $mainMod, F, exec, thunar
 bind = $mainMod SHIFT, F, fullscreen
 
-bind = $mainMod SHIFT, semicolon, exec, hyprrun colorPrefix kitty -e lf
+bind = $mainMod SHIFT, semicolon, exec, colorPrefix kitty -e yazi
 
-bind = $mainMod, Insert, exec, hyprrun libreoffice
+bind = $mainMod, Insert, exec, libreoffice
 
 bind = $mainMod, V, togglefloating,
 
-bind = $mainMod SHIFT, V, exec, hyprrun vlc
+bind = $mainMod SHIFT, V, exec, vlc
 
-bind = , Menu, exec, hyprrun rofi -show drun
+bind = , Menu, exec, rofi -show drun -show-icons -run-command '{cmd}'
 
-bind = $mainMod, Menu, exec, hyprrun hyprpanel -q; hyprrun hyprpanel
+bind = $mainMod, Menu, exec, systemctl restart --user quickshell
 
 #bind = $mainMod, P, pseudo, # dwindle
 #bind = $mainMod, Z, togglesplit, # dwindle
@@ -140,34 +136,34 @@ bind = $mainMod, Menu, exec, hyprrun hyprpanel -q; hyprrun hyprpanel
 bind = $mainMod, N, layoutmsg, rollnext # master
 bind = $mainMod, P, layoutmsg, rollprev # master
 
-bind = $mainMod, M, exec, hyprrun spotify
+bind = $mainMod, M, exec, spotify
 
-bind = $mainMod SHIFT, M, exec, hyprrun firefox soundcloud.com/you/library
+bind = $mainMod SHIFT, M, exec, firefox soundcloud.com/you/library
 
-bind = $mainMod CTRL, M, exec, hyprrun colorPrefix kitty -e ncmpcpp -s browser
+bind = $mainMod CTRL, M, exec, colorPrefix kitty -e ncmpcpp -s browser
 
-bind = $mainMod, XF86AudioPlay, exec, hyprrun mpc load casual
+bind = $mainMod, XF86AudioPlay, exec, mpc load casual
 
-bind = , XF86AudioPlay, exec, hyprrun playerctl play-pause
+bind = , XF86AudioPlay, exec, playerctl play-pause
 
-bind = , XF86AudioPause, exec, hyprrun playerctl pause
+bind = , XF86AudioPause, exec, playerctl pause
 
-bind = , XF86AudioNext, exec, hyprrun playerctl next
+bind = , XF86AudioNext, exec, playerctl next
 
-bind = , XF86AudioPrev, exec, hyprrun playerctl previous
+bind = , XF86AudioPrev, exec, playerctl previous
 
-bind = , XF86Launch2, exec, hyprrun steam
-bind = $mainMod, XF86Launch2, exec, hyprrun prismlauncher
+bind = , XF86Launch2, exec, steam
+bind = $mainMod, XF86Launch2, exec, prismlauncher
 
-bind = , XF86Calculator, exec, hyprrun geogebra
+bind = , XF86Calculator, exec, geogebra
 
-bind = $mainMod SHIFT, Print, exec, hyprrun firefox localhost:631
+bind = $mainMod SHIFT, Print, exec, firefox localhost:631
 
-bind = $mainMod, Return, exec, hyprrun discord --enable-features=UseOzonePlatform --ozone-platform=wayland
+bind = $mainMod, Return, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland
 
-bind = $mainMod CTRL, Return, exec, hyprrun firefox https://discord.com/app
+bind = $mainMod CTRL, Return, exec, firefox https://discord.com/app
 
-bind = , Home, exec, hyprrun setWallpaper
+bind = , Home, exec, setWallpaper
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, W, movefocus, u
@@ -203,26 +199,25 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod SHIFT, Home, movetoworkspace, 11
 
 # Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, right, workspace, e+1
-bind = $mainMod, left, workspace, e-1
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
 
-bind = $mainMod, H, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod, H, workspace, e-1
-bind = $mainMod, J, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
 bind = $mainMod, J, workspace, e+1
-bind = $mainMod, K, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
 bind = $mainMod, K, workspace, e-1
-bind = $mainMod, L, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod, L, workspace, e+1
+bind = $mainMod, L, layoutmsg, focus r
 
-bind = $mainMod SHIFT, H, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod SHIFT, H, movetoworkspace, e-1
-bind = $mainMod SHIFT, J, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
 bind = $mainMod SHIFT, J, movetoworkspace, e+1
-bind = $mainMod SHIFT, K, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
 bind = $mainMod SHIFT, K, movetoworkspace, e-1
-bind = $mainMod SHIFT, L, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod SHIFT, L, movetoworkspace, e+1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
 
 #switch network connections
 bind = CTRL SHIFT, Escape, exec, nmcli device down wlo1
@@ -232,14 +227,18 @@ bind = CTRL SHIFT, 2, exec, nmcli connection up CXNK00813829
 bind = CTRL SHIFT, 3, exec, nmcli connection up ATT9MhT2ql
 
 #brightness keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl set +10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
+binde = SHIFT, XF86MonBrightnessUp, exec, brightnessctl set +2%
+binde = SHIFT, XF86MonBrightnessDown, exec, brightnessctl set 2%-
+binde = , XF86MonBrightnessUp, exec, brightnessctl set +10%
+binde = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
 
 #volume keys
+binde = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%+
+binde = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%-
 binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%+
 binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%-
 bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle
-bind = $mainMod, F9, exec, hyprrun pavucontrol
+bind = $mainMod, F9, exec, pavucontrol
 
 #screen lock key
 #bind = $mainMod, F12, exec, swaylock
@@ -257,29 +256,9 @@ bind = $mainMod SHIFT, D, movewindow, r
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod SHIFT, mouse:272, resizewindow
 
-$scratchpadsize = size 60% 80%
+source = ~/.config/hypr/pypr.conf
 
-$kitty = class:^(scratchpad-kitty)$
-windowrulev2 = float, $kitty
-windowrulev2 = $scratchpadsize, $kitty
-windowrulev2 = workspace special silent, $kitty
-
-$lf = class:^(scratchpad-lf)$
-windowrulev2 = float, $lf
-windowrulev2 = $scratchpadsize, $lf
-windowrulev2 = workspace special silent, $lf
-
-$cal = class:^(scratchpad-cal)$
-windowrulev2 = float, $cal
-windowrulev2 = $scratchpadsize, $cal
-windowrulev2 = workspace special silent, $cal
-
-bind = $mainMod, semicolon, exec, pypr toggle lf
-bind = $mainMod, E, exec, pypr toggle kitty
-bind = $mainMod, C, exec, pypr toggle calendar
-
-
-bind = CTRL SHIFT, Home, exec, hyprrun ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
+bind = CTRL SHIFT, Home, exec, ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
 bind = CTRL SHIFT, Home, submap, clean
 
 

homes/nathan/home-manager/dotfiles/hypr/master.conf

@@ -0,0 +1,35 @@
+
+master {
+        # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+        new_status = "master"
+}
+
+bind = $mainMod, F2, submap, master
+
+submap = master
+
+bind = $mainMod, F1, submap, dwindle
+bind = $mainMod, F3, submap, scrolling
+bind = $mainMod, End, submap, reset
+
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
+
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
+bind = $mainMod, J, workspace, e+1
+bind = $mainMod, K, workspace, e-1
+bind = $mainMod, L, layoutmsg, focus r
+
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
+bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, K, movetoworkspace, e-1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
+
+submap = reset

homes/nathan/home-manager/dotfiles/hypr/pypr.conf

@@ -0,0 +1,21 @@
+
+$scratchpadsize = size (monitor_w*0.6) (monitor_h*0.8)
+
+$kitty = ^(scratchpad-kitty)$
+windowrule = float on, match:class $kitty
+windowrule = $scratchpadsize, match:class $kitty
+windowrule = workspace special silent, match:class $kitty
+
+$files = ^(scratchpad-files)$
+windowrule = float on, match:class $files
+windowrule = $scratchpadsize, match:class $files
+windowrule = workspace special silent, match:class $files
+
+$cal = ^(scratchpad-cal)$
+windowrule = float on, match:class $cal
+windowrule = $scratchpadsize, match:class $cal
+windowrule = workspace special silent, match:class $cal
+
+bind = $mainMod, semicolon, exec, pypr toggle files
+bind = $mainMod, E, exec, pypr toggle kitty
+bind = $mainMod, C, exec, pypr toggle calendar

homes/nathan/home-manager/dotfiles/hypr/pyprland.toml

@@ -3,18 +3,18 @@
         "scratchpads"
 	]
 
-	[scratchpads.lf]
+	[scratchpads.files]
 	animation = "fromTop"
-	command = "hyprrun kitty --class scratchpad-lf lf ~"
+	command = "kitty --class scratchpad-files yazi ~"
 	lazy = true
-	class = "scratchpad-lf"
+	class = "scratchpad-files"
 	margin = 100
 	multi = true
 	excludes = "*"
 
 	[scratchpads.kitty]
 	animation = "fromBottom"
-	command = "hyprrun kitty --class scratchpad-kitty"
+	command = "kitty --class scratchpad-kitty"
 	class = "scratchpad-kitty"
 	lazy = true
 	margin = 100
@@ -23,7 +23,7 @@
 	
     [scratchpads.calendar]
 	animation = "fromTop"
-	command = "hyprrun kitty --class scratchpad-cal -e calcurse"
+	command = "kitty --class scratchpad-cal -e calcurse"
 	class = "scratchpad-cal"
 	lazy = true
 	margin = 100

homes/nathan/home-manager/dotfiles/hypr/scroll.conf

@@ -0,0 +1,35 @@
+
+scrolling {
+    column_width = 0.7
+    direction = "right"
+}
+
+bind = $mainMod, F3, submap, scrolling
+
+submap = scrolling
+
+bind = $mainMod, F1, submap, dwindle
+bind = $mainMod, F2, submap, master
+bind = $mainMod, End, submap, reset
+
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
+
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
+bind = $mainMod, J, workspace, e+1
+bind = $mainMod, K, workspace, e-1
+bind = $mainMod, L, layoutmsg, focus r
+
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
+bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, K, movetoworkspace, e-1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
+
+submap = reset

homes/nathan/home-manager/dotfiles/wal/templates/colors-tmux.conf

@@ -0,0 +1,14 @@
+set -g status-style 'fg={color0},bg={color3}'
+
+set -g status-interval 1
+
+set -g status-left-length 50
+set -g status-left "#[fg={color12},bg={color1}]  #[fg={color1},bg={color2}]◤#[fg={color14}]#{{user}}@#H#[fg={color2},bg={color4}]◤#[fg={color14}]#{{session_name}}#[fg={color4},bg={color3}]◤"
+
+set -g status-right "#[fg={color2}]◥#[fg={color14},bg={color2}]%A %T#[fg={color1}]◥#[fg={color12},bg={color1}]%D "
+
+set -g window-status-separator '/'
+set -g window-status-format '#[fg={color3},bg={color3}]◢#[fg={color0},bg={color3}] #{{window_index}}: #{{window_name}} #[fg={color3},bg={color3}]◤'
+set -g window-status-current-format '#[fg={color11},bg={color3}]◢#[fg={color0},bg={color11},bold] #{{window_index}}: #{{window_name}} #[fg={color11},bg={color3}]◤'
+
+

homes/nathan/home-manager/dotfiles/wal/templates/ohmyposh.toml

@@ -1,21 +1,3 @@
-{ config, lib, pkgs, ... }: {
-
-  home.packages = with pkgs; [
-    oh-my-posh
-  ];
-  
-  programs.zsh = {
-    
-    initContent = if config.homeconfig.wal.enable then (lib.mkBefore ''
-      cat ${config.home.homeDirectory}/.cache/wal/sequences
-      eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
-    '') else (lib.mkBefore ''
-      eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
-    '');
-
-  };
-
-  home.file.".config/wal/templates/ohmyposh.toml".text = ''
 #:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
 
 version = 2
@@ -128,5 +110,3 @@ c12 = "{color12}"
 c13 = "{color13}"
 c14 = "{color14}"
 c15 = "{color15}"
-  '';
-}

homes/nathan/home-manager/packages/default.nix

@@ -0,0 +1,117 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: let 
+        system = pkgs.stdenv.hostPlatform;
+
+    pkgs-us = import inputs.nixpkgs-us {
+        inherit system;
+        config.allowUnfree = true;
+    };
+
+    in {
+
+        options.homeconfig.minimal = with lib; options.mkOption {
+            type = with types; bool;
+            default = false;
+        };
+
+        config = with lib; mkMerge [
+        {
+
+            home.packages = with pkgs; [
+
+                kjv
+                openssh
+                sops
+                dig
+                #toybox
+                btop
+                zip    
+                unzip
+                rsync
+                curl
+
+                (python314.withPackages (ps: with ps; [
+                    gpustat
+                    numpy
+                    matplotlib
+                    scipy
+                    pandas
+                    pyaudio
+                    pyusb
+                    requests
+                ]))
+            ];
+
+        }
+
+        (mkIf config.homeconfig.graphical {
+         home.packages = with pkgs; [
+
+         grim
+         slurp
+         wl-clipboard
+         xfce.thunar
+         blueberry
+         ];
+         })
+
+        (mkIf (!config.homeconfig.minimal) {
+         home.packages = with pkgs; [
+         cava 
+         android-tools
+         neovim-remote
+         zulu
+         fastfetch
+         ncmpcpp
+         playerctl
+         mpc
+         ffmpeg
+         ];
+         })
+
+        (mkIf (!config.homeconfig.minimal && config.homeconfig.graphical) {
+
+         nixpkgs.config = {
+         allowUnfree = true;
+         };
+
+         home.packages = with pkgs; [
+
+         handbrake
+         quickemu
+         bottles
+
+         brightnessctl
+         libdbusmenu-gtk3
+         lmms
+
+#unfree {
+         geogebra
+         spotify
+         discord
+#}
+         rustdesk-flutter
+         mpv
+         vlc
+         pavucontrol
+         rpi-imager
+         tigervnc
+         keepassxc
+         localsend
+
+#3D modeling/printing
+         blender
+         freecad-wayland
+         cura-appimage
+
+#productivity
+         libreoffice
+
+#games
+         prismlauncher
+         ];
+        })
+        ];
+    };
+}

homes/nathan/home-manager/packages/scripts/default.nix

@@ -0,0 +1,71 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        options = {
+            homeconfig.scripts.enable = lib.options.mkOption {
+                type = lib.types.bool;
+                default = true;
+            };
+        };
+
+        config = lib.mkMerge [
+
+        (lib.mkIf config.homeconfig.scripts.enable {
+         home.packages = [
+
+#scripts
+
+         (pkgs.writeShellScriptBin "randWallpaper" ''
+          file=''$(ls ${config.home.homeDirectory}/Pictures/Wallpaper/ | shuf -n 1)
+          aurora-set-wallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/''$file
+          '')
+
+        (pkgs.writeShellScriptBin "colorPrefix" ''
+                   pidof firefox > /dev/null && ${pkgs.pywalfox-native}/bin/pywalfox update &
+                   pidof kitty > /dev/null && pkill -USR1 kitty
+                   pidof cava > /dev/null && pkill -USR1 cava
+                   for i in ''$(ls /run/user/1000 | grep nvim); do 
+                   ${pkgs.neovim-remote}/bin/nvr -s --servername /run/user/1000/''$i --remote-send '<cmd>colorscheme pywal<CR>'; 
+                   done
+
+                   eval "''$@"
+        '')
+
+                  (pkgs.writeShellScriptBin "onSystemStart" ''
+
+
+                   if [[ -f /tmp/aurora/tmp.jpg ]]; then
+                        hyprctl --batch "\
+                        dispatch exec aurora-init ;\
+                        dispatch exec aurora-set-wallpaper ;\
+                        dispatch exec ${pkgs.pyprland}/bin/pypr ;\
+                        dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\
+                        dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\
+                        setcursor Bibata-Modern-Classic 16"
+                   else
+                        hyprctl --batch "\
+                        dispatch exec aurora-init ;\
+                        dispatch exec aurora-set-wallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ;\
+                        dispatch exec ${pkgs.pyprland}/bin/pypr ;\
+                        dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\
+                        dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\
+                        setcursor Bibata-Modern-Classic 16"
+                   fi
+
+                   if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then
+                   rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid
+                   fi
+
+                   sleep 3
+
+                   aurora ipc call shell reload
+                   hyprctl reload
+                   '')
+
+                   ];
+        })
+        ];
+    };
+}
+

homes/nathan/home-manager/programs/aurora/default.nix

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

homes/nathan/home-manager/programs/calcurse/default.nix

@@ -0,0 +1,17 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { 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
+            ];
+        };
+    };
+}

homes/nathan/home-manager/programs/default.nix

@@ -0,0 +1,14 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        config = {
+
+            home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
+                inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
+            ];
+
+            home.sessionVariables.EDITOR = "nvim";
+        };
+    };
+}

homes/nathan/home-manager/programs/firefox/default.nix

@@ -0,0 +1,63 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        options.homeconfig.firefox.enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.firefox.enable {
+
+            home.sessionVariables.BROWSER = "${config.programs.firefox.package}/bin/firefox";
+
+            home.packages = lib.mkIf config.homeconfig.wal.enable [ 
+                pkgs.pywalfox-native
+            ];
+
+            home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = let
+                pywalfox-wrapper = pkgs.writeShellScriptBin "pywalfox-wrapper" ''
+                ${pkgs.pywalfox-native}/bin/pywalfox start
+                '';
+            in lib.replaceStrings [ "<path>" ] [
+                "${pywalfox-wrapper}/bin/pywalfox-wrapper"
+            ] (lib.readFile "${pkgs.pywalfox-native}/lib/python3.13/site-packages/pywalfox/assets/manifest.json");
+
+
+            programs.firefox = {
+
+                enable = true;
+                package = pkgs.firefox;
+
+                profiles.nathan = {
+                    search = {
+                        default = "ddg";
+                        privateDefault = "ddg";
+                        force = true;
+                    };
+                    bookmarks = {
+                        force = true;
+                        settings = [
+                        {
+                            name = "toolbar";
+                            toolbar = true;
+                            bookmarks = [
+                            {
+                                name = "NixOS Search - Packages";
+                                url = "https://search.nixos.org/packages";
+                            }
+                            ];
+                        }
+                        ];
+                    };
+
+                    extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
+                        ublock-origin
+                            keepassxc-browser
+                            pywalfox
+                    ];
+                };
+            };
+        };
+    };
+}

homes/nathan/home-manager/programs/git/default.nix

@@ -0,0 +1,50 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
+
+        options.homeconfig.git.enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.git.enable {
+
+            sops = {
+                secrets = {
+                    "git/username" = {};
+                    "git/email" = {};
+                };
+
+                templates.gitconfig.content = ''
+                    [user]
+                    name = "${config.sops.placeholder."git/username"}"
+                    email = "${config.sops.placeholder."git/email"}"
+                '';
+            };
+
+            programs.git = {
+                enable = true;
+
+                includes = [
+                { path = "${config.sops.templates.gitconfig.path}"; }
+                ];
+
+                settings = {
+                    init = {
+                        defaultBranch = "master";
+                    };
+
+                    safe.directory = "/etc/nixos";
+
+                    url = {
+                        "ssh://gitea@gitea.esotericbytes.com/" = {
+                            insteadOf = [
+                                "server:"
+                            ];
+                        };
+                    };
+                };
+            };
+        };
+    };
+}

homes/nathan/home-manager/programs/hypridle/default.nix

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

homes/nathan/home-manager/programs/hyprland/default.nix

@@ -0,0 +1,50 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { 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
+            ];
+
+            home.activation.extraHyprFile = lib.hm.dag.entryAfter ["writeBoundary"] ''
+                if [[ ! -f ${config.home.homeDirectory}/.config/hypr/otf.conf ]]; then
+                    touch ${config.home.homeDirectory}/.config/hypr/otf.conf
+                fi
+            '';
+
+
+            wayland.windowManager.hyprland = {
+
+                enable = true;
+
+                package = null;
+                portalPackage = null;
+
+                systemd = {
+                    enable = true;
+                    variables = [ "--all" ];
+                };
+
+                extraConfig = ''
+                    bind = , Print, exec, grim -g "$(slurp)" > ~/Pictures/screenshots/$(date +"%m-%d-%Y_%H:%M:%S").png
+
+                    source = ${config.home.homeDirectory}/.config/hypr/main.conf
+
+                    exec-shutdown = if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid; fi
+                '';
+
+            };
+        };
+    };
+}

homes/nathan/home-manager/programs/nh/default.nix

@@ -0,0 +1,25 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
+
+        options.homeconfig.nh.enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.nh.enable {
+
+            programs.nh = {
+                enable = true;
+                package = let pkgs-us = import inputs.nixpkgs-us { system = "x86_64-linux"; }; in pkgs-us.nh;
+#flake = "${config.home.homeDirectory}/Projects/Olympus";
+
+                clean = {
+                    enable = true;
+                    dates = "weekly";
+                    extraArgs = "--keep 5 --keep-since 5d";
+                };
+            };
+        };
+    };
+}

homes/nathan/home-manager/programs/pywal/default.nix

@@ -0,0 +1,22 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        options.homeconfig.wal.enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.wal.enable {
+
+            home.packages = with pkgs; [
+                inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.pywal
+
+                    pywal16
+                    imagemagick
+            ];
+
+
+        };
+    };
+}

homes/nathan/home-manager/programs/rofi/default.nix

@@ -0,0 +1,23 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        options.homeconfig.rofi.enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.rofi.enable {
+            programs.rofi = {
+
+                enable = true;
+                package = pkgs.rofi;
+
+                cycle = true;
+
+                theme = "/home/nathan/.cache/wal/colors-rofi-dark.rasi";
+            };
+        };
+    };
+}
+

homes/nathan/home-manager/programs/terminal/bash/default.nix

@@ -0,0 +1,35 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        home.packages = with pkgs; [ oh-my-posh ];
+
+        programs.bash = {
+            enable = true;
+            enableCompletion = true;
+
+            shellAliases = {
+                ls = "eza";
+                ll = "ls -l";
+
+                ksh = "kitten ssh";
+
+                v = "nvim";
+                vi = "nvim";
+                vim = "nvim";
+
+            };
+
+            bashrcExtra = ''
+                source ${pkgs.blesh}/share/blesh/ble.sh
+            '';
+
+            initExtra = if config.homeconfig.wal.enable then (lib.mkBefore ''
+                cat ${config.home.homeDirectory}/.cache/wal/sequences
+                eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
+            '') else (lib.mkBefore ''
+                eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
+            '');
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/bat/default.nix

@@ -0,0 +1,21 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        programs.bat = {
+
+            enable = true;
+
+            extraPackages = with pkgs.bat-extras; [
+                batman
+                    batpipe
+                    batgrep
+                    batdiff
+                    batwatch
+                    prettybat
+            ];
+
+
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/eza/default.nix

@@ -0,0 +1,20 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        programs.eza = {
+
+            enable = true;
+
+            enableZshIntegration = true;
+
+            extraOptions = [
+                "--color=auto"
+            ];
+
+            git = true;
+
+            icons = "auto";
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/fzf/default.nix

@@ -0,0 +1,18 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        programs.fzf = {
+
+            enable = true;
+
+            enableZshIntegration = true;
+
+            tmux = {
+#enableShellIntegration = true;
+
+#shellIntegrationOptions = [];
+            };
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/kitty/default.nix

@@ -0,0 +1,38 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, ... }: {
+
+        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
+
+                allow_remote_control yes
+
+            '';
+        };
+    };
+}
+

homes/nathan/home-manager/programs/terminal/ohmyposh/default.nix

@@ -0,0 +1,146 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        home.packages = with pkgs; [
+            oh-my-posh
+        ];
+
+        programs.zsh = {
+
+            initContent = with lib; mkMerge [
+                (mkIf config.homeconfig.wal.enable (mkBefore ''
+                    cat ${config.home.homeDirectory}/.cache/wal/sequences
+                    eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
+                    
+                    function _colorRefresh() { 
+                        eval $(oh-my-posh init zsh --config ~/.cache/wal/ohmyposh.toml)
+                        zle accept-line
+                    }
+                    zle -N _colorRefresh
+                    bindkey '\r' _colorRefresh
+                ''))
+
+                (mkIf (!config.homeconfig.wal.enable) (mkBefore ''
+                    eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
+                ''))
+            ];
+
+        };
+
+        home.file.".config/wal/templates/ohmyposh.toml".text = ''
+#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
+
+            version = 2
+            final_space = true
+            console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
+
+            [[blocks]]
+            type = 'prompt'
+            alignment = 'left'
+            newline = true
+
+            [[blocks.segments]]
+            type = 'os'
+            style = 'diamond'
+            trailing_diamond = ''
+            background = 'p:c1'
+            foreground = 'p:c12'
+            template = ' {{{{ .Icon }}}} '
+
+            [[blocks.segments]]
+            type = 'session'
+            style = 'diamond'
+            trailing_diamond = ''
+            background = 'p:c2'
+            foreground = 'p:c14'
+            template = '{{{{ .UserName }}}}@{{{{ .HostName }}}}'
+
+            [[blocks.segments]]
+            type = 'path'
+            style = 'diamond'
+            trailing_diamond = ''
+            background = 'p:c4'
+            foreground = 'p:c13'
+            template = '{{{{ .Path }}}}'
+
+            [blocks.segments.properties]
+            style = 'full'
+
+            [[blocks]]
+            type = 'prompt'
+            overflow = 'hidden'
+            alignment = 'right'
+
+            [[blocks.segments]]
+            type = 'executiontime'
+            style = 'diamond'
+            leading_diamond = ''
+            background = 'p:c4'
+            foreground = 'p:c13'
+            template = '{{{{ .FormattedMs }}}}'
+
+            [[blocks.segments]]
+            type = 'time'
+            style = 'diamond'
+            leading_diamond = ''
+            background = 'p:c2'
+            foreground = 'p:c14'
+
+            [[blocks.segments]]
+            type = 'shell'
+            style = 'diamond'
+            leading_diamond = ''
+            background = 'p:c1'
+            foreground = 'p:c12'
+
+            [[blocks]]
+            type = 'prompt'
+            alignment = 'left'
+            newline = true
+
+            [[blocks.segments]]
+            type = 'text'
+            style = 'plain'
+            background = 'transparent'
+            foreground_templates = [
+            "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
+            "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
+            ]
+            template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
+
+            [transient_prompt] 
+            foreground_templates = [
+                "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
+                "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
+            ]
+            background = 'transparent'
+            template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
+
+            [secondary_prompt]
+            background = 'transparent'
+            forground = 'p:c14'
+            template = "❭❭ "
+
+
+            [palette]
+
+            c0 = "{color0}"
+            c1 = "{color1}"
+            c2 = "{color2}"
+            c3 = "{color3}"
+            c4 = "{color4}"
+            c5 = "{color5}"
+            c6 = "{color6}"
+            c7 = "{color7}"
+            c8 = "{color8}"
+            c9 = "{color9}"
+            c10 = "{color10}"
+            c11 = "{color11}"
+            c12 = "{color12}"
+            c13 = "{color13}"
+            c14 = "{color14}"
+            c15 = "{color15}"
+        '';
+    };
+}

homes/nathan/home-manager/programs/terminal/opencode/default.nix

@@ -0,0 +1,54 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
+
+        options.homeconfig.opencode.enable = with lib; mkOption {
+            type = with types; bool;
+            default = true;
+        };
+
+        config = lib.mkIf config.homeconfig.opencode.enable {
+
+            programs.opencode = {
+                enable = true;
+
+                settings = {
+                    theme = "system";
+                    model = "ollama-remote/qwen3:8b";
+
+                    provider = {
+                        ollama-local = {
+                            name = "Ollama (local)";
+
+                            npm = "@ai-sdk/openai-compatible";
+
+                            options.baseURL = "http://localhost:11434/v1";
+
+                            models = {
+                                "ministral-3:8b".name = "Ministral 3 8B";
+                                "llama3.2".name = "Llama 3.2";
+                                "qwen3:8b".name = "Qwen 3";
+                            };
+
+                        };
+
+                        ollama-remote = {
+                            name = "Ollama (remote)";
+
+                            npm = "@ai-sdk/openai-compatible";
+
+                            options.baseURL = "https://ollama.esotericbytes.com/v1";
+
+                            models = {
+                                "ministral-3:8b".name = "Ministral 3 8B";
+                                "llama3.2".name = "Llama 3.2";
+                                "qwen3:8b".name = "Qwen 3";
+                            };
+
+                        };
+                    };
+                };
+            };
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/ripgrep/default.nix

@@ -0,0 +1,9 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
+
+        programs.ripgrep = {
+            enable = true;
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/ssh/default.nix

@@ -0,0 +1,27 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
+
+        programs.ssh = {
+
+            enable = true;
+
+# defaults as of 25.11
+            matchBlocks."*" = {
+                forwardAgent = false;
+                addKeysToAgent = "no";
+                compression = false;
+                serverAliveInterval = 0;
+                serverAliveCountMax = 3;
+                hashKnownHosts = false;
+                userKnownHostsFile = "~/.ssh/known_hosts";
+                controlMaster = "no";
+                controlPath = "~/.ssh/master-%r@%n:%p";
+                controlPersist = "no";
+            };
+            enableDefaultConfig = false;
+
+
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/tmux/default.nix

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

homes/nathan/home-manager/programs/terminal/yazi/default.nix

@@ -0,0 +1,10 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
+        config = {
+            programs.yazi = {
+                enable = true;
+            };
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/zoxide/default.nix

@@ -0,0 +1,16 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
+
+        programs.zoxide = {
+
+            enable = true;
+
+            enableZshIntegration = true;
+
+            options = [
+                "--cmd cd"
+            ];
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/zsh/default.nix

@@ -0,0 +1,40 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { lib, ... }: {
+
+        programs.zsh = {
+
+            enable = true;
+
+            initContent = lib.mkOrder 1200 ''
+                bindkey ' ' magic-space
+            '';
+
+            enableCompletion = true;
+
+            autosuggestion.enable = true;
+
+            syntaxHighlighting.enable = true;
+
+            shellAliases = {
+                ls = "eza";
+                ll = "ls -l";
+
+                ksh = "kitten ssh";
+
+                vi = "nvim";
+                vim = "nvim";
+
+                python = "python3.14";
+                python3 = "python3.14";
+            };
+
+            history = {
+                size = 5000;
+                ignoreAllDups = true;
+                ignoreSpace = true;
+                share = true;
+            };
+        };
+    };
+}

homes/nathan/home-manager/services/custom/default.nix

@@ -0,0 +1 @@
+{ ... }: {}

homes/nathan/home-manager/services/mpd/default.nix

@@ -0,0 +1,44 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        options = {
+            homeconfig.mpd.enable = lib.options.mkOption {
+                type = lib.types.bool;
+                default = false;
+            };
+        };
+
+        config = lib.mkIf config.homeconfig.mpd.enable {
+            services.mpd = {
+                enable = true;
+                network.startWhenNeeded = true;
+                network.port = 6600;
+                network.listenAddress = "127.0.0.1";
+                musicDirectory = "/home/nathan/Music";
+                extraConfig = ''
+                    audio_output {
+                        type "pipewire"
+                            name "Audio1"
+                    }
+                audio_output {
+                    type "fifo"
+                        name "visualizer"
+                        path "/tmp/mpd.fifo"
+                        format "44100:16:1"
+                }
+                '';
+            };
+
+            services.mpdris2 = { 
+                enable = true;
+                mpd.host = "127.0.0.1";
+                mpd.port = 6600;
+                package = pkgs.mpdris2;
+                mpd.musicDirectory = "/home/nathan/Music";
+                notifications = true;
+            };
+        };
+
+    };
+}

homes/nathan/home.nix

@@ -1,11 +1,38 @@
-{ ... }:
+{ self, inputs, ... }: {
 
-{
+    flake.homeModules.nathan = { lib, ... }:
 
-    config = {                    
-        homeconfig = {
-            graphical = false;
-            minimal = false;
+    {
+
+        config = {                    
+            homeconfig = {
+                graphical = lib.mkDefault false;
+                minimal = lib.mkDefault false;
+
+                hyprland.enable = lib.mkDefault false;
+            };
+
+
+            nix = {
+                nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+                settings = {
+                    experimental-features = [ "nix-command" "flakes" ];
+                    builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
+                    builders-use-substitutes = true;
+                };
+            };
+
+            programs.home-manager.enable = true;
         };
     };
- }
+
+    flake.homeConfigurations.nathan = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = import inputs.nixpkgs {
+            system = builtins.currentSystem;
+        };
+
+        modules = [
+            self.homeModules.nathan
+        ];
+    };
+}

profiles/container/default.nix

@@ -0,0 +1,158 @@
+{ inputs, ... }: {
+
+    flake.nixosModules.container = { config, pkgs, lib, ... }:
+
+    {
+        imports =
+            [
+
+            inputs.home-manager.nixosModules.default
+
+            ];
+
+        config = {
+            hardware.nvidia.open = true;
+
+            boot.isContainer = true;
+
+            services = {
+                xserver = {
+#enable = true;
+                    videoDrivers = ["nvidia"];
+                };
+                displayManager = {
+                    enable = true;
+                    defaultSession = "plasma";
+                    autoLogin = {
+                        enable = true;
+                        user = "nathan";
+                    };
+                };
+                pulseaudio.enable = false;
+            };
+
+            systemd.extraConfig = "DefaultLimitNOFILE=2048";
+            /*
+               environment.sessionVariables = {
+               WLR_BACKENDS = "headless";
+               WLR_LIBINPUT_NO_DEVICES = "1";
+               };
+             */
+            programs.zsh.enable = true;
+            environment.shells = with pkgs; [ zsh ];
+            users.defaultUserShell = pkgs.zsh;
+
+            nixpkgs = {
+                config.allowUnfree = true;
+                hostPlatform = "x86_64-linux";
+            };
+
+# Set your time zone.
+            time.timeZone = "America/Chicago";
+
+# Select internationalisation properties.
+            i18n.defaultLocale = "en_US.UTF-8";
+
+            i18n.extraLocaleSettings = {
+                LC_ADDRESS = "en_US.UTF-8";
+                LC_IDENTIFICATION = "en_US.UTF-8";
+                LC_MEASUREMENT = "en_US.UTF-8";
+                LC_MONETARY = "en_US.UTF-8";
+                LC_NAME = "en_US.UTF-8";
+                LC_NUMERIC = "en_US.UTF-8";
+                LC_PAPER = "en_US.UTF-8";
+                LC_TELEPHONE = "en_US.UTF-8";
+                LC_TIME = "en_US.UTF-8";
+            };
+
+            services.displayManager.sddm.settings.AutoLogin = {
+                User = "nathan";
+                Session = "plasmawayland.desktop";
+                Relogin = true;
+            };
+
+            networking = {
+                nameservers = [ "1.1.1.1" "1.0.0.1" ];
+                networkmanager.enable = true;
+                firewall.allowedTCPPorts = [ 80 ];
+            };
+
+            system.stateVersion = "25.05"; # Did you read the comment?
+
+                users.users."nathan" = {
+                    isNormalUser = true;
+
+                    initialPassword = "7567";
+
+#hashedPasswordFile = config.sops.secrets."nathan/pass".path;
+
+                    extraGroups = [ 
+                        "wheel"
+                    ]; # Enable ‘sudo’ for the user.
+
+                    /*openssh.authorizedKeys.keys = [
+                      ];*/
+                };
+
+            nix = {
+                nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+                settings = {
+                    experimental-features = [ "nix-command" "flakes" ];
+                };
+            };
+
+            /*sops = {
+              age.keyFile = "/home/nathan/.config/sops/age/keys.txt";
+              defaultSopsFile = ./secrets.yaml;
+              defaultSopsFormat = "yaml";
+
+              secrets = {
+              "nathan/pass" = {
+              neededForUsers = true;
+              };
+              };
+              };*/
+
+            programs.fuse.userAllowOther = true;
+
+            home-manager = {
+                backupFileExtension = "backup";
+                extraSpecialArgs = {inherit inputs;};
+                users = {
+                    "nathan" = lib.mkMerge [
+                        inputs.nathan-home-manager
+                        {
+                            config.homeconfig = {
+                                minimal = false;
+                                hyprland.enable = false;
+                                wal.enable = false;
+                                mpd.enable = true;
+                                calcurse.enable = true;
+                                rofi.enable = true;
+                                firefox.enable = true;
+                            };
+                        }
+                    ];
+                };
+            };
+
+            sysconfig = {
+                opts = {
+                    novnc.enable = true;
+                    sddm.enable = true;
+                    openssh.enable = true;
+                    pipewire.enable = true;
+                    hyprpanel.enable = false;
+                    hyprland.enable = false;
+                    kdePlasma6.enable = true;
+                    git.enable = true;
+                    nh.enable = true;
+                    netbird.enable = true;
+                };
+            };
+
+            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
+
+        };
+    };
+}

profiles/homebox/.sops.yaml

@@ -0,0 +1,7 @@
+keys:
+  - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
+creation_rules:
+  - path_regex: ^secrets.yaml$
+    key_groups:
+    - age:
+      - *homebox

profiles/homebox/config.nix

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

profiles/homebox/default.nix

@@ -0,0 +1,120 @@
+{ self, inputs, ... }: {
+
+    flake.nixosModules.homebox = { config, pkgs, lib, ... }:
+
+    {
+        imports =
+            [
+                inputs.disko.nixosModules.default
+
+                inputs.home-manager.nixosModules.default
+            
+                self.nixosModules.default
+
+            ];
+
+        config = {
+
+            boot = {
+                kernelPackages = pkgs.linuxKernel.packages.linux_6_18;
+                loader = {
+                    systemd-boot.enable = true;
+                    efi.canTouchEfiVariables = true;
+                };
+                binfmt.emulatedSystems = lib.mkIf config.sysconfig.remoteBuildHost [ "aarch64-linux" ];
+            };
+
+            systemd.settings.Manager.DefaultLimitNOFILE = 2048;
+
+            programs.zsh.enable = true;
+            environment.shells = with pkgs; [ zsh bashInteractive ];
+
+            nixpkgs.config.allowUnfree = true;
+
+            networking = {
+                nameservers = lib.mkDefault [ "1.1.1.1" "1.0.0.1" ];
+                networkmanager = {
+                    enable = true;
+                    dns = "none";
+                };
+                useDHCP = false;
+                dhcpcd.enable = false;
+
+                nftables = {};
+                nat = {
+                    enable = true;
+                    internalInterfaces = [ "ve-.+" ];
+                    externalInterface = "wlp7s0"; # wifi
+#externalInterface = "enp6s0"; # ethernet
+                };
+            };
+
+            services.netbird.clients.default.environment = {
+                NB_EXTRA_DNS_LABELS = "server";
+            };
+
+            sysconfig = {
+                remoteBuildHost = true;
+                graphical = false;
+
+                services = {
+                    sddm.enable = false;
+                    openssh.enable = true;
+                    pipewire.enable = true;
+                    netbird.enable = true;
+
+                    ollama.enable = false;
+                    avahi.enable = true;
+                    wyoming = {
+                        enable = true;
+                        piper = true;
+                        openwakeword = true;
+                        faster-whisper = true;
+                    };
+                };
+
+                programs = {
+                    hyprland.enable = false;
+                    steam.enable = false;
+                };
+
+                docker = {
+                    enable = true;
+
+                    portainer.enable = true;
+                    traefik.enable = true;
+                    pihole.enable = true;
+                    authentik.enable = true;
+                    netbird.enable = true;
+
+                    openwebui.enable = true;
+                    ollama.enable = true;
+                    searxng.enable = true;
+                    home-assistant.enable = true;
+                    n8n.enable = true;
+
+                    nextcloud.enable = false;
+                    jellyfin.enable = true;
+                };
+
+                containers = {
+                    "esotericbytes.com".enable = true;
+
+                    gitea.enable = true;
+
+                    code-server.enable = true;
+
+                    sandbox.enable = false;
+                };
+
+                virtual-machines = {
+                    enable = true;
+                };
+            };
+
+            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
+
+        };
+
+    };
+}

profiles/homebox/disko.nix

@@ -0,0 +1,143 @@
+{ ... }: {
+
+    flake.diskoConfigurations.homebox = {
+        disko.devices = {
+            disk = {
+                main = {
+                    device = "/dev/nvme0n1";
+                    type = "disk";
+                    content = {
+                        type = "gpt";
+                        partitions = {
+                            boot = {
+                                name = "boot";
+                                size = "1M";
+                                type = "EF02";
+                            };
+                            esp = {
+                                name = "ESP";
+                                size = "500M";
+                                type = "EF00";
+                                content = {
+                                    type = "filesystem";
+                                    format = "vfat";
+                                    mountpoint = "/boot";
+                                };
+                            };
+                            swap = {
+                                size = "4G";
+                                content = {
+                                    type = "swap";
+                                    resumeDevice = true;
+                                };
+                            };
+                            root = {
+                                name = "root";
+                                size = "100%";
+                                content = {
+                                    type = "lvm_pv";
+                                    vg = "root_vg";
+                                };
+                            };
+                        };
+                    };
+                };
+                ssd1 = {
+                    device = "/dev/nvme1n1";
+                    type = "disk";
+                    content = {
+                        type = "gpt";
+                        partitions = {
+                            ssd1 = {
+                                name = "ssd1";
+                                size = "100%";
+                                content = {
+                                    type = "lvm_pv";
+                                    vg = "ssd1_vg";
+                                };
+                            };
+                        };
+                    };
+                };
+                hdd1 = {
+                    device = "/dev/sda";
+                    type = "disk";
+                    content = {
+                        type = "gpt";
+                        partitions = {
+                            hdd1 = {
+                                name = "hdd1";
+                                size = "100%";
+                                content = {
+                                    type = "lvm_pv";
+                                    vg = "hdd1_vg";
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+            lvm_vg = {
+                root_vg = {
+                    type = "lvm_vg";
+                    lvs = {
+                        root = {
+                            size = "100%FREE";
+                            content = {
+                                type = "btrfs";
+                                extraArgs = ["-f"];
+
+                                subvolumes = {
+                                    "/root" = {
+                                        mountpoint = "/";
+                                    };
+
+                                    "/nix" = {
+                                        mountOptions = ["subvol=nix" "noatime"];
+                                        mountpoint = "/nix";
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+                ssd1_vg = {
+                    type = "lvm_vg";
+                    lvs = {
+                        ssd1 = {
+                            size = "100%FREE";
+                            content = {
+                                type = "btrfs";
+                                extraArgs = [ "-f" ];
+                                subvolumes = {
+                                    "/ssd1" = {
+                                        mountOptions = [ "subvol=ssd1" "noatime" ];
+                                        mountpoint = "/ssd1";
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+                hdd1_vg = {
+                    type = "lvm_vg";
+                    lvs = {
+                        hdd1 = {
+                            size = "100%FREE";
+                            content = {
+                                type = "btrfs";
+                                extraArgs = [ "-f" ];
+                                subvolumes = {
+                                    "/hdd1" = {
+                                        mountOptions = [ "subvol=hdd1" "noatime" ];
+                                        mountpoint = "/hdd1";
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };    
+        };
+    };
+}

profiles/homebox/hardware-configuration.nix

@@ -0,0 +1,24 @@
+{ ... }: {
+
+    flake.nixosModules.homebox = { config, lib, pkgs, modulesPath, ... }:
+
+    {
+        imports =
+            [ (modulesPath + "/installer/scan/not-detected.nix")
+            ];
+
+        boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ];
+        boot.initrd.kernelModules = [ "dm-snapshot" ];
+        boot.kernelModules = [ "kvm-amd" ];
+        boot.extraModulePackages = [ ];
+
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# (the default) this is the recommended approach. When using systemd-networkd it's
+# still possible to use this option, but it's recommended to use it in conjunction
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+        networking.useDHCP = lib.mkDefault true;
+
+        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+        hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
+}

profiles/homebox/secrets.yaml

@@ -1,5 +1,8 @@
 nathan:
     pass: ENC[AES256_GCM,data:HP/kF665VvIUybXmqaluJikeHWR0lvTXjA8Ry/dpbjDd3VUfiDuWFKlBkUzIZ1brAc86PV1xl4JWu2CNEz7uc3TmPuJ+GsFFOA==,iv:uPQZE7s3PvfShOaVCNRnnhXlcvA5aIiXRxi7UPbXfdU=,tag:Wg0IuCm4ljSPBmB/H2OSFA==,type:str]
+traefik:
+    cf_email: ENC[AES256_GCM,data:ujvdfobp/aTcyC+kUYeYYeaiXQnQhoHYhg==,iv:LBzvuMMt76jX70a68rzaMgkmzHtVE2TlbrJlWE7I6o8=,tag:cTO1ApZQ214zjJyumunvPg==,type:str]
+    cf_api_key: ENC[AES256_GCM,data:CrtkBlhUZT3rlZAqiEHz7/OhPaoQ5nAz+deWmrh2zmwJfAp95lGZCA==,iv:qPXTm5zjTVYupot/hUkI/pSe0QNs17rapDrvdweRDTQ=,tag:VL2Cnig8Ih0iSL7myqlTgA==,type:str]
 authentik:
     pass: ENC[AES256_GCM,data:pTjpwRgdUVU5543T199P7Zoy,iv:93WpIK6qq+A1LhaQdBvMQ4jzuAOmMUt575y/p8m8Ugk=,tag:jTg/JED3vpdOVHF8LdIyLg==,type:str]
     secret_key: ENC[AES256_GCM,data:tIWDGtB/z7Ysizz9FPQJe2EeSTAxDPkeHJnaDfytDvbqvRaiCgg7qGpEF6hAQFdZ,iv:gloup5aI0qY+SYJt8V6lvUdE+18IWH09BXtz8dRi6JE=,tag:vFwF9h1Rsa/X1bjvdSRSfQ==,type:str]
@@ -10,7 +13,7 @@ gitea:
 keycloak:
     dbpass: ENC[AES256_GCM,data:tc4wIAqzY7nonBhz8s+YdAux,iv:Wg0b0/xnl6cANLTOJWBsX+gw1iF8Q/GvO/iKyKwqJrM=,tag:LORKRmo4RjcrVbPNhk2A9Q==,type:str]
 netbird:
-    coturnPass: ENC[AES256_GCM,data:zB6P9RyTTKkXEOIhOyeJuF4Y,iv:8SWVfcdmMnXQJxezu3uanrlmFhR+hxXEJ3T7KA+YZqE=,tag:1H21K3kbZOuLOdN2zufWJw==,type:str]
+    secret_key: ENC[AES256_GCM,data:isJHGh/InvgJUSqISqxpWhZH0OMN/QG7WBbSS7WqHaWTdfZDBOh//PBP8g==,iv:j0D6feM3qnDjXijXRHgZPboFLHzPwWIhT5bYz3M+QMU=,tag:pOHRxOEdOUrL3n6DgqGDsA==,type:str]
 gitlab:
     db_pass: ENC[AES256_GCM,data:N3KvXkXql/PDjxZSpGo/Apr/,iv:OOzhR4BEmV3T01PA50vqdJMg7D2OGKHn/8hiqKEaOd4=,tag:jzdonXH/D/5kZ5Cld2W//w==,type:str]
     root_pass: ENC[AES256_GCM,data:bALaUkoJw3N0ugZP/4MCnEsD,iv:LJdJpXlyzA6o00UVlK+l5WCCFIL/sT/fQNjI8wA5LAg=,tag:BYk1o/rjubyEpeHbgYA1Sg==,type:str]
@@ -35,7 +38,7 @@ sops:
             S0NMRGJSeks0Q0UrVnZmUVdyU2NqVm8KLu2kQpD1fJdU0fTdR9A2cTQzRp+waJ6M
             8vA+E8xYb2U4d7m0YnwKkGzw0CBPb0BvdEgvWvqpFViftoDwRv5KGA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-08-19T05:54:41Z"
-    mac: ENC[AES256_GCM,data:hLxsJDB3kr00fVVlkGC7L/pP3AH+W+IZbt4zHxGb9C7bhgs1zkLdDGGW8uqitsYQP5ZqSq00raym+JGGREH0q+SepQB+yrB26yDsac6thzKV1Yr3sIMhKdzSHJiNEawUxI7pTToKG3e6XDz2S0r0i0AvAoA6abPHoPH4ihojoXE=,iv:lSKAiSdkP1FxVoeKtSYs4i3HcyouNUeBHRvAXXqiBKY=,tag:hJGw0QhvbUf9M3AXC67iFA==,type:str]
+    lastmodified: "2026-02-01T12:56:37Z"
+    mac: ENC[AES256_GCM,data:clu/WnwHAQaowQ99Z8tNlIKKcVnLHYeYsgQK0meftXgiQKnLyLzqNipwfaU3qjITdm6fB7wY+TcySygpwFbY2f2TKrqAk7RxdnTFa61vQDqMF7rYPG90Ub79P+R5URZI8yjv69Hmrav0Y6z92vH8ItbPSRBLtgrbYZx36IFq0LU=,iv:qzBVA0xATM979tzu6cTvMrX77firvA5K0WU2hoUggoA=,tag:Fm3IqH0GUHBq9Din6ZW6ng==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.11.0

profiles/iso/default.nix

@@ -0,0 +1,106 @@
+{ self, inputs, ... }: {
+
+    perSystem = { config, system, pkgs, self', inputs', ... }: {
+        packages.iso = self.nixosConfigurations.iso.config.system.build.isoImage;
+    };
+
+    flake.nixosConfigurations.iso = inputs.nixpkgs.lib.nixosSystem {
+
+        modules = [
+            self.nixosModules.iso
+        ];
+    };
+
+    flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: {
+
+        imports = with inputs; [
+
+            (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
+
+            self.nixosModules.default
+            self.nixosModules.aurora-greeter
+
+            home-manager.nixosModules.default
+
+        ];
+
+        config = {
+
+            fonts.fontconfig.enable = lib.mkForce true;
+
+            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
+            environment.systemPackages = with pkgs; [ nerd-fonts.fira-code ];
+
+            system.stateVersion = "25.11";
+
+            nixpkgs.hostPlatform = "x86_64-linux";
+
+            users.users."nathan" = {
+                hashedPassword = "$y$j9T$F0pn6l4C45lz4a0FTZLqE0$Fc48Ptbmz/3MJCk/Jsaqop4ff.bY3J3GcjhmJx5R7k6";
+                packages = with pkgs; [ 
+                    git 
+                    nerd-fonts.fira-code
+                ];
+            };
+
+            users.users.nixos.enable = lib.mkForce false;
+
+            networking = {
+                nameservers = [ "1.1.1.1" "1.0.0.1" ];
+                networkmanager.enable = true;
+            };
+
+            programs.zsh.enable = true;
+
+            environment.shells = with pkgs; [ zsh bashInteractive ];
+
+            sysconfig = {
+                host = "iso";
+                graphical = true;
+                users = {
+                    nathan = {
+                        extraGroups = [ "wheel" "networkmanager" ];
+                        shell = pkgs.zsh;
+                        ssh.keys = [
+                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
+                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost"
+                        ];
+                        home-manager = {
+                            enable = true;
+                            standalone = false;
+                            extraModules = [
+                            {
+                                homeconfig = {
+                                    minimal = false;
+                                    hyprland.enable = true;
+                                    wal.enable = true;
+                                    mpd.enable = true;
+                                    rofi.enable = true;
+                                    firefox.enable = true;
+                                    git.enable = false;
+                                    nh.enable = true;
+
+                                    aurora.enable = true;
+                                };
+                            } 
+                            ];
+                        };
+                    };
+                };
+
+                services = {
+                    openssh.enable = true;
+                    pipewire.enable = true;
+#kdePlasma6.enable = true;
+                    netbird.enable = true;
+#ollama.enable = true;
+                };
+
+                programs = {
+#steam.enable = true;
+                    hyprland.enable = true;
+                };
+            };
+        };
+    };
+}

profiles/jesstop/default.nix

@@ -0,0 +1,132 @@
+{ inputs, ... }: {
+
+    flake.nixosModules.jesstop = { config, pkgs, lib, ... }:
+
+    {
+
+        imports = [
+#inputs.home-manager.nixosModules.default
+
+                inputs.sops-nix.nixosModules.sops
+        ];
+
+        config = {
+
+            nixpkgs.config = {
+                allowUnfree = true;
+            };
+
+# Bootloader.
+            boot = {
+                loader = {
+                    systemd-boot.enable = true;
+                    efi.canTouchEfiVariables = true;
+                };
+            };
+
+            systemd.extraConfig = "DefaultLimitNOFILE=2048";
+
+            hardware = {
+                graphics.enable = true;
+
+#enable bluetooth
+                bluetooth.enable = true;
+
+            };
+
+            services.pulseaudio.enable = false;
+
+            environment.systemPackages = with pkgs; [
+                alsa-utils
+            ];
+
+            sysconfig.opts = {
+                sddm.enable = true;
+                openssh.enable = false;
+                steam.enable = true;
+                pipewire.enable = true;
+                hyprpanel.enable = false;
+                hyprland.enable = false;
+                git.enable = false;
+                nh.enable = true;
+
+            };
+
+
+# Enable the X11 windowing system.
+            services.xserver = {
+                enable = true;
+                desktopManager.enlightenment.enable = true;
+            };
+
+            services.acpid.enable = true;
+
+            services.displayManager.enable = true;
+
+# Enable CUPS to print documents.
+            services.printing.enable = true;
+
+            system.stateVersion = "23.05"; # Did you read the comment?
+
+# Set your time zone.
+                time.timeZone = "America/Chicago";
+
+# Select internationalisation properties.
+            i18n.defaultLocale = "en_US.UTF-8";
+
+            i18n.extraLocaleSettings = {
+                LC_ADDRESS = "en_US.UTF-8";
+                LC_IDENTIFICATION = "en_US.UTF-8";
+                LC_MEASUREMENT = "en_US.UTF-8";
+                LC_MONETARY = "en_US.UTF-8";
+                LC_NAME = "en_US.UTF-8";
+                LC_NUMERIC = "en_US.UTF-8";
+                LC_PAPER = "en_US.UTF-8";
+                LC_TELEPHONE = "en_US.UTF-8";
+                LC_TIME = "en_US.UTF-8";
+            };
+
+            networking = {
+                hostName = "jesstop";
+                nameservers = [ "1.1.1.1" "1.0.0.1" ];
+                networkmanager.enable = true;
+            };
+
+
+            users.users."nickelback" = {
+                isNormalUser = true;
+                description = "Thomas Jefferson";
+                initialPassword = "89453712";
+#hashedPasswordFile = config.sops.secrets."nathan/pass".path;
+                extraGroups = [ 
+                    "wheel"
+                    "networkmanager"
+                ]; # Enable ‘sudo’ for the user.
+                openssh.authorizedKeys.keys = [];
+
+                packages = with pkgs; [
+                    (writeShellScriptBin "beets" ''
+                     bluetoothctl connect A4:16:C0:74:1F:55
+                     '')
+
+                        spotify
+                        gnome-network-displays
+                        discord
+                        krita
+                        rpcs3
+                ];
+            };
+
+            nix = {
+                nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+                settings = {
+                    experimental-features = [ "nix-command" "flakes" ];
+                };
+            };
+
+            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
+
+
+        };
+    };
+}

profiles/jesstop/hardware-configuration.nix

@@ -0,0 +1,39 @@
+{ ... }: {
+
+    flake.nixosModules.jesstop = { config, lib, pkgs, modulesPath, ... }:
+
+    {
+        imports =
+            [ (modulesPath + "/installer/scan/not-detected.nix")
+            ];
+
+        boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+        boot.initrd.kernelModules = [ ];
+        boot.kernelModules = [ "kvm-intel" ];
+        boot.extraModulePackages = [ ];
+
+        fileSystems."/" =
+        { device = "/dev/disk/by-uuid/d76defe1-149f-4ea2-a5a1-d9cc2804cf72";
+            fsType = "ext4";
+        };
+
+        fileSystems."/boot" =
+        { device = "/dev/disk/by-uuid/D497-6455";
+            fsType = "vfat";
+            options = [ "fmask=0077" "dmask=0077" ];
+        };
+
+        swapDevices = [ ];
+
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# (the default) this is the recommended approach. When using systemd-networkd it's
+# still possible to use this option, but it's recommended to use it in conjunction
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+        networking.useDHCP = lib.mkDefault true;
+# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+
+        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+        hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
+}

profiles/laptop/.sops.yaml

@@ -0,0 +1,7 @@
+keys:
+  - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
+creation_rules:
+  - path_regex: ^secrets.yaml$
+    key_groups:
+    - age:
+      - *laptop

profiles/laptop/config.nix

@@ -0,0 +1,125 @@
+{ self, inputs, ... }: {
+
+    flake.nixosConfigurations."laptop" = inputs.nixpkgs.lib.nixosSystem {
+
+        modules = [
+            self.nixosModules.laptop
+        ];
+    };
+
+    flake.nixosModules.laptop = { config, pkgs, ... }:
+
+    {
+
+        config = {
+
+            boot.kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ];
+
+            hardware = {
+                nvidia = {
+                    modesetting.enable = true;
+                    powerManagement.enable = true;
+                    powerManagement.finegrained = true;
+                    open = false;
+                    nvidiaSettings = true;
+                    package = config.boot.kernelPackages.nvidiaPackages.stable;
+
+                    prime = {
+# Make sure to use the correct Bus ID values for your system!
+                        intelBusId = "PCI:0:2:0";
+                        nvidiaBusId = "PCI:1:0:0";
+# WARNING: sync and offload are mutually exclusive.
+# You can only pick one!!
+#sync.enable = true;
+                        offload = {
+                            enable = true;
+                            enableOffloadCmd = true;
+                        };
+                    };
+                };
+            };
+
+            sops = {
+                defaultSopsFile = ./secrets.yaml;
+                secrets = {
+                    "nathan/pass" = {
+                        neededForUsers = true;
+                    };
+
+                    remoteBuildKey = {};
+                };
+            };
+
+            services.wyoming.satellite.user = "nathan";
+
+            sysconfig = {
+
+                host = "laptop";
+
+                services = {
+                    wyoming = {
+                        enable = true;
+                        satellite = true;
+                    };
+                };
+
+                remoteBuildClient = true;
+
+                users = {
+                    nathan = {
+                        isSuperuser = true;
+                        extraGroups = [ "networkmanager" ];
+                        hashedPasswordFile = config.sops.secrets."nathan/pass".path;
+                        shell = pkgs.zsh;
+                        home-manager = {
+                            enable = true;
+                            standalone = false;
+                            extraModules = [
+                            {
+                                homeconfig = {
+                                    minimal = false;
+                                    graphical = true;
+
+                                    virtual-machines = true;
+                                    hyprland.enable = true;
+                                    hypridle.enable = true;
+                                    wal.enable = true;
+                                    mpd.enable = true;
+                                    calcurse.enable = true;
+                                    rofi.enable = true;
+                                    firefox.enable = true;
+                                    git.enable = true;
+                                    nh.enable = true;
+
+                                    aurora.enable = true;
+                                };
+
+#monitor=eDP-1, addreserved, 40,0,0,0
+                                wayland.windowManager.hyprland.extraConfig = ''
+                                    monitor=eDP-1,1920x1080@60,0x0,1
+                                    bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
+                                    bind = ALT, Escape, 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
+                                    '';
+
+                            } 
+                            ];
+                        };
+                    };
+                };
+            };
+
+
+            services.xserver.videoDrivers = [ "nvidia" ];
+
+
+# This value determines the NixOS release from which the default
+# settings for stateful data, like file locations and database versions
+# on your system were taken. It‘s perfectly fine and recommended to leave
+# this value at the release version of the first install of this system.
+# Before changing this value read the documentation for this option
+# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+            system.stateVersion = "23.05"; # Did you read the comment?
+        };
+
+    };
+}

profiles/laptop/default.nix

@@ -0,0 +1,120 @@
+{ self, inputs, ... }: {
+
+    flake.nixosModules.laptop = { config, pkgs, lib, ... }:
+
+    {
+
+        imports = [
+            inputs.home-manager.nixosModules.default
+
+            self.nixosModules.default
+
+            self.nixosModules.aurora-greeter
+        ];
+
+        config = {
+
+            nixpkgs.config = {
+                allowUnfree = true;
+            };
+
+# Bootloader.
+            boot = {
+                kernelPackages = pkgs.linuxKernel.packages.linux_6_18;
+                loader = {
+                    systemd-boot.enable = true;
+                    efi.canTouchEfiVariables = true;
+                    timeout = null;
+                };
+            };
+
+            systemd.settings.Manager.DefaultLimitNOFILE = 2048;
+
+            hardware = {
+                graphics.enable = true;
+
+                firmware = with pkgs; [
+                    sof-firmware
+                ];
+
+#enable bluetooth
+                bluetooth.enable = true;
+
+            };
+
+            programs.partition-manager.enable = true;
+            services.pulseaudio.enable = false;
+
+            environment.systemPackages = with pkgs; [
+                alsa-utils
+            ];
+
+            sysconfig = with lib; {
+                remoteBuildClient = mkDefault true;
+                graphical = mkDefault true;
+
+                services = {
+                    sddm.enable = mkDefault true;
+                    openssh.enable = mkDefault false;
+                    pipewire.enable = mkDefault true;
+                    netbird.enable = mkDefault true;
+                    ollama.enable = mkDefault true;
+                    avahi.enable = mkDefault true;
+                };
+
+                programs = {
+                    steam.enable = mkDefault true;
+                    hyprland.enable = mkDefault true;
+                };
+
+
+                containers = {
+
+                    wyoming = {
+                        enable = mkDefault false;
+                    };
+                };
+
+                virtual-machines = {
+                    enable = true;
+                };
+            };
+
+
+# Enable the X11 windowing system.
+            services.xserver = {
+                enable = true;
+            };
+
+            services.displayManager.enable = true;
+
+
+            environment.shells = with pkgs; [ zsh bashInteractive ];
+
+# Enable CUPS to print documents.
+            services.printing.enable = true;
+
+            programs.adb.enable = true;
+
+            programs.zsh.enable = true;
+
+            networking = {
+                nameservers = [ 
+                    "1.1.1.1" 
+                    "1.0.0.1" 
+                ];
+                networkmanager = {
+                    enable = true;
+                    dns = "none";
+                };
+                useDHCP = false;
+                dhcpcd.enable = false;
+            };
+
+
+            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
+
+        };
+
+    };
+}

profiles/laptop/hardware-configuration.nix

@@ -0,0 +1,39 @@
+{ ... }: {
+
+    flake.nixosModules.laptop = { config, lib, pkgs, modulesPath, ... }:
+
+    {
+        imports =
+            [ (modulesPath + "/installer/scan/not-detected.nix")
+            ];
+
+        boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+        boot.initrd.kernelModules = [ ];
+        boot.kernelModules = [ "kvm-intel" ];
+        boot.extraModulePackages = [ ];
+
+        fileSystems."/" =
+        { device = "/dev/disk/by-uuid/78c0964d-c09e-4e31-8a73-eb719d79917a";
+            fsType = "ext4";
+        };
+
+        fileSystems."/boot" =
+        { device = "/dev/disk/by-uuid/AE5E-AC86";
+            fsType = "vfat";
+            options = [ "fmask=0022" "dmask=0022" ];
+        };
+
+        swapDevices = [ ];
+
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# (the default) this is the recommended approach. When using systemd-networkd it's
+# still possible to use this option, but it's recommended to use it in conjunction
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+        networking.useDHCP = lib.mkDefault true;
+# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+
+        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+        hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
+}