updated quickshell

Flake lock file updates:

• Updated input 'hyprland':
    'git+https://git.voidarc.co.uk/voidarc/hypr?ref=refs/heads/main&rev=bdd6ec3efa05c1130002808d4c2c4552bb20587a' (2026-07-04)
  → 'git+https://git.voidarc.co.uk/voidarc/hypr?ref=refs/heads/main&rev=25fcd16d4d4836e063e2198102ddfba38de43100' (2026-07-10)

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`

flake.lock

@@ -24,11 +24,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782073106,
+        "lastModified": 1784368054,
-        "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=",
+        "narHash": "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457",
+        "rev": "9b5f14d9483445e766294eb8fbe0b8f370269ed0",
         "type": "github"
       },
       "original": {
@@ -37,6 +37,24 @@
         "type": "github"
       }
     },
+    "beaker-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1780436704,
+        "narHash": "sha256-3aMH1YblnpiXKdkQVMRLmMZ5/8G7vB4HAfLg7+izyHg=",
+        "ref": "refs/heads/master",
+        "rev": "360d6271e1a20d128430e52637d5d35f4c706ca5",
+        "revCount": 34,
+        "shallow": false,
+        "type": "git",
+        "url": "https://git.bwaaa.monster/beaker"
+      },
+      "original": {
+        "shallow": false,
+        "type": "git",
+        "url": "https://git.bwaaa.monster/beaker"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1781825982,
@@ -52,6 +70,40 @@
         "type": "github"
       }
     },
+    "crane_2": {
+      "locked": {
+        "lastModified": 1781825982,
+        "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "davinci": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-pinned": "nixpkgs-pinned"
+      },
+      "locked": {
+        "lastModified": 1782405315,
+        "narHash": "sha256-pZKG7KOr1NPtWwzfEnRZvAi7Uvndd4LiC0OVHjf5IPE=",
+        "ref": "refs/heads/main",
+        "rev": "c9859df9bd3781c63d838a1a90d22129885a910b",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -140,26 +192,39 @@
         "type": "github"
       }
     },
-    "gitignore": {
+    "flake-utils_2": {
       "inputs": {
-        "nixpkgs": [
+        "systems": "systems_7"
-          "hyprland",
-          "hyprland",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1709087332,
+        "lastModified": 1731533236,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "hercules-ci",
+        "owner": "numtide",
-        "repo": "gitignore.nix",
+        "repo": "flake-utils",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
+        "owner": "numtide",
-        "repo": "gitignore.nix",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_9"
+      },
+      "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"
       }
     },
@@ -294,20 +359,18 @@
     "hyprland": {
       "inputs": {
         "hyprland": "hyprland_2",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3",
-          "nixpkgs"
-        ],
         "otter-launcher": "otter-launcher",
         "woomer": "woomer",
         "wrappers": "wrappers",
         "wshowkeys": "wshowkeys"
       },
       "locked": {
-        "lastModified": 1783179784,
+        "lastModified": 1786391152,
-        "narHash": "sha256-9qyKPHXc2fK6oZxCXLV9q0WdyNYdgCpfiAouRf+ELrc=",
+        "narHash": "sha256-P+dUN0wWRYLop9lLsnCOEi5bYE/GC5LvzV2VZh520TM=",
         "ref": "refs/heads/main",
-        "rev": "bdd6ec3efa05c1130002808d4c2c4552bb20587a",
+        "rev": "b4426becc44de00e891098b9883eca2b2028f981",
-        "revCount": 37,
+        "revCount": 53,
         "type": "git",
         "url": "https://git.voidarc.co.uk/voidarc/hypr"
       },
@@ -356,11 +419,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782563850,
+        "lastModified": 1784196523,
-        "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=",
+        "narHash": "sha256-ahtKMGXFJdlQNhatQm1+BBU/pGfGYnAqQt3vWvq4p8s=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178",
+        "rev": "a6ccb6cb112ed5a244c0191fb972347ecfa893e0",
         "type": "github"
       },
       "original": {
@@ -407,17 +470,17 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1783110106,
+        "lastModified": 1785237127,
-        "narHash": "sha256-PRnnFkTfQ+sQHSrcWw0512zEMNp5/1WHJeVuDf6FmxI=",
+        "narHash": "sha256-sMSWRj9zZ3O4Q1Bk8mKkdXsTb3zpXRESlrzWmQXmW54=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "14fa1fd0273973b7a40966b4fa9e081d6bf67dae",
+        "rev": "ff24e1755fd308ee70367d63168a12feb05d1fc2",
         "type": "github"
       },
       "original": {
@@ -531,11 +594,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783002634,
+        "lastModified": 1784323413,
-        "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=",
+        "narHash": "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1",
+        "rev": "5f03477ab3a005ff27c527486f551883535aea2f",
         "type": "github"
       },
       "original": {
@@ -605,11 +668,11 @@
     },
     "import-tree": {
       "locked": {
-        "lastModified": 1778781969,
+        "lastModified": 1784254960,
-        "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
+        "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=",
         "owner": "vic",
         "repo": "import-tree",
-        "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
+        "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69",
         "type": "github"
       },
       "original": {
@@ -620,16 +683,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1782467914,
+        "lastModified": 1782233679,
-        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
+        "narHash": "sha256-QyuGP5+QOtmXpy4i2X4DhBVBaySBdDKQEhqKcphcp34=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
+        "rev": "667d5cf1c59585031d743c78b394b0a647537c35",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -679,13 +742,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-pinned": {
       "locked": {
-        "lastModified": 1782175435,
+        "lastModified": 1772567409,
-        "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
+        "narHash": "sha256-qspxGige37s/66q9sptyG5VA/l2IOmMMZVJ4Xhta2wU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
+        "rev": "e4ec59bc1152b09a4843702e4a49381194f065a2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e4ec59bc1152b09a4843702e4a49381194f065a2",
+        "type": "github"
+      }
+    },
+    "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
         "type": "github"
       },
       "original": {
@@ -695,55 +774,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_11": {
-      "locked": {
-        "lastModified": 1773734432,
-        "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1783148766,
-        "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1782467914,
-        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
       "locked": {
         "lastModified": 1780336545,
         "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
@@ -759,13 +790,45 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_12": {
       "locked": {
-        "lastModified": 1783224372,
+        "lastModified": 1781577229,
-        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "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": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1785090369,
+        "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "rev": "624af665418d3c65d544145b4d34ad696439570e",
         "type": "github"
       },
       "original": {
@@ -775,6 +838,70 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1782175435,
+        "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1773734432,
+        "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1785386831,
+        "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "21ea275a7c46aef9d4d6ddc962e6d562e9d94183",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1782467914,
+        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_8": {
       "locked": {
         "lastModified": 1780336545,
@@ -791,17 +918,33 @@
         "type": "github"
       }
     },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nvim": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_7",
         "wrappers": "wrappers_2"
       },
       "locked": {
-        "lastModified": 1783352922,
+        "lastModified": 1786377545,
-        "narHash": "sha256-59Kea6PaeTM6ZBEAWzdPnuLlij2emLd21JsPnobR3B0=",
+        "narHash": "sha256-I5/PcFU0jlDw6+32MXpMGJxxHqWBUdYCt6DzFDctybw=",
         "ref": "refs/heads/main",
-        "rev": "970da906087f0691932418db8757803d64f60c28",
+        "rev": "dc386a5f5cf31925c513a3a39f546d5364289095",
-        "revCount": 94,
+        "revCount": 100,
         "type": "git",
         "url": "https://git.voidarc.co.uk/voidarc/nvim"
       },
@@ -810,6 +953,27 @@
         "url": "https://git.voidarc.co.uk/voidarc/nvim"
       }
     },
+    "omnisearch": {
+      "inputs": {
+        "beaker-src": "beaker-src",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1780508528,
+        "narHash": "sha256-0OkItQH4D8KcS+mIxgrzGHTHMl7Eb6ZHzTN3UmZbtWI=",
+        "ref": "refs/heads/master",
+        "rev": "e48c6366d07e0357afa379dff7b73328589164e5",
+        "revCount": 131,
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/omnisearch"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/omnisearch"
+      }
+    },
     "otter-launcher": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -821,11 +985,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1783145565,
+        "lastModified": 1783875707,
-        "narHash": "sha256-czL1P2nQV3JrbV6J2b3jXnWcz+Kbz+xhaXKk3+wdnF0=",
+        "narHash": "sha256-Ryg3PqFcGydelQpgPF0j8GMaXaGDrNTSesEy6fDw/eg=",
         "owner": "kuokuo123",
         "repo": "otter-launcher",
-        "rev": "2e35ce8c7ba6f5e4d98bf4c9073f5fa91143744d",
+        "rev": "242e5da4f0acc0b4301be7b4546f5afb3e4b23d6",
         "type": "github"
       },
       "original": {
@@ -844,11 +1008,11 @@
         "systems": "systems_6"
       },
       "locked": {
-        "lastModified": 1783339207,
+        "lastModified": 1783875707,
-        "narHash": "sha256-ZO2WzXNEM9XKuReixgQuP1G+5nrihYWajugBCIjjPkE=",
+        "narHash": "sha256-Ryg3PqFcGydelQpgPF0j8GMaXaGDrNTSesEy6fDw/eg=",
         "owner": "kuokuo123",
         "repo": "otter-launcher",
-        "rev": "d101421377473a190701d53cbe28b8244edad728",
+        "rev": "242e5da4f0acc0b4301be7b4546f5afb3e4b23d6",
         "type": "github"
       },
       "original": {
@@ -860,7 +1024,6 @@
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
         "nixpkgs": [
           "hyprland",
           "hyprland",
@@ -868,11 +1031,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781733627,
+        "lastModified": 1784288435,
-        "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
+        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
+        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
         "type": "github"
       },
       "original": {
@@ -881,29 +1044,69 @@
         "type": "github"
       }
     },
+    "quickshell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1786547899,
+        "narHash": "sha256-QxLEKq1R455FlEmaarx3cq9mk4jSBxHg3CyseLiOick=",
+        "ref": "refs/heads/main",
+        "rev": "e33041b66c66a1b68930bfd3bb58746ffbd5f4b2",
+        "revCount": 72,
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/quickshell"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/quickshell"
+      }
+    },
     "root": {
       "inputs": {
+        "davinci": "davinci",
         "flake-parts": "flake-parts",
         "gotify-desktop": "gotify-desktop",
         "hyprland": "hyprland",
         "import-tree": "import-tree",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_6",
         "nvim": "nvim",
+        "omnisearch": "omnisearch",
         "otter-launcher": "otter-launcher_2",
+        "quickshell": "quickshell",
         "sls-steam": "sls-steam",
-        "wrappers": "wrappers_3"
+        "weylus": "weylus",
+        "woomer": "woomer_2",
+        "wrappers": "wrappers_3",
+        "wshowkeys": "wshowkeys_2"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_10"
+      },
+      "locked": {
+        "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_7"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1783322884,
+        "lastModified": 1785411317,
-        "narHash": "sha256-BmYEQewp9fCTP6KFGnYh2dh6EjMj62FfJQTrksSSN3c=",
+        "narHash": "sha256-r/YV6psmPZj9aSMydTmOooTBLFiwMJoCWnaKkUlXiss=",
         "owner": "AceSLS",
         "repo": "SLSsteam",
-        "rev": "8ef40a2bdc662331f215775e525e1b010a2ffba3",
+        "rev": "b3da36b024f565f79ee19b44bea493af3f48ea95",
         "type": "github"
       },
       "original": {
@@ -1002,6 +1205,51 @@
         "type": "github"
       }
     },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_8": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "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"
@@ -1020,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_2",
+        "nixpkgs": "nixpkgs_4",
         "systems": "systems_4"
       },
       "locked": {
@@ -1040,16 +1310,38 @@
         "type": "github"
       }
     },
+    "woomer_2": {
+      "inputs": {
+        "crane": "crane_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_8"
+      },
+      "locked": {
+        "lastModified": 1782685056,
+        "narHash": "sha256-WJasTKjf1hcxdCc+jKL3dU5RIL2zdYJ/OBFTmIUbuXc=",
+        "owner": "coffeeispower",
+        "repo": "woomer",
+        "rev": "a7a0b288f70b98d168eaa0e8714816d3583c33b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "coffeeispower",
+        "repo": "woomer",
+        "type": "github"
+      }
+    },
     "wrappers": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1782375095,
+        "lastModified": 1785177581,
-        "narHash": "sha256-bRepNpAluz2i0IIk7Tmzw/4BkyOrwABvc66NEgXPEhA=",
+        "narHash": "sha256-9Z4l080DSrHMxoQTZTpVsML2h6JDuB9lDwHPsLd9BrQ=",
         "owner": "lassulus",
         "repo": "wrappers",
-        "rev": "cd780e92c0fa66c2e721e1d91894f3db13b9f2b4",
+        "rev": "f57bc81aa9669871343341b13aa175c8927b6a74",
         "type": "github"
       },
       "original": {
@@ -1060,7 +1352,7 @@
     },
     "wrappers_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1782135443,
@@ -1078,7 +1370,7 @@
     },
     "wrappers_3": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
         "lastModified": 1782135443,
@@ -1116,6 +1408,25 @@
         "type": "github"
       }
     },
+    "wshowkeys_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_12"
+      },
+      "locked": {
+        "lastModified": 1781708685,
+        "narHash": "sha256-NH5b736WoI9LodJKPlonO1X+Lxg8URMLLRkT5to61Zg=",
+        "owner": "voidarclabs",
+        "repo": "wshowkeys",
+        "rev": "47dfb7a0237acbf847ca28cbb88000b33929f50a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "voidarclabs",
+        "repo": "wshowkeys",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -1150,11 +1461,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782311043,
+        "lastModified": 1784371182,
-        "narHash": "sha256-07zLc2M3/ax+JsjxGTft17/Joua41LHE9/9AC/F9zeU=",
+        "narHash": "sha256-S8A1lezEalltWcCp3gAic5lssS0xTSISK6fKODefhOk=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "882ad01e195ce201b07c618bbee44a0cad8b9e5a",
+        "rev": "08d99f727944dd15e4740090305e31c5fb92a50a",
         "type": "github"
       },
       "original": {

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";
@@ -20,6 +19,24 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sls-steam.url = "github:AceSLS/SLSsteam";
+    davinci.url = "git+https://git.voidarc.co.uk/voidarc/nixos.davinci";
+    quickshell = {
+      url = "git+https://git.voidarc.co.uk/voidarc/quickshell";
+      flake = false;
+    };
+    omnisearch = {
+      url = "git+https://git.voidarc.co.uk/voidarc/omnisearch";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    woomer = {
+      url = "github:coffeeispower/woomer";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    wshowkeys.url = "github:voidarclabs/wshowkeys";
+    weylus = {
+      url = "github:voidarclabs/WeylusCommunityEdition";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Flake parts
     flake-parts.url = "github:hercules-ci/flake-parts";

modules/attrs/bottles/default.nix

@@ -0,0 +1,18 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.bottles = moduleWithSystem ({pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      (bottles.override {
+        removeWarningPopup = true;
+      })
+      wineWow64Packages.stable
+      winetricks
+      wine
+      wine64
+      freetype
+    ];
+  });
+}

modules/attrs/development/default.nix

@@ -0,0 +1,19 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.development = moduleWithSystem ({pkgs, ...}: let
+    modules = with self.nixosModules; [
+      git
+      nvim
+    ];
+  in {
+    imports = modules;
+    environment.systemPackages = with pkgs; [
+      opencode
+      devenv
+			jellyfin-tui
+    ];
+  });
+}

modules/attrs/gaming/default.nix

@@ -0,0 +1,13 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.gaming = moduleWithSystem ({...}: let
+    modules = with self.nixosModules; [
+      steam
+    ];
+  in {
+    imports = modules;
+  });
+}

modules/attrs/youtube/default.nix

@@ -0,0 +1,16 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.youtube = moduleWithSystem ({...}: let
+    modules = with self.nixosModules; [
+      obs-studio
+      wshowkeys
+      woomer
+      mumble
+    ];
+  in {
+    imports = modules;
+  });
+}

modules/empty.nix

@@ -0,0 +1,28 @@
+{
+	self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.name = moduleWithSystem ({
+    pkgs,
+    self',
+		inputs',
+    ...
+  }: let
+    modules = with self.nixosModules; [];
+  in {
+    imports = modules;
+    programs.name = {
+      enable = true;
+      package = self'.packages.hello;
+    };
+  });
+  perSystem = {
+    pkgs,
+    lib,
+    self',
+    ...
+  }: {
+    packages.hello = pkgs.hello;
+  };
+}

modules/features/davinci/default.nix

@@ -0,0 +1,14 @@
+{
+  moduleWithSystem,
+  self,
+  ...
+}: {
+  flake.nixosModules.davinci = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      davinci-resolve
+    ];
+  });
+  perSystem = {inputs', ...}: {
+    packages.davinci-resolve = inputs'.davinci.packages.default;
+  };
+}

modules/features/git/default.nix

@@ -0,0 +1,40 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.git = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    programs.git = {
+      enable = true;
+      package = self.packages.${pkgs.stdenv.hostPlatform.system}.git;
+    };
+    programs.gnupg.agent = {
+      enable = true;
+      pinentryPackage = pkgs.pinentry-all;
+    };
+  };
+  perSystem = {
+    pkgs,
+    lib,
+    self',
+    ...
+  }: {
+    packages.git = inputs.wrappers.wrappers.git.wrap {
+      inherit pkgs;
+      runtimePkgs = with pkgs; [
+        git-secret
+      ];
+      settings = {
+        user = {
+          email = "admin@voidarc.co.uk";
+          name = "voidarc";
+        };
+        credential.helper = "store";
+      };
+    };
+  };
+}

modules/features/gotify-desktop/default.nix

@@ -1,21 +1,16 @@
 {
-  self,
 inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.gotify-desktop = {
+  flake.nixosModules.gotify-desktop = moduleWithSystem ({self', ...}: {
-    pkgs,
+    environment.systemPackages = with self'.packages; [
-    lib,
+      gotify-desktop
-    ...
-  }: {
-    environment.systemPackages = [
-      self.packages.${pkgs.stdenv.hostPlatform.system}.gotify-desktop
     ];
-  };
+  });
   perSystem = {
     pkgs,
-    lib,
+    inputs',
-    self',
     ...
   }: {
     packages = {
@@ -29,14 +24,9 @@
           	min_priority = 1
         '';
       in
-        inputs.wrappers.lib.wrapPackage ({
+        inputs.wrappers.lib.wrapPackage ({...}: {
-          config,
-          wlib,
-          lib,
-          ...
-        }: {
           inherit pkgs;
-          package = inputs.gotify-desktop.packages.${pkgs.stdenv.hostPlatform.system}.default;
+          package = inputs'.gotify-desktop.packages.default;
           flags = {
             "-c" = config-file;
           };

modules/features/hypr/default.nix

@@ -1,68 +0,0 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.hyprland = {
-    pkgs,
-    lib,
-    ...
-  }: let
-    modules = with self.nixosModules; [
-      audio
-    ];
-  in {
-    imports = modules;
-    programs.hyprland = {
-      enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    };
-    services.xserver.enable = true;
-    security.polkit.enable = true;
-  };
-  perSystem = {
-    pkgs,
-    lib,
-    self',
-    ...
-  }: {
-    packages = {
-      hyprland = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
-        runtimePackages =
-          inputs.hyprland.lib.defaultRuntimePkgs.${pkgs.stdenv.hostPlatform.system}
-          // {
-            wpaperd = self'.packages.wpaperd;
-            kitty = self'.packages.kitty;
-            otter-launcher = self'.packages.otter-launcher;
-          };
-      };
-      wpaperd = let
-        config-file = builtins.toFile "config.toml" ''
-          [any]
-          path = "${./wallpapers}"
-
-          [HDMI-A-1]
-          path = "${./wallpapers/topo1.png}"
-
-          [DP-1]
-          path = "${./wallpapers/topo2.png}"
-
-          [DP-2]
-          path = "${./wallpapers/topo3.png}"
-        '';
-      in
-        inputs.wrappers.lib.wrapPackage ({
-          config,
-          wlib,
-          lib,
-          ...
-        }: {
-          inherit pkgs;
-          package = pkgs.wpaperd;
-          flags = {
-            "--config" = config-file;
-          };
-        });
-    };
-  };
-}

modules/features/hyprland/default.nix

@@ -0,0 +1,80 @@
+{
+  moduleWithSystem,
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.hyprland = moduleWithSystem ({
+    self',
+    pkgs,
+    inputs',
+    ...
+  }: {config, ...}: let
+    modules = with self.nixosModules; [
+      audio
+      systemTheme
+    ];
+
+    runtimePkgs = self'.packages.hyprland.passthru.runtimePackages;
+    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;
+    };
+
+    services.displayManager.defaultSession = "hyprland";
+    services.xserver.enable = true;
+    security.polkit.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      hyprlock
+      gsettings-desktop-schemas
+    ];
+
+    system.activationScripts.hyprRuntimeEnv = lib.stringAfter ["specialfs"] ''
+      mkdir -p /run/hypr-runtime-env/bin
+      ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: pkg: ''
+          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',
+    system,
+    inputs',
+    ...
+  }: {
+    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}
+          // {
+            wpaperd = self'.packages.wpaperd;
+            kitty = self'.packages.kitty;
+            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;
+          };
+      };
+    };
+  };
+}

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
+}

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;
+      };
+    });
+  };
+}

modules/features/kitty/default.nix

@@ -1,23 +1,16 @@
 {
-  self,
   inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.kitty = {
+  flake.nixosModules.kitty = moduleWithSystem (
-    pkgs,
+    {self'}: {
-    lib,
+      environment.systemPackages = with self'.packages; [
-    ...
+        kitty
-  }: {
-    environment.systemPackages = [
-      self.packages.${pkgs.stdenv.hostPlatform.system}.kitty
       ];
-  };
+    }
-  perSystem = {
+  );
-    pkgs,
+  perSystem = {pkgs, ...}: {
-    lib,
-    self',
-    ...
-  }: {
     packages.kitty = let
       fira-mono = pkgs.nerd-fonts.fira-mono;
       fontsConf = pkgs.makeFontsConf {
@@ -30,12 +23,14 @@
           "FONTCONFIG_FILE" = "${fontsConf}";
         };
         font = {
-          name = "FiraMono Nerd Font";
+          name = "FiraMono Nerd Font Mono";
           size = 11;
         };
         settings = {
           font_size = 11;
-          window_padding_width = 10;
+          scrollbar = "never";
+          pixel_scroll = false;
+          window_padding_width = 9;
           background_opacity = 0.50;
           confirm_os_window_close = 0;
           enable_audio_bell = false;

modules/features/lazygit/default.nix

@@ -0,0 +1,51 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.lazygit = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    environment.systemPackages = with pkgs; [
+      self.packages.${pkgs.stdenv.hostPlatform.system}.lazygit
+    ];
+  };
+  perSystem = {
+    pkgs,
+    lib,
+    self',
+    ...
+  }: let
+    config-file = pkgs.writeText "config.yml" ''
+      gui:
+        nerdFontsVersion: "3"
+
+      customCommands:
+        - key: 'p'
+          context: 'global'
+          command: 'git pull --recurse-submodules'
+          loadingText: 'Pulling with submodules'
+          output: 'log'
+        - key: '<c-p>'
+          context: 'global'
+          command: 'git pull'
+          loadingText: 'Pulling remote repo'
+          output: 'log'
+    '';
+  in {
+    packages.lazygit = inputs.wrappers.lib.wrapPackage ({
+      config,
+      wlib,
+      lib,
+      ...
+    }: {
+      inherit pkgs;
+      package = pkgs.lazygit;
+      flags = {
+        "--use-config-file" = config-file;
+      };
+    });
+  };
+}

modules/features/nvim/default.nix

@@ -1,24 +1,11 @@
-{
+{moduleWithSystem, ...}: {
-  self,
+  flake.nixosModules.nvim = moduleWithSystem ({self', ...}: {
-  inputs,
+    programs.neovim = {
-  ...
-}: {
-  flake.nixosModules.nvim = {
-    pkgs,
-    lib,
-    ...
-  }: {
-    programs.nvim = {
       enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.nvim;
+      package = self'.packages.nvim;
     };
-  };
+  });
-  perSystem = {
+  perSystem = {inputs', ...}: {
-    pkgs,
+    packages.nvim = inputs'.nvim.packages.default;
-    lib,
-    self',
-    ...
-  }: {
-    packages.nvim = inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.default;
   };
 }

modules/features/obs-studio/default.nix

@@ -0,0 +1,8 @@
+{moduleWithSystem, ...}: {
+  flake.nixosModules.obs-studio = moduleWithSystem ({...}: {
+    programs.obs-studio = {
+      enable = true;
+      enableVirtualCamera = true;
+    };
+  });
+}

modules/features/omnisearch/default.nix

@@ -0,0 +1,14 @@
+{
+  moduleWithSystem,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.omnisearch = moduleWithSystem ({...}: let
+    modules = [
+      inputs.omnisearch.nixosModules.default
+    ];
+  in {
+    imports = modules;
+    services.omnisearch.enable = true;
+  });
+}

modules/features/otter-launcher/config.toml

@@ -14,14 +14,20 @@ delay_startup = 0 # sometimes the otter runs too fast even before the terminal w
 [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 = 8 # 0 to disable suggestions and tab completion
+suggestion_lines = 7 # 0 to disable suggestions and tab completion
 list_prefix = "  "
 selection_prefix = "\u001B[31;1m "
 prefix_padding = 3 # format prefixes to have a uniformed width

modules/features/otter-launcher/default.nix

@@ -1,45 +1,40 @@
 {
-  self,
   inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.otter-launcher = {
+  flake.nixosModules.otter-launcher = moduleWithSystem ({self', ...}: {
-    pkgs,
-    lib,
-    ...
-  }: {
     environment.systemPackages = [
-      self.packages.${pkgs.stdenv.hostPlatform.system}.otter-launcher
+      self'.packages.otter-launcher
     ];
-  };
+  });
   perSystem = {
     pkgs,
     lib,
     self',
+    inputs',
     ...
   }: {
     packages = {
       otter-launcher = let
         extra-config = ''
                   [overlay]
-               overlay_cmd = """
+                  overlay_cmd = "${lib.getExe pkgs.kitty} +kitten icat --fit height --align left --no-trailing-newline ${./cat.png}"
-               ${lib.getExe pkgs.chafa} -s 20x20 ${./cat.png}
+                  overlay_trimmed_lines = 0
-               """
-          # overlay_trimmed_lines = 1
         '';
         final-config = pkgs.writeText "config.toml" ''
-          ${builtins.readFile ./config.toml}
           ${extra-config}
+
+          ${builtins.readFile ./config.toml}
         '';
       in
-        inputs.wrappers.lib.wrapPackage ({
+        inputs.wrappers.lib.wrapPackage ({...}: {
-          config,
-          wlib,
-          lib,
-          ...
-        }: {
           inherit pkgs;
-          package = inputs.otter-launcher.packages.${pkgs.stdenv.hostPlatform.system}.default;
+          package = inputs'.otter-launcher.packages.default;
+          runtimePkgs = with pkgs; [
+            fsel
+            bluetui
+          ];
           flags = {
             "-c" = final-config;
           };

modules/features/quickshell/default.nix

@@ -0,0 +1,22 @@
+{
+  moduleWithSystem,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.quickshell = moduleWithSystem ({
+    self',
+    pkgs,
+    ...
+  }: {
+    environment.systemPackages = with self'.packages; [
+      quickshell
+    ];
+  });
+  perSystem = {pkgs, ...}: {
+    packages.quickshell = inputs.wrappers.wrappers.quickshell.wrap {
+      inherit pkgs;
+      configDir = inputs.quickshell;
+      configFile = "${inputs.quickshell}/shell.qml";
+    };
+  };
+}

modules/features/sddm/autologin.nix

@@ -7,12 +7,7 @@
     pkgs,
     lib,
     ...
-  }: let
+  }: {
-    modules = with self.nixosModules; [
-      sddm
-    ];
-  in {
-    imports = modules;
     services.displayManager = {
       autoLogin.enable = true;
       autoLogin.user = "user01";

modules/features/steam/default.nix

@@ -1,16 +1,14 @@
-{
+{moduleWithSystem, ...}: {
-  self,
+  flake.nixosModules.steam = moduleWithSystem ({
-  inputs,
-  ...
-}: {
-  flake.nixosModules.steam = {
 		pkgs,
+    unfreePkgs,
+    inputs',
     lib,
     ...
   }: {
     # If buying isn't owning than piracy isn't stealing
     environment.systemPackages = [
-      inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.wrapped
+      inputs'.sls-steam.packages.default
     ];
     programs.steam = {
       enable = true;
@@ -18,15 +16,15 @@
       extraCompatPackages = with pkgs; [
         proton-ge-bin
       ];
-      package = pkgs.steam.override {
+      package = unfreePkgs.steam.override {
         extraEnv = {
           LD_AUDIT = "${
-            inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+            inputs'.sls-steam.packages.sls-steam
           }/library-inject.so:${
-            inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+            inputs'.sls-steam.packages.sls-steam
           }/SLSsteam.so";
         };
       };
     };
-  };
+  });
 }

modules/features/tailscale/default.nix

@@ -0,0 +1,11 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.tailscale = moduleWithSystem ({...}: {
+    services.tailscale = {
+      enable = true;
+    };
+  });
+}

modules/features/way-edges/config.jsonc

@@ -0,0 +1,60 @@
+{
+    "allow-trailing-commas": true,
+    "widgets": [
+        {
+            "type": "slider",
+            "edge": "right",
+            "position": "top",
+            "thickness": 30,
+            "length": "25%",
+            "margins": {
+                "top": "50%"
+            },
+            "border-width": 4,
+            "border-color": "#cba6f7ff",
+            "fg-color": "#cba6f7bb",
+            "bg-color": "#31324466",
+            "fg-text-color": "#11111bff",
+            "bg-text-color": "#bac2dedd",
+            "transition-duration": 100,
+            "redraw-only-on-internal-update": true, 
+            "radius": 10, // corner radius
+            "obtuse-angle": 90, // in degrees(90~180). controls how much curve the widget has
+            "scroll-unit": 0.005, 
+            "pinnable": false,
+            "preset": {
+                "type": "speaker",
+                "animation-curve": "Linear", // mute animation
+                "mute-text-color": "#f38ba8ff",
+                "mute-color": "#f38ba8bb",
+            },
+        },
+        {
+            "type": "slider",
+            "edge": "right",
+            "position": "top",
+            "thickness": 30,
+            "length": "25%",
+            "margins": {
+                "top": "25%"
+            },
+            "border-width": 4,
+            "border-color": "#f9e2afff",
+            "fg-color": "#f9e2afbb",
+            "bg-color": "#31324466",
+            "fg-text-color": "#11111bff",
+            "bg-text-color": "#bac2dedd",
+            "transition-duration": 100,
+            "redraw-only-on-internal-update": true, 
+            "radius": 10, // corner radius
+            "obtuse-angle": 90, // in degrees(90~180). controls how much curve the widget has
+            "scroll-unit": 0.005, 
+            "pinnable": false,
+            "preset": {
+                "type": "backlight",
+                "device": "intel_backlight", // this is the name of the device. Find it under `/sys/class/backlight/` It should be something like `nvidia_0`, `intel_0`, etc.
+            },
+        },
+    ]
+}
+

modules/features/way-edges/default.nix

@@ -0,0 +1,20 @@
+{
+  inputs,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.way-edges = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      way-edges
+    ];
+  });
+  perSystem = {pkgs, ...}: {
+    packages.way-edges = inputs.wrappers.lib.wrapPackage ({...}: {
+      inherit pkgs;
+      package = pkgs.way-edges;
+      flags = {
+        "--config-path" = ./config.jsonc;
+      };
+    });
+  };
+}

modules/features/waybar/default.nix

@@ -0,0 +1,42 @@
+{
+  moduleWithSystem,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.waybar = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      waybar
+    ];
+  });
+  perSystem = {pkgs, ...}: {
+    packages.waybar = inputs.wrappers.wrappers.waybar.wrap {
+      inherit pkgs;
+      "style.css".path = ./style.css;
+      configFile.content = ''
+        {
+        		"include": [
+        			"${./modules.jsonc}"
+        		],
+            "height": 20,
+            "margin": "3 6",
+            "reload_style_on_change": true,
+            "position": "top",
+            "modules-left": [
+                "custom/logo",
+                "hyprland/workspaces"
+            ],
+            "modules-center": [
+                "mpris"
+            ],
+            "modules-right": [
+                "network",
+                "bluetooth",
+                "custom/notifs",
+        				"battery",
+                "clock"
+            ]
+        }
+      '';
+    };
+  };
+}

modules/features/waybar/modules.jsonc

@@ -0,0 +1,78 @@
+{
+    "custom/logo": {
+        "format": ""
+    },
+    "mpris": {
+        "format": "{status_icon} {title} - {artist}",
+        "title-len": 50,
+        "artist-len": 20,
+        "status-icons": {
+            "playing": "",
+            "paused": ""
+        }
+    },
+    "network": {
+        "format": "󰤭",
+        "format-ethernet": "󰈀",
+        "format-wifi": "{icon}",
+        "format-icons": [
+            "󰤟",
+            "󰤢",
+            "󰤥",
+            "󰤨"
+        ],
+        "format-alt": "{ipaddr} / {gwaddr}",
+        "tooltip-format": "{ifname} - {essid}"
+    },
+    "bluetooth": {
+        "format": "󰂲",
+        "format-connected": "󰂱",
+        "tooltip-format": "{status} - {device_alias}",
+        "on-click": "kitty --class otter --title otter-launcher -e sh -c 'sleep 0.05 && otter-launcher bl'"
+    },
+    "battery": {
+        "format": "{icon} {capacity}%",
+        "format-plugged": "󰂄 {capacity}%",
+        "format-charging": "󰂄 {capacity}%",
+        "states": {
+            "warning": 30,
+            "critical": 15
+        },
+        "format-icons": [
+            "",
+            "",
+            "",
+            ""
+        ]
+    },
+		"custom/notifs": {
+			"format": "",
+        "on-click": "kitty --class otter --title otter-launcher -e sh -c 'sleep 0.05 && otter-launcher dunst'"
+		},
+    "memory": {
+        "format": " {percentage}%",
+        "tooltip-format": "{used:0.1f}GiB, {swapUsed:0.1f}GiB Swap"
+    },
+    "cpu": {
+        "format": " {usage}%"
+    },
+    "clock": {
+        "interval": 1,
+        "format": "{:%T}",
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+                    "mode"          : "year",
+                    "mode-mon-col"  : 3,
+                    "weeks-pos"     : "right",
+                    "on-scroll"     : 1,
+                    "format": {
+                              "months":     "<span color='#89b4fa'><b>{}</b></span>",
+                              "days":       "<span color='#eba0ac'><b>{}</b></span>",
+                              "weeks":      "<span color='#a6e3a1'><b>W{}</b></span>",
+                              "weekdays":   "<span color='#fab387'><b>{}</b></span>",
+                              "today":      "<span color='#cba6f7'><b><u>{}</u></b></span>"
+                              }
+                    },
+    }
+}
+

modules/features/waybar/style.css

@@ -0,0 +1,158 @@
+* {
+  font-family: "Fira Mono Nerd Font Propo";
+  font-size: 16px;
+  font-weight: bold;
+  min-height: 16px;
+  margin: 0;
+  padding: 0;
+}
+
+window#waybar {
+  background: transparent;
+}
+
+.module {
+  background-color: rgba(30, 30, 46, 0.8);
+  margin: 0 3px;
+  padding: 0 9px;
+  border-radius: 7px;
+}
+
+#custom-logo {
+  background-color: #cba6f7;
+  color: #1e1e2e;
+  font-size: 21px;
+}
+
+#workspaces {
+  padding: 3px 4px;
+}
+
+#workspaces button {
+  background-color: #585b70;
+  margin: 0 2px;
+  padding: 0 2px;
+  border-radius: 2px;
+}
+
+#workspaces button:first-child {
+  border-radius: 5px 2px 2px 5px;
+  margin: 0;
+  margin-right: 2px;
+}
+
+#workspaces button:last-child {
+  border-radius: 2px 5px 5px 4px;
+  margin: 0;
+  margin-left: 2px;
+}
+
+#workspaces button:only-child {
+  border-radius: 5px;
+  padding: 0 12px;
+  margin: 0 1px;
+}
+
+#workspaces button.active {
+  background-color: #b4befe;
+  color: #313244;
+}
+
+#mpris {
+  font-size: 14px;
+  transition:
+    color 0.5s,
+    background-color 0.5s;
+}
+
+#mpris.paused {
+  color: #f2cdcd;
+}
+
+#mpris.playing {
+  color: rgba(30, 30, 46, 0.8);
+  background-color: #ca9ee6;
+}
+
+#network {
+  background-color: #f38ba8;
+  color: #1e1e2e;
+}
+
+#bluetooth {
+  background-color: #fab387;
+  color: #1e1e2e;
+}
+
+#custom-notifs {
+  background-color: #f9e2af;
+  color: #1e1e2e;
+}
+
+#battery {
+  background-color: #a6e3a1;
+  color: #1e1e2e;
+  transition:
+    color 0.5s,
+    background-color 0.5s,
+    linear-gradient 0.4s;
+}
+
+#battery.warning {
+  color: #1e1e2e;
+  background: #f38ba8;
+  background: linear-gradient(
+    135deg,
+    rgba(243, 139, 168, 1) 0%,
+    rgba(166, 218, 149, 1) 65%,
+    rgba(166, 218, 149, 1) 100%
+  );
+}
+
+#battery.charging {
+  background-color: #40a02b;
+  background: #cba6f7;
+  background: linear-gradient(
+    135deg,
+    rgba(203, 166, 247, 1) 0%,
+    rgba(166, 218, 149, 1) 65%,
+    rgba(166, 218, 149, 1) 100%
+  );
+}
+
+#battery.plugged {
+  background-color: #40a02b;
+  background: #cba6f7;
+  background: linear-gradient(
+    135deg,
+    rgba(203, 166, 247, 1) 0%,
+    rgba(166, 218, 149, 1) 65%,
+    rgba(166, 218, 149, 1) 100%
+  );
+}
+
+#battery.critical {
+  color: #f38ba8;
+}
+
+#memory {
+  padding-right: 3px;
+  border-radius: 7px 0 0 7px;
+  margin-right: 0;
+  background-color: #89dceb;
+  color: #1e1e2e;
+}
+
+#cpu {
+  padding-left: 3px;
+  border-radius: 0 7px 7px 0;
+  margin-left: 0;
+  background-color: #89dceb;
+  color: #1e1e2e;
+}
+
+#clock {
+  background-color: #89b4fa;
+  color: #1e1e2e;
+}
+

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"];
+    };
+  });
+}

modules/features/wlogout/default.nix

@@ -0,0 +1,22 @@
+{
+  inputs,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.wlogout = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      wlogout
+    ];
+  });
+  perSystem = {pkgs, ...}: {
+    packages.wlogout = inputs.wrappers.lib.wrapPackage ({...}: {
+      inherit pkgs;
+      package = pkgs.wlogout;
+      flags = {
+        "--css" = ./style.css;
+        "--layout" = ./layout;
+        "--buttons-per-row" = "5";
+      };
+    });
+  };
+}

modules/features/wlogout/layout

@@ -0,0 +1,30 @@
+{
+    "label" : "lock",
+    "action" : "hyprlock",
+    "text" : "Lock",
+    "keybind" : "l"
+}
+{
+    "label" : "logout",
+    "action" : "hyprctl dispatch 'hl.dsp.exit()'" ,
+    "text" : "Logout",
+    "keybind" : "e"
+}
+{
+    "label" : "shutdown",
+    "action" : "systemctl poweroff",
+    "text" : "Shutdown",
+    "keybind" : "s"
+}
+{
+    "label" : "suspend",
+    "action" : "systemctl suspend",
+    "text" : "Sleep",
+    "keybind" : "u"
+}
+{
+    "label" : "reboot",
+    "action" : "systemctl reboot",
+    "text" : "Reboot",
+    "keybind" : "r"
+}

modules/features/wlogout/style.css

@@ -0,0 +1,73 @@
+* {
+	background-image: none;
+	box-shadow: none;
+}
+
+window {
+	background-color: rgba(12, 12, 12, 0.05);
+}
+
+button {
+    border-radius: 0;
+    border-color: #cba6f7;
+	text-decoration-color: #ffffff;
+    color: #FFFFFF;
+	background-color: #313244;
+	border-style: solid none;
+	border-width: 4px;
+	background-repeat: no-repeat;
+	background-position: 50% 30%;
+	background-size: 75%;
+}
+
+button:first-child {
+	border-top-left-radius: 10px;
+	border-bottom-left-radius: 10px;
+}
+
+button:last-child {
+	border-top-right-radius: 10px;
+	border-bottom-right-radius: 10px;
+}
+
+#lock {
+    border-left-style: solid;
+    background-image: image(url("./icons/lock.png"));
+}
+
+#logout {
+    background-image: image(url("./icons/exit.png"));
+}
+
+#suspend {
+    background-image: image(url("./icons/slwwp.png"));
+}
+
+#shutdown {
+    background-image: image(url("./icons/power.png"));
+}
+
+#reboot {
+    border-right-style: solid;
+    background-image: image(url("./icons/reload.png"));
+}
+
+#lock:focus {
+    background-color: #f38ba8;
+}
+
+#logout:focus {
+    background-color: #fab387;
+}
+
+#shutdown:focus {
+    background-color: #a6e3a1;
+}
+
+#suspend:focus {
+    background-color: #f9e2af;
+}
+
+#reboot:focus {
+    background-color: #cba6f7;
+}

modules/features/woomer/default.nix

@@ -0,0 +1,26 @@
+{
+  inputs,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.woomer = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      woomer
+    ];
+  });
+  perSystem = {
+    pkgs,
+    inputs',
+    ...
+  }: {
+    packages.woomer = inputs.wrappers.lib.wrapPackage ({...}: {
+      inherit pkgs;
+      package = inputs'.woomer.packages.default;
+      flags = {
+        "--monitor" = "DP-1";
+        "--output" = "DP-1";
+        "--radius" = "2";
+      };
+    });
+  };
+}

modules/features/wpaperd/default.nix

@@ -0,0 +1,35 @@
+{
+  moduleWithSystem,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.wpaperd = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      wpaperd
+    ];
+  });
+  perSystem = {pkgs, ...}: {
+    packages.wpaperd = let
+      config-file = builtins.toFile "config.toml" ''
+        [any]
+        path = "${./wallpapers}"
+
+        [HDMI-A-1]
+        path = "${./wallpapers/topo1.png}"
+
+        [DP-1]
+        path = "${./wallpapers/topo2.png}"
+
+        [DP-2]
+        path = "${./wallpapers/topo3.png}"
+      '';
+    in
+      inputs.wrappers.lib.wrapPackage ({...}: {
+        inherit pkgs;
+        package = pkgs.wpaperd;
+        flags = {
+          "--config" = config-file;
+        };
+      });
+  };
+}

modules/features/wshowkeys/default.nix

@@ -0,0 +1,17 @@
+{moduleWithSystem, ...}: {
+  flake.nixosModules.wshowkeys = moduleWithSystem ({
+    self',
+    pkgs,
+    ...
+  }: let
+    lib = pkgs.lib;
+  in {
+    programs.wshowkeys = {
+      enable = true;
+      package = self'.packages.wshowkeys;
+    };
+  });
+  perSystem = {inputs', ...}: {
+    packages.wshowkeys = inputs'.wshowkeys.packages.default;
+  };
+}

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'

modules/features/zsh/default.nix

@@ -1,16 +1,16 @@
 {
-  self,
   inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.zsh = {
+  flake.nixosModules.zsh = moduleWithSystem ({
     pkgs,
-    lib,
+    self',
     ...
   }: {
     nixpkgs.overlays = [
       (final: prev: {
-        zsh = self.packages.${pkgs.stdenv.hostPlatform.system}.zsh;
+        zsh = self'.packages.zsh;
       })
     ];
     programs.zsh = {
@@ -22,7 +22,7 @@
       histSize = 10000;
     };
     users.defaultUserShell = pkgs.zsh;
-  };
+  });
   perSystem = {
     pkgs,
     lib,
@@ -30,33 +30,78 @@
     ...
   }: {
     packages = {
-      zsh = inputs.wrappers.wrappers.zsh.wrap {
+      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];
+          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;
-          devenv = lib.getExe pkgs.devenv;
-          carapace = lib.getExe pkgs.carapace;
             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}
+
+                  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:|=*'
 
+                  	autoload -U select-word-style
+                  	select-word-style bash
+
+                  	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
+
+                  	bindkey "^[[1;5C" forward-word
+                  	bindkey "^[[1;5D" backward-word
+                  	bindkey "^[[3;5~" kill-word
+                  	bindkey "^H" backward-kill-word
+
+                  	source <(${lib.getExe pkgs.fzf} --zsh)
+
                   	setopt NO_CASE_GLOB
 
+                  	${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
+
                   	export EDITOR=nvim
 
-          eval "$(${lib.getExe pkgs.devenv} hook zsh)"
+                  	eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)"
-          eval "$(${lib.getExe self.packages.${pkgs.host.stdenv.hostPlatform.system}.ohMyPosh} init zsh)"
 
-          ${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
+            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 {

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"
+}

modules/hosts/HACKSTATION/default.nix

@@ -7,6 +7,16 @@
     modules = with self.nixosModules; [
       desktop
       hackstationConfiguration
+      amdDrivers
+      youtube
+      development
+      bottles
+      gaming
+      davinci
+      sddm-autologin
+      nix-ld
+
+			i3
     ];
   };
 }

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
+    ];
   };
 }

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
+    ];
+  };
+}

modules/hosts/mobile02/mobile02Configuration.nix

@@ -0,0 +1,11 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.mobile02Configuration = {...}: {
+    networking = {
+      hostName = "mobile02";
+    };
+  };
+}

modules/system/audio/default.nix

@@ -8,8 +8,16 @@
     lib,
     ...
   }: {
+    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;

modules/system/core/default.nix

@@ -21,5 +21,22 @@
         /etc/nixos/hardware-configuration.nix
       ]
       ++ modules;
+    services = {
+      openssh.enable = true;
+      avahi.enable = true;
+    };
+    environment.systemPackages = with pkgs; [
+      vim
+      unzip
+      p7zip-rar
+      usbutils
+      lsof
+      gvfs
+      libnotify
+      python315
+      curlWithGnuTls
+      wget
+    ];
+    system.stateVersion = "25.05";
   };
 }

modules/system/core/nix-settings.nix

@@ -1,13 +1,11 @@
-{
+{inputs, ...}: {
-  self,
+  perSystem = {system, ...}: {
-  inputs,
+    _module.args.unfreePkgs = import inputs.nixpkgs {
-  ...
+      inherit system;
-}: {
+      config.allowUnfree = true;
-  flake.nixosModules.nix = {
+    };
-    pkgs,
+  };
-    lib,
+  flake.nixosModules.nix = {...}: {
-    ...
-  }: {
     nix = {
       registry = {
         voidarc = {
@@ -23,6 +21,7 @@
       };
       settings = {
         cores = 6;
+        trusted-users = ["root" "user01"];
         download-buffer-size = 524288000;
         experimental-features = [
           "nix-command"

modules/system/desktop/default.nix

@@ -1,19 +1,21 @@
 {
   self,
-  inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.desktop = {
+  flake.nixosModules.desktop = moduleWithSystem ({pkgs, ...}: let
-    pkgs,
-    lib,
-    ...
-  }: let
     modules = with self.nixosModules; [
       core
       hyprland
       sddm
+      network
+      omnisearch
+			tailscale
     ];
   in {
     imports = modules;
-  };
+    environment.systemPackages = with pkgs; [
+      mpv
+    ];
+  });
 }

modules/system/drivers/amd.nix

@@ -1,13 +1,11 @@
-{
+{...}: {
-  self,
+  flake.nixosModules.amdDrivers = {pkgs, ...}: {
-  inputs,
+    environment.systemPackages = with pkgs; [
-  ...
+      mesa
-}: {
+      rocmPackages.rocm-smi
-  flake.nixosModules.amdDrivers = {
+      rocmPackages.rocminfo
-    pkgs,
+      vulkan-tools
-    lib,
+    ];
-    ...
-  }: {
     hardware = {
       graphics = {
         enable = true;

modules/system/drivers/intel.nix

@@ -8,6 +8,10 @@
     lib,
     ...
   }: {
+    environment.systemPackages = with pkgs; [
+      mesa
+      vulkan-tools
+    ];
     hardware.graphics = {
       enable = true;
       extraPackages = with pkgs; [

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

modules/system/network/default.nix

@@ -3,7 +3,7 @@
   inputs,
   ...
 }: {
-  flake.nixosModules.networking = {
+  flake.nixosModules.network = {
     pkgs,
     lib,
     ...
@@ -17,6 +17,7 @@
         "1.1.1.1"
         "8.8.8.8"
       ];
+      firewall.enable = false;
     };
     services.unbound = {
       enable = true;

modules/system/network/wake-on-lan.nix

@@ -1,22 +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;
-      firewall.enable = false;
-    };
-  };
-}

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
+        ];
+      };
+    };
+  });
+}

modules/system/systemTheme/cursor.nix

@@ -0,0 +1,36 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.bibataCursors = {
+    pkgs,
+    lib,
+    ...
+  }: let
+  in {
+    fonts.packages = with pkgs.nerd-fonts; [
+      fira-mono
+    ];
+    environment.systemPackages = with pkgs; [
+      bibata-cursors
+    ];
+
+    environment.variables = {
+      XCURSOR_THEME = "Bibata-Modern-Ice";
+      XCURSOR_SIZE = "20";
+    };
+
+    programs.dconf.profiles.user.databases = [
+      {
+        lockAll = false;
+        settings = {
+          "org/gnome/desktop/interface" = {
+            cursor-theme = "Bibata-Modern-Ice";
+            font-name = "FiraMono Nerd Font 11";
+          };
+        };
+      }
+    ];
+  };
+}

modules/system/systemTheme/default.nix

@@ -0,0 +1,19 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.systemTheme = {
+    config,
+    pkgs,
+    lib,
+    ...
+  }: let
+    modules = with self.nixosModules; [
+      bibataCursors
+      catppuccinGtk
+    ];
+  in {
+    imports = modules;
+  };
+}

modules/system/systemTheme/gtk.nix

@@ -0,0 +1,43 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.catppuccinGtk = {
+    pkgs,
+    lib,
+    ...
+  }: let
+  in {
+    environment.systemPackages = with pkgs; [
+      (catppuccin-gtk.override {
+        variant = "mocha";
+        accents = ["mauve"];
+        tweaks = ["rimless"];
+        size = "compact";
+      })
+      (catppuccin-papirus-folders.override {
+        flavor = "mocha";
+        accent = "mauve";
+      })
+    ];
+    programs = {
+      xfconf.enable = true;
+      dconf = {
+        enable = true;
+        profiles.user.databases = [
+          {
+            lockAll = false;
+            settings = {
+              "org/gnome/desktop/interface" = {
+                gtk-theme = "catppuccin-mocha-mauve-compact+rimless";
+                icon-theme = "Papirus";
+                color-scheme = "prefer-dark";
+              };
+            };
+          }
+        ];
+      };
+    };
+  };
+}