fixed hyprlock import stuff

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)

.gitignore

@@ -1,3 +1,8 @@
 .session
 /nixos.qcow2
 /result
+/HACKSTATION.qcow2
+/result-man
+.gitsecret/keys/random_seed
+!*.secret
+modules/features/gotify-desktop/gotify-key

.gitsecret/paths/mapping.cfg

@@ -0,0 +1 @@
+modules/features/gotify-desktop/gotify-key:f6129ad401b60d5a491d582169088600bb58a537d232b93c22923aede129d5cc

.prettierrc.json

@@ -0,0 +1,8 @@
+{
+  "tabWidth": 2,
+  "printWidth": 90,
+	"useTabs": false,
+  "proseWrap": "always",
+	"endOfLine": "lf",
+  "embeddedLanguageFormatting": "auto"
+}

CONTRIBUTING.md

@@ -0,0 +1,251 @@
+# CONTRIBUTING
+
+## Tldr
+
+**Do's**
+
+- Be concise
+- Follow the [Formatting Rules](#formatting-rules) to the best of your ability
+- Segment larger changes into managable, reviewable commits
+- Leave a trail of your development so I can tell you put some effort in (doesnt really
+  apply to smaller commits)
+- Write your own code
+- Leave some way of crediting your work
+- Disclose the capacity in which you used AI. Most of the time, anything more than making
+  examples or helping you understand the codebase will be disallowed. As little AI code
+  should make it to production as possible
+
+**Dont's**
+
+- Report upstream issues to me (ie an issue with the app itself, not my config)
+- Make major structural changes
+- Submit chore commits such as updating the flake, I can do that myself
+- Add new hosts for no reason, make your own flake and import the modules you want for
+  your host
+- Majorly change existing hosts for your own preference
+- Ask AI to fix your issues and expect me to merge changes
+- Delete existing modules. Executive decisions like that will be made at my disgression,
+  and will be done as non-destructively as possible, such as moving those modules to a
+  "deprecated" branch in the future.
+
+## General format
+
+All emails regarding this repo (or another) should have a subject prepended with the
+following:
+
+```text
+[GIT] [voidarc/nixos] (request type)
+```
+
+The content of the second set of brackets should be replaced with the specific submodule
+or repo that is being referred to. For example, in the case of a quickshell bug, it should
+contain `voidarc/quickshell`.
+
+In general, for most requests, I also implore you to include a github username (or
+equivalent, codeberg, gitlab, etc.) so that I have a frame of reference for you as a
+person, and also so that you can be credited in any resulting commits. Depending on
+scenario, this requirement can be waived, or substituted for a reddit account or
+something.
+
+The third set of brackets pertains to the subject proper, and should only reasonably
+contain `issue`, `patch` or `feature`. If you believe that your request does not fit into
+any of those categories, then feel free to do whatever you want within reason.
+
+## Issues
+
+Issues are restricted to bugs or otherwise not fixed problems in the code. If it is an
+upstream bug, ie one not caused by my specific config, please don't send me a complaint
+about it, refer to the source app. The subject for an issue should be formatted as such:
+
+```Text
+(prefix) (module type) (specific module) - (description of issue)
+```
+
+The prefix shoud be formatted as above. In the case of an issue pertaining to another
+repo, the module type and module name may be omitted, unless it is an issue with the
+dendritic module implementation, in which case the repo in the subject should be this one.
+
+The module type should match the repo's folder structure, being one of `feature`,
+`system`, `attr/attribute` or `host`. Self explanitory. Doesn't have to be an exact match.
+
+The specific module should be the name of the module itself, not just the directory that
+contains it, due to the fact that some directories and files contain multiple modules. In
+the case of a file containing both a package and a module, favour the module that
+implements the package, and not the package itself (`self.nixosModules` rather than
+`self'.packages`).
+
+The description should follow standard conventions, as you would report on other
+platforms. Don't make it stupidly long, common sense required.
+
+The body of the email should be reminiscent of a github issue, and contain the following
+items in roughly the presented order:
+
+- Clear description of the issue (and why it's an issue in the first place, and not
+  personal preference)
+- Step by step instructions on how to replicate the given issue
+- Step by step instructions detailing what you believe the behaviour should be
+- Any attempts to fix the issue, or references to suspected code that may be causing the
+  issue
+
+If you have attempted to fix the issue, or altered the code, please refer to the next
+section
+
+## Patches / Contributions (Pull requests)
+
+Patches are for altered code that you would like me to review and possibly add to the
+codebase. Most of the time, these should be for issues that you have encountered using the
+repo, not new features entirely. If a patch doesn't fit an issue, is mostly or fully AI
+generated, or otherwise doesnt fit the repo, it will be rejected.
+
+The format here is similar, but with a few key differences. The type of request should
+obviously be patch, and the rest should be identical to the previous type, containing
+module type, name, and a short description of the issue.
+
+The body should also follow similar beats, having a breakdown of the issue and detailing
+the intended behaviour. Beyond the detailing portion, there are some other specific things
+that are required for issues in particular.
+
+- A description of whatever alterations have been made to the code
+- Some form of username so that, in the event of a merge, you can be credited properly
+- A disclosure of how much or little AI was used in the creation of the patch. For
+  completeness, even if no AI is used, please include "No AI was used" anyway, it is not
+  implied.
+
+A git patch file should be attatched to the email, not a link to a github repo or
+something else. Any "patch" email with no attatchments will probably not be looked at any
+further than the issue section. For patches, please refer to the
+[Formatting Rules](#formatting-rules)
+
+Both issues and patches are on a first come first serve basis. Because there is no public
+forum (I'm sure as hell not maintaining one), if someone submits an issue or patch, even
+if someone else independantly discovered the bug, the first person will most likely be
+credited for that issue.
+
+If you have previously opened an issue, and wish to make a patch for the same issue, reply
+to the initial issue email, and prefix the subject with `PATCH:` instead of the usual
+`RE:` or whatever your email client chooses to prepend. The rest of the subject should
+remain the same. The email should then contain the patch-specific sections, found above.
+Don't bother re-iterating the issue.
+
+## Feature Requests
+
+Feature requests are for anything that doesn't already exist or doesnt otherwise fall into
+the previous categories. These are more freeform, and could come in the form of a useful
+app, a better way of managing something, or a better replacement for something that is
+already in the repo. Most importantly, this is NOT somewhere to shill an app you
+vibe-coded. Any AI generated apps will be rejected out of principle.
+
+Headers should follow this structure, but, again, this is lenient:
+
+```text
+(prefix) - (Feature type) - (App name): (description)
+```
+
+The feature type, as before, should be one of the given folders in the repo. Generally,
+this will be a `feature` for a new app, but could be `system` for a new driver or
+`attribute` for a new collection of packages. If it is more general than any of those
+categories, or smaller in scope than an entire feature, use the feature type `other`, and
+detail what you are requesting (other should be used if you are just requesting a singular
+package be added to the system, for example).
+
+Instead of following a fixed structure for the body, it is up to you to make a case for
+whatever you are suggesting. Whatever that entails is up to you. It could be use cases, it
+could be reasons it is better than whatever I am using. Be as verbose or as minimal as you
+wish, but keep in mind that the better your argument is, the more likely I am to accept
+your contribution. Again, if you wish, you can leave a username so that you can be
+correctly credited if I decide to include whatever you suggested.
+
+If you are suggesting a new feature, app or otherwise, you may also choose to make a basic
+or full module implementing that feature, and then attach that to the email in the form of
+a patch. Refer to the [Formatting Rules](#formatting-rules) for further instruction on how
+to write your code.
+
+Please also leave references for whatever it is you're suggesting, not just the name of
+the app. This could come in the form of documentation, a homepage, or the link for its
+github. In general, if an app has none of these things, or is closed source in any
+capacity, it will not be accepted.
+
+## Formatting rules
+
+Formatting in this repo should attempt to be standard to whatever I am using. For ease of
+use, either refer to or use my nvim config (`#nvim` output for this repo, refer to the
+README for how to run it). This prevents ugly git histories with commits specifically for
+formatting etc.
+
+### General rules
+
+When submitting a patch, there should be no merge conflicts with the current HEAD at the
+time of creation. It is a good rule of thumb to pull from remote before making a patch,
+incase behaviour changes.
+
+If there are commits pushed between the time you send a patch and the time it is reviewed,
+any resulting merge conflicts are not your fault, and therefore will not be treated as
+such. Don't resubmit the same patch because there are new commits on remote, when patches
+are reviewed they are inserted at the point at which they were created, not on top of
+newer commits.
+
+#### Branches
+
+All patches should be mergable to the main branch, ie not have a patch for the `feature-x`
+branch or some nonsense. I do not have your git history, and therefore don't have whatever
+branch you created on my machine. In general, most changes should be restricted to one
+commit, so that crediting is easy.
+
+If a change is more than one or two commits, make a new branch, make the changes that you
+want, then merge to the latest head before submitting a patch. When merging back to main,
+please use a merge commit instead of fast forwarding or clobbering the branch. This makes
+it easy to see who made what changes in the git history, and keeps blame easy to read.
+This merge commit will be where your credit goes. If you submit a patch that contains a
+load of commits on the main branch, the chances I accept the patch are very low.
+
+### Code
+
+There are many types of code in this repo, so if there is any confusion, either refer to
+the config that I am using in nvim, or send me an email asking me how to handle it.
+
+#### Nix
+
+For starters, all nix code should be formatted with
+[Alejandra](https://github.com/kamadorueda/alejandra). If you choose to format your code
+with nix-fmt or something else, chances are I won't refuse it, but I will overwrite your
+commits with a formatted version. To format the entire repo properly, run the following
+command:
+
+```bash
+nix-shell -p alejandra --run "alejandra ."
+```
+
+This will recursively check and format all `.nix` files in the repo, which is what I want.
+
+As a secondary requirement, try to follow the already set out conventions that are on
+display in this repo, as well as the conventions of dendritic nix. A few examples:
+
+- All top level objects should be merged into one unless there is a good reason for it
+- The first item in a module should be the module definition (`flake.nixosModules.xyz`)
+- All modules should be portable unless there is a good reason for it
+- Modules should reference eachother through `self.nixosModules` instead of relative
+  paths, which should be avoided in most scenarios
+- In general, if a package is available in nixpkgs, an input need not be added. This rule
+  differs case-by-case due to versioning differences.
+
+#### Markdown
+
+All markdown files should be formatted using prettier, with the settings provided in this
+repo. For reference, the rules are:
+
+- 90 characters maximum, excluding code blocks
+- word wrapping
+- tab width of 2, as well as replacing spaces with tabs
+
+#### Other languages
+
+For one-off config languages (think `kitty.conf`), no formatting is needed. Whitespace can
+be added at the programmer's disgression.
+
+For standard structured languages, such as json, yaml or toml, if there is an available
+prettier formatter, then it should be used. In general, tabwidth should be 2 and spaces
+should be used across the board. Don't use some esoteric formatter just to be special.
+
+For actual programming languages, like qml or lua, either use the provided formatter, such
+as `qmlformat`, with the settings configured, or refer to my nvim config (in this case I
+use `stylua` with the default settings)

README.md

@@ -0,0 +1,138 @@
+# 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.
+
+### Mandatory thing on AI
+
+I am not completely against AI. However, asking an agent to write a load of code and then
+posting it to reddit as if you made it yourself is disingenuous and (in my opinion) at
+least slightly morally incorrect. Many a time I have seen a cool project on a subreddit
+just for it to turn out to be ai generated garbage that I refuse to use out of principle.
+
+I would go out on a limb and say that 99% of this codebase was written with no AI
+assistance. Every config, every module, every obscure fix for a bug that only exists
+because I'm using a dendritic pattern instead of being normal was programmed by hand by a
+real human (yours truly). I'm not saying I had no assistance at all, there are sections
+that are verbatim copied from the wiki of whatever app or language that I was using, but
+by and large, no AI code has made it into this repo.
+
+There may be commits somewhere saying that opencode refactored something, or that it
+solved some obscure bug I was having, but after having those changes implemented for me, I
+took it upon myself to understand what actually happened, in order to make maintaining
+this config as easy as possible in the future.
+
+This repo is not temporary. I daily drive this, and I intend to for many years to come.
+Going forward, I will keep to the same standard of only using AI as a last resort, and
+when needs must, only implementing and commiting changes that I fully understand and
+could've eventually come to myself. Sometimes, at the end of a long coding session, a man
+gets lazy. I could spend another 45 minutes fixing some quickshell update order bug, or I
+could get deepseek to do it. In the end, it was a 5 line fix that, in hindsight, was
+pretty obvious (lol).
+
+## 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 contains all features available (near enough), with mobile02 being a lighter
+version of the system, looking the same visually, but with less bloat, only really having
+firefox and a terminal.
+
+It is recommended to clone the repo beforehand, but the system can be built directly from
+remote. When cloning the repo, in order to properly evaluate the `vinix` and `nrs` shell
+aliases, the config should be built from the directory you cloned it to, not from another
+directory. When building from remote, or in any other scenario in which the `$PWD`
+environment variable is not available, the zsh module will throw and evaluation warning,
+but the build will not be hindered.
+
+```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`. No, that isn't my usual password.
+
+### 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`. Most if not all modules in a subdirectory will have a module
+name corresponding to that directory. This only applies for `default.nix` files, so files
+that have different names are not expected to follow this convention, even if there is not
+ea `default.nix` in that directory.
+
+## Issues and contributing
+
+Because this is a private git server, there is no inline way to submit issues,
+contributions, or feature ideas. If you should wish, you may send such requests to
+<admin@voidarc.co.uk>, with the format found in CONTRIBUTING.md. Failure to follow the
+format found there will most likely result in your email being ignored.

flake.nix

@@ -7,11 +7,36 @@
 
     # Apps
     nvim.url = "git+https://git.voidarc.co.uk/voidarc/nvim";
-    hyprland.url = "git+https://git.voidarc.co.uk/voidarc/hypr";
+    hyprland = {
+      url = "git+https://git.voidarc.co.uk/voidarc/hypr";
+    };
     otter-launcher = {
       url = "github:kuokuo123/otter-launcher";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    gotify-desktop = {
+      url = "github:voidarclabs/gotify-desktop";
+      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/music/default.nix

@@ -0,0 +1,11 @@
+{moduleWithSystem, ...}: {
+  flake.nixosModules.music = moduleWithSystem ({pkgs, unfreePkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      ardour
+      unfreePkgs.vital
+			distrho-ports
+      cardinal
+      calf
+    ];
+  });
+}

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

@@ -0,0 +1,36 @@
+{
+inputs,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.gotify-desktop = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      gotify-desktop
+    ];
+  });
+  perSystem = {
+    pkgs,
+    inputs',
+    ...
+  }: {
+    packages = {
+      gotify-desktop = let
+        # Requires gpg keyring cert in order to get api key
+        config-file = pkgs.writeText "config.toml" ''
+          	[gotify]
+          	url = "wss://ntfy.voidarc.co.uk:443"
+          		token = { command = "${pkgs.gnupg}/bin/gpg --quiet --batch --decrypt ${./gotify-key.secret}" }
+          [notification]
+          	min_priority = 1
+        '';
+      in
+        inputs.wrappers.lib.wrapPackage ({...}: {
+          inherit pkgs;
+          package = inputs'.gotify-desktop.packages.default;
+          flags = {
+            "-c" = config-file;
+          };
+        });
+    };
+  };
+}

modules/features/hypr/default.nix

@@ -1,53 +0,0 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.hypr = {
-    pkgs,
-    lib,
-    ...
-  }: {
-    programs.hypr = {
-      enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    };
-  };
-  perSystem = {
-    pkgs,
-    lib,
-    self',
-    ...
-  }: {
-    packages = {
-      hyprland = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default;
-      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; [
+      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;
+            hyprlock = self'.packages.hyprlock;
+            quickshell = self'.packages.quickshell;
+            wshowkeys = self'.packages.wshowkeys;
+            waybar = self'.packages.waybar;
+            wlogout = self'.packages.wlogout;
+            way-edges = self'.packages.way-edges;
+          };
+      };
+    };
+  };
+}

modules/features/hyprlock/default.nix

@@ -0,0 +1,129 @@
+{
+  inputs,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.hyprlock = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      hyprock
+    ];
+  });
+  perSystem = {pkgs, ...}: {
+    packages.hyprlock = inputs.wrappers.wrappers.hyprlock.wrap {
+      inherit pkgs;
+      "hyprlock.conf".content = ''
+        source = ${./mocha.conf}
+
+        $accent = $mauve
+        $accentAlpha = $mauveAlpha
+        $font = FiraMono Nerd Font
+
+        # GENERAL
+        general {
+          hide_cursor = true
+        }
+
+        # BACKGROUND
+        background {
+          monitor =
+          path = screenshot
+          blur_passes = 3
+          color = rgba(0, 0, 0, 0)
+        }
+
+
+        # LAYOUT
+        label {
+          monitor =
+          text = Layout: $LAYOUT
+          color = $text
+          font_size = 25
+          font_family = $font
+          position = 30, -30
+          halign = left
+          valign = top
+        }
+
+        # TIME
+        label {
+          monitor =
+          text = $TIME
+          color = $text
+          font_size = 90
+          font_family = $font
+          position = -30, 0
+          halign = right
+          valign = top
+        }
+
+        # DATE
+        label {
+          monitor =
+          text = cmd[update:43200000] date +"%A, %d %B %Y"
+          color = $text
+          font_size = 25
+          font_family = $font
+          position = -30, -150
+          halign = right
+          valign = top
+        }
+
+        # FINGERPRINT
+        {
+          monitor = "";
+          text = "$FPRINTPROMPT";
+          color = "$text";
+          font_size = 14;
+          font_family = $font;
+          position = "0, -107";
+          halign = "center";
+          valign = "center";
+        }
+
+        image {
+          path = ${./cat.png}
+          size = 240
+          border_color = transparent
+          rounding = 0
+          position = 0, 7px
+        }
+
+        # USER AVATAR
+        image {
+          monitor =
+          path = $HOME/.face
+          size = 100
+          border_color = $accent
+          position = 0, 75
+          halign = center
+          valign = center
+        }
+
+        # INPUT FIELD
+        input-field {
+          monitor =
+          size = 300, 60
+          outline_thickness = 4
+          dots_size = 0.2
+          dots_spacing = 0.2
+          dots_center = true
+          outer_color = $accent
+          inner_color = $surface0
+          font_color = $text
+          fade_on_empty = false
+          placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
+          hide_input = false
+          check_color = $accent
+          fail_color = $red
+          fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
+          capslock_color = $yellow
+          position = 0, -47
+          halign = center
+          valign = center
+        }
+
+
+      '';
+    };
+  };
+}

