updated quickshell

updated hyprland and quickshell, will deprecate waybar shortly
updated nvim and quickshell
2026-08-15 20:12:58 +01:00 · 2026-08-10 20:46:39 +01:00 · 2026-08-10 16:59:46 +01:00 · 2026-08-10 12:11:03 +01:00 · 2026-08-10 12:10:56 +01:00 · 2026-08-07 19:04:33 +01:00
28 changed files with 740 additions and 278 deletions
--- a/README.md
+++ b/README.md
@@ -0,0 +1,74 @@
+# The Void
+*An opinionated dendritic nix configuration*
+
+## The Concept
+
+I have been trying to get consistent, across device experiences from the second that I
+started using linux. I tried my best with arch, but I foolishly believed that just remembering
+what packages I installed would be enough. Then I started managing my dotfiles with GNU stow,
+but that only allowed for a single host per repo. I moved over to doot, and simultaneously nixos.
+
+I believed a dotfiles manager was my endgame. The final evolution, but it was far from ideal. I had to
+manage a mess of dotfiles, submodules and nix packages that were completely uncoupled from the apps that
+used them. Hyprland just assumed that I had all of my apps installed, assumed that otter-launcher's
+config existed. Just by forgetting an app or a toml file, I had the potential to brick my entire setup.
+
+This is no longer the case.
+
+The solution is similar to that of safely typed languages, like rust. Rust, instead of having optional parameters
+like typescript, requires that a variable be passed to a function, regardless of whether it contains anything.
+This leads to what is essentially a fixed dependancy tree, where there are no points of failiure, only allowing
+for logic errors and such. The same methodology can be applied to nix, using flake parts and wrapper scripts.
+
+Instead of defining the packages beside the app, and its config, you can use the config to define the required binaries.
+By wrapping a config that contains a nix variable, ie a binary, that binary is intrinsically linked to that config,
+and will therefore always be installed. No more dependancy issues, and because the configs are defined within nix too, no
+more potential for missing config files. Dotfile managers are no more, long live dotfile managers. Any app with a `--config`
+flag can now be fully versioned and self contained within one repo, config and all, accessible on any machine with nix.
+
+One command for a truly reproducible, fully contained, configured system. This is the endgame.
+
+## Usage
+
+Usage is similar to any other flake, with everything in the module directory being an output.
+
+The folder structure is simply defined:
+```
+modules/
+|- features/ - all available apps, every subfolder contains a seperate wrapped binary
+|- attrs/ - attributes composed of other modules, no new features defined
+|- system/ - basic system modules, no binaries. Should not be run standalone. (Think network and audio config)
+|- hosts/ - available presets for machines. Output names match subfolder names, eg #HACKSTATION, and hostnames
+```
+
+### Nixos Configurations
+
+Due to the host module referencing `/etc/nixos/hardware-configuration.nix`, so that it is seperated from the repo,
+all rebuild commands will need `--impure`, unless you copy your configuration into the repo.
+
+HACKSTATION is the heavier system, mobile02 is minimal and has no specialist hyprland config.
+
+It is recommended to clone the repo beforehand, but the system can be built directly from remote
+```bash
+# Local Clone, . is the directory containing flake.nix
+sudo nixos-rebuild switch --impure --flake .
+
+# Build from remote
+sudo nixos-rebuild switch --impure --flake "git+https://git.voidarc.co.uk/voidarc/nixos.git?ref=dendritic"
+```
+Both of these commands can be appended with a desired hostname in order to build that configuration.
+```bash
+# Example of building mobile02 from a local repo
+sudo nixos-rebuild switch --impure --flake .#mobile02
+```
+There is no default output, so if the current hostname doesn't match a host, you will get an error.
+Building this config should be non destructive to any existing dotfiles, but will remove all users (not home directories)
+from the system other than `user01`, who's default password is `qwer`.
+
+### Binaries
+
+Any binary can be run with the same base command (will change when merged to main)
+```bash
+nix run "git+https://git.voidarc.co.uk/voidarc/nixos.git?ref=dendritic#appname"
+```
+`Appname` can be substituted for the name of any folder in the `modules/features` dir, ie `kitty` or `otter-launcher`
--- a/flake.lock
+++ b/flake.lock
@@ -24,11 +24,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1782073106,
-        "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=",
+        "lastModified": 1784368054,
+        "narHash": "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457",
+        "rev": "9b5f14d9483445e766294eb8fbe0b8f370269ed0",
        "type": "github"
      },
      "original": {
@@ -194,7 +194,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_7"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -210,26 +210,21 @@
        "type": "github"
      }
    },
-    "gitignore": {
+    "flake-utils_3": {
      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "hyprland",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
+        "systems": "systems_9"
      },
      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
+        "owner": "numtide",
+        "repo": "flake-utils",
        "type": "github"
      }
    },
@@ -364,20 +359,18 @@
    "hyprland": {
      "inputs": {
        "hyprland": "hyprland_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_3",
        "otter-launcher": "otter-launcher",
        "woomer": "woomer",
        "wrappers": "wrappers",
        "wshowkeys": "wshowkeys"
      },
      "locked": {
-        "lastModified": 1783770011,
-        "narHash": "sha256-U+RNUy0UjDgAMIiAVZCJRmtcriGAE4tqOkprvs2/nE4=",
+        "lastModified": 1786391152,
+        "narHash": "sha256-P+dUN0wWRYLop9lLsnCOEi5bYE/GC5LvzV2VZh520TM=",
        "ref": "refs/heads/main",
-        "rev": "45818e93959b636b27910689f29cb640da88c8b9",
-        "revCount": 44,
+        "rev": "b4426becc44de00e891098b9883eca2b2028f981",
+        "revCount": 53,
        "type": "git",
        "url": "https://git.voidarc.co.uk/voidarc/hypr"
      },
@@ -426,11 +419,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1782563850,
-        "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=",
+        "lastModified": 1784196523,
+        "narHash": "sha256-ahtKMGXFJdlQNhatQm1+BBU/pGfGYnAqQt3vWvq4p8s=",
        "owner": "hyprwm",
        "repo": "hyprland-guiutils",
-        "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178",
+        "rev": "a6ccb6cb112ed5a244c0191fb972347ecfa893e0",
        "type": "github"
      },
      "original": {
@@ -483,11 +476,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1783110106,
-        "narHash": "sha256-PRnnFkTfQ+sQHSrcWw0512zEMNp5/1WHJeVuDf6FmxI=",
+        "lastModified": 1785237127,
+        "narHash": "sha256-sMSWRj9zZ3O4Q1Bk8mKkdXsTb3zpXRESlrzWmQXmW54=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "14fa1fd0273973b7a40966b4fa9e081d6bf67dae",
+        "rev": "ff24e1755fd308ee70367d63168a12feb05d1fc2",
        "type": "github"
      },
      "original": {
@@ -601,11 +594,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1783002634,
-        "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=",
+        "lastModified": 1784323413,
+        "narHash": "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1",
+        "rev": "5f03477ab3a005ff27c527486f551883535aea2f",
        "type": "github"
      },
      "original": {
@@ -675,11 +668,11 @@
    },
    "import-tree": {
      "locked": {
-        "lastModified": 1778781969,
-        "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
+        "lastModified": 1784254960,
+        "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=",
        "owner": "vic",
        "repo": "import-tree",
-        "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
+        "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69",
        "type": "github"
      },
      "original": {
@@ -765,13 +758,61 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs_10": {
      "locked": {
-        "lastModified": 1782467914,
-        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
+      "locked": {
+        "lastModified": 1780336545,
+        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_12": {
+      "locked": {
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1784356753,
+        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
        "type": "github"
      },
      "original": {
@@ -782,6 +823,22 @@
      }
    },
    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1785090369,
+        "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "624af665418d3c65d544145b4d34ad696439570e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
      "locked": {
        "lastModified": 1782175435,
        "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
@@ -797,7 +854,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1773734432,
        "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
@@ -813,13 +870,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1783549019,
-        "narHash": "sha256-0XnckG4ZhBmAsYa9mLuEIFowBG0fDGPLHduQGsbMS4A=",
+        "lastModified": 1785386831,
+        "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "74cc63f702f7d60a557e152a57b40fb1fd0f72ac",
+        "rev": "21ea275a7c46aef9d4d6ddc962e6d562e9d94183",
        "type": "github"
      },
      "original": {
@@ -829,7 +886,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
      "locked": {
        "lastModified": 1782467914,
        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
@@ -845,7 +902,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
      "locked": {
        "lastModified": 1780336545,
        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
@@ -861,7 +918,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
      "locked": {
        "lastModified": 1783224372,
        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
@@ -877,33 +934,17 @@
        "type": "github"
      }
    },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1780336545,
-        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nvim": {
      "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
        "wrappers": "wrappers_2"
      },
      "locked": {
-        "lastModified": 1783352922,
-        "narHash": "sha256-59Kea6PaeTM6ZBEAWzdPnuLlij2emLd21JsPnobR3B0=",
+        "lastModified": 1786377545,
+        "narHash": "sha256-I5/PcFU0jlDw6+32MXpMGJxxHqWBUdYCt6DzFDctybw=",
        "ref": "refs/heads/main",
-        "rev": "970da906087f0691932418db8757803d64f60c28",
-        "revCount": 94,
+        "rev": "dc386a5f5cf31925c513a3a39f546d5364289095",
+        "revCount": 100,
        "type": "git",
        "url": "https://git.voidarc.co.uk/voidarc/nvim"
      },
@@ -944,11 +985,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1783145565,
-        "narHash": "sha256-czL1P2nQV3JrbV6J2b3jXnWcz+Kbz+xhaXKk3+wdnF0=",
+        "lastModified": 1783875707,
+        "narHash": "sha256-Ryg3PqFcGydelQpgPF0j8GMaXaGDrNTSesEy6fDw/eg=",
        "owner": "kuokuo123",
        "repo": "otter-launcher",
-        "rev": "2e35ce8c7ba6f5e4d98bf4c9073f5fa91143744d",
+        "rev": "242e5da4f0acc0b4301be7b4546f5afb3e4b23d6",
        "type": "github"
      },
      "original": {
@@ -967,11 +1008,11 @@
        "systems": "systems_6"
      },
      "locked": {
-        "lastModified": 1783339207,
-        "narHash": "sha256-ZO2WzXNEM9XKuReixgQuP1G+5nrihYWajugBCIjjPkE=",
+        "lastModified": 1783875707,
+        "narHash": "sha256-Ryg3PqFcGydelQpgPF0j8GMaXaGDrNTSesEy6fDw/eg=",
        "owner": "kuokuo123",
        "repo": "otter-launcher",
-        "rev": "d101421377473a190701d53cbe28b8244edad728",
+        "rev": "242e5da4f0acc0b4301be7b4546f5afb3e4b23d6",
        "type": "github"
      },
      "original": {
@@ -983,7 +1024,6 @@
    "pre-commit-hooks": {
      "inputs": {
        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
        "nixpkgs": [
          "hyprland",
          "hyprland",
@@ -991,11 +1031,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1781733627,
-        "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
+        "lastModified": 1784288435,
+        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
+        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
        "type": "github"
      },
      "original": {
@@ -1007,11 +1047,11 @@
    "quickshell": {
      "flake": false,
      "locked": {
-        "lastModified": 1783436659,
-        "narHash": "sha256-rh0BJlcRM8nFet9aYIaZMxe7M6BMNJOrSgJi3cPQ+Tc=",
+        "lastModified": 1786547899,
+        "narHash": "sha256-QxLEKq1R455FlEmaarx3cq9mk4jSBxHg3CyseLiOick=",
        "ref": "refs/heads/main",
-        "rev": "68d4240fcbc605ee36a0e71797c04c0ac33f3e19",
-        "revCount": 25,
+        "rev": "e33041b66c66a1b68930bfd3bb58746ffbd5f4b2",
+        "revCount": 72,
        "type": "git",
        "url": "https://git.voidarc.co.uk/voidarc/quickshell"
      },
@@ -1027,27 +1067,46 @@
        "gotify-desktop": "gotify-desktop",
        "hyprland": "hyprland",
        "import-tree": "import-tree",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
        "nvim": "nvim",
        "omnisearch": "omnisearch",
        "otter-launcher": "otter-launcher_2",
        "quickshell": "quickshell",
        "sls-steam": "sls-steam",
+        "weylus": "weylus",
        "woomer": "woomer_2",
        "wrappers": "wrappers_3",
        "wshowkeys": "wshowkeys_2"
      }
    },
-    "sls-steam": {
+    "rust-overlay": {
      "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_10"
      },
      "locked": {
-        "lastModified": 1783704618,
-        "narHash": "sha256-/zurHHGZW+E2xF4Pk6BSP4Mib3oPJDMtqrinRF2pYFI=",
+        "lastModified": 1784438913,
+        "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "sls-steam": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_9"
+      },
+      "locked": {
+        "lastModified": 1785411317,
+        "narHash": "sha256-r/YV6psmPZj9aSMydTmOooTBLFiwMJoCWnaKkUlXiss=",
        "owner": "AceSLS",
        "repo": "SLSsteam",
-        "rev": "37d5bb313fa186e70b38623bee3ba0f4f17f65b5",
+        "rev": "b3da36b024f565f79ee19b44bea493af3f48ea95",
        "type": "github"
      },
      "original": {
@@ -1176,6 +1235,21 @@
        "type": "github"
      }
    },
+    "systems_9": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "utils": {
      "inputs": {
        "systems": "systems"
@@ -1194,10 +1268,32 @@
        "type": "github"
      }
    },
+    "weylus": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1784471251,
+        "narHash": "sha256-07//RRO1xhgR4lKyq460+iOEDHUw21rJRi59fMUhLfM=",
+        "owner": "voidarclabs",
+        "repo": "WeylusCommunityEdition",
+        "rev": "bcf34c2a2c9d3cbac00ca0d3e6ede5b3bbc6a18c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "voidarclabs",
+        "repo": "WeylusCommunityEdition",
+        "type": "github"
+      }
+    },
    "woomer": {
      "inputs": {
        "crane": "crane",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
        "systems": "systems_4"
      },
      "locked": {
@@ -1220,7 +1316,7 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "systems": "systems_7"
+        "systems": "systems_8"
      },
      "locked": {
        "lastModified": 1782685056,
@@ -1238,14 +1334,14 @@
    },
    "wrappers": {
      "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1782375095,
-        "narHash": "sha256-bRepNpAluz2i0IIk7Tmzw/4BkyOrwABvc66NEgXPEhA=",
+        "lastModified": 1785177581,
+        "narHash": "sha256-9Z4l080DSrHMxoQTZTpVsML2h6JDuB9lDwHPsLd9BrQ=",
        "owner": "lassulus",
        "repo": "wrappers",
-        "rev": "cd780e92c0fa66c2e721e1d91894f3db13b9f2b4",
+        "rev": "f57bc81aa9669871343341b13aa175c8927b6a74",
        "type": "github"
      },
      "original": {
@@ -1256,7 +1352,7 @@
    },
    "wrappers_2": {
      "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
      },
      "locked": {
        "lastModified": 1782135443,
@@ -1274,7 +1370,7 @@
    },
    "wrappers_3": {
      "inputs": {
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_11"
      },
      "locked": {
        "lastModified": 1782135443,
@@ -1314,10 +1410,8 @@
    },
    "wshowkeys_2": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_12"
      },
      "locked": {
        "lastModified": 1781708685,
@@ -1367,11 +1461,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1782311043,
-        "narHash": "sha256-07zLc2M3/ax+JsjxGTft17/Joua41LHE9/9AC/F9zeU=",
+        "lastModified": 1784371182,
+        "narHash": "sha256-S8A1lezEalltWcCp3gAic5lssS0xTSISK6fKODefhOk=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "882ad01e195ce201b07c618bbee44a0cad8b9e5a",
+        "rev": "08d99f727944dd15e4740090305e31c5fb92a50a",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,6 @@
    nvim.url = "git+https://git.voidarc.co.uk/voidarc/nvim";
    hyprland = {
      url = "git+https://git.voidarc.co.uk/voidarc/hypr";
-      inputs.nixpkgs.follows = "nixpkgs";
    };
    otter-launcher = {
      url = "github:kuokuo123/otter-launcher";
@@ -33,8 +32,9 @@
      url = "github:coffeeispower/woomer";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    wshowkeys = {
-      url = "github:voidarclabs/wshowkeys";
+    wshowkeys.url = "github:voidarclabs/wshowkeys";
+    weylus = {
+      url = "github:voidarclabs/WeylusCommunityEdition";
      inputs.nixpkgs.follows = "nixpkgs";
    };

--- a/modules/attrs/development/default.nix
+++ b/modules/attrs/development/default.nix
@@ -13,6 +13,7 @@
    environment.systemPackages = with pkgs; [
      opencode
      devenv
+			jellyfin-tui
    ];
  });
 }
--- a/modules/features/hyprland/default.nix
+++ b/modules/features/hyprland/default.nix
@@ -7,24 +7,29 @@
  flake.nixosModules.hyprland = moduleWithSystem ({
    self',
    pkgs,
-		system,
+    inputs',
    ...
-  }: let
+  }: {config, ...}: let
    modules = with self.nixosModules; [
      audio
      systemTheme
    ];
+
    runtimePkgs = self'.packages.hyprland.passthru.runtimePackages;
-		lib = pkgs.lib;
+    lib = pkgs.lib;
+
+    runtimeTarget = name: pkg:
+      if config.security.wrappers ? ${name}
+      then "/run/wrappers/bin/${name}"
+      else lib.getExe pkg;
  in {
    imports = modules;
-
    programs.hyprland = {
      enable = true;
      package = self'.packages.hyprland;
-      portalPackage = inputs.hyprland.inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
    };

+    services.displayManager.defaultSession = "hyprland";
    services.xserver.enable = true;
    security.polkit.enable = true;

@@ -36,10 +41,15 @@
    system.activationScripts.hyprRuntimeEnv = lib.stringAfter ["specialfs"] ''
      mkdir -p /run/hypr-runtime-env/bin
      ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: pkg: ''
-          ln -sfn ${lib.getExe pkg} /run/hypr-runtime-env/bin/${name}
+          ln -sfn ${runtimeTarget name pkg} /run/hypr-runtime-env/bin/${name}
        '')
        runtimePkgs)}
    '';
+
+    system.activationScripts.hyprConfig = lib.stringAfter ["specialfs"] ''
+      mkdir -p /run/hypr/config
+      ln -sfn ${inputs'.hyprland.packages.repo-files}/* /run/hypr/config
+    '';
  });
  perSystem = {
    self',
@@ -49,6 +59,8 @@
  }: {
    packages = {
      hyprland = inputs'.hyprland.packages.default.override {
+        flags."--config" = "/run/hypr/config/hyprland.lua";
+        env."MODULES_ROOT" = "/run/hypr/config/modules";
        runtimePackages =
          inputs.hyprland.lib.defaultRuntimePkgs.${system}
          // {
@@ -57,6 +69,7 @@
            gotify-desktop = self'.packages.gotify-desktop;
            otter-launcher = self'.packages.otter-launcher;
            quickshell = self'.packages.quickshell;
+            wshowkeys = self'.packages.wshowkeys;
            waybar = self'.packages.waybar;
            wlogout = self'.packages.wlogout;
            way-edges = self'.packages.way-edges;
--- a/modules/features/i3/config
+++ b/modules/features/i3/config
@@ -0,0 +1,71 @@
+set $mod Mod4
+set $term kitty
+set $menu dmenu_run
+
+exec --no-startup-id xrandr --output HDMI-1 --mode 1920x1080 --rate 60 --pos -1920x0 --output DP-1 --mode 1920x1080 --rate 60 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 60 --pos 1920x0
+
+font pango:FiraMono Nerd Font 10
+
+workspace 1 output DP-1
+workspace 2 output HDMI-A-1
+workspace 3 output DP-2
+
+# Window functions
+bindsym $mod+BackSpace kill
+bindsym $mod+b fullscreen toggle
+
+# Apps
+bindsym $mod+Return exec --no-startup-id $term
+bindsym $mod+d exec --no-startup-id $menu
+bindsym $mod+f exec --no-startup-id firefox
+bindsym $mod+s exec --no-startup-id nemo
+
+# Focus windows
+bindsym $mod+k focus up
+bindsym $mod+j focus down
+bindsym $mod+h focus left
+bindsym $mod+l focus right
+
+# Move windows
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+l move right
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+j move down
+
+# Workspaces
+bindsym $mod+q workspace number 1
+bindsym $mod+w workspace number 2
+bindsym $mod+e workspace number 3
+bindsym $mod+r workspace number 4
+bindsym $mod+t workspace number 5
+bindsym $mod+y workspace number 6
+bindsym $mod+u workspace number 7
+bindsym $mod+i workspace number 8
+bindsym $mod+o workspace number 9
+bindsym $mod+p workspace number 10
+
+# Move container to workspace
+bindsym $mod+Shift+q move container to workspace number 1
+bindsym $mod+Shift+w move container to workspace number 2
+bindsym $mod+Shift+e move container to workspace number 3
+bindsym $mod+Shift+r move container to workspace number 4
+bindsym $mod+Shift+t move container to workspace number 5
+bindsym $mod+Shift+y move container to workspace number 6
+bindsym $mod+Shift+u move container to workspace number 7
+bindsym $mod+Shift+i move container to workspace number 8
+bindsym $mod+Shift+o move container to workspace number 9
+bindsym $mod+Shift+p move container to workspace number 10
+
+# Logout menu
+bindsym $mod+Shift+a exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+
+# Reload
+bindsym $mod+Shift+m reload
+
+# Drag windows with titlebar
+tiling_drag modifier titlebar
+
+# Bar
+bar {
+        status_command i3status
+}
--- a/modules/features/i3/default.nix
+++ b/modules/features/i3/default.nix
@@ -0,0 +1,48 @@
+{
+  inputs,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.i3 = moduleWithSystem ({
+    pkgs,
+    self',
+    ...
+  }: {
+    services.xserver = {
+      enable = true;
+
+      desktopManager = {
+        xterm.enable = false;
+      };
+
+      windowManager.i3 = {
+        enable = true;
+        package = self'.packages.i3;
+        extraPackages = with pkgs;
+          [
+            dmenu
+            i3status
+            xinit
+          ];
+      };
+    };
+  });
+  perSystem = {pkgs, self', ...}: {
+    packages.i3 = inputs.wrappers.lib.wrapPackage ({...}: {
+      inherit pkgs;
+      package = pkgs.i3;
+      runtimePkgs = with pkgs;
+        [
+          xrandr
+          firefox
+        ]
+        ++ (with self'.packages; [
+          kitty
+          nemo
+        ]);
+      flags = {
+        "-c" = ./config;
+      };
+    });
+  };
+}
--- a/modules/features/kitty/default.nix
+++ b/modules/features/kitty/default.nix
@@ -4,10 +4,7 @@
  ...
 }: {
  flake.nixosModules.kitty = moduleWithSystem (
-    {
-      pkgs,
-      self',
-    }: {
+    {self'}: {
      environment.systemPackages = with self'.packages; [
        kitty
      ];
@@ -26,12 +23,13 @@
          "FONTCONFIG_FILE" = "${fontsConf}";
        };
        font = {
-          name = "FiraMono Nerd Font";
+          name = "FiraMono Nerd Font Mono";
          size = 11;
        };
        settings = {
          font_size = 11;
          scrollbar = "never";
+          pixel_scroll = false;
          window_padding_width = 9;
          background_opacity = 0.50;
          confirm_os_window_close = 0;
--- a/modules/features/otter-launcher/config.toml
+++ b/modules/features/otter-launcher/config.toml
@@ -9,17 +9,23 @@ cheatsheet_viewer = "less -R; clear" # command to show cheatsheet; through pipin
 clear_screen_after_execution = false
 loop_mode = false # don't quit after executing a module, useful with scratchpads; stderr is hidden in loop mode
 external_editor = "nvim" # if set, press ctrl+x ctrl+ee (or v in vi normal mode) to edit prompt in the specified program
-delay_startup = 1 # sometimes the otter runs too fast even before the terminal window is ready; this slows it down by milliseconds; useful when chafa image is skewed
+delay_startup = 0 # sometimes the otter runs too fast even before the terminal window is ready; this slows it down by milliseconds; useful when chafa image is skewed

 [interface]
 # use three quotes to write longer codes
 header = """
-  \u001B[1;36m$USER@nixos\u001B[0m
+  \x1b[1;38;2;203;166;247m$USER@nixos\x1b[0m
 	"""
-header_cmd = "" # run a command and print stdout above the header
+header_cmd = '' # run a command and print stdout above the header
 header_cmd_trimmed_lines = 0 # remove trailing lines from header_cmd output, in case of some programs appending excessive empty lines
 place_holder = "execute" # at the input field
 suggestion_mode = "list" # available options: list, hint
+separator = """
+$( \
+    text="                      "; \
+    printf "\u001B[0;90m$text \
+    $(printf -v line '%*s' \"$(( COLUMNS - $(printf "$text" | wc -m) - 3 ))\" ''; printf '%s' \"${line// /─}\")" \
+)"""
 footer = "" # add a line after suggestion list
 suggestion_lines = 7 # 0 to disable suggestions and tab completion
 list_prefix = "  "
--- a/modules/features/otter-launcher/default.nix
+++ b/modules/features/otter-launcher/default.nix
@@ -18,9 +18,9 @@
    packages = {
      otter-launcher = let
        extra-config = ''
-          [overlay]
-          overlay_cmd = "${lib.getExe pkgs.chafa} -s 20x ${./cat.png}"
-          overlay_trimmed_lines = 1
+                  [overlay]
+                  overlay_cmd = "${lib.getExe pkgs.kitty} +kitten icat --fit height --align left --no-trailing-newline ${./cat.png}"
+                  overlay_trimmed_lines = 0
        '';
        final-config = pkgs.writeText "config.toml" ''
          ${extra-config}
@@ -33,7 +33,6 @@
          package = inputs'.otter-launcher.packages.default;
          runtimePkgs = with pkgs; [
            fsel
-            chafa
            bluetui
          ];
          flags = {
--- a/modules/features/quickshell/default.nix
+++ b/modules/features/quickshell/default.nix
@@ -3,7 +3,11 @@
  inputs,
  ...
 }: {
-  flake.nixosModules.quickshell = moduleWithSystem ({self', ...}: {
+  flake.nixosModules.quickshell = moduleWithSystem ({
+    self',
+    pkgs,
+    ...
+  }: {
    environment.systemPackages = with self'.packages; [
      quickshell
    ];
--- a/modules/features/tailscale/default.nix
+++ b/modules/features/tailscale/default.nix
@@ -0,0 +1,11 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.tailscale = moduleWithSystem ({...}: {
+    services.tailscale = {
+      enable = true;
+    };
+  });
+}
--- a/modules/features/weylus/default.nix
+++ b/modules/features/weylus/default.nix
@@ -0,0 +1,9 @@
+{moduleWithSystem, ...}: {
+  flake.nixosModules.weylus = moduleWithSystem ({inputs', ...}: {
+    programs.weylus = {
+      enable = true;
+      package = inputs'.weylus.packages.default;
+      users = ["user01"];
+    };
+  });
+}
--- a/modules/features/wshowkeys/default.nix
+++ b/modules/features/wshowkeys/default.nix
@@ -1,32 +1,17 @@
-{
-  inputs,
-  moduleWithSystem,
-  ...
-}: {
-  flake.nixosModules.wshowkeys = moduleWithSystem ({inputs', ...}: {
+{moduleWithSystem, ...}: {
+  flake.nixosModules.wshowkeys = moduleWithSystem ({
+    self',
+    pkgs,
+    ...
+  }: let
+    lib = pkgs.lib;
+  in {
    programs.wshowkeys = {
      enable = true;
-      package = inputs'.wshowkeys.packages.default;
+      package = self'.packages.wshowkeys;
    };
  });
-  perSystem = {
-    pkgs,
-    inputs',
-    ...
-  }: {
-    packages.wshowkeys = inputs.wrappers.lib.wrapPackage ({...}: {
-      inherit pkgs;
-      package = inputs'.wshowkeys.packages.default;
-      flags = {
-        "-a" = ["right" "top"];
-        "-F" = "'FiraMono Nerd Font 35'";
-        "-s" = "'#cba6f7ff'";
-        "-f" = " '#cdd6f4ff'";
-        "-b" = "'#45475a99'";
-        "-m" = "70";
-        "-l" = "60";
-        "-t" = "1000";
-      };
-    });
+  perSystem = {inputs', ...}: {
+    packages.wshowkeys = inputs'.wshowkeys.packages.default;
  };
 }
--- a/modules/features/zsh/config.toml
+++ b/modules/features/zsh/config.toml
@@ -34,6 +34,11 @@ template = '''
 {{- end -}}
 '''

+	[[blocks.segments]] # Hostname
+  type = 'text'
+  style = 'plain'
+  template = '{{ if eq .HostName "server02" }}<green>󰒋 {{.HostName}}</> <#7f849c>|</> {{ end }}'
+
 	[[blocks.segments]] # Python venv
  type = 'text'
  style = 'plain'
--- a/modules/features/zsh/default.nix
+++ b/modules/features/zsh/default.nix
@@ -1,92 +1,113 @@
 {
-	self,
-		inputs,
-		moduleWithSystem,
-		...
+  inputs,
+  moduleWithSystem,
+  ...
 }: {
-	flake.nixosModules.zsh = moduleWithSystem ({
-			pkgs,
-			self',
-			...
-			}: {
-			nixpkgs.overlays = [
-			(final: prev: {
-			 zsh = self'.packages.zsh;
-			 })
-			];
-			programs.zsh = {
-			enable = true;
-			enableCompletion = true;
-			enableBashCompletion = true;
-			autosuggestions.enable = true;
-			syntaxHighlighting.enable = true;
-			histSize = 10000;
-			};
-			users.defaultUserShell = pkgs.zsh;
-			});
-	perSystem = {
-		pkgs,
-		lib,
-		self',
-		...
-	}: {
-		packages = {
-			zsh = inputs.wrappers.wrappers.zsh.wrap {
-				inherit pkgs;
-				runtimePkgs = [pkgs.carapace pkgs.fzf];
-				zshAliases = {
-					ls = "${lib.getExe pkgs.lsd} -l";
-					v = lib.getExe self'.packages.nvim;
-					cat = lib.getExe pkgs.bat;
-					lg = lib.getExe pkgs.lazygit;
-					devenv = lib.getExe pkgs.devenv;
-					carapace = lib.getExe pkgs.carapace;
-					man = "man -P \"${lib.getExe pkgs.bat} -p\"";
-					nsh = "nix-shell -p";
-				};
-				zshrc.content = ''
-					if (( ''${+terminfo[smkx]} )) && (( ''${+terminfo[rmkx]} )); then
-						function zle-line-init() { echoti smkx }
-				function zle-line-finish() { echoti rmkx }
-				zle -N zle-line-init
-					zle -N zle-line-finish
-					fi
-					autoload -U compinit && compinit
-					export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
-					zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
-					source <(${lib.getExe pkgs.carapace} _carapace)
-					zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+  flake.nixosModules.zsh = moduleWithSystem ({
+    pkgs,
+    self',
+    ...
+  }: {
+    nixpkgs.overlays = [
+      (final: prev: {
+        zsh = self'.packages.zsh;
+      })
+    ];
+    programs.zsh = {
+      enable = true;
+      enableCompletion = true;
+      enableBashCompletion = true;
+      autosuggestions.enable = true;
+      syntaxHighlighting.enable = true;
+      histSize = 10000;
+    };
+    users.defaultUserShell = pkgs.zsh;
+  });
+  perSystem = {
+    pkgs,
+    lib,
+    self',
+    ...
+  }: {
+    packages = {
+      zsh = let
+        flakeLocation = builtins.getEnv "PWD";
+      in
+        lib.warnIf (flakeLocation == "") "Flake Location is undefined. Are you building in the right directory?"
+        inputs.wrappers.wrappers.zsh.wrap {
+          inherit pkgs;
+          runtimePkgs = [pkgs.carapace pkgs.devenv pkgs.fzf];
+          zshAliases = {
+            ls = "${lib.getExe pkgs.lsd} -l";
+            v = lib.getExe self'.packages.nvim;
+            cat = lib.getExe pkgs.bat;
+            lg = lib.getExe pkgs.lazygit;
+            man = "man -P \"${lib.getExe pkgs.bat} -p\"";
+            nsh = "nix-shell -p";
+            nrs =
+              if flakeLocation != ""
+              then "( cd ${flakeLocation} && sudo nixos-rebuild switch --impure --flake . )"
+              else "echo 'Flake location not specified. Did you build with --impure?'";
+            vinix =
+              if flakeLocation != ""
+              then "nvim --cmd 'cd ${flakeLocation}'"
+              else "echo 'Flake location not specified. Did you build with --impure?'";
+          };
+          zshrc.content = ''
+                  	source ${./devenv.zsh}

-					autoload -U select-word-style
-					select-word-style bash
+                  if (( ''${+terminfo[smkx]} )) && (( ''${+terminfo[rmkx]} )); then
+                  	function zle-line-init() { echoti smkx }
+                  function zle-line-finish() { echoti rmkx }
+                  zle -N zle-line-init
+                  	zle -N zle-line-finish
+                  	fi

-					autoload -U up-line-or-beginning-search down-line-or-beginning-search
-					zle -N up-line-or-beginning-search
-					zle -N down-line-or-beginning-search
-					bindkey "^[OA" up-line-or-beginning-search
-					bindkey "^[OB" down-line-or-beginning-search
+                  	autoload -U compinit && compinit
+                  	export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
+                  	zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
+                  	source <(${lib.getExe pkgs.carapace} _carapace)
+                  	zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'

-					bindkey "^[[1;5C" forward-word
-					bindkey "^[[1;5D" backward-word
-					bindkey "^[[3;5~" kill-word
-					bindkey "^H" backward-kill-word
+                  	autoload -U select-word-style
+                  	select-word-style bash

-					source <(${lib.getExe pkgs.fzf} --zsh)
+                  	autoload -U up-line-or-beginning-search down-line-or-beginning-search
+                  	zle -N up-line-or-beginning-search
+                  	zle -N down-line-or-beginning-search
+                  	bindkey "^[OA" up-line-or-beginning-search
+                  	bindkey "^[OB" down-line-or-beginning-search

-					setopt NO_CASE_GLOB
+                  	bindkey "^[[1;5C" forward-word
+                  	bindkey "^[[1;5D" backward-word
+                  	bindkey "^[[3;5~" kill-word
+                  	bindkey "^H" backward-kill-word

-					export EDITOR=nvim
+                  	source <(${lib.getExe pkgs.fzf} --zsh)

-					eval "$(${lib.getExe pkgs.devenv} hook zsh)"
-					eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)"
+                  	setopt NO_CASE_GLOB

-					${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
-					'';
-			};
-			ohMyPosh = inputs.wrappers.wrappers.oh-my-posh.wrap {
-				inherit pkgs;
-				configFile = ./config.toml;
-			};
-		};
-	};
+                  	${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
+
+                  	export EDITOR=nvim
+
+                  	eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)"
+
+            eval "$(${lib.getExe pkgs.devenv} hook zsh)"
+
+                  	typeset -ag precmd_functions
+                  	if (( ! ''${precmd_functions[(I)__devenv_reload_apply]} )); then
+                  		precmd_functions+=(__devenv_reload_apply)
+                  			fi
+                  			if (( ! ''${precmd_functions[(I)__devenv_restore_path]} )); then
+                  				precmd_functions+=(__devenv_restore_path)
+                  					fi
+          '';
+        };
+      ohMyPosh = inputs.wrappers.wrappers.oh-my-posh.wrap {
+        inherit pkgs;
+        configFile = ./config.toml;
+      };
+    };
+  };
 }
--- a/modules/features/zsh/devenv.zsh
+++ b/modules/features/zsh/devenv.zsh
@@ -0,0 +1,82 @@
+__devenv_reload_apply() {
+    if [ -n "$DEVENV_RELOAD_FILE" ] && [ -f "$DEVENV_RELOAD_FILE" ]; then
+        local output
+        output=$(DEVENV_RELOAD_FILE="$DEVENV_RELOAD_FILE" bash <<'RELOAD_BASH' 2>/dev/null
+__devenv_ignored_var() {
+    case "$1" in
+        _*|PWD|OLDPWD|SHLVL|SHELL|SHELLOPTS|BASHOPTS|BASH_*|HISTCMD|HISTFILE)
+            return 0 ;;
+        PS1|PS2|PS3|PS4|PROMPT|PROMPT_COMMAND|PROMPT_DIRTRIM)
+            return 0 ;;
+        COMP_*|READLINE_*|MAILCHECK|COLUMNS|LINES|RANDOM|SECONDS|LINENO|EPOCHSECONDS|EPOCHREALTIME|SRANDOM)
+            return 0 ;;
+        STARSHIP_*|__fish*|DIRENV_*|nix_saved_*)
+            return 0 ;;
+        *)  return 1 ;;
+    esac
+}
+__devenv_capture_env() { declare -p -x 2>/dev/null | LC_ALL=C sort; }
+__devenv_serialize_diff() { gzip -c | base64 -w0; }
+__devenv_deserialize_diff() { echo "$1" | base64 -d | gzip -d 2>/dev/null; }
+__devenv_compute_diff() {
+    local before_file="$1" after_file diff_content
+    after_file=$(mktemp); diff_content=$(mktemp)
+    __devenv_capture_env > "$after_file"
+    local -A before_vars after_vars
+    while IFS= read -r line; do
+        [[ "$line" != declare\ -x\ * ]] && continue
+        local vardef="${line#declare -x }" var="${vardef%%=*}"
+        [[ -z "$var" ]] && continue
+        __devenv_ignored_var "$var" && continue
+        before_vars["$var"]="$line"
+    done < "$before_file"
+    while IFS= read -r line; do
+        [[ "$line" != declare\ -x\ * ]] && continue
+        local vardef="${line#declare -x }" var="${vardef%%=*}"
+        [[ -z "$var" ]] && continue
+        __devenv_ignored_var "$var" && continue
+        after_vars["$var"]="$line"
+    done < "$after_file"
+    for var in "${!before_vars[@]}"; do
+        [[ "${after_vars[$var]}" != "${before_vars[$var]}" ]] && echo "P:${before_vars[$var]}" >> "$diff_content"
+    done
+    for var in "${!after_vars[@]}"; do
+        if [[ -z "${before_vars[$var]+x}" ]]; then echo "N:$var" >> "$diff_content"
+        elif [[ "${after_vars[$var]}" != "${before_vars[$var]}" ]]; then echo "N:$var" >> "$diff_content"; fi
+    done
+    _DEVENV_DIFF=$(__devenv_serialize_diff < "$diff_content"); export _DEVENV_DIFF
+    rm -f "$after_file" "$diff_content"
+}
+__devenv_apply_reverse_diff() {
+    [[ -z "$_DEVENV_DIFF" ]] && return
+    local -A prev_vars
+    local diff_content; diff_content=$(__devenv_deserialize_diff "$_DEVENV_DIFF")
+    while IFS= read -r line; do
+        if [[ "$line" == P:declare\ * ]]; then
+            local decl="${line#P:}" var="${decl#declare -x }"; var="${var%%=*}"
+            prev_vars["$var"]=1; eval "export ${decl#declare -x }" 2>/dev/null
+        fi
+    done <<< "$diff_content"
+    while IFS= read -r line; do
+        if [[ "$line" == N:* ]]; then
+            local var="${line#N:}"
+            [[ -z "${prev_vars[$var]+x}" ]] && unset "$var"
+        fi
+    done <<< "$diff_content"
+}
+__devenv_apply_reverse_diff
+_before=$(mktemp); __devenv_capture_env > "$_before"
+if { : >/dev/tty; } 2>/dev/null; then _devenv_reload_out=/dev/tty; else _devenv_reload_out=/dev/null; fi
+source "$DEVENV_RELOAD_FILE" >"$_devenv_reload_out" 2>"$_devenv_reload_out"
+rm -f "$DEVENV_RELOAD_FILE"; unset _devenv_reload_out
+__devenv_compute_diff "$_before"; rm -f "$_before"
+export -p
+RELOAD_BASH
+)
+        if [ -n "$output" ]; then eval "$output"; fi
+        _DEVENV_PATH="$PATH"
+    fi
+}
+__devenv_restore_path() {
+    [ -n "$_DEVENV_PATH" ] && export PATH="$_DEVENV_PATH"
+}
--- a/modules/hosts/HACKSTATION/default.nix
+++ b/modules/hosts/HACKSTATION/default.nix
@@ -6,14 +6,17 @@
  flake.nixosConfigurations.HACKSTATION = inputs.nixpkgs.lib.nixosSystem {
    modules = with self.nixosModules; [
      desktop
-			amdDrivers
+      hackstationConfiguration
+      amdDrivers
      youtube
      development
-      hackstationConfiguration
      bottles
      gaming
      davinci
      sddm-autologin
+      nix-ld
+
+			i3
    ];
  };
 }
--- a/modules/hosts/HACKSTATION/hackstationConfiguration.nix
+++ b/modules/hosts/HACKSTATION/hackstationConfiguration.nix
@@ -1,9 +1,15 @@
-{
-  self,
-  inputs,
-  ...
-}: {
+{...}: {
  flake.nixosModules.hackstationConfiguration = {pkgs, ...}: {
-    networking.hostName = "HACKSTATION";
+    virtualisation.docker = {
+      enable = true;
+    };
+    networking = {
+      interfaces.enp5s0.wakeOnLan.enable = true;
+      hostName = "HACKSTATION";
+    };
+    environment.systemPackages = with pkgs; [
+      tor-browser
+      tor
+    ];
  };
 }
--- a/modules/hosts/mobile02/default.nix
+++ b/modules/hosts/mobile02/default.nix
@@ -0,0 +1,15 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosConfigurations.mobile02 = inputs.nixpkgs.lib.nixosSystem {
+    modules = with self.nixosModules; [
+      desktop
+      mobile02Configuration
+      intelDrivers
+			development
+			upower
+    ];
+  };
+}
--- a/modules/hosts/mobile02/mobile02Configuration.nix
+++ b/modules/hosts/mobile02/mobile02Configuration.nix
@@ -0,0 +1,11 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.mobile02Configuration = {...}: {
+    networking = {
+      hostName = "mobile02";
+    };
+  };
+}
--- a/modules/system/audio/default.nix
+++ b/modules/system/audio/default.nix
@@ -8,12 +8,16 @@
    lib,
    ...
  }: {
-		environment.systemPackages = with pkgs; [
-		playerctl
-		pavucontrol
-		];
+    environment.systemPackages = with pkgs; [
+      playerctl
+      pavucontrol
+			pulseaudioFull
+    ];
    services.pulseaudio.enable = false;
    security.rtkit.enable = true;
+
+    nixpkgs.config.pulseaudio = true;
+
    services.pipewire = {
      enable = true;
      alsa.enable = true;
--- a/modules/system/core/nix-settings.nix
+++ b/modules/system/core/nix-settings.nix
@@ -21,6 +21,7 @@
      };
      settings = {
        cores = 6;
+        trusted-users = ["root" "user01"];
        download-buffer-size = 524288000;
        experimental-features = [
          "nix-command"
--- a/modules/system/desktop/default.nix
+++ b/modules/system/desktop/default.nix
@@ -3,15 +3,19 @@
  moduleWithSystem,
  ...
 }: {
-  flake.nixosModules.desktop = moduleWithSystem ({...}: let
+  flake.nixosModules.desktop = moduleWithSystem ({pkgs, ...}: let
    modules = with self.nixosModules; [
      core
      hyprland
      sddm
      network
      omnisearch
+			tailscale
    ];
  in {
    imports = modules;
+    environment.systemPackages = with pkgs; [
+      mpv
+    ];
  });
 }
--- a/modules/system/drivers/amd.nix
+++ b/modules/system/drivers/amd.nix
@@ -1,13 +1,5 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.amdDrivers = {
-    pkgs,
-    lib,
-    ...
-  }: {
+{...}: {
+  flake.nixosModules.amdDrivers = {pkgs, ...}: {
    environment.systemPackages = with pkgs; [
      mesa
      rocmPackages.rocm-smi
--- a/modules/system/drivers/upower.nix
+++ b/modules/system/drivers/upower.nix
@@ -0,0 +1,11 @@
+{...}: {
+  flake.nixosModules.upower = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      upower
+    ];
+    services = {
+      upower.enable = true;
+      power-profiles-daemon.enable = true;
+    };
+  };
+}
--- a/modules/system/network/wake-on-lan.nix
+++ b/modules/system/network/wake-on-lan.nix
@@ -1,21 +0,0 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.networking = {
-    pkgs,
-    lib,
-    ...
-  }: let
-    modules = with self.nixosModules; [
-      networking
-    ];
-  in {
-    imports = modules;
-    networking = {
-      # Just for hackstation, replace enp5s0 with primary interface
-      interfaces.enp5s0.wakeOnLan.enable = true;
-    };
-  };
-}
--- a/modules/system/nix-ld/default.nix
+++ b/modules/system/nix-ld/default.nix
@@ -0,0 +1,15 @@
+{moduleWithSystem, ...}: {
+  flake.nixosModules.nix-ld = moduleWithSystem ({pkgs, ...}: {
+    programs = {
+      nix-ld = {
+        enable = true;
+        libraries = with pkgs; [
+          util-linux
+          stdenv.cc.cc
+          zlib
+          libusb1
+        ];
+      };
+    };
+  });
+}
Author	SHA1	Message	Date
voidarc	25c6507c3e	updated quickshell	2026-08-15 20:12:58 +01:00
voidarc	b33c816191	updated hyprland and quickshell, will deprecate waybar shortly	2026-08-10 20:46:39 +01:00
voidarc	f2c68c8511	updated nvim and quickshell	2026-08-10 16:59:46 +01:00
voidarc	06848de32a	tailscale feature added to desktop	2026-08-10 12:11:03 +01:00
voidarc	29413b1f67	fixed upower quickshell thing	2026-08-10 12:10:56 +01:00
voidarc	bfeeacc434	moved upower to dedicated module	2026-08-07 19:04:33 +01:00
voidarc	749ee86763	removed useless inputs from amddrivers	2026-08-07 19:04:19 +01:00
voidarc	e56b948f91	updated nvim	2026-08-07 16:42:48 +01:00
voidarc	c0da93fe55	enabled upower for quickshell	2026-08-05 17:12:49 +01:00
voidarc	9b931a6284	updated nvim	2026-08-05 17:06:04 +01:00
voidarc	f16c1137f9	disabled pixel scroll on kitty because who tf needs that	2026-08-05 16:57:16 +01:00
voidarc	eb7217973d	updated hyprland for new binds	2026-08-04 18:12:58 +01:00
voidarc	d9bbfff120	fixed i3	2026-08-01 20:47:08 +01:00
voidarc	21fe0c40e9	i3 feature	2026-08-01 20:21:23 +01:00
voidarc	7be2e897d4	made hyprland default session for display manager	2026-08-01 20:20:13 +01:00
voidarc	deddffad50	changed wshowkeys nixpkgs	2026-07-31 20:27:59 +01:00
voidarc	00f6800290	added mpv to desktop	2026-07-30 19:38:12 +01:00
voidarc	56aed1cf2d	trying to fix davinci recording	2026-07-30 19:37:52 +01:00
voidarc	88266b040f	added server02 hostname block to ohmyposh	2026-07-29 17:46:43 +01:00
voidarc	5f7fc8ea05	added warning for flakeLocation being null instead of an assert	2026-07-29 17:26:14 +01:00
voidarc	3a634375a0	updated quickshell	2026-07-29 17:16:49 +01:00
voidarc	7a3d2fee77	removed weylus temporarily	2026-07-28 19:59:10 +01:00
voidarc	d4db1e7f09	updated flake and removed now redundant hyprland input	2026-07-28 19:59:10 +01:00
voidarc	33702f4552	added docker and tor	2026-07-28 19:21:53 +01:00
voidarc	4d9e050344	added user01 as a nix trusted user for devenv	2026-07-28 19:21:43 +01:00
voidarc	a938343f87	devenv support (zsh feature)	2026-07-28 19:21:28 +01:00
voidarc	637e665581	weylus feature	2026-07-22 13:35:09 +01:00
voidarc	0d35a34e9b	added weylus	2026-07-17 21:55:28 +01:00
voidarc	9104f3b5af	reformat and added vinix and nrs functions	2026-07-15 17:47:26 +01:00
voidarc	bbc74a9614	added README	2026-07-13 13:25:19 +01:00
voidarc	bd5fdfb8f3	fixed hyprland module root assignment and overriding	2026-07-13 13:25:12 +01:00
voidarc	458ff46192	added nix-ld to hackstation	2026-07-13 12:18:31 +01:00
voidarc	44b51bf454	fixed hyprland config getting garbage collected	2026-07-13 12:18:22 +01:00
voidarc	9d20805a2b	nix-ld feature	2026-07-13 12:17:52 +01:00
voidarc	fb74703c0d	formatting and removing useless parameters	2026-07-12 17:22:49 +01:00
voidarc	f5664dd863	enabled wake on lan	2026-07-12 14:08:11 +01:00
voidarc	0920cf080d	fixed wshowkeys setuid problems	2026-07-11 20:30:07 +01:00
voidarc	0c8cd3dd3d	added much needed music to dev attr	2026-07-11 16:35:07 +01:00
voidarc	3601a4a53a	made otter look a bit nicer	2026-07-11 16:35:07 +01:00
voidarc	a865a34754	fixed otter launcher and removed chafa dependancy	2026-07-11 15:55:20 +01:00
voidarc	f41b716d95	fixed kitty font mismatch	2026-07-11 15:00:22 +01:00
voidarc	72a91337ee	fixed otter launcher somewhat	2026-07-11 15:00:13 +01:00
voidarc	1910db8bd2	updated flake and decoupled useless runtimePackages	2026-07-11 14:54:14 +01:00
voidarc	599f44a5a9	removed updated flake	2026-07-11 13:04:43 +01:00
voidarc	896db79184	updated flake	2026-07-11 13:01:13 +01:00