modules/features/hyprlock/mocha.conf

@@ -0,0 +1,79 @@
+
+$rosewater = rgb(f5e0dc)
+$rosewaterAlpha = f5e0dc
+
+$flamingo = rgb(f2cdcd)
+$flamingoAlpha = f2cdcd
+
+$pink = rgb(f5c2e7)
+$pinkAlpha = f5c2e7
+
+$mauve = rgb(cba6f7)
+$mauveAlpha = cba6f7
+
+$red = rgb(f38ba8)
+$redAlpha = f38ba8
+
+$maroon = rgb(eba0ac)
+$maroonAlpha = eba0ac
+
+$peach = rgb(fab387)
+$peachAlpha = fab387
+
+$yellow = rgb(f9e2af)
+$yellowAlpha = f9e2af
+
+$green = rgb(a6e3a1)
+$greenAlpha = a6e3a1
+
+$teal = rgb(94e2d5)
+$tealAlpha = 94e2d5
+
+$sky = rgb(89dceb)
+$skyAlpha = 89dceb
+
+$sapphire = rgb(74c7ec)
+$sapphireAlpha = 74c7ec
+
+$blue = rgb(89b4fa)
+$blueAlpha = 89b4fa
+
+$lavender = rgb(b4befe)
+$lavenderAlpha = b4befe
+
+$text = rgb(cdd6f4)
+$textAlpha = cdd6f4
+
+$subtext1 = rgb(bac2de)
+$subtext1Alpha = bac2de
+
+$subtext0 = rgb(a6adc8)
+$subtext0Alpha = a6adc8
+
+$overlay2 = rgb(9399b2)
+$overlay2Alpha = 9399b2
+
+$overlay1 = rgb(7f849c)
+$overlay1Alpha = 7f849c
+
+$overlay0 = rgb(6c7086)
+$overlay0Alpha = 6c7086
+
+$surface2 = rgb(585b70)
+$surface2Alpha = 585b70
+
+$surface1 = rgb(45475a)
+$surface1Alpha = 45475a
+
+$surface0 = rgb(313244)
+$surface0Alpha = 313244
+
+$base = rgb(1e1e2e)
+$baseAlpha = 1e1e2eee
+
+$mantle = rgb(181825)
+$mantleAlpha = 181825
+
+$crust = rgb(11111b)
+$crustAlpha = 11111b
+

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,28 +1,20 @@
 {
-  self,
   inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.kitty = {
-    pkgs,
-    lib,
-    ...
-  }: {
-    programs.kitty = {
-      enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.kitty;
-    };
-  };
-  perSystem = {
-    pkgs,
-    lib,
-    self',
-    ...
-  }: {
+  flake.nixosModules.kitty = moduleWithSystem (
+    {self'}: {
+      environment.systemPackages = with self'.packages; [
+        kitty
+      ];
+    }
+  );
+  perSystem = {pkgs, ...}: {
     packages.kitty = let
-      myFont = pkgs.nerd-fonts.fira-mono; # or any font-providing package
+      fira-mono = pkgs.nerd-fonts.fira-mono;
       fontsConf = pkgs.makeFontsConf {
-        fontDirectories = [myFont];
+        fontDirectories = [fira-mono];
       };
     in
       inputs.wrappers.wrappers.kitty.wrap {
@@ -31,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/mumble/default.nix

@@ -0,0 +1,75 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.mumble = {
+    pkgs,
+    lib,
+    ...
+  }: let
+    modules = with self.nixosModules; [
+      audio
+    ];
+  in {
+    imports = modules;
+    services.murmur = {
+      enable = true;
+      bandwidth = 540000;
+      bonjour = true;
+      password = "password";
+      autobanTime = 0;
+    };
+
+    environment.systemPackages = with pkgs; [
+      mumble
+    ];
+
+    services.pipewire.extraConfig.pipewire = {
+      "97-null-sink" = {
+        "context.objects" = [
+          {
+            factory = "adapter";
+            args = {
+              "factory.name" = "support.null-audio-sink";
+              "node.name" = "Null-Sink";
+              "node.description" = "Null Sink";
+              "media.class" = "Audio/Sink";
+              "audio.position" = "FL,FR";
+            };
+          }
+          {
+            factory = "adapter";
+            args = {
+              "factory.name" = "support.null-audio-sink";
+              "node.name" = "Null-Source";
+              "node.description" = "Null Source";
+              "media.class" = "Audio/Source";
+              "audio.position" = "FL,FR";
+            };
+          }
+        ];
+      };
+      "98-virtual-mic" = {
+        "context.modules" = [
+          {
+            name = "libpipewire-module-loopback";
+            args = {
+              "audio.position" = "FL,FR";
+              "node.description" = "Mumble as Microphone";
+              "capture.props" = {
+                # Mumble's output node name.
+                "node.target" = "Mumble";
+                "node.passive" = true;
+              };
+              "playback.props" = {
+                "node.name" = "Virtual-Mumble-Microphone";
+                "media.class" = "Audio/Source";
+              };
+            };
+          }
+        ];
+      };
+    };
+  };
+}

modules/features/nvim/default.nix

@@ -1,24 +1,11 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.nvim = {
-    pkgs,
-    lib,
-    ...
-  }: {
-    programs.nvim = {
+{moduleWithSystem, ...}: {
+  flake.nixosModules.nvim = moduleWithSystem ({self', ...}: {
+    programs.neovim = {
       enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.nvim;
+      package = self'.packages.nvim;
     };
-  };
-  perSystem = {
-    pkgs,
-    lib,
-    self',
-    ...
-  }: {
-    packages.nvim = inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  });
+  perSystem = {inputs', ...}: {
+    packages.nvim = inputs'.nvim.packages.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,46 +1,40 @@
 {
-  self,
   inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.hypr = {
-    pkgs,
-    lib,
-    ...
-  }: {
-    programs.hypr = {
-      enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    };
-  };
+  flake.nixosModules.otter-launcher = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = [
+      self'.packages.otter-launcher
+    ];
+  });
   perSystem = {
     pkgs,
     lib,
     self',
+    inputs',
     ...
   }: {
     packages = {
       otter-launcher = let
         extra-config = ''
-               [overlay]
-               overlay_cmd = """
-               ${lib.getExe pkgs.chafa} -s 20x20 ${./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" ''
-          ${builtins.readFile ./config.toml}
           ${extra-config}
+
+          ${builtins.readFile ./config.toml}
         '';
       in
-        inputs.wrappers.lib.wrapPackage ({
-          config,
-          wlib,
-          lib,
-          ...
-        }: {
+        inputs.wrappers.lib.wrapPackage ({...}: {
           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

@@ -0,0 +1,16 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.sddm-autologin = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    services.displayManager = {
+      autoLogin.enable = true;
+      autoLogin.user = "user01";
+    };
+  };
+}

modules/features/sddm/default.nix

@@ -0,0 +1,25 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.sddm = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    environment.systemPackages = [
+      (pkgs.catppuccin-sddm.override {
+        flavor = "mocha";
+        font = "Fira Mono Nerd Font";
+        fontSize = "11";
+        background = null;
+      })
+    ];
+    services.displayManager.sddm = {
+      enable = true;
+      theme = "catppuccin-mocha-mauve";
+      package = pkgs.kdePackages.sddm;
+    };
+  };
+}

modules/features/steam/default.nix

@@ -0,0 +1,30 @@
+{moduleWithSystem, ...}: {
+  flake.nixosModules.steam = moduleWithSystem ({
+		pkgs,
+    unfreePkgs,
+    inputs',
+    lib,
+    ...
+  }: {
+    # If buying isn't owning than piracy isn't stealing
+    environment.systemPackages = [
+      inputs'.sls-steam.packages.default
+    ];
+    programs.steam = {
+      enable = true;
+      protontricks.enable = true;
+      extraCompatPackages = with pkgs; [
+        proton-ge-bin
+      ];
+      package = unfreePkgs.steam.override {
+        extraEnv = {
+          LD_AUDIT = "${
+            inputs'.sls-steam.packages.sls-steam
+          }/library-inject.so:${
+            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,18 +1,28 @@
 {
-  self,
   inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.zsh = {
+  flake.nixosModules.zsh = moduleWithSystem ({
     pkgs,
-    lib,
+    self',
     ...
   }: {
+    nixpkgs.overlays = [
+      (final: prev: {
+        zsh = self'.packages.zsh;
+      })
+    ];
     programs.zsh = {
       enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.myZsh;
+      enableCompletion = true;
+      enableBashCompletion = true;
+      autosuggestions.enable = true;
+      syntaxHighlighting.enable = true;
+      histSize = 10000;
     };
-  };
+    users.defaultUserShell = pkgs.zsh;
+  });
   perSystem = {
     pkgs,
     lib,
@@ -20,30 +30,80 @@
     ...
   }: {
     packages = {
-      myZsh = inputs.wrappers.wrappers.zsh.wrap {
-        inherit pkgs;
-        zshAliases = {
-          ls = lib.getExe pkgs.lsd;
-          cat = lib.getExe pkgs.bat;
-          lg = lib.getExe pkgs.lazygit;
-          man = "man -P \"${lib.getExe pkgs.bat} -p\"";
-          nsh = "nix-shell -p";
+      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}
+
+                  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 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
+          '';
         };
-        zshrc.content = ''
-          export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
-          zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
-          source <(${pkgs.carapace}/bin/carapace _carapace)
-          setopt NO_CASE_GLOB
-          zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
-
-          export EDITOR=nvim
-
-          eval "$(${pkgs.devenv}/bin/devenv hook zsh)"
-          eval "$(${self.packages.${pkgs.host.stdenv.hostPlatform.system}.ohMyPosh}/bin/oh-my-posh init zsh)"
-
-          ${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin
-        '';
-      };
       ohMyPosh = inputs.wrappers.wrappers.oh-my-posh.wrap {
         inherit pkgs;
         configFile = ./config.toml;

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

@@ -5,8 +5,18 @@
 }: {
   flake.nixosConfigurations.HACKSTATION = inputs.nixpkgs.lib.nixosSystem {
     modules = with self.nixosModules; [
-      core
+      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,16 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosConfigurations.mobile02 = inputs.nixpkgs.lib.nixosSystem {
+    modules = with self.nixosModules; [
+      desktop
+      mobile02Configuration
+      intelDrivers
+			development
+			upower
+			music
+    ];
+  };
+}

modules/hosts/mobile02/mobile02Configuration.nix

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

modules/system/audio/default.nix

@@ -0,0 +1,32 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.audio = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    environment.systemPackages = with pkgs; [
+      playerctl
+      pavucontrol
+			pulseaudioFull
+			pipewire
+			pipewire.jack
+    ];
+    services.pulseaudio.enable = false;
+    security.rtkit.enable = true;
+
+    nixpkgs.config.pulseaudio = true;
+
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+			wireplumber.enable = true;
+    };
+  };
+}

modules/system/core.nix

@@ -1,23 +0,0 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.core = {
-    pkgs,
-    lib,
-    ...
-  }: let
-    modules = with self.nixosModules; [
-      userConfiguration
-    ];
-  in {
-    imports =
-      [
-        /etc/nixos/hardware-configuration.nix
-      ]
-      ++ modules;
-
-    programs.zsh.enable = true;
-  };
-}

modules/system/core/boot.nix

@@ -0,0 +1,36 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.bootloader = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    boot = {
+      loader = {
+        timeout = 2;
+        efi = {
+          canTouchEfiVariables = true;
+        };
+        grub = {
+          efiSupport = true;
+          device = "nodev";
+          theme = pkgs.catppuccin-grub;
+        };
+      };
+      plymouth = {
+        enable = true;
+        theme = "catppuccin-mocha";
+        themePackages = with pkgs; [
+          # By default we would install all themes
+          (catppuccin-plymouth.override {
+            variant = "mocha";
+          })
+        ];
+      };
+      kernelPackages = pkgs.linuxPackages_latest;
+    };
+  };
+}

modules/system/core/default.nix

@@ -0,0 +1,42 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.core = {
+    pkgs,
+    lib,
+    ...
+  }: let
+    modules = with self.nixosModules; [
+      user
+      bootloader
+      nix
+      hardware
+      locale
+    ];
+  in {
+    imports =
+      [
+        /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/hardware.nix

@@ -0,0 +1,16 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.hardware = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    hardware = {
+      bluetooth.enable = true;
+      xpadneo.enable = true;
+    };
+  };
+}

modules/system/core/locale.nix

@@ -0,0 +1,32 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.locale = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    time.timeZone = "Europe/London";
+    i18n = {
+      defaultLocale = "en_GB.UTF-8";
+      extraLocaleSettings = {
+        LC_ADDRESS = "en_GB.UTF-8";
+        LC_IDENTIFICATION = "en_GB.UTF-8";
+        LC_MEASUREMENT = "en_GB.UTF-8";
+        LC_MONETARY = "en_GB.UTF-8";
+        LC_NAME = "en_GB.UTF-8";
+        LC_NUMERIC = "en_GB.UTF-8";
+        LC_PAPER = "en_GB.UTF-8";
+        LC_TELEPHONE = "en_GB.UTF-8";
+        LC_TIME = "en_GB.UTF-8";
+      };
+    };
+    services.xserver.xkb = {
+      layout = "gb";
+      variant = "";
+    };
+    console.keyMap = "uk";
+  };
+}

modules/system/core/nix-settings.nix

@@ -0,0 +1,52 @@
+{inputs, ...}: {
+  perSystem = {system, ...}: {
+    _module.args.unfreePkgs = import inputs.nixpkgs {
+      inherit system;
+      config.allowUnfree = true;
+    };
+  };
+  flake.nixosModules.nix = {...}: {
+    nix = {
+      registry = {
+        voidarc = {
+          from = {
+            id = "voidarc";
+            type = "indirect";
+          };
+          to = {
+            type = "git";
+            url = "https://git.voidarc.co.uk/voidarc/flakes.git";
+          };
+        };
+      };
+      settings = {
+        cores = 6;
+        trusted-users = ["root" "user01"];
+        download-buffer-size = 524288000;
+        experimental-features = [
+          "nix-command"
+          "flakes"
+        ];
+      };
+      nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+      optimise.automatic = true;
+      gc = {
+        automatic = true;
+        dates = "daily";
+        options = "--delete-older-than 5d";
+      };
+    };
+    nixpkgs = {
+      config = {
+        allowUnfree = true;
+        packageOverrides = pkgs: {
+          unstable = import inputs.nixpkgs-unstable {
+            config = {
+              allowUnfree = true;
+            };
+          };
+        };
+      };
+    };
+  };
+}

modules/system/core/user.nix

@@ -3,14 +3,19 @@
   inputs,
   ...
 }: {
-  flake.nixosModules.userConfiguration = {
+  flake.nixosModules.user = {
     pkgs,
     lib,
     ...
-  }: {
+  }: let
+    modules = with self.nixosModules; [
+      zsh
+    ];
+  in {
+    imports = modules;
     users.users.user01 = {
       isNormalUser = true;
-      initialPassword = "password";
+      initialPassword = "qwer";
       shell = pkgs.zsh;
       description = "user01";
       extraGroups = [

modules/system/desktop/default.nix

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

modules/system/drivers/amd.nix

@@ -0,0 +1,34 @@
+{...}: {
+  flake.nixosModules.amdDrivers = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      mesa
+      rocmPackages.rocm-smi
+      rocmPackages.rocminfo
+      vulkan-tools
+    ];
+    hardware = {
+      graphics = {
+        enable = true;
+        enable32Bit = true;
+        extraPackages = with pkgs; [
+          libva-vdpau-driver
+          libvdpau-va-gl
+          rocmPackages.clr.icd
+        ];
+      };
+      amdgpu = {
+        initrd.enable = true;
+        opencl.enable = true;
+      };
+    };
+
+    boot.kernelParams = [
+      "amdgpu.ppfeaturemask=0xffffffff"
+    ];
+
+    # For rOCM
+    systemd.tmpfiles.rules = [
+      "L+ /opt/rocm - - - - ${pkgs.rocmPackages.clr}"
+    ];
+  };
+}

modules/system/drivers/intel.nix

@@ -0,0 +1,32 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.intelDrivers = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    environment.systemPackages = with pkgs; [
+      mesa
+      vulkan-tools
+    ];
+
+    environment.sessionVariables = {
+      LIBVA_DRIVER_NAME = "iHD";
+    };
+
+    boot.initrd.kernelModules = ["i915"];
+    services.xserver.videoDrivers = ["modesetting"];
+
+    hardware.graphics = {
+      enable = true;
+      extraPackages = with pkgs; [
+        intel-media-driver
+        vpl-gpu-rt
+        intel-compute-runtime
+      ];
+    };
+  };
+}

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

@@ -0,0 +1,28 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.network = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    networking = {
+      networkmanager = {
+        enable = true;
+        dns = "none";
+      };
+      nameservers = [
+        "1.1.1.1"
+        "8.8.8.8"
+      ];
+      firewall.enable = false;
+    };
+    services.unbound = {
+      enable = true;
+    };
+
+    systemd.services.NetworkManager-wait-online.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;
+  };
+}