diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes
deleted file mode 100644
index 665b10e..0000000
--- a/.git-crypt/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-# Do not edit this file.  To specify the files to encrypt, create your own
-# .gitattributes file in the directory where your files are.
-* !filter !diff
-*.gpg binary
diff --git a/.git-crypt/keys/default/0/059F098EBF0E9A13E10A46BF6500251E087653C9.gpg b/.git-crypt/keys/default/0/059F098EBF0E9A13E10A46BF6500251E087653C9.gpg
deleted file mode 100644
index 8164576..0000000
Binary files a/.git-crypt/keys/default/0/059F098EBF0E9A13E10A46BF6500251E087653C9.gpg and /dev/null differ
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 7e0e7cf..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-secrets.gcrypt/** filter=git-crypt diff=git-crypt
diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml
index 6ab9707..67158bd 100644
--- a/.github/workflows/autoupdate.yml
+++ b/.github/workflows/autoupdate.yml
@@ -12,8 +12,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PAT_TOKEN }}
 
       - name: Check for updates
         id: check
@@ -46,5 +44,5 @@ jobs:
         if: steps.check.outputs.skip == 0
         uses: ad-m/github-push-action@master
         with:
-          github_token: ${{ secrets.PAT_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: ${{ steps.check.outputs.branch_name }}
diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 06bed3e..bdc63ba 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -5,23 +5,29 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    name: Build linux-lava for x86_64-linux
+  check:
+    name: Check flake
     runs-on: ubuntu-latest
     steps:
-      # credits to https://github.com/easimon/maximize-build-space/issues/45
-      - name: Remove unneeded packages to maximise build space
-        shell: bash
-        run: |
-            df -h
-            sudo rm -rf /usr/share/dotnet
-            sudo rm -rf /usr/local/lib/android
-            df -h
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: cachix/install-nix-action@v31
-      - uses: cachix/cachix-action@v16
+      - uses: cachix/cachix-action@v14
+        with:
+          name: lava
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - run: nix flake check --keep-going --verbose
+
+  build:
+    name: Build linux-lava for x86_64-linux
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: cachix/install-nix-action@v31
+      - uses: cachix/cachix-action@v14
         with:
           name: lava
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
diff --git a/containers/amethyst/configuration.nix b/containers/amethyst/configuration.nix
deleted file mode 100644
index b9d496d..0000000
--- a/containers/amethyst/configuration.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, pkgs, ... }: {
-  system.stateVersion = "23.11";
-  systemd.tmpfiles.rules = [
-    "d /persist/transmission 755 transmission transmission"
-    "d /persist/transmission/.config/transmission-daemon 750 transmission transmission"
-    "d /persist/transmission/.incomplete 750 transmission transmission"
-    "d /persist/transmission/Downloads 755 transmission transmission"
-    "d /persist/transmission/watchdir 755 transmission transmission"
-  ];
-  networking.wg-quick.interfaces.wg0 = {
-    configFile = "/persist/vpn.conf";
-    preUp = ''
-          # Try to access the DNS for up to 300s
-          for i in {1..60}; do
-            ${pkgs.iputils}/bin/ping -c1 'google.com' && break
-            echo "Attempt $i: DNS still not available"
-            sleep 5s
-          done
-    '';
-  };
-
-  # https://github.com/NixOS/nixpkgs/issues/258793
-  systemd.services.transmission.serviceConfig = {
-    BindReadOnlyPaths = lib.mkForce [ builtins.storeDir "/etc" ];
-    RootDirectoryStartOnly = lib.mkForce false;
-    RootDirectory = lib.mkForce "";
-    PrivateMounts = lib.mkForce false;
-    PrivateUsers = lib.mkForce false;
-  };
-
-  networking.firewall.allowedTCPPorts = [ 9091 ];
-  services.transmission = {
-    enable = true;
-    package = pkgs.transmission_4;
-    downloadDirPermissions = "775";
-    openFirewall = true;
-    home = "/persist/transmission";
-    settings = {
-      ratio-limit-enabled = true;
-      rpc-bind-address = "0.0.0.0";
-      rpc-enabled = true;
-      rpc-port = 9091;
-      rpc-host-whitelist-enabled = false;
-      rpc-whitelist-enabled = false;
-    };
-  };
-}
diff --git a/containers/amethyst/flake.lock b/containers/amethyst/flake.lock
deleted file mode 100644
index 88ab73f..0000000
--- a/containers/amethyst/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/containers/amethyst/flake.nix b/containers/amethyst/flake.nix
deleted file mode 100644
index 739c3e5..0000000
--- a/containers/amethyst/flake.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-  outputs = { nixpkgs, ... }: {
-    nixosConfigurations.container = nixpkgs.lib.nixosSystem {
-      modules = [ ./configuration.nix ];
-    };
-    nixosModule = { ... }:
-    let
-      name = "amethyst";
-      fqdn = "amethyst.lava.moe";
-      subnet = "1";
-    in {
-      networking.nat = {
-        enable = true;
-        enableIPv6 = true;
-        internalInterfaces = [ "ve-${name}" ];
-      };
-
-      services.nginx.virtualHosts."${fqdn}" = {
-        useACMEHost = "lava.moe";
-        forceSSL = true;
-        #locations."/".proxyPass = "http://[fd0d:1::${subnet}:2]:9091";
-        locations."/".proxyPass = "http://10.30.${subnet}.2:9091";
-        listenAddresses = [ "10.0.0.1" "[fd0d::1]" ];
-      };
-
-      systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
-      containers.${name} = {
-        autoStart = true;
-        privateNetwork = true;
-        hostAddress = "10.30.${subnet}.1";
-        localAddress = "10.30.${subnet}.2";
-        hostAddress6 = "fd0d:1::${subnet}:1";
-        localAddress6 = "fd0d:1::${subnet}:2";
-        # privateUsers = "pick";
-        nixpkgs = nixpkgs;
-        ephemeral = true;
-        config = { imports = [ ./configuration.nix ]; };
-
-        bindMounts."persist" = {
-          hostPath = "/persist/containers/${name}";
-          mountPoint = "/persist";
-          isReadOnly = false;
-        };
-        # flake = "path:" + ./.;
-      };
-    };
-  };
-}
diff --git a/containers/beryllium/configuration.nix b/containers/beryllium/configuration.nix
deleted file mode 100644
index 6629a31..0000000
--- a/containers/beryllium/configuration.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }: {
-  system.stateVersion = "25.11";
-  fileSystems."/var/lib/private" = {
-    device = "/persist";
-    fsType = "none";
-    options = [ "bind" ];
-  };
-  networking.firewall.allowedTCPPorts = [ 6167 ];
-  networking.firewall.allowedUDPPorts = [ 6167 ];
-  # TODO: this should be generically set
-  networking.useHostResolvConf = false;
-  networking.nameservers = [ "8.8.8.8" ];
-
-  services.matrix-continuwuity = {
-    enable = true;
-    settings.global = {
-      # TODO: link this with outer container's address
-      address = [ "10.30.2.2" ];
-      server_name = "lava.moe";
-      rocksdb_recovery_mode = 2;
-    };
-  };
-}
diff --git a/containers/beryllium/flake.lock b/containers/beryllium/flake.lock
deleted file mode 100644
index 88ab73f..0000000
--- a/containers/beryllium/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/containers/beryllium/flake.nix b/containers/beryllium/flake.nix
deleted file mode 100644
index 5805401..0000000
--- a/containers/beryllium/flake.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-  outputs = { nixpkgs, ... }: {
-    nixosConfigurations.container = nixpkgs.lib.nixosSystem {
-      modules = [ ./configuration.nix ];
-    };
-    nixosModule = { ... }:
-    let
-      name = "beryllium";
-      fqdn = "beryllium.lava.moe";
-      subnet = "2";
-    in {
-      networking.nat = {
-        enable = true;
-        enableIPv6 = true;
-        internalInterfaces = [ "ve-${name}" ];
-      };
-
-      services.nginx.virtualHosts."${fqdn}" = {
-        useACMEHost = "lava.moe";
-        forceSSL = true;
-        locations."/".extraConfig = "return 302 'https://lava.moe';";
-        locations."/_matrix".proxyPass = "http://10.30.${subnet}.2:6167";
-        locations."/_conduwuit".proxyPass = "http://10.30.${subnet}.2:6167";
-        locations."/_continuwuity".proxyPass = "http://10.30.${subnet}.2:6167";
-      };
-
-      services.nginx.virtualHosts."lava.moe" = {
-        locations."= /.well-known/matrix/server".extraConfig =
-          let
-            server = { "m.server" = "${fqdn}:443"; };
-          in ''
-            add_header Content-Type application/json;
-            return 200 '${builtins.toJSON server}';
-          '';
-        locations."= /.well-known/matrix/client".extraConfig =
-          let
-            client = {
-              "m.homeserver" = { "base_url" = "https://${fqdn}"; };
-              # "m.identity_server" = { "base_url" = "https://vector.im"; };
-            };
-          in ''
-            add_header Content-Type application/json;
-            add_header Access-Control-Allow-Origin *;
-            return 200 '${builtins.toJSON client}';
-          '';
-      };
-
-      systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
-      containers.${name} = {
-        autoStart = true;
-        privateNetwork = true;
-        hostAddress = "10.30.${subnet}.1";
-        localAddress = "10.30.${subnet}.2";
-        nixpkgs = nixpkgs;
-        ephemeral = true;
-        config = { imports = [ ./configuration.nix ]; };
-
-        bindMounts."persist" = {
-          hostPath = "/persist/containers/${name}";
-          mountPoint = "/persist";
-          isReadOnly = false;
-        };
-      };
-    };
-  };
-}
diff --git a/containers/citrine/configuration.nix b/containers/citrine/configuration.nix
deleted file mode 100644
index 0f4242a..0000000
--- a/containers/citrine/configuration.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ config, fqdn, lib, ... }: {
-  system.stateVersion = "25.11";
-  networking.firewall.allowedTCPPorts = [ 22 3000 ];
-  networking.firewall.allowedUDPPorts = [ 22 3000 ];
-
-  systemd.tmpfiles.rules = [
-    "L+ /persist/forgejo/custom/templates - - - - ${./templates}"
-  ];
-
-  services.forgejo = {
-    enable = true;
-    lfs.enable = true;
-    settings = {
-      DEFAULT.APP_NAME = "cilly's botanical laboratory";
-      server = {
-        DOMAIN = fqdn;
-        ROOT_URL = "https://${fqdn}/";
-        HTTP_PORT = 3000;
-        START_SSH_SERVER = true;
-        BUILTIN_SSH_SERVER_USER = "git";
-        SSH_DOMAIN = "git.lava.moe";
-        SSH_SERVER_KEY_EXCHANGES = "mlkem768x25519-sha256,sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256";
-      };
-      ui = lib.mkForce {
-        DEFAULT_THEME = "catppuccin-maroon-auto";
-        THEMES = lib.strings.concatMapStringsSep "," (x: "${x}-auto") [
-          "catppuccin-pink"
-          "catppuccin-maroon"
-          "catppuccin-flamingo"
-          "catppuccin-rosewater"
-          "forgejo"
-          "gitea"
-        ];
-      };
-      api.ENABLE_SWAGGER = false;
-      other.SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
-      repository.ENABLE_PUSH_CREATE_USER = true;
-      repository.ENABLE_PUSH_CREATE_ORG = true;
-      service.DISABLE_REGISTRATION = true;
-    };
-    stateDir = "/persist/forgejo";
-  };
-
-  systemd.services.forgejo.serviceConfig = {
-    AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
-    CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
-    PrivateUsers = lib.mkForce false;
-  };
-
-  catppuccin.forgejo.enable = true;
-
-  environment.systemPackages = [ config.services.forgejo.package ];
-}
diff --git a/containers/citrine/flake.lock b/containers/citrine/flake.lock
deleted file mode 100644
index d627614..0000000
--- a/containers/citrine/flake.lock
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "nodes": {
-    "catppuccin": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1773403535,
-        "narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1773122722,
-        "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "catppuccin": "catppuccin",
-        "nixpkgs": "nixpkgs_2"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/containers/citrine/flake.nix b/containers/citrine/flake.nix
deleted file mode 100644
index c2a81b7..0000000
--- a/containers/citrine/flake.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    catppuccin.url = "github:catppuccin/nix";
-  };
-  outputs = { nixpkgs, catppuccin, ... }:
-  let
-    name = "citrine";
-    fqdn = "lab.lava.moe";
-    subnetId = "3";
-
-    subnet = x: "fd0d:1::${subnetId}:${toString x}";
-    host = subnet 1;
-    client = subnet 2;
-
-    subnet4 = x: "10.30.${subnetId}.${toString x}";
-    host4 = subnet4 1;
-    client4 = subnet4 2;
-
-    modules = [
-      ./configuration.nix
-      catppuccin.nixosModules.catppuccin
-      {
-        networking.useHostResolvConf = false;
-        networking.nameservers = [ host ];
-      }
-    ];
-  in {
-    nixosConfigurations.container = nixpkgs.lib.nixosSystem {
-      inherit modules;
-    };
-    nixosModule = { ... }: {
-      networking.nat = {
-        enable = true;
-        enableIPv6 = true;
-        internalInterfaces = [ "ve-${name}" ];
-      };
-
-      services.nginx.virtualHosts."${fqdn}" = {
-        useACMEHost = "lava.moe";
-        forceSSL = true;
-        locations."/".proxyPass = "http://[${client}]:3000";
-      };
-
-      systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
-      containers.${name} = {
-        autoStart = true;
-        privateNetwork = true;
-        hostAddress = host4;
-        localAddress = client4;
-        hostAddress6 = host;
-        localAddress6 = client;
-        # privateUsers = "pick";
-        nixpkgs = nixpkgs;
-        ephemeral = true;
-        config = { imports = modules; };
-        specialArgs = { inherit fqdn; };
-
-        bindMounts."persist" = {
-          hostPath = "/persist/containers/${name}";
-          mountPoint = "/persist";
-          isReadOnly = false;
-        };
-        # flake = "path:" + ./.;
-      };
-    };
-  };
-}
diff --git a/containers/citrine/templates/base/footer_content.tmpl b/containers/citrine/templates/base/footer_content.tmpl
deleted file mode 100644
index a9238c3..0000000
--- a/containers/citrine/templates/base/footer_content.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<footer class="page-footer" role="group" aria-label="{{ctx.Locale.Tr "aria.footer"}}">
-    <div class="left-links" role="contentinfo" aria-label="{{ctx.Locale.Tr "aria.footer.software"}}">
-        {{if ShowFooterPoweredBy}}
-            <a target="_blank" rel="noopener noreferrer" href="https://forgejo.org">Forgejo</a>
-        {{end}}
-        {{if (or .ShowFooterVersion .PageIsAdmin)}}
-            {{if .IsAdmin}}
-                <a href="{{AppSubUrl}}/admin/config">{{AppVerNoMetadata}}</a>
-            {{else}}
-                {{AppVerNoMetadata}}
-            {{end}}
-        {{end}}
-        {{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}}
-            {{ctx.Locale.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
-            {{ctx.Locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
-        {{end}}
-    </div>
-    <div class="right-links" role="group" aria-label="{{ctx.Locale.Tr "aria.footer.links"}}">
-        <div class="ui dropdown upward language">
-            <span class="flex-text-inline">{{svg "octicon-globe" 14}} {{ctx.Locale.LangName}}</span>
-            <div class="menu language-menu">
-                {{range .AllLangs}}
-                    <a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq ctx.Locale.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
-                {{end}}
-            </div>
-        </div>
-        <a href="{{AssetUrlPrefix}}/licenses.txt">{{ctx.Locale.Tr "licenses"}}</a>
-        {{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
-        {{template "custom/extra_links_footer" .}}
-    </div>
-</footer>
diff --git a/containers/citrine/templates/home.tmpl b/containers/citrine/templates/home.tmpl
deleted file mode 100644
index d460caf..0000000
--- a/containers/citrine/templates/home.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{template "base/head" .}}
-{{if not .IsSigned}}
-    <script>window.location.href = "/explore/repos";</script>
-{{end}}
-<div role="main" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home"}}{{end}}" class="page-content home">
-    <div class="tw-mb-8 tw-px-8">
-        <div class="center">
-            <img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}">
-            <div class="hero">
-                <h1 class="ui icon header title">
-                    {{AppDisplayName}}
-                </h1>
-                <h2>{{ctx.Locale.Tr "startpage.app_desc"}}</h2>
-            </div>
-        </div>
-    </div>
-    {{template "home_forgejo" .}}
-</div>
-{{template "base/footer" .}}
diff --git a/containers/diamond/configuration.nix b/containers/diamond/configuration.nix
deleted file mode 100644
index 01b4311..0000000
--- a/containers/diamond/configuration.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ fqdn, ... }: {
-  system.stateVersion = "25.11";
-  systemd.tmpfiles.rules = [
-    "d /persist/vaultwarden 755 vaultwarden vaultwarden"
-  ];
-  fileSystems."/var/lib/vaultwarden" = {
-    device = "/persist/vaultwarden";
-    fsType = "none";
-    options = [ "bind" ];
-  };
-  networking.firewall.allowedTCPPorts = [ 8000 ];
-  networking.firewall.allowedUDPPorts = [ 8000 ];
-
-  services.vaultwarden = {
-    enable = true;
-    domain = fqdn;
-    config = {
-      DOMAIN = "https://${fqdn}";
-      ROCKET_ADDRESS = "::";
-    };
-  };
-}
diff --git a/containers/diamond/flake.lock b/containers/diamond/flake.lock
deleted file mode 100644
index 88ab73f..0000000
--- a/containers/diamond/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/containers/diamond/flake.nix b/containers/diamond/flake.nix
deleted file mode 100644
index 71ab4fd..0000000
--- a/containers/diamond/flake.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-  outputs = { nixpkgs, ... }:
-  let
-    name = "diamond";
-    fqdn = "astransia.lava.moe";
-    subnetId = "4";
-
-    subnet = x: "fd0d:1::${subnetId}:${toString x}";
-    host = subnet 1;
-    client = subnet 2;
-
-    modules = [
-      ./configuration.nix
-    ];
-  in {
-    nixosConfigurations.container = nixpkgs.lib.nixosSystem {
-      inherit modules;
-    };
-    nixosModule = { ... }: {
-      services.nginx.virtualHosts."${fqdn}" = {
-        useACMEHost = "lava.moe";
-        forceSSL = true;
-        locations."/".proxyPass = "http://[${client}]:8000";
-        listenAddresses = [ "10.0.0.1" "[fd0d::1]" "100.67.1.1" ];
-      };
-
-      systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
-      containers.${name} = {
-        autoStart = true;
-        privateNetwork = true;
-        hostAddress6 = host;
-        localAddress6 = client;
-        # privateUsers = "pick";
-        nixpkgs = nixpkgs;
-        ephemeral = true;
-        config = { imports = modules; };
-        specialArgs = { inherit fqdn; };
-
-        bindMounts."persist" = {
-          hostPath = "/persist/containers/${name}";
-          mountPoint = "/persist";
-          isReadOnly = false;
-        };
-        # flake = "path:" + ./.;
-      };
-    };
-  };
-}
diff --git a/containers/emerald/configuration.nix b/containers/emerald/configuration.nix
deleted file mode 100644
index 421ddb0..0000000
--- a/containers/emerald/configuration.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ fqdn, shareFqdn, ... }: {
-  system.stateVersion = "25.11";
-  systemd.tmpfiles.rules = [
-    "d /persist/navidrome 755 navidrome navidrome"
-  ];
-  networking.firewall.allowedTCPPorts = [ 4533 ];
-  networking.firewall.allowedUDPPorts = [ 4533 ];
-
-  services.navidrome = {
-    enable = true;
-    environmentFile = "/binds/navidrome_env";
-    settings = {
-      Port = 4533;
-      Address = "[::]";
-      BaseUrl = "https://${fqdn}/";
-      ShareURL = "https://${shareFqdn}";
-      EnableSharing = true;
-      DataFolder = "/persist/navidrome";
-      MusicFolder = "/binds/music/main";
-    };
-  };
-  systemd.services.navidrome.serviceConfig.BindReadOnlyPaths = ["/binds/music"];
-}
diff --git a/containers/emerald/flake.lock b/containers/emerald/flake.lock
deleted file mode 100644
index 88ab73f..0000000
--- a/containers/emerald/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/containers/emerald/flake.nix b/containers/emerald/flake.nix
deleted file mode 100644
index 5ee69e4..0000000
--- a/containers/emerald/flake.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-  outputs = { nixpkgs, ... }:
-  let
-    name = "emerald";
-    fqdn = "navia.lava.moe";
-    shareFqdn = "muse.lava.moe";
-    subnetId = "5";
-
-    subnet = x: "fd0d:2::${subnetId}:${toString x}";
-    host = subnet 1;
-    client = subnet 2;
-
-    subnet4 = x: "10.32.${subnetId}.${toString x}";
-    host4 = subnet4 1;
-    client4 = subnet4 2;
-
-    modules = [
-      ./configuration.nix
-      {
-        networking.useHostResolvConf = false;
-        networking.nameservers = [ host ];
-      }
-    ];
-  in {
-    nixosConfigurations.container = nixpkgs.lib.nixosSystem {
-      inherit modules;
-    };
-    nixosModule = { config, ... }: {
-      networking.nat = {
-        enable = true;
-        enableIPv6 = true;
-        internalInterfaces = [ "ve-${name}" ];
-      };
-
-      services.nginx.virtualHosts."${fqdn}" = {
-        useACMEHost = "lava.moe";
-        forceSSL = true;
-        locations."/".proxyPass = "http://[${client}]:4533";
-        listenAddresses = [ "100.67.2.1" ];
-      };
-
-      systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
-      containers.${name} = {
-        autoStart = true;
-        privateNetwork = true;
-        hostAddress = host4;
-        localAddress = client4;
-        hostAddress6 = host;
-        localAddress6 = client;
-        # privateUsers = "pick";
-        nixpkgs = nixpkgs;
-        ephemeral = true;
-        config = { imports = modules; };
-        specialArgs = { inherit fqdn shareFqdn; };
-
-        bindMounts."persist" = {
-          hostPath = "/persist/containers/${name}";
-          mountPoint = "/persist";
-          isReadOnly = false;
-        };
-        bindMounts."music" = {
-          hostPath = "/flower/media/music";
-          mountPoint = "/binds/music";
-          isReadOnly = true;
-        };
-        bindMounts."navidrome_env" = {
-          hostPath = config.age.secrets.navidrome_env.path;
-          mountPoint = "/binds/navidrome_env";
-          isReadOnly = true;
-        };
-        # flake = "path:" + ./.;
-      };
-    };
-  };
-}
diff --git a/containers/fluorite/configuration.nix b/containers/fluorite/configuration.nix
deleted file mode 100644
index 9fcb5f5..0000000
--- a/containers/fluorite/configuration.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ ... }: {
-  system.stateVersion = "25.11";
-  systemd.tmpfiles.rules = [
-    "d /persist/slskd/Downloads 755 slskd slskd"
-  ];
-  fileSystems."/var/lib/slskd" = {
-    device = "/persist/slskd";
-    fsType = "none";
-    options = [ "bind" ];
-  };
-  networking.firewall.allowedTCPPorts = [ 5030 50300 ];
-  networking.firewall.allowedUDPPorts = [ 5030 50300 ];
-
-  services.slskd = {
-    enable = true;
-    domain = null;
-    environmentFile = "/binds/slskd_env";
-    settings = {
-      shares.directories = [ "/binds/music/" ];
-    };
-  };
-}
diff --git a/containers/fluorite/flake.lock b/containers/fluorite/flake.lock
deleted file mode 100644
index 88ab73f..0000000
--- a/containers/fluorite/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/containers/fluorite/flake.nix b/containers/fluorite/flake.nix
deleted file mode 100644
index 33fcdb1..0000000
--- a/containers/fluorite/flake.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-  outputs = { nixpkgs, ... }:
-  let
-    name = "fluorite";
-    fqdn = "fluorite.lava.moe";
-    subnetId = "6";
-
-    subnet = x: "fd0d:1::${subnetId}:${toString x}";
-    host = subnet 1;
-    client = subnet 2;
-
-    subnet4 = x: "10.30.${subnetId}.${toString x}";
-    host4 = subnet4 1;
-    client4 = subnet4 2;
-
-    modules = [
-      ./configuration.nix
-      {
-        networking.useHostResolvConf = false;
-        networking.nameservers = [ host ];
-      }
-    ];
-  in {
-    nixosConfigurations.container = nixpkgs.lib.nixosSystem {
-      inherit modules;
-    };
-    nixosModule = { config, ... }: {
-      networking.nat = {
-        enable = true;
-        enableIPv6 = true;
-        internalInterfaces = [ "ve-${name}" ];
-      };
-      networking.firewall.allowedTCPPorts = [ 50300 ];
-
-      services.nginx.virtualHosts."${fqdn}" = {
-        useACMEHost = "lava.moe";
-        forceSSL = true;
-        locations."/".proxyPass = "http://[${client}]:5030";
-        listenAddresses = [ "10.0.0.1" "[fd0d::1]" "100.67.1.1" ];
-      };
-
-      systemd.tmpfiles.rules = [
-        "d /persist/containers/${name} 755 root users"
-        "d /persist/media/music 075 nobody users"
-      ];
-      containers.${name} = {
-        autoStart = true;
-        privateNetwork = true;
-        hostAddress = host4;
-        localAddress = client4;
-        hostAddress6 = host;
-        localAddress6 = client;
-        # privateUsers = "pick";
-        nixpkgs = nixpkgs;
-        ephemeral = true;
-        config = { imports = modules; };
-        specialArgs = { inherit fqdn; };
-
-        forwardPorts = [
-          {
-            containerPort = 50300;
-            hostPort = 50300;
-            protocol = "tcp";
-          }
-        ];
-
-        bindMounts."persist" = {
-          hostPath = "/persist/containers/${name}";
-          mountPoint = "/persist";
-          isReadOnly = false;
-        };
-        bindMounts."music" = {
-          hostPath = "/persist/media/music";
-          mountPoint = "/binds/music";
-          isReadOnly = true;
-        };
-        bindMounts."slskd_env" = {
-          hostPath = config.age.secrets.slskd_env.path;
-          mountPoint = "/binds/slskd_env";
-          isReadOnly = true;
-        };
-        # flake = "path:" + ./.;
-      };
-    };
-  };
-}
diff --git a/containers/garnet/configuration.nix b/containers/garnet/configuration.nix
deleted file mode 100644
index 21400c5..0000000
--- a/containers/garnet/configuration.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ ... }: {
-  system.stateVersion = "25.11";
-  fileSystems."/var/lib/opencloud" = {
-    device = "/flower/data";
-    fsType = "none";
-    options = [ "bind" ];
-  };
-  fileSystems."/etc/opencloud" = {
-    device = "/persist/cfg";
-    fsType = "none";
-    options = [ "bind" ];
-  };
-  # TODO: hardcoded address
-  networking.extraHosts = ''
-    100.67.2.1 cloud.lava.moe
-  '';
-
-  networking.firewall.allowedTCPPorts = [ 9200 ];
-  networking.firewall.allowedUDPPorts = [ 9200 ];
-
-  environment.etc."opencloud-admin-pass".text = ''
-    IDM_ADMIN_PASSWORD=supersillysecure
-  '';
-  services.opencloud = {
-    enable = true;
-    url = "https://cloud.lava.moe";
-    address = "10.30.7.2";
-    port = 9200;
-    environment = {
-      PROXY_TLS = "false";
-      IDP_ACCESS_TOKEN_EXPIRATION = "2592000";
-      IDP_ID_TOKEN_EXPIRATION = "2592000";
-    };
-    environmentFile = "/etc/opencloud-admin-pass";
-  };
-}
diff --git a/containers/garnet/flake.lock b/containers/garnet/flake.lock
deleted file mode 100644
index 4070242..0000000
--- a/containers/garnet/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/containers/garnet/flake.nix b/containers/garnet/flake.nix
deleted file mode 100644
index df835a4..0000000
--- a/containers/garnet/flake.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-  outputs = { nixpkgs, ... }:
-  let
-    name = "garnet";
-    fqdn = "cloud.lava.moe";
-    subnetId = "7";
-
-    subnet = x: "fd0d:1::${subnetId}:${toString x}";
-    host = subnet 1;
-    client = subnet 2;
-
-    subnet4 = x: "10.30.${subnetId}.${toString x}";
-    host4 = subnet4 1;
-    client4 = subnet4 2;
-
-    modules = [
-      ./configuration.nix
-      {
-        networking.useHostResolvConf = false;
-        networking.nameservers = [ host ];
-      }
-    ];
-  in {
-    nixosConfigurations.container = nixpkgs.lib.nixosSystem {
-      inherit modules;
-    };
-    nixosModule = { config, ... }: {
-      networking.nat = {
-        enable = true;
-        enableIPv6 = true;
-        internalInterfaces = [ "ve-${name}" ];
-      };
-
-      services.nginx.virtualHosts."${fqdn}" = {
-        useACMEHost = "lava.moe";
-        forceSSL = true;
-        locations."/" = {
-          proxyPass = "http://${client4}:9200";
-          proxyWebsockets = true;
-        };
-        extraConfig = ''
-          proxy_read_timeout 3600s;
-          proxy_send_timeout 3600s;
-          keepalive_requests 100000;
-          keepalive_timeout 5m;
-          http2_max_concurrent_streams 512;
-        '';
-        # TODO: hardcoded address
-        listenAddresses = [ "100.67.2.1" ];
-      };
-
-      systemd.tmpfiles.rules = [
-        "d /persist/containers/${name} 755 root users"
-      ];
-      containers.${name} = {
-        autoStart = true;
-        privateNetwork = true;
-        hostAddress = host4;
-        localAddress = client4;
-        hostAddress6 = host;
-        localAddress6 = client;
-        # privateUsers = "pick";
-        nixpkgs = nixpkgs;
-        ephemeral = true;
-        config = { imports = modules; };
-        specialArgs = { inherit fqdn; };
-
-        bindMounts."persist" = {
-          hostPath = "/persist/containers/${name}";
-          mountPoint = "/persist";
-          isReadOnly = false;
-        };
-        bindMounts."content" = {
-          hostPath = "/flower/opencloud";
-          mountPoint = "/flower";
-          isReadOnly = false;
-        };
-      };
-    };
-  };
-}
diff --git a/flake.lock b/flake.lock
index 2578a7e..15c58b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,15 +3,14 @@
     "aagl": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1779903856,
-        "narHash": "sha256-uRShMtD6xW3ZKZbCQ6sDzKWEnbBXUg3IGfOARYogKhg=",
+        "lastModified": 1740876632,
+        "narHash": "sha256-u695YUS3R5HI1VQp7feCifWYOn3Gh6yGde1vp5rKqTg=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "50671fc7f29d686f63ef34b603320d44ad7f2d29",
+        "rev": "5505af25160f16ad26f9107aebee9ea7713b59d9",
         "type": "github"
       },
       "original": {
@@ -30,11 +29,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1770165109,
-        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
+        "lastModified": 1736955230,
+        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
+        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
         "type": "github"
       },
       "original": {
@@ -43,131 +42,41 @@
         "type": "github"
       }
     },
-    "c-amethyst": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "path": "./containers/amethyst",
-        "type": "path"
-      },
-      "original": {
-        "path": "./containers/amethyst",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "c-beryllium": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "path": "./containers/beryllium",
-        "type": "path"
-      },
-      "original": {
-        "path": "./containers/beryllium",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "c-citrine": {
-      "inputs": {
-        "catppuccin": "catppuccin",
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "path": "./containers/citrine",
-        "type": "path"
-      },
-      "original": {
-        "path": "./containers/citrine",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "c-diamond": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_6"
-      },
-      "locked": {
-        "path": "./containers/diamond",
-        "type": "path"
-      },
-      "original": {
-        "path": "./containers/diamond",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "c-emerald": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_7"
-      },
-      "locked": {
-        "path": "./containers/emerald",
-        "type": "path"
-      },
-      "original": {
-        "path": "./containers/emerald",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "c-fluorite": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_8"
-      },
-      "locked": {
-        "path": "./containers/fluorite",
-        "type": "path"
-      },
-      "original": {
-        "path": "./containers/fluorite",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "c-garnet": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_9"
-      },
-      "locked": {
-        "path": "./containers/garnet",
-        "type": "path"
-      },
-      "original": {
-        "path": "./containers/garnet",
-        "type": "path"
-      },
-      "parent": []
-    },
     "catppuccin": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "catppuccin-v1_1": "catppuccin-v1_1",
+        "catppuccin-v1_2": "catppuccin-v1_2",
+        "home-manager": "home-manager_2",
+        "home-manager-stable": "home-manager-stable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nuscht-search": "nuscht-search"
       },
       "locked": {
-        "lastModified": 1773403535,
-        "narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=",
+        "lastModified": 1736069220,
+        "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47",
+        "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
         "type": "github"
       },
       "original": {
         "owner": "catppuccin",
         "repo": "nix",
+        "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
         "type": "github"
       }
     },
     "catppuccin-palette": {
       "flake": false,
       "locked": {
-        "lastModified": 1774131488,
-        "narHash": "sha256-hsy+GhuM4MSjnwGq1YJSLBFIbVm67SSdPRgObP00mxw=",
+        "lastModified": 1741384489,
+        "narHash": "sha256-aIIwnSRJPQGaAwprYIRQ7Bp5MtpAhJS8Y007cBi0UsI=",
         "owner": "catppuccin",
         "repo": "palette",
-        "rev": "07d02aa110ef9eb7e7427afca5c73ba9cf7f8ebd",
+        "rev": "5bb0420add3b61e4c7e32549e014f06e03dfbc42",
         "type": "github"
       },
       "original": {
@@ -204,33 +113,6 @@
         "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz"
       }
     },
-    "catppuccin_2": {
-      "inputs": {
-        "catppuccin-v1_1": "catppuccin-v1_1",
-        "catppuccin-v1_2": "catppuccin-v1_2",
-        "home-manager": "home-manager_2",
-        "home-manager-stable": "home-manager-stable",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable",
-        "nuscht-search": "nuscht-search"
-      },
-      "locked": {
-        "lastModified": 1736069220,
-        "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -239,11 +121,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744478979,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
         "type": "github"
       },
       "original": {
@@ -256,11 +138,11 @@
     "fast-syntax-highlighting": {
       "flake": false,
       "locked": {
-        "lastModified": 1752660993,
-        "narHash": "sha256-ZihUL4JAVk9V+IELSakytlb24BvEEJ161CQEHZYYoSA=",
+        "lastModified": 1688591419,
+        "narHash": "sha256-RVX9ZSzjBW3LpFs2W86lKI6vtcvDWP6EPxzeTcRZua4=",
         "owner": "zdharma-continuum",
         "repo": "fast-syntax-highlighting",
-        "rev": "3d574ccf48804b10dca52625df13da5edae7f553",
+        "rev": "cf318e06a9b7c9f2219d78f41b46fa6e06011fd9",
         "type": "github"
       },
       "original": {
@@ -272,11 +154,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -288,15 +170,31 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -309,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "lastModified": 1740872218,
+        "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
         "type": "github"
       },
       "original": {
@@ -323,15 +221,36 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "neovim-nightly",
+          "hercules-ci-effects",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "type": "github"
+      },
+      "original": {
+        "id": "flake-parts",
+        "type": "indirect"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "lastModified": 1740872218,
+        "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
         "type": "github"
       },
       "original": {
@@ -358,57 +277,21 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "git-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "gitignore": "gitignore",
         "nixpkgs": [
-          "nix-gaming",
+          "neovim-nightly",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1778507602,
-        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "lastModified": 1740915799,
+        "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732",
         "type": "github"
       },
       "original": {
@@ -420,7 +303,7 @@
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "nix-gaming",
+          "neovim-nightly",
           "git-hooks",
           "nixpkgs"
         ]
@@ -439,6 +322,28 @@
         "type": "github"
       }
     },
+    "hercules-ci-effects": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "neovim-nightly",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739595404,
+        "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "rev": "06519cec8fb32d219006da6eacd255504a9996af",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -447,11 +352,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745494811,
-        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
+        "lastModified": 1703113217,
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
         "type": "github"
       },
       "original": {
@@ -510,11 +415,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779969295,
-        "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
+        "lastModified": 1741416850,
+        "narHash": "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
+        "rev": "26f6b862645ff281f3bada5d406e8c20de8d837c",
         "type": "github"
       },
       "original": {
@@ -554,11 +459,11 @@
     "linux-tkg": {
       "flake": false,
       "locked": {
-        "lastModified": 1779857514,
-        "narHash": "sha256-dCrVB3cFvv1d/9wuEejYN131b1phyf6SDy1bcEvtWGo=",
+        "lastModified": 1741397765,
+        "narHash": "sha256-39zEl8F5HUOHdVaMeo+0jYs056w3vDmjdPhK/GzbqBU=",
         "owner": "Frogging-Family",
         "repo": "linux-tkg",
-        "rev": "c9196dea7ee464f7792f94cd39c32431ad9e25ab",
+        "rev": "1146bf0623e06befb70e2905f42f033351fbd19f",
         "type": "github"
       },
       "original": {
@@ -569,18 +474,22 @@
     },
     "neovim-nightly": {
       "inputs": {
+        "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts",
+        "git-hooks": "git-hooks",
+        "hercules-ci-effects": "hercules-ci-effects",
         "neovim-src": "neovim-src",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1780013080,
-        "narHash": "sha256-m984DKbcIeNNuLYFjN3780rPEd55Xe9/cB4BNKkIDvg=",
+        "lastModified": 1741306000,
+        "narHash": "sha256-qaDw0TyUceZBLntPBOdd1642T/mBGMNtK5NBuv2gWiY=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "c6cc238427db8f61b786a66d7e02cf7724b30226",
+        "rev": "c1855b306b8eeb70118b3ba70471188a65e694e7",
         "type": "github"
       },
       "original": {
@@ -592,11 +501,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1779979065,
-        "narHash": "sha256-3uF/oP2D4Jka3DU2G8qqml75UOzPRrK+FIp+jghOq0s=",
+        "lastModified": 1741302428,
+        "narHash": "sha256-zcgucpL/rgEC/IIii6R4NvmtJsYT+/F0ub1FQOWVv0Q=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "5d85669a33e10f1f156b086562458cbbc8054438",
+        "rev": "e46f07b1d2942c7b5c08fca9a4cac735ee2c0c71",
         "type": "github"
       },
       "original": {
@@ -607,16 +516,15 @@
     },
     "nix-gaming": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
-        "git-hooks": "git-hooks",
-        "nixpkgs": "nixpkgs_10"
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1779768228,
-        "narHash": "sha256-/dRavNAx/Mp67xcQQ3JBIMyf0cLoXqKedafB1+wksAE=",
+        "lastModified": 1741311896,
+        "narHash": "sha256-M/ppn20it9Ru2hoYoWIYzEWyTfBVxQiAQ7SvRws+luY=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "6e7a8414c0f547a86646eb0b56ebf89e7cc217a2",
+        "rev": "0e78e723bdf5a13dc45f3a6b994715b871c3f650",
         "type": "github"
       },
       "original": {
@@ -625,33 +533,13 @@
         "type": "github"
       }
     },
-    "nix-index-database": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1779604987,
-        "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
-        "owner": "nix-community",
-        "repo": "nix-index-database",
-        "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-index-database",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777268161,
-        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+        "lastModified": 1740560979,
+        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
         "type": "github"
       },
       "original": {
@@ -663,17 +551,14 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1777168982,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
-        "type": "github"
+        "lastModified": 1740872140,
+        "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz"
       },
       "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz"
       }
     },
     "nixpkgs-stable": {
@@ -692,13 +577,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_10": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1779536132,
-        "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
+        "lastModified": 1740791350,
+        "narHash": "sha256-igS2Z4tVw5W/x3lCZeeadt0vcU9fxtetZ/RyrqsCRQ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
+        "rev": "199169a2135e6b864a888e89a2ace345703c025d",
         "type": "github"
       },
       "original": {
@@ -708,157 +593,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_11": {
-      "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_12": {
-      "locked": {
-        "lastModified": 1770019141,
-        "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
+        "lastModified": 1741246872,
+        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1773122722,
-        "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
         "type": "github"
       },
       "original": {
@@ -894,11 +635,11 @@
     "nvim-treesitter": {
       "flake": false,
       "locked": {
-        "lastModified": 1775221900,
-        "narHash": "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE=",
+        "lastModified": 1741416594,
+        "narHash": "sha256-nnnCrsOFm82/Oa6/ipbRQiy7K4f5o9bw4G6qGaYNGIU=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "4916d6592ede8c07973490d9322f187e07dfefac",
+        "rev": "ee8e149a4ff75ebd5f1b065831746ddaf0e480ec",
         "type": "github"
       },
       "original": {
@@ -907,57 +648,14 @@
         "type": "github"
       }
     },
-    "pastel": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_12",
-        "pnpm2nix": "pnpm2nix"
-      },
-      "locked": {
-        "lastModified": 1775622883,
-        "narHash": "sha256-2+7uCRXn+tn4LVaO7hLKPaezdKPW6HGvTr00aO4Tcxs=",
-        "owner": "cillynder",
-        "repo": "pastel",
-        "rev": "46f6569d5ad41ec1256dbf999d21701f73d6077b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cillynder",
-        "repo": "pastel",
-        "type": "github"
-      }
-    },
-    "pnpm2nix": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "pastel",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717937937,
-        "narHash": "sha256-bKoHjG5P15vCVpDndIXFfoJC65XhrBPQ9GWcXtXNuDA=",
-        "owner": "wrvsrx",
-        "repo": "pnpm2nix-nzbr",
-        "rev": "a2d285ad5718cb202f45e98a4f839a5b2608c4b1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "wrvsrx",
-        "ref": "adapt-to-v9",
-        "repo": "pnpm2nix-nzbr",
-        "type": "github"
-      }
-    },
     "pure": {
       "flake": false,
       "locked": {
-        "lastModified": 1779255807,
-        "narHash": "sha256-UQ0hP3qJd4Qxiw1LXPdb9d0Dc4OSD3HJpgYzaCfujno=",
+        "lastModified": 1723068801,
+        "narHash": "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A=",
         "owner": "sindresorhus",
         "repo": "pure",
-        "rev": "cc0759a0de620f191510e2e2f9748194a605b54d",
+        "rev": "92b8e9057988566b37ff695e70e2e9bbeb7196c8",
         "type": "github"
       },
       "original": {
@@ -970,69 +668,37 @@
       "inputs": {
         "aagl": "aagl",
         "agenix": "agenix",
-        "c-amethyst": "c-amethyst",
-        "c-beryllium": "c-beryllium",
-        "c-citrine": "c-citrine",
-        "c-diamond": "c-diamond",
-        "c-emerald": "c-emerald",
-        "c-fluorite": "c-fluorite",
-        "c-garnet": "c-garnet",
-        "catppuccin": "catppuccin_2",
+        "catppuccin": "catppuccin",
         "catppuccin-palette": "catppuccin-palette",
         "fast-syntax-highlighting": "fast-syntax-highlighting",
         "home-manager": "home-manager_3",
         "linux-tkg": "linux-tkg",
         "neovim-nightly": "neovim-nightly",
         "nix-gaming": "nix-gaming",
-        "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs_11",
+        "nixpkgs": "nixpkgs_3",
         "nvim-treesitter": "nvim-treesitter",
-        "pastel": "pastel",
         "pure": "pure",
         "spicetify-nix": "spicetify-nix",
         "spotify-adblock": "spotify-adblock",
-        "stevenblack-hosts": "stevenblack-hosts",
         "tree-sitter-jsonc": "tree-sitter-jsonc",
-        "website": "website",
         "wine-discord-ipc-bridge": "wine-discord-ipc-bridge",
         "zsh-abbr": "zsh-abbr",
         "zsh-history-substring-search": "zsh-history-substring-search"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "aagl",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777605393,
-        "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "spicetify-nix": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_5"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1779824049,
-        "narHash": "sha256-dWHVUjP03KSVG1PaLKA6j9EdxWSxSQvipMUIcSyuA/U=",
+        "lastModified": 1742098581,
+        "narHash": "sha256-c8pnJi/Y8+whPi5aOs5qKshfh4vvRUqczaJIOc6Xdv8=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "1362178e5f5f7a848c49fe9dee004ef8824f100a",
+        "rev": "4b285681a73e73c4f961fb69163c0daa36a18d30",
         "type": "github"
       },
       "original": {
@@ -1044,11 +710,11 @@
     "spotify-adblock": {
       "flake": false,
       "locked": {
-        "lastModified": 1773417310,
+        "lastModified": 1739206126,
         "narHash": "sha256-nwiX2wCZBKRTNPhmrurWQWISQdxgomdNwcIKG2kSQsE=",
         "owner": "abba23",
         "repo": "spotify-adblock",
-        "rev": "813d3451c53126bf1941baaf8dd37f1152c3f412",
+        "rev": "8e0312d6085a6e4f9afeb7c2457517a75e8b8f9d",
         "type": "github"
       },
       "original": {
@@ -1057,22 +723,6 @@
         "type": "github"
       }
     },
-    "stevenblack-hosts": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1779976382,
-        "narHash": "sha256-wt5NGa4K8/vda669UYUmTUt+BR9X5fPnuTZFfQdpLYo=",
-        "owner": "StevenBlack",
-        "repo": "hosts",
-        "rev": "d3e838712512490260f051150e3573eeebecfadb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "StevenBlack",
-        "repo": "hosts",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -1118,44 +768,14 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tree-sitter-jsonc": {
       "flake": false,
       "locked": {
-        "lastModified": 1769637052,
-        "narHash": "sha256-V38tvBHJsSHJbj8QrMbt5hz2q8WLf4jtKsTiAo98/Vo=",
+        "lastModified": 1615145540,
+        "narHash": "sha256-iWc2ePRiQnZ0FEdMAaAwa3iYt/SY0bEjQrZyqE9EhlU=",
         "owner": "WhyNotHugo",
         "repo": "tree-sitter-jsonc",
-        "rev": "f7890ba894d885d1b2b721cfae759b07d53c8886",
+        "rev": "02b01653c8a1c198ae7287d566efa86a135b30d5",
         "type": "gitlab"
       },
       "original": {
@@ -1164,20 +784,24 @@
         "type": "gitlab"
       }
     },
-    "website": {
-      "flake": false,
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "neovim-nightly",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1668017714,
-        "narHash": "sha256-ywy/7xeT6FHkF7lcs+stW1WPV+piE8ztSwcQ161iico=",
-        "owner": "cillynder",
-        "repo": "lavadesu.github.io",
-        "rev": "4e30c50be520a0a1bbecf408f056e6aaf135df67",
+        "lastModified": 1739829690,
+        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
         "type": "github"
       },
       "original": {
-        "owner": "cillynder",
-        "ref": "master",
-        "repo": "lavadesu.github.io",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
         "type": "github"
       }
     },
@@ -1200,11 +824,11 @@
     "zsh-abbr": {
       "flake": false,
       "locked": {
-        "lastModified": 1773890443,
-        "narHash": "sha256-SVuwDeHIBg8yArKGzDEfsG3fz0UwABQoJkyKTQAPUiw=",
+        "lastModified": 1740172038,
+        "narHash": "sha256-idwCtAwXa7qNZlKE8KdS9cUgEOCSdf6tec0YuXINcl8=",
         "ref": "refs/heads/main",
-        "rev": "889f4772c12b9dbe4965bbd56f2572af0a28fa3b",
-        "revCount": 1139,
+        "rev": "f9e43d78110db0a8bf8ec75ca5b101a06b1d5ce8",
+        "revCount": 1041,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/olets/zsh-abbr"
@@ -1218,11 +842,11 @@
     "zsh-history-substring-search": {
       "flake": false,
       "locked": {
-        "lastModified": 1768499095,
-        "narHash": "sha256-KHujL1/TM5R3m4uQh2nGVC98D6MOyCgQpyFf+8gjKR0=",
+        "lastModified": 1717563893,
+        "narHash": "sha256-1+w0AeVJtu1EK5iNVwk3loenFuIyVlQmlw8TWliHZGI=",
         "owner": "zsh-users",
         "repo": "zsh-history-substring-search",
-        "rev": "14c8d2e0ffaee98f2df9850b19944f32546fdea5",
+        "rev": "87ce96b1862928d84b1afe7c173316614b30e301",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5cf3457..b728f33 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,27 +2,24 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
+    neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
     agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
+
     aagl.url = "github:ezKEa/aagl-gtk-on-nix";
+    agenix.inputs.nixpkgs.follows = "nixpkgs";
     catppuccin.url = "github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e";
     catppuccin.inputs.nixpkgs.follows = "nixpkgs";
     catppuccin-palette = { url = "github:catppuccin/palette"; flake = false; };
-    neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     neovim-nightly.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-gaming.url = "github:fufexan/nix-gaming";
-    nix-index-database.url = "github:nix-community/nix-index-database";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
     spicetify-nix.url = "github:Gerg-L/spicetify-nix";
     spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     # services
-    pastel.url = "github:cillynder/pastel";
-    stevenblack-hosts = { url = "github:StevenBlack/hosts"; flake = false; };
-    website = { url = "github:cillynder/lavadesu.github.io/master"; flake = false; };
+    # hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; };
+    # website = { url = "github:LavaDesu/lavadesu.github.io/master"; flake = false; };
 
     # zsh plugins
     zsh-abbr = { url = "git+https://github.com/olets/zsh-abbr?submodules=1"; flake = false; };
@@ -36,15 +33,6 @@
     spotify-adblock = { url = "github:abba23/spotify-adblock"; flake = false; };
     tree-sitter-jsonc = { url = "gitlab:WhyNotHugo/tree-sitter-jsonc"; flake = false; };
     wine-discord-ipc-bridge = { url = "github:0e4ef622/wine-discord-ipc-bridge"; flake = false; };
-
-    # containers
-    c-amethyst.url = "path:./containers/amethyst";
-    c-beryllium.url = "path:./containers/beryllium";
-    c-citrine.url = "path:./containers/citrine";
-    c-diamond.url = "path:./containers/diamond";
-    c-emerald.url = "path:./containers/emerald";
-    c-fluorite.url = "path:./containers/fluorite";
-    c-garnet.url = "path:./containers/garnet";
   };
 
   outputs = { self, agenix, catppuccin, nixpkgs, ... } @ inputs:
@@ -63,7 +51,7 @@
 
       mkSystem =
         if !(self ? rev) then throw "Dirty git tree detected." else
-        nixpkgs: name: arch: extraModules: nixpkgs.lib.nixosSystem {
+        nixpkgs: name: arch: enableGUI: extraModules: nixpkgs.lib.nixosSystem {
           system = arch;
           modules = [
             ({
@@ -74,17 +62,14 @@
             (./hosts + "/${name}")
           ] ++ extraModules;
           specialArgs = {
-            inherit inputs;
+            inherit inputs enableGUI;
             modules = import ./modules { lib = nixpkgs.lib; };
-            gcSecrets = builtins.fromJSON (builtins.readFile "${self}/secrets.gcrypt/shared.json");
           };
         };
     in
     {
-      nixosConfigurations."alyssum" = mkSystem nixpkgs "alyssum" "x86_64-linux" [];
-      nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" [];
-      nixosConfigurations."dandelion" = mkSystem nixpkgs "dandelion" "aarch64-linux" [];
-      nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" [];
+      nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" true [];
+      nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" true [];
 
       packages."x86_64-linux" =
         let
@@ -95,7 +80,6 @@
         in
         {
           inherit (pkgs.me) linux-lava spotify-adblock;
-          linux-lava-ccache = pkgs.me.linux-lava.override { useCcache = true; };
         };
     };
 }
diff --git a/hosts/alyssum/default.nix b/hosts/alyssum/default.nix
deleted file mode 100644
index 06c415f..0000000
--- a/hosts/alyssum/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ inputs, lib, modules, modulesPath, ... }: {
-  networking.hostName = "alyssum";
-  system.stateVersion = "25.11";
-  time.timeZone = "Australia/Melbourne";
-
-  age.secrets = {
-    acme_dns.file = ../../secrets/acme_dns.age;
-    passwd.file = ../../secrets/passwd.age;
-    navidrome_env.file = ../../secrets/navidrome_env.age;
-    wpa_conf = {
-      file = ../../secrets/wpa_conf.age;
-      path = "/etc/wpa_supplicant/imperative.conf";
-      symlink = false;
-    };
-  };
-
-  imports = with modules.system; [
-    (modulesPath + "/profiles/qemu-guest.nix")
-    home-manager
-
-    base
-    kernel
-    nix-stable
-    packages
-    security
-    tailscale
-
-    modules.services.nginx
-    modules.services.syncthing
-
-    inputs.c-emerald.nixosModule
-    inputs.c-garnet.nixosModule
-
-    ./filesystem.nix
-    ./kernel.nix
-    ./networking.nix
-    ./home.syncthing.nix
-    ./samba.nix
-
-    ../../users/hana
-  ];
-
-  me.environment = "headless";
-  services.syncthing.user = lib.mkForce "hana";
-}
diff --git a/hosts/alyssum/filesystem.nix b/hosts/alyssum/filesystem.nix
deleted file mode 100644
index bdea423..0000000
--- a/hosts/alyssum/filesystem.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ ... }:
-let
-  bind = src: {
-    depends = [ "/nix" ];
-    device = src;
-    fsType = "none";
-    neededForBoot = true;
-    options = [ "bind" ];
-  };
-
-  mkLabelMount = label: type: {
-    device = "/dev/disk/by-label/${label}";
-    fsType = type;
-    options = [ "defaults" "relatime" ];
-  };
-  mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" // {
-    options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ];
-  };
-  submount = mkBtrfsMount "alyssum";
-in {
-  fileSystems = {
-    "/" = {
-      device = "rootfs";
-      fsType = "tmpfs";
-      options = [ "defaults" "size=8G" "mode=755" ];
-    };
-    "/boot" = mkLabelMount "stem" "vfat";
-
-    "/flower" = mkBtrfsMount "myosotis" "/@" true;
-    "/nix" = submount "/@/nix" false;
-    "/persist" = (submount "/@/persist" true) // { neededForBoot = true; };
-    "/persist/.snapshots" = submount "/snap/persist" false;
-    "/var/log/journal" = bind "/persist/journal";
-  };
-}
diff --git a/hosts/alyssum/home.syncthing.nix b/hosts/alyssum/home.syncthing.nix
deleted file mode 100644
index 8d5a1cc..0000000
--- a/hosts/alyssum/home.syncthing.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, lib, ... }:
-let
-  configOn = user: port: {
-    me.binds."/home/${user}/.config/syncthing" = "${user}/syncthing/config";
-    me.binds."/home/${user}/.local/state/syncthing" = "${user}/syncthing/state";
-
-    systemd.tmpfiles.rules = [ "d /flower/syncthing/${user} 700 ${user} users" ];
-
-    users.users.${user} = {
-      hashedPasswordFile = config.age.secrets.passwd.path;
-      isNormalUser = true;
-      linger = true;
-    };
-    home-manager.users.${user} = { ... }: {
-      home = {
-        username = "${user}";
-        homeDirectory = "/home/${user}";
-        stateVersion = "26.05";
-      };
-      services.syncthing = {
-        enable = true;
-        guiAddress = "[::]:${toString port}";
-        overrideDevices = false;
-        overrideFolders = false;
-        settings = {
-          options.listenAddresses = [
-            "tcp://0.0.0.0:2${toString port}"
-            "quic://0.0.0.0:2${toString port}"
-            "dynamic+https://relays.syncthing.net/endpoint"
-          ];
-          defaults.folder.path = "/flower/syncthing/${user}";
-        };
-      };
-    };
-  };
-in lib.mkMerge [
-  (configOn "kujira" 8385)
-  (configOn "cilly" 8386)
-]
diff --git a/hosts/alyssum/kernel.nix b/hosts/alyssum/kernel.nix
deleted file mode 100644
index 5e9b300..0000000
--- a/hosts/alyssum/kernel.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, ... }: {
-  boot = {
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
-    };
-    initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
-    initrd.kernelModules = [ ];
-    kernelModules = [ "kvm-amd" ];
-  };
-  hardware.cpu.amd.updateMicrocode = true;
-}
diff --git a/hosts/alyssum/networking.nix b/hosts/alyssum/networking.nix
deleted file mode 100644
index 281cbb6..0000000
--- a/hosts/alyssum/networking.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, ... }: {
-  networking = {
-    useDHCP = true;
-    wireless.enable = true;
-
-    interfaces.wlp1s0.useDHCP = false;
-    interfaces.wlp1s0.ipv4.addresses = [{
-      address = "192.168.1.167";
-      prefixLength = 24;
-    }];
-
-    defaultGateway = "192.168.1.1";
-    nameservers = [ "8.8.8.8" "8.8.4.4" ];
-  };
-}
diff --git a/hosts/alyssum/packages.nix b/hosts/alyssum/packages.nix
deleted file mode 100644
index 2d4bd30..0000000
--- a/hosts/alyssum/packages.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    git
-    htop
-    jq
-    neovim
-    rsync
-    sshfs
-    wget
-
-    kitty.terminfo
-  ];
-  environment.variables.EDITOR = "nvim";
-}
diff --git a/hosts/alyssum/samba.nix b/hosts/alyssum/samba.nix
deleted file mode 100644
index d876981..0000000
--- a/hosts/alyssum/samba.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  configOn = user: let
-    passwd_fname = "passwd_smb${user}";
-  in {
-    age.secrets.${passwd_fname}.file = ../../secrets/${passwd_fname}.age;
-    me.binds."/flower/smb/${user}/music" = "/flower/media/music/${user}";
-    me.binds."/flower/smb/${user}/syncthing" = "/flower/syncthing/${user}";
-
-    users.users.${user} = {
-      hashedPasswordFile = config.age.secrets.passwd.path;
-      isNormalUser = true;
-    };
-
-    system.activationScripts = {
-      init_smbpasswd.text = let
-        smbpasswd = "${config.services.samba.package}/bin/smbpasswd";
-      in ''
-        printf "$(cat ${config.age.secrets.${passwd_fname}.path})\n$(cat ${config.age.secrets.${passwd_fname}.path})\n" | ${smbpasswd} -sa ${user}
-      '';
-    };
-    services.samba.settings."${user}" = {
-      "path" = "/flower/smb/${user}";
-      "browseable" = "yes";
-      "read only" = "no";
-      "guest ok" = "no";
-      "create mask" = "0644";
-      "directory mask" = "0755";
-      "force user" = user;
-      "force group" = "users";
-      "valid users" = user;
-    };
-  };
-in lib.mkMerge [
-  (configOn "cilly")
-  (configOn "kujira")
-  {
-    me.binds."/flower/smb/kujira/opencloud" = "/flower/opencloud/data/storage/users/users/a8e29fc0-673c-4c67-be00-2442904acb43";
-
-    networking.firewall.allowPing = true;
-
-    services.samba = {
-      enable = true;
-      package = pkgs.samba4Full;
-      openFirewall = true;
-      settings = {
-        global = {
-          "server smb encrypt" = "required";
-          "workgroup" = "WORKGROUP";
-          "server string" = "smbnix";
-          "netbios name" = "smbnix";
-          "security" = "user";
-          "hosts allow" = "100.64.0.0/10 127.0.0.1 alyssum localhost";
-          "hosts deny" = "0.0.0.0/0";
-          "guest account" = "nobody";
-          "map to guest" = "bad user";
-        };
-        "public" = {
-          "path" = "/flower/smb/public";
-          "browseable" = "yes";
-          "read only" = "no";
-          "guest ok" = "yes";
-          "create mask" = "0644";
-          "directory mask" = "0755";
-          "force user" = "hana";
-          "force group" = "users";
-        };
-      };
-    };
-
-    services.samba-wsdd = {
-      enable = true;
-      openFirewall = true;
-    };
-
-    services.avahi = {
-      enable = true;
-      openFirewall = true;
-      nssmdns4 = true;
-      publish.enable = true;
-      publish.userServices = true;
-    };
-  }
-]
diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix
index 841e909..b29d535 100644
--- a/hosts/anemone/default.nix
+++ b/hosts/anemone/default.nix
@@ -5,7 +5,6 @@
 
   nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
   age.secrets = {
-    wg_anemone.file = ../../secrets/wg_anemone.age;
     passwd.file = ../../secrets/passwd.age;
   };
 
@@ -17,9 +16,8 @@
     bluetooth
     ccache
     corectrl
-    docker
     flatpak
-    greetd
+    greetd_wayland
     gui
     input
     kernel
@@ -28,25 +26,21 @@
     printing
     security
     snapper
-    tailscale
-    wireguard
 
     ./filesystem.nix
     ./kernel.nix
     ./networking.nix
 
-    ../../users/rin
-
-    modules.services.syncthing
+    ../../users/rin/wayland.nix
   ];
 
-  me = {
-    environment = "laptop";
-    batteryDevice = "BATT";
-    kbBacklightDevice = "asus::kbd_backlight";
-    hasFingerprint = true;
-    hidpi = true;
-  };
+  programs.hyprland.enable = true;
+  security.pam.services.hyprlock = {};
+
+  # For steam fhs-env
+  nixpkgs.config.permittedInsecurePackages = [
+    "openssl-1.1.1w"
+  ];
 
   programs.wireshark = {
     enable = true;
@@ -55,6 +49,4 @@
 
   services.fprintd.enable = true;
   services.tlp.enable = true;
-
-  programs.kdeconnect.enable = true;
 }
diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix
index d959b37..97d19be 100644
--- a/hosts/anemone/kernel.nix
+++ b/hosts/anemone/kernel.nix
@@ -23,22 +23,17 @@
     ];
   };
 
-  # swapDevices = [{
-  #   device = "/persist/swapfile";
-  #   size = 16 * 1024;
-  # }];
-  #
-  # systemd.sleep.extraConfig = ''
-  #   HibernateMode=shutdown
-  # '';
-  /*
+  swapDevices = [{
+    device = "/persist/swapfile";
+    size = 16 * 1024;
+  }];
+
   services.logind.lidSwitch = "suspend-then-hibernate";
   systemd.sleep.extraConfig = ''
     HibernateDelaySec=14400
     SuspendEstimationSec=3600
-    HibernateOnACPower=true
+    HibernateOnACPower=false
   '';
-  */
 
   powerManagement.cpufreq.min = 400000;
 
diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix
index f5a4dc5..8b6bdf9 100644
--- a/hosts/anemone/networking.nix
+++ b/hosts/anemone/networking.nix
@@ -1,4 +1,18 @@
 { config, ... }: {
-  networking.wireless.iwd.enable = true;
+  networking = {
+    #nameservers = [ "8.8.8.8" "8.8.4.4" ];
+
+    #wg-quick.interfaces.wg0.configFile = "/persist/vpn.conf";
+
+    networkmanager = {
+      enable = true;
+      #dns = "none";
+    };
+
+    extraHosts = ''
+      192.168.100.16 hyacinth
+    '';
+  };
+
   environment.etc."NetworkManager/system-connections".source = "/persist/nm_system-connections";
 }
diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix
deleted file mode 100644
index f65dfd1..0000000
--- a/hosts/dandelion/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ inputs, modules, modulesPath, ... }: {
-  networking.hostName = "dandelion";
-  system.stateVersion = "23.11";
-  time.timeZone = "Australia/Melbourne";
-
-  age.secrets = {
-    acme_dns.file = ../../secrets/acme_dns.age;
-    slskd_env.file = ../../secrets/slskd_env.age;
-    wg_dandelion.file = ../../secrets/wg_dandelion.age;
-  };
-
-  imports = with modules.system; [
-    (modulesPath + "/profiles/qemu-guest.nix")
-    home-manager
-
-    base
-    kernel
-    nix-stable
-    packages
-    security
-    tailscale
-    wireguard
-
-    modules.services.banksia
-    modules.services.nginx
-    modules.services.unbound
-    modules.services.website
-
-    inputs.c-amethyst.nixosModule
-    inputs.c-beryllium.nixosModule
-    inputs.c-citrine.nixosModule
-    inputs.c-diamond.nixosModule
-    inputs.c-fluorite.nixosModule
-
-    ./filesystem.nix
-    ./kernel.nix
-    ./networking.nix
-    ./nginx.nix
-
-    ../../users/hana
-  ];
-
-  me.environment = "headless";
-}
diff --git a/hosts/dandelion/filesystem.nix b/hosts/dandelion/filesystem.nix
deleted file mode 100644
index 861bc15..0000000
--- a/hosts/dandelion/filesystem.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ ... }:
-let
-  bind = src: {
-    depends = [ "/nix" ];
-    device = src;
-    fsType = "none";
-    neededForBoot = true;
-    options = [ "bind" ];
-  };
-
-  mkLabelMount = label: type: {
-    device = "/dev/disk/by-label/${label}";
-    fsType = type;
-    options = [ "defaults" "relatime" ];
-  };
-  mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" // {
-    options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ];
-  };
-  submount = mkBtrfsMount "DANDELION";
-in {
-  fileSystems = {
-    "/" = {
-      device = "rootfs";
-      fsType = "tmpfs";
-      options = [ "defaults" "size=6G" "mode=755" ];
-    };
-    "/boot" = mkLabelMount "UEFI" "vfat";
-
-    "/nix" = submount "/@/nix" false;
-    "/persist" = (submount "/@/persist" true) // { neededForBoot = true; };
-    "/persist/.snapshots" = submount "/snap/persist" false;
-    "/var/log/journal" = bind "/persist/journal";
-  };
-}
diff --git a/hosts/dandelion/kernel.nix b/hosts/dandelion/kernel.nix
deleted file mode 100644
index 7ea7d43..0000000
--- a/hosts/dandelion/kernel.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }: {
-  boot = {
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
-    };
-    initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ];
-    initrd.kernelModules = [ "nvme" ];
-  };
-}
diff --git a/hosts/dandelion/networking.nix b/hosts/dandelion/networking.nix
deleted file mode 100644
index 322719e..0000000
--- a/hosts/dandelion/networking.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }: {
-  networking.useDHCP = true;
-  networking.interfaces.enp2s0.useDHCP = false;
-}
diff --git a/hosts/dandelion/nginx.nix b/hosts/dandelion/nginx.nix
deleted file mode 100644
index c29de38..0000000
--- a/hosts/dandelion/nginx.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  services.nginx.virtualHosts."muse.lava.moe" = {
-    useACMEHost = "lava.moe";
-    forceSSL = true;
-    locations."/".return = "404";
-    locations."/share/".proxyPass = "http://[fd0d:2::5:2]:4533";
-  };
-}
diff --git a/hosts/dandelion/packages.nix b/hosts/dandelion/packages.nix
deleted file mode 100644
index 2d4bd30..0000000
--- a/hosts/dandelion/packages.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    git
-    htop
-    jq
-    neovim
-    rsync
-    sshfs
-    wget
-
-    kitty.terminfo
-  ];
-  environment.variables.EDITOR = "nvim";
-}
diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix
index a32d4bd..9584f3a 100644
--- a/hosts/hyacinth/default.nix
+++ b/hosts/hyacinth/default.nix
@@ -3,10 +3,11 @@
   system.stateVersion = "21.11";
   time.timeZone = "Australia/Melbourne";
 
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
   age.secrets = {
     passwd.file = ../../secrets/passwd.age;
-    wg_hyacinth.file = ../../secrets/wg_hyacinth.age;
+    wg_hyacinth.file = ../../secrets/wg_blossom.age;
     wpa_conf.file = ../../secrets/wpa_conf.age;
   };
   imports = with modules.system; [
@@ -18,9 +19,9 @@
     bluetooth
     ccache
     corectrl
-    docker
     flatpak
-    greetd
+    #greetd_xorg
+    greetd_wayland
     gui
     input
     kernel
@@ -29,19 +30,24 @@
     printing
     security
     snapper
-    tailscale
-    wireguard
+    virtualisation
 
-    modules.services.syncthing
+    modules.services.postgres
 
     ./filesystem.nix
     ./kernel.nix
     ./networking.nix
     ./packages.nix
 
-    ../../users/rin
+    #../../users/rin/xorg.nix
+    ../../users/rin/wayland.nix
   ];
+  services.postgresql.ensureDatabases = [ "barista" "barista-dev" ];
+  programs.hyprland.enable = true;
   systemd.services.nix-daemon.environment.TMPDIR = "/nix/tmp";
 
-  me.hasBluetooth = true;
+  # For steam fhs-env
+  nixpkgs.config.permittedInsecurePackages = [
+    "openssl-1.1.1w"
+  ];
 }
diff --git a/hosts/hyacinth/filesystem.nix b/hosts/hyacinth/filesystem.nix
index 2757182..c85d7be 100644
--- a/hosts/hyacinth/filesystem.nix
+++ b/hosts/hyacinth/filesystem.nix
@@ -15,7 +15,7 @@ in
     "/" = {
       device = "rootfs";
       fsType = "tmpfs";
-      options = [ "defaults" "size=24G" "mode=755" ];
+      options = [ "defaults" "size=8G" "mode=755" ];
     };
     "/boot" = mkLabelMount "CUP" "vfat";
 
diff --git a/hosts/hyacinth/kernel.nix b/hosts/hyacinth/kernel.nix
index f410014..7ce4a16 100644
--- a/hosts/hyacinth/kernel.nix
+++ b/hosts/hyacinth/kernel.nix
@@ -13,8 +13,12 @@
     ];
     kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava);
   };
-  hardware.amdgpu.overdrive = {
-    enable = true;
-    ppfeaturemask = "0xffffffff";
-  };
+  services.xserver.xrandrHeads = [{
+    output = "DP-1";
+    primary = true;
+    monitorConfig = ''
+      Modeline "2560x1440_144.00"  808.75  2560 2792 3072 3584  1440 1443 1448 1568 -hsync +vsync
+      Option "PreferredMode" "2560x1440_144.00"
+    '';
+  }];
 }
diff --git a/hosts/hyacinth/networking.nix b/hosts/hyacinth/networking.nix
index 0b2eb03..7796639 100644
--- a/hosts/hyacinth/networking.nix
+++ b/hosts/hyacinth/networking.nix
@@ -3,13 +3,12 @@
   networking = {
     useDHCP = true;
     interfaces.enp5s0.useDHCP = false;
-    interfaces.enp5s0.wakeOnLan.enable = true;
 
     interfaces.enp5s0.ipv4.addresses = [{
-      address = "192.168.1.201";
+      address = "192.168.0.151";
       prefixLength = 24;
     }];
-    defaultGateway = "192.168.1.1";
+    defaultGateway = "192.168.0.1";
     nameservers = [ "8.8.8.8" "8.8.4.4" ];
 
     extraHosts = ''
diff --git a/hosts/hyacinth/packages.nix b/hosts/hyacinth/packages.nix
index 69f9ba1..555a414 100644
--- a/hosts/hyacinth/packages.nix
+++ b/hosts/hyacinth/packages.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    discord
-    jetbrains.idea
+    android-studio
+    jetbrains.idea-community-bin
     texliveFull
   ];
 }
diff --git a/modules/binds.nix b/modules/binds.nix
deleted file mode 100644
index c9ffe18..0000000
--- a/modules/binds.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ...}: {
-  imports = [ ./options.nix ];
-  fileSystems = lib.mapAttrs (dest: key: let
-    target = if (lib.strings.hasPrefix "/" key)
-      then key
-      else "/persist/binds/${key}";
-  in {
-    depends = [ "/persist" ];
-    device = target;
-    fsType = "none";
-    options = [ "bind" ];
-  }) config.me.binds;
-}
diff --git a/modules/default.nix b/modules/default.nix
index 6775c55..295a8db 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -14,21 +14,15 @@ let
     }) paths
   );
 in {
-  binds = ./binds.nix;
-  options = ./options.nix;
   services = mkAttrsFromPaths [
-    ./services/banksia.nix
     ./services/jellyfin.nix
     ./services/nginx.nix
     ./services/postgres.nix
     ./services/sonarr.nix
     ./services/synapse.nix
-    ./services/syncthing.nix
     ./services/tmptsync.nix
-    ./services/transmission.nix
     ./services/unbound.nix
     ./services/vaultwarden.nix
-    ./services/website.nix
   ];
   system = mkAttrsFromPaths [
     ./system/aagl.nix
@@ -37,9 +31,9 @@ in {
     ./system/bluetooth.nix
     ./system/ccache.nix
     ./system/corectrl.nix
-    ./system/docker.nix
     ./system/flatpak.nix
-    ./system/greetd.nix
+    ./system/greetd_wayland.nix
+    ./system/greetd_xorg.nix
     ./system/gui.nix
     ./system/home-manager.nix
     ./system/input.nix
@@ -50,16 +44,17 @@ in {
     ./system/printing.nix
     ./system/security.nix
     ./system/snapper.nix
-    ./system/tailscale.nix
+    ./system/transmission.nix
     ./system/virtualisation.nix
     ./system/wireguard.nix
   ];
   user = mkAttrsFromPaths [
+    ./user/bspwm.nix
     ./user/catppuccin.nix
-    ./user/comma.nix
     ./user/direnv.nix
     ./user/dunst.nix
     ./user/eww.nix
+    ./user/eww-wayland.nix
     ./user/git.nix
     ./user/gpg.nix
     ./user/hypridle.nix
@@ -70,11 +65,18 @@ in {
     ./user/neovim-minimal.nix
     ./user/npm.nix
     ./user/obs.nix
+    ./user/packages-rin.nix
+    ./user/pass.nix
+    ./user/picom.nix
+    ./user/polybar.nix
     ./user/rofi.nix
+    ./user/rofi-wayland.nix
     ./user/sessionVariables.nix
     ./user/spicetify.nix
+    ./user/sxhkd.nix
     ./user/theming.nix
     ./user/xdg.nix
+    ./user/xorg.nix
     ./user/zsh.nix
   ];
 }
diff --git a/modules/options.nix b/modules/options.nix
deleted file mode 100644
index e861c12..0000000
--- a/modules/options.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ config, lib, ... }:
-let
-  inherit (lib)
-    mkOption
-    types;
-in {
-  options.me = {
-    environment = mkOption {
-      type = types.enum [ "desktop" "laptop" "headless" ];
-      default = "desktop";
-    };
-
-    hasFingerprint = mkOption {
-      type = types.bool;
-      default = false;
-    };
-
-    gui = mkOption {
-      type = types.bool;
-      default = config.me.environment != "headless";
-    };
-
-    batteryDevice = mkOption {
-      type = with types; nullOr (uniq str);
-      default = null;
-    };
-
-    kbBacklightDevice = mkOption {
-      type = with types; nullOr (uniq str);
-      default = null;
-    };
-
-    hasBluetooth = mkOption {
-      type = types.bool;
-      default = config.me.environment == "laptop";
-    };
-
-    hasWifi = mkOption {
-      type = types.bool;
-      default = config.me.environment == "laptop";
-    };
-
-    hidpi = mkOption {
-      type = types.bool;
-      default = false;
-    };
-
-    binds = lib.mkOption {
-      type = with lib.types; attrsOf str;
-      default = {};
-    };
-  };
-}
diff --git a/modules/services/banksia.nix b/modules/services/banksia.nix
deleted file mode 100644
index 2ace618..0000000
--- a/modules/services/banksia.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# TODO ^^
-{ ... }: {
-  services.nginx.virtualHosts = {
-    "banksia.lava.moe" = {
-      useACMEHost = "lava.moe";
-      forceSSL = true;
-      locations."/".return = "302 https://lab.lava.moe/cilly/Banksia";
-      locations."/api".proxyPass = "http://localhost:8080/";
-    };
-  };
-}
diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix
index a02b7e9..c58f2ee 100644
--- a/modules/services/nginx.nix
+++ b/modules/services/nginx.nix
@@ -1,21 +1,18 @@
-{ config, ... }: {
+{ config, inputs, ... }: {
   networking.firewall.allowedTCPPorts = [ 80 443 ];
   security.acme = {
     acceptTerms = true;
-    defaults = {
-      email = "me@lava.moe";
-      group = "nginx";
-      dnsProvider = "cloudflare";
-      environmentFile = config.age.secrets."acme_dns".path;
-    };
+    email = "me@lava.moe";
     certs."lava.moe" = {
+      group = "nginx";
+      domain = "lava.moe";
       extraDomainNames = [
         "*.lava.moe"
         "*.local.lava.moe"
       ];
+      dnsProvider = "cloudflare";
+      credentialsFile = config.age.secrets."acme_dns".path;
     };
-    certs."cilly.moe" = {};
-    certs."cilly.dev" = {};
   };
 
   services.nginx = {
@@ -24,5 +21,28 @@
     recommendedOptimisation = true;
     recommendedGzipSettings = true;
     recommendedProxySettings = true;
+
+    virtualHosts = {
+      "lava.moe" = {
+        useACMEHost = "lava.moe";
+        forceSSL = true;
+        root = inputs.website.outPath;
+      };
+      "cdn.lava.moe" = {
+        useACMEHost = "lava.moe";
+        forceSSL = true;
+        root = "/persist/cdn";
+      };
+      "_" = {
+        default = true;
+        addSSL = true;
+        # TODO generate this somewhere
+        sslCertificate = "/persist/fakeCerts/fake.crt";
+        sslCertificateKey = "/persist/fakeCerts/fake.key";
+        extraConfig = ''
+          return 444;
+        '';
+      };
+    };
   };
 }
diff --git a/modules/services/postgres.nix b/modules/services/postgres.nix
index bbbeaa1..bffdcee 100644
--- a/modules/services/postgres.nix
+++ b/modules/services/postgres.nix
@@ -8,7 +8,6 @@ in {
   services.postgresql = {
     enable = true;
     dataDir = dir;
-    # TODO: broken :3
     package = pkgs.postgresql_13;
     authentication = lib.mkOverride 10 ''
       #type  database  DBuser  origin-address      auth-method
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
deleted file mode 100644
index db32371..0000000
--- a/modules/services/syncthing.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, ... }:
-let
-  dir = "/persist/shared/.syncthing";
-  user = if config.me.gui then "rin" else "hana";
-  uid = toString config.users.users."${user}".uid;
-  gid = toString config.users.groups.users.gid;
-in
-{
-  systemd.tmpfiles.rules = [
-    "d ${dir}/config 700 ${uid} ${gid}"
-    "d ${dir}/data 700 ${uid} ${gid}"
-  ];
-  systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true";
-  services.syncthing = {
-    enable = true;
-    openDefaultPorts = true;
-    user = user;
-    group = "users";
-    dataDir = "/persist/shared/.syncthing/data";
-    configDir = "/persist/shared/.syncthing/config";
-    guiAddress = if config.me.gui then "127.0.0.1:8384" else ":8384";
-  };
-}
diff --git a/modules/services/unbound.nix b/modules/services/unbound.nix
index 8aae0fd..a9cf3bc 100644
--- a/modules/services/unbound.nix
+++ b/modules/services/unbound.nix
@@ -1,17 +1,8 @@
-{ inputs, pkgs, gcSecrets, ... }:
+{ inputs, ... }:
 let
   dir = "/persist/unbound";
-
-  converted = pkgs.runCommand "stevenblack-hosts-unbound" {} ''
-    echo "server:" > "$out"
-    grep '^0\.0\.0\.0' "${inputs.stevenblack-hosts}/hosts" | awk '{print "local-zone: \""$2"\" always_refuse"}' | tail -n +2 >> "$out"
-  '';
 in {
-  networking.firewall.interfaces."ve-+" = {
-    allowedUDPPorts = [ 53 853 ];
-    allowedTCPPorts = [ 53 853 ];
-  };
-  networking.firewall.interfaces.wg0 = {
+  networking.firewall.interfaces.wlan0 = {
     allowedUDPPorts = [ 53 853 ];
     allowedTCPPorts = [ 53 853 ];
   };
@@ -25,27 +16,17 @@ in {
         name = ".";
         forward-tls-upstream = true;
         forward-addr = [
-          "2606:4700:4700::1111@853#cloudflare-dns.com"
-          "2606:4700:4700::1001@853#cloudflare-dns.com"
-          "2001:4860:4860::8888@853#dns.google"
-          "2001:4860:4860::8844@853#dns.google"
           "1.1.1.1@853#cloudflare-dns.com"
           "1.0.0.1@853#cloudflare-dns.com"
-          "8.8.8.8@853#dns.google"
-          "8.8.4.4@853#dns.google"
         ];
       }];
 
       server = {
-        interface = [ "0.0.0.0" "::0" ];
+        interface = [ "0.0.0.0" ];
         access-control = [
           "127.0.0.1/8      allow"
           "10.0.0.0/8       allow"
-          "100.64.0.0/10    allow"
           "192.168.100.0/24 allow"
-          "fd0d::/16        allow"
-          "fd7a:115c:a1e0::/48 allow"
-          "${gcSecrets.wireguard.ipv6Subnet}:/80 allow"
         ];
         domain-insecure = [ "\"local.lava.moe\"" ];
         local-zone = [ "\"warden.local.lava.moe.\" redirect" ];
@@ -54,7 +35,7 @@ in {
         ];
       };
 
-      include = "${converted}";
+      include = "${inputs.hosts-blocklists}/unbound/unbound.blacklist.conf";
     };
   };
 
diff --git a/modules/services/website.nix b/modules/services/website.nix
deleted file mode 100644
index 3fba609..0000000
--- a/modules/services/website.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ inputs, pkgs, ... }: let
-  pastel = inputs.pastel.packages.${pkgs.system}.default;
-in {
-  services.nginx.virtualHosts = {
-    "cilly.moe" = {
-      useACMEHost = "cilly.moe";
-      forceSSL = true;
-      root = pastel.outPath;
-    };
-    "cilly.dev" = {
-      useACMEHost = "cilly.dev";
-      forceSSL = true;
-      root = pastel.outPath;
-    };
-    "lava.moe" = {
-      useACMEHost = "lava.moe";
-      forceSSL = true;
-      root = inputs.website.outPath;
-    };
-    "cdn.lava.moe" = {
-      useACMEHost = "lava.moe";
-      forceSSL = true;
-      extraConfig = ''
-        return 301 https://sh.lava.moe$request_uri;
-      '';
-    };
-    "sh.lava.moe" = {
-      useACMEHost = "lava.moe";
-      forceSSL = true;
-      root = "/persist/cdn";
-    };
-    "_" = {
-      default = true;
-      addSSL = true;
-      # TODO generate this somewhere
-      sslCertificate = "/persist/fakeCerts/fake.crt";
-      sslCertificateKey = "/persist/fakeCerts/fake.key";
-      extraConfig = ''
-        return 444;
-      '';
-    };
-  };
-}
diff --git a/modules/system/base.nix b/modules/system/base.nix
index c45eb99..c7e3591 100644
--- a/modules/system/base.nix
+++ b/modules/system/base.nix
@@ -1,6 +1,4 @@
-{ config, inputs, modules, ... }: {
-  imports = [ modules.binds modules.options ];
-
+{ config, enableGUI, inputs, modules, overlays, ... }: {
   environment.etc = {
     "machine-id".source = "/persist/machine-id";
     "ssh/ssh_host_rsa_key".source = "/persist/ssh_host_rsa_key";
@@ -11,8 +9,6 @@
   environment.pathsToLink = [ "/share/zsh" ];
 
   i18n.defaultLocale = "en_AU.UTF-8";
-  i18n.extraLocales = [ "en_GB.UTF-8/UTF-8" ];
-
   users.mutableUsers = false;
 
   system = {
@@ -23,5 +19,6 @@
     };
   };
   nix.registry.config.flake = inputs.self;
+  nix.registry.nixpkgs.flake = inputs.nixpkgs;
   nix.registry.shells.flake = inputs.self;
 }
diff --git a/modules/system/corectrl.nix b/modules/system/corectrl.nix
index 6f6ca01..c2ec98d 100644
--- a/modules/system/corectrl.nix
+++ b/modules/system/corectrl.nix
@@ -1,5 +1,9 @@
 { ... }: {
   programs.corectrl = {
     enable = true;
+    gpuOverclock = {
+      enable = true;
+      ppfeaturemask = "0xffffffff";
+    };
   };
 }
diff --git a/modules/system/docker.nix b/modules/system/docker.nix
deleted file mode 100644
index 1ebd190..0000000
--- a/modules/system/docker.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, ... }: {
-  virtualisation.docker = {
-    enable = true;
-    storageDriver = "btrfs";
-    # rootless = {
-    #   enable = true;
-    #   setSocketVariable = true;
-    # };
-  };
-  environment.systemPackages = [
-    pkgs.docker-compose
-  ];
-}
diff --git a/modules/system/greetd.nix b/modules/system/greetd.nix
deleted file mode 100644
index f220847..0000000
--- a/modules/system/greetd.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }: {
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && Hyprland > $XDG_RUNTIME_DIR/Hyprland.out\"'";
-        user = "greeter";
-      };
-
-      initial_session = {
-        command = "${pkgs.writeShellScript "launch.sh" ''
-          zsh -c "source $HOME/.config/zsh/.zshrc && Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\""
-        ''}";
-        user = "rin";
-      };
-    };
-  };
-}
diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd_wayland.nix
new file mode 100644
index 0000000..9295b27
--- /dev/null
+++ b/modules/system/greetd_wayland.nix
@@ -0,0 +1,21 @@
+{ pkgs, lib, ... }: {
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && Hyprland > $XDG_RUNTIME_DIR/Hyprland.out\"'";
+        user = "greeter";
+      };
+
+      initial_session = {
+        command = "Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\"";
+        user = "rin";
+      };
+    };
+  };
+
+  services.xserver = {
+    autorun = false;
+    displayManager.startx.enable = true;
+  };
+}
diff --git a/modules/system/greetd_xorg.nix b/modules/system/greetd_xorg.nix
new file mode 100644
index 0000000..2958926
--- /dev/null
+++ b/modules/system/greetd_xorg.nix
@@ -0,0 +1,16 @@
+{ pkgs, lib, ... }: {
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && startx\"'";
+        user = "greeter";
+      };
+    };
+  };
+
+  services.xserver = {
+    autorun = false;
+    displayManager.startx.enable = true;
+  };
+}
diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index 7028dac..128e850 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -15,6 +15,7 @@
       hanazono
       noto-fonts
       noto-fonts-cjk-sans
+      noto-fonts-extra
       open-sans
       twemoji-color-font
       unifont
@@ -25,7 +26,4 @@
     displayManager.lightdm.enable = lib.mkForce false;
     desktopManager.xterm.enable = false;
   };
-
-  programs.hyprland.enable = true;
-  security.pam.services.hyprlock = {};
 }
diff --git a/modules/system/home-manager.nix b/modules/system/home-manager.nix
index 7d0f19d..3255e4d 100644
--- a/modules/system/home-manager.nix
+++ b/modules/system/home-manager.nix
@@ -1,4 +1,4 @@
-{ config, inputs, modules, ... }: {
+{ config, enableGUI, inputs, modules, ... }: {
   imports = [
     inputs.home-manager.nixosModules.home-manager
   ];
@@ -6,14 +6,8 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = {
-      inherit inputs modules;
+      inherit enableGUI inputs modules;
       sysConfig = config;
     };
-    sharedModules = [
-      {
-        imports = [ modules.options ];
-        config.me = config.me;
-      }
-    ];
   };
 }
diff --git a/modules/system/input.nix b/modules/system/input.nix
index a0bf2ff..6eaf550 100644
--- a/modules/system/input.nix
+++ b/modules/system/input.nix
@@ -6,19 +6,14 @@
         "-arinterval 15"
       ];
     };
+    xkb.options = "caps:escape";
   };
-  services.keyd = {
+  services.libinput = {
     enable = true;
-    keyboards = {
-      default = {
-        ids = [ "*" ];
-        settings = {
-          main = {
-            capslock = "esc";
-            esc = "capslock";
-          };
-        };
-      };
+    mouse = {
+      accelSpeed = "0";
+      accelProfile = "flat";
     };
   };
+  console.useXkbConfig = true;
 }
diff --git a/modules/system/nix-stable.nix b/modules/system/nix-stable.nix
index 1884c04..a88612a 100644
--- a/modules/system/nix-stable.nix
+++ b/modules/system/nix-stable.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }: {
   nix = {
-    package = pkgs.nixVersions.latest;
-
     settings = rec {
       substituters = [
         "https://cache.nixos.org?priority=10"
@@ -19,5 +17,4 @@
     '';
   };
   nixpkgs.config.allowUnfree = true;
-  programs.nh.enable = true;
 }
diff --git a/modules/system/nix.nix b/modules/system/nix.nix
index eb14f73..b3ebc41 100644
--- a/modules/system/nix.nix
+++ b/modules/system/nix.nix
@@ -1,7 +1,6 @@
-{ config, inputs, pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   nix = {
-    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-    package = pkgs.nixVersions.latest;
+    package = pkgs.nixVersions.git;
 
     settings = rec {
       extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
@@ -24,5 +23,4 @@
     '';
   };
   nixpkgs.config.allowUnfree = true;
-  programs.nh.enable = true;
 }
diff --git a/modules/system/packages-gui.nix b/modules/system/packages-gui.nix
deleted file mode 100644
index d853c40..0000000
--- a/modules/system/packages-gui.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, lib, pkgs, ... }: {
-  config = lib.mkIf config.me.gui {
-    environment.systemPackages = with pkgs; [
-      android-tools
-      gparted
-      nautilus
-    ];
-    hardware.graphics.extraPackages = with pkgs; [
-      intel-vaapi-driver
-      libva-vdpau-driver
-      libvdpau-va-gl
-    ];
-    hardware.opentabletdriver.enable = true;
-    hardware.keyboard.qmk.enable = true;
-    programs.steam = {
-      enable = true;
-      package = pkgs.steam.override {
-        extraPkgs = pkgs: with pkgs; [
-          gsettings-desktop-schemas
-        ];
-      };
-    };
-    services.dbus.packages = [ pkgs.dconf pkgs.gcr ];
-    services.gnome.sushi.enable = true;
-  };
-}
diff --git a/modules/system/packages.nix b/modules/system/packages.nix
index d4e2e3c..2f545a2 100644
--- a/modules/system/packages.nix
+++ b/modules/system/packages.nix
@@ -1,14 +1,11 @@
-{ pkgs, ... }: {
-  imports = [ ./packages-gui.nix ];
+{ config, enableGUI, lib, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    # ecryptfs
+    comma
+    ecryptfs
     efibootmgr
-    fd
     git
-    git-crypt
     htop
     jq
-    kitty.terminfo
     libarchive
     lf
     msr-tools
@@ -16,10 +13,33 @@
     neovim
     nfs-utils
     ntfs3g
-    ripgrep
-    rsync
     sshfs
+    rsync
     wget
+  ] ++ lib.optionals enableGUI [
+    gparted
+    nautilus
   ];
   environment.variables.EDITOR = "nvim";
 }
+// (if !enableGUI then {} else {
+  programs.adb.enable = true;
+  hardware.graphics.extraPackages = with pkgs; [
+    vaapiIntel
+    vaapiVdpau
+    libvdpau-va-gl
+  ];
+  programs.light.enable = true;
+  hardware.opentabletdriver.enable = true;
+  hardware.keyboard.qmk.enable = true;
+  programs.steam = {
+    enable = true;
+    package = pkgs.steam.override {
+      extraPkgs = pkgs: with pkgs; [
+        gsettings-desktop-schemas
+      ];
+    };
+  };
+  services.dbus.packages = [ pkgs.dconf pkgs.gcr ];
+  services.gnome.sushi.enable = true;
+})
diff --git a/modules/system/security.nix b/modules/system/security.nix
index f1f087b..602f108 100644
--- a/modules/system/security.nix
+++ b/modules/system/security.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ config, pkgs, ... }: {
   networking.firewall =
   let
     iptables = "${pkgs.iptables}/bin/iptables";
@@ -53,33 +53,5 @@
         }
       ];
     };
-    pam = lib.mkIf (config.me.environment != "headless") {
-      u2f = {
-        enable = true;
-        settings = {
-          cue = true;
-          pinverification = 1;
-        };
-      };
-      services.doas.rules.auth = {
-        u2f.settings.pinverification = lib.mkForce 0;
-        u2f_int = lib.mkMerge [
-          {
-            enable = true;
-            order = config.security.pam.services.doas.rules.auth.u2f.order + 1;
-            control = "sufficient";
-            modulePath = "${pkgs.pam_u2f}/lib/security/pam_u2f.so";
-            inherit (config.security.pam.u2f) settings;
-          }
-          {
-            settings = lib.mkForce {
-              interactive = true;
-              pinverification = 0;
-              userpresence = 0;
-            };
-          }
-        ];
-      };
-    };
   };
 }
diff --git a/modules/system/tailscale.nix b/modules/system/tailscale.nix
deleted file mode 100644
index 5e3e044..0000000
--- a/modules/system/tailscale.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }: {
-  age.secrets.tailscale_auth.file = ../../secrets/tailscale_auth.age;
-  me.binds."/var/lib/tailscale" = "tailscale";
-  networking.firewall.trustedInterfaces = [ "tailscale0" ];
-  networking.firewall.allowedUDPPorts = lib.mkIf (config.me.environment == "headless") [ 123 ];
-
-  services.tailscale = {
-    enable = true;
-    authKeyFile = config.age.secrets.tailscale_auth.path;
-    openFirewall = true;
-    useRoutingFeatures = if config.me.environment == "headless" then "both" else "client";
-  };
-}
diff --git a/modules/services/transmission.nix b/modules/system/transmission.nix
similarity index 71%
rename from modules/services/transmission.nix
rename to modules/system/transmission.nix
index 7540d68..202b5ae 100644
--- a/modules/services/transmission.nix
+++ b/modules/system/transmission.nix
@@ -5,6 +5,13 @@
     downloadDirPermissions = "775";
     openFirewall = true;
     settings = {
+      alt-speed-down = 512;
+      alt-speed-enabled = true;
+      alt-speed-time-begin = 360;
+      alt-speed-time-day = 127;
+      alt-speed-time-enabled = true;
+      alt-speed-time-end = 1380;
+      alt-speed-up = 256;
       download-dir = "/persist/transmission/Downloads";
       incomplete-dir = "/persist/transmission/.incomplete";
       ratio-limit-enabled = true;
diff --git a/modules/system/wireguard.nix b/modules/system/wireguard.nix
index 71f85ad..2684d65 100644
--- a/modules/system/wireguard.nix
+++ b/modules/system/wireguard.nix
@@ -1,11 +1,13 @@
-{ config, lib, pkgs, gcSecrets, ... }:
+{ config, lib, pkgs, ... }:
 let
-  port = 51801;
-  serverName = "dandelion";
-  serverInterface = "enp0s6";
-  serverIp = gcSecrets.wireguard.gateway;
+  port = 51820;
+  serverName = "sugarcane";
+  serverInterface = "ens3";
+  serverIp = "51.79.240.130";
 
   forwarding = {
+    "80" = [ "10.100.0.2" "80" ];
+    "443" = [ "10.100.0.2" "443" ];
     "22727" = [ "10.100.0.3" "7777" ];
   };
 
@@ -18,61 +20,52 @@ let
       in ''
         ${pkgs.iptables}/bin/iptables -${type} PREROUTING -t nat -i ${serverInterface} -p tcp --dport ${sport} -j DNAT --to ${dest}:${dport}
         ${pkgs.iptables}/bin/iptables -${type} FORWARD -p tcp -d ${dest} --dport ${dport} -j ACCEPT
-        ${pkgs.iptables}/bin/iptables -${type} PREROUTING -t nat -i ${serverInterface} -p udp --dport ${sport} -j DNAT --to ${dest}:${dport}
-        ${pkgs.iptables}/bin/iptables -${type} FORWARD -p udp -d ${dest} --dport ${dport} -j ACCEPT
       '') forwarding
     );
 
-  clients = {
+  routeBypass = {
+    caramel = {
+      gateway = "192.168.100.1";
+      interface = "wlan0";
+      routes = [
+        serverIp
+      ];
+    };
     hyacinth = {
-      publicKey = "6nVhazYdmC15A/nke9VrqIg3sOBVOmqj4GEsyBq7MVo=";
-      allowedIPs = [ "10.100.0.3/32" "${gcSecrets.wireguard.ipv6Subnet}:3" "fd0d::3" ];
-      interfaces = {
-        wg0 = { peers = [ server6OnlyPeer ]; };
-        wg1 = { peers = [ serverPeer ]; autostart = false; };
-        wg2 = { peers = [ serverLocalOnlyPeer ]; autostart = false; };
-      };
-    };
-    anemone = {
-      publicKey = "px5+JNdAmqBvUC++DhiJrUBRAr+BYP6iYVt4sbhPTWY=";
-      allowedIPs = [ "10.100.0.4/32" "${gcSecrets.wireguard.ipv6Subnet}:4" "fd0d::4" ];
-      interfaces = {
-        wg0 = { peers = [ server6OnlyPeer ]; };
-        wg1 = { peers = [ serverPeer ]; autostart = false; };
-        wg2 = { peers = [ serverLocalOnlyPeer ]; autostart = false; };
-      };
-    };
-    hibiscus = {
-      publicKey = "vQ5a2KMrwi7RCRsD0yvog+n35vQYFuvwiPn+W4lbRBw=";
-      allowedIPs = [ "10.100.0.5/32" "${gcSecrets.wireguard.ipv6Subnet}:5" "fd0d::5" ];
-      interfaces = {
-        wg0 = { peers = [ server6OnlyPeer ]; };
-        wg1 = { peers = [ serverPeer ]; autostart = false; };
-        wg2 = { peers = [ serverLocalOnlyPeer ]; autostart = false; };
-      };
-    };
-    hazel = {
-      publicKey = "0zruTndObzHo+b1rbOuTsxCU97epygZycxXS/lgUHUc=";
-      allowedIPs = [ "10.100.0.21/32" "${gcSecrets.wireguard.ipv6Subnet}:21" "fd0d::21" ];
-      interfaces = {
-        wg0 = {
-          dns = [ "::1" "127.0.0.1" ];
-          peers = [ serverLocalOnlyPeer ];
-        };
-      };
+      gateway = "192.168.100.1";
+      interface = "enp5s0";
+      routes = [
+        serverIp
+      ];
     };
   };
 
-  clientPeers = builtins.map (client: builtins.removeAttrs client [ "interfaces" ]) (builtins.attrValues clients);
-  serverPeerWith = ips: {
+  clients = {
+    caramel = {
+      publicKey = "VDqcpS0lJzFgwikj61MJ1xc9P8Cuq0NXa+Hc+etn2iA=";
+      allowedIPs = [ "10.100.0.2/32" ];
+    };
+    hyacinth = {
+      publicKey = "6nVhazYdmC15A/nke9VrqIg3sOBVOmqj4GEsyBq7MVo=";
+      allowedIPs = [ "10.100.0.3/32" ];
+    };
+    strawberry = {
+      publicKey = "Fkcp/VSN4Dkhly8V4hskF4lnDviA7VZHCnWf7OliFCg=";
+      allowedIPs = [ "10.100.0.4/32" ];
+    };
+    maple = {
+      publicKey = "kPw8hpANygfz83Oi/l+iCVYalV2zfs7fhkccjoGG2Do=";
+      allowedIPs = [ "10.100.0.5/32" ];
+    };
+  };
+
+  clientPeers = builtins.attrValues clients;
+  serverPeer = {
     publicKey = "3ugIk2tQZXjAH9/95s63ld2WNUHQrd4Mz5jzbln6oj0=";
-    allowedIPs = ips;
+    allowedIPs = [ "0.0.0.0/0" ];
     endpoint = "${serverIp}:${toString port}";
     persistentKeepalive = 25;
   };
-  serverPeer = serverPeerWith [ "0.0.0.0/0" "::/0" ];
-  server6OnlyPeer = serverPeerWith [ "10.100.0.0/24" "::/0" ];
-  serverLocalOnlyPeer = serverPeerWith [ "10.100.0.0/24" "fd0d::/16" ];
 
   serverConfig = {
     nat = {
@@ -86,7 +79,7 @@ let
     };
 
     wireguard.interfaces.wg0 = {
-      ips = [ "10.100.0.1/24" "${gcSecrets.wireguard.ipv6Subnet}:1" "fd0d::1" ];
+      ips = [ "10.100.0.1/24" ];
       listenPort = port;
 
       postSetup = ''
@@ -104,24 +97,33 @@ let
   };
 
   clientConfig = {
-    wg-quick.interfaces =
+    wireguard.interfaces.wg0 =
     let
       client = clients."${config.networking.hostName}";
-    in
-      builtins.mapAttrs (interface: conf: {
-        address = client.allowedIPs;
-        dns = [ "fd0d::1" "10.100.0.1" ];
-        privateKeyFile = config.age.secrets."wg_${config.networking.hostName}".path;
-      } // conf) client.interfaces;
+      routes = routeBypass."${config.networking.hostName}";
+      mapRoutes = type: lib.concatMapStringsSep "\n" (r: "${pkgs.iproute2}/bin/ip route ${type} ${r} via ${routes.gateway} dev ${routes.interface}") routes.routes;
+    in {
+      ips = client.allowedIPs;
+      listenPort = port;
+
+      postSetup = ''
+        ${mapRoutes "add"}
+        ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o ${serverInterface} -j MASQUERADE
+      '';
+
+      postShutdown = ''
+        ${mapRoutes "del"}
+        ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o ${serverInterface} -j MASQUERADE
+      '';
+
+      privateKeyFile = config.age.secrets."wg_${config.networking.hostName}".path;
+      peers = [ serverPeer ];
+    };
   };
 in {
-  boot.kernel.sysctl = lib.mkIf (config.networking.hostName == serverName) ({
-    "net.ipv6.conf.all.forwarding" = true;
-    "net.ipv6.conf.default.forwarding" = true;
-  });
   networking =
     lib.mkMerge [
       (lib.mkIf (config.networking.hostName == serverName) serverConfig)
-      (lib.mkIf (config.networking.hostName != serverName) clientConfig)
+      (lib.mkIf (builtins.hasAttr config.networking.hostName clients) clientConfig)
     ];
 }
diff --git a/modules/user/bspwm.nix b/modules/user/bspwm.nix
new file mode 100644
index 0000000..13b2941
--- /dev/null
+++ b/modules/user/bspwm.nix
@@ -0,0 +1,19 @@
+# Depends on eww
+{ config, pkgs, ... }: {
+  xsession.windowManager.bspwm = {
+    enable = true;
+    monitors = { "DP-1" = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" "0"]; };
+    settings = {
+      window_gap = 10;
+      border_width = 0;
+      split_ratio = 0.5;
+      top_padding = 0;
+    };
+    extraConfig = ''
+      ${pkgs.feh}/bin/feh --no-fehbg --bg-fill ~/Pictures/Wallpapers/current
+
+      ${pkgs.procps}/bin/pkill -SIGINT eww
+      ${pkgs.eww}/bin/eww open linebar
+    '';
+  };
+}
diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix
index 176b42c..e941fc0 100644
--- a/modules/user/catppuccin.nix
+++ b/modules/user/catppuccin.nix
@@ -1,4 +1,4 @@
-{ config, inputs, lib, pkgs, ... }: {
+{ config, inputs, lib, ... }: {
   imports = [
     inputs.catppuccin.homeManagerModules.catppuccin
   ];
@@ -14,62 +14,18 @@
 
   config = {
     catppuccin = {
-      accent = lib.mkDefault "pink";
-      flavor = lib.mkDefault "mocha";
+      accent = "maroon";
+      flavor = "mocha";
       kitty.enable = true;
       gtk.enable = true;
       hyprlock.enable = true;
+      kvantum.enable = true;
       nvim.enable = true;
     };
-
-    specialisation = {
-      light.configuration.catppuccin.flavor = "latte";
-      dark.configuration.catppuccin.flavor = "mocha";
+    qt = {
+      enable = true;
+      style.name = "kvantum";
+      platformTheme.name = "kvantum";
     };
-
-    home.packages = [(pkgs.writeShellScriptBin "theme" ''
-      last_path="$HOME/.local/state/last-theme"
-      target="$1"
-      if [ "$target" == "get_last" ]; then
-        if [ ! -e "$last_path" ]; then
-          echo "no last theme found; assuming dark" >&2
-          target="dark"
-        else
-          target=$(cat "$last_path" | tr -d "\n")
-        fi
-        echo "$target"
-        exit 0
-      fi
-      if [ "$target" == "restore" ]; then
-        echo "restoring theme"
-        if [ ! -e "$last_path" ]; then
-          echo "no last theme found; assuming dark" >&2
-          target="dark"
-        else
-          target=$(cat "$last_path" | tr -d "\n")
-        fi
-      fi
-      if [ "$target" != "dark" ] && [ "$target" != "light" ]; then
-        echo "invalid theme, valid values: [dark, light, restore]"
-        exit 1
-      fi
-      current="$HOME/.local/state/home-manager/gcroots/current-home/"
-      cached="$HOME/.local/state/last-parent-specialisation"
-      if [ -d "$current/specialisation" ]; then
-        if [ -d "$cached" ]; then
-          rm -f "$cached"
-        fi
-        ln -sf "$(readlink -f $current)" "$cached"
-      fi
-
-      if [ ! -d "$cached/specialisation" ]; then
-        echo "no specialisations found"
-        exit 1
-      fi
-
-      "$cached/specialisation/$target/activate"
-
-      echo "$target" > "$last_path"
-    '')];
   };
 }
diff --git a/modules/user/comma.nix b/modules/user/comma.nix
deleted file mode 100644
index 5ae7f03..0000000
--- a/modules/user/comma.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ inputs, ... }: {
-  imports = [
-    inputs.nix-index-database.homeModules.default
-  ];
-  programs.nix-index.enable = true;
-  programs.nix-index-database.comma.enable = true;
-}
diff --git a/modules/user/direnv.nix b/modules/user/direnv.nix
index 2329800..3f54b94 100644
--- a/modules/user/direnv.nix
+++ b/modules/user/direnv.nix
@@ -5,7 +5,7 @@
       enable = true;
     };
   };
-  programs.git.settings.core.excludesFile = ".envrc";
+  programs.git.extraConfig.core.excludesFile = ".envrc";
   # We can't use .source since hm manages this file too
   xdg.configFile."direnv/direnvrc".text = builtins.readFile ../../res/direnvrc;
   home.activation = {
diff --git a/modules/user/eww-wayland.nix b/modules/user/eww-wayland.nix
new file mode 100644
index 0000000..e82f5ac
--- /dev/null
+++ b/modules/user/eww-wayland.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+let
+  res = pkgs.stdenvNoCC.mkDerivation {
+    pname = "eww-wayland-config";
+    version = "1.0.0";
+    dontUnpack = true;
+    installPhase = ''
+      cp -r ${../../res/eww-wayland} $out
+      substituteInPlace $out/eww.scss \
+        --replace-warn "EWW_BACKGROUND" "${config.catppuccin.hexcolors.crust}" \
+        --replace-warn "EWW_TEXT" "${config.catppuccin.hexcolors.text}" \
+        --replace-warn "EWW_ACCENT" "${config.catppuccin.hexcolors.${config.catppuccin.accent}}"
+    '';
+  };
+in {
+  home.packages = with pkgs; [ socat ];
+  programs.eww = {
+    enable = true;
+    configDir = res;
+  };
+}
diff --git a/modules/user/eww.nix b/modules/user/eww.nix
index 13db70e..b0a8099 100644
--- a/modules/user/eww.nix
+++ b/modules/user/eww.nix
@@ -1,29 +1,8 @@
-{ config, lib, pkgs, ... }:
-let
-  inherit (lib) boolToString defaultTo;
-  res = pkgs.stdenvNoCC.mkDerivation {
-    pname = "eww-wayland-config";
-    version = "1.0.0";
-    dontUnpack = true;
-    installPhase = ''
-      cp -r ${../../res/eww} $out
-
-      substituteInPlace $out/eww.yuck \
-        --replace-fail "_BAT_ENABLED_" "${boolToString (config.me.batteryDevice != null)}" \
-        --replace-fail "_BAT_PATH_" "${defaultTo "" config.me.batteryDevice}" \
-        --replace-fail "_BT_ENABLED_" "${boolToString config.me.hasBluetooth}" \
-        --replace-fail "_WIFI_ENABLED_" "${boolToString config.me.hasWifi}"
-
-      substituteInPlace $out/eww.scss \
-        --replace-fail "EWW_BACKGROUND" "${config.catppuccin.hexcolors.crust}" \
-        --replace-fail "EWW_TEXT" "${config.catppuccin.hexcolors.text}" \
-        --replace-fail "EWW_ACCENT" "${config.catppuccin.hexcolors.${config.catppuccin.accent}}"
-    '';
-  };
-in {
-  home.packages = with pkgs; [ iw socat ];
+# Depends on bspwm
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ xtitle ];
   programs.eww = {
     enable = true;
+    configDir = ../../res/eww;
   };
-  xdg.configFile."eww".source = res;
 }
diff --git a/modules/user/git.nix b/modules/user/git.nix
index ca2762e..b64492e 100644
--- a/modules/user/git.nix
+++ b/modules/user/git.nix
@@ -1,16 +1,15 @@
 { ... }: {
   programs.git = {
     enable = true;
+    userName = "LavaDesu";
+    userEmail = "me@lava.moe";
     signing = {
       key = "059F098EBF0E9A13E10A46BF6500251E087653C9";
       signByDefault = true;
     };
-    settings = {
-      user.name = "Cilly Leang";
-      user.email = "mini@cilly.moe";
+    extraConfig = {
       core.abbrev = 11;
       safe.directory = "/home/rin/Projects/flakes";
-      init.defaultBranch = "master";
     };
   };
 }
diff --git a/modules/user/gpg.nix b/modules/user/gpg.nix
index dba731f..768c5d9 100644
--- a/modules/user/gpg.nix
+++ b/modules/user/gpg.nix
@@ -5,6 +5,6 @@
   };
   services.gpg-agent = {
     enable = true;
-    pinentry.package = pkgs.pinentry-gnome3;
+    pinentryPackage = pkgs.pinentry-gnome3;
   };
 }
diff --git a/modules/user/hypridle.nix b/modules/user/hypridle.nix
index af7af86..9ee5f26 100644
--- a/modules/user/hypridle.nix
+++ b/modules/user/hypridle.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  kblight = "brightnessctl -d ${config.me.kbBacklightDevice}";
+  kblight = "light -s sysfs/leds/asus::kbd_backlight";
 in
 {
   home.packages = [ config.services.hypridle.package ];
@@ -13,28 +13,26 @@ in
         after_sleep_cmd = "hyprctl dispatch dpms on";
       };
 
-      listener = lib.optionals (config.me.kbBacklightDevice != null) [
+      listener = [
         {
           timeout = 120;
-          on-timeout = "${kblight} -s && ${kblight} 0";
-          on-resume = "${kblight} -r";
+          on-timeout = "${kblight} -O && ${kblight} -S 0";
+          on-resume = "${kblight} -I";
         }
-      ] ++ [
         {
           timeout = 150;
-          on-timeout = "brightnessctl -s && brightnessctl 50%-";
-          on-resume = "brightnessctl -r";
+          on-timeout = "light -O && light -T 0.5";
+          on-resume = "light -I";
         }
         {
           timeout = 180;
-          on-timeout = "brightnessctl -r && loginctl lock-session";
+          on-timeout = "light -I && loginctl lock-session";
         }
         {
           timeout = 195;
           on-timeout = "hyprctl dispatch dpms off";
           on-resume = "hyprctl dispatch dpms on";
         }
-      ] ++ lib.optionals (config.me.environment == "laptop") [
         {
           timeout = 600;
           on-timeout = "systemctl suspend";
diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix
index 529c522..2311d52 100644
--- a/modules/user/hyprlock.nix
+++ b/modules/user/hyprlock.nix
@@ -1,17 +1,4 @@
-{ config, lib, ... }:
-let
-  scaling = if config.me.hidpi then 1 else 0.5;
-  s = value: if builtins.isInt value || builtins.isFloat value
-  then
-    builtins.floor (value * scaling)
-  else if builtins.isList value
-  then
-    lib.strings.concatMapStringsSep "," (v: builtins.toString (scaling * v)) value
-  else
-    builtins.throw "invalid scaled value type ${builtins.typeOf value} for ${value}";
-  sn = value: s (builtins.map (v: (-v)) value);
-in
-{
+{ ... }: {
   programs.hyprlock = {
     enable = true;
     settings = {
@@ -21,7 +8,7 @@ in
       };
       auth = {
         fingerprint = {
-          enabled = config.me.hasFingerprint;
+          enabled = true;
           ready_message = "Scan fingerprint to unlock";
         };
       };
@@ -29,39 +16,16 @@ in
         monitor = "";
         color = "$base";
       };
-      shape = lib.optionals (config.me.batteryDevice != null) [
-        # Battery pill
-        {
-          monitor = "";
-          size = s [165 65];
-          color = "$crust";
-          rounding = -1;
-          halign = "right";
-          valign = "top";
-          position = sn [595 10];
-        }
-      ] ++ [
-        # Time pill
-        {
-          monitor = "";
-          size = s [545 65];
-          color = "$crust";
-          rounding = -1;
-          halign = "right";
-          valign = "top";
-          position = sn [40 10];
-        }
-      ];
-      label = lib.optionals config.me.hasFingerprint [
+      label = [
         # Fingerprint icon
         {
             monitor = "";
             color = "$text";
             font_family = "Material Symbols Outlined";
-            font_size = s 64;
+            font_size = 64;
             halign = "center";
             valign = "top";
-            position = sn [0 100];
+            position = "0, -100";
             text = "";
         }
         # Fingerprint text
@@ -69,64 +33,50 @@ in
           monitor = "";
           color = "$text";
           text = "$FPRINTPROMPT";
-          font_size = s 25;
+          font_size = 25;
           font_family = "Open Sans";
-          position = sn [0 235];
+          position = "0, -235";
           halign = "center";
           valign = "top";
         }
-      ] ++ lib.optionals (config.me.batteryDevice != null) [
-        # Battery icon
-        {
-          monitor = "";
-          text = "";
-          color = "$accent";
-          font_family = "Material Symbols Outlined";
-          font_size = s 27;
-          position = sn [695 20];
-          halign = "right";
-          valign = "top";
-        }
-        # Battery percentage
-        {
-          monitor = "";
-          text = ''cmd[update:60000] echo "<span weight='700'>$(cat /sys/class/power_supply/${config.me.batteryDevice}/capacity)%</span>"'';
-          color = "$text";
-          font_size = s 23;
-          font_family = "Open Sans";
-          position = sn [625 20];
-          halign = "right";
-          valign = "top";
-        }
-      ] ++ [
-        # Time and Date
-        {
-          monitor = "";
-          color = "$text";
-          font_family = "Open Sans";
-          font_size = s 23;
-          halign = "right";
-          valign = "top";
-          position = sn [70 20];
-          text = ''cmd[update:1000] echo "<span alpha='70%' weight='550'>$(date '+%A, %d %B %Y')</span>  <span weight='700'>$(date +%H:%M)</span><span alpha='70%' weight='550'>$(date +:%S)</span>"'';
-        }
-
         # Fail text under input
         {
           monitor = "";
           color = "$red";
           font_family = "Open Sans";
-          font_size = s 25;
+          font_size = 25;
           text = "$FAIL $ATTEMPTS[]";
-          position = sn [0 200];
+          position = "0, -200";
           halign = "center";
           valign = "center";
         }
+        # Time
+        {
+          monitor = "";
+          text = "$TIME";
+          color = "$text";
+          font_size = 90;
+          font_family = "Open Sans";
+          position = "-50, 0";
+          halign = "right";
+          valign = "top";
+        }
+        # Date
+        {
+          monitor = "";
+          text = "cmd[update:43200000] date +'%A, %d %B %Y'";
+          color = "$text";
+          font_size = 25;
+          font_family = "Open Sans";
+          position = "-50, -150";
+          halign = "right";
+          valign = "top";
+        }
       ];
       input-field = {
         monitor = "";
-        size = s [600 120];
-        outline_thickness = s 4;
+        size = "600, 120";
+        outline_thickness = 4;
         check_color = "$peach";
         dots_size = 0.2;
         dots_spacing = 0.2;
@@ -139,7 +89,7 @@ in
         fade_on_empty = false;
         hide_input = false;
         capslock_color = "$yellow";
-        position = sn [0 47];
+        position = "0, -47";
         halign = "center";
         valign = "center";
       };
diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix
index ddc189a..1ae7970 100644
--- a/modules/user/kitty.nix
+++ b/modules/user/kitty.nix
@@ -11,9 +11,6 @@
       enable_audio_bell = false;
       color5 = config.catppuccin.hexcolors.mauve;
       color13 = config.catppuccin.hexcolors.mauve;
-      window_margin_width = 5;
-      scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - " -c "autocmd VimEnter * normal G"'';
-      scrollback_pager_history_size = 2;
     };
   };
 }
diff --git a/modules/user/mpv.nix b/modules/user/mpv.nix
index 6ef3da4..1b1899c 100644
--- a/modules/user/mpv.nix
+++ b/modules/user/mpv.nix
@@ -1,7 +1,8 @@
-{ pkgs, ... }: {
+{ config, pkgs, ... }: {
   programs.mpv = {
     enable = true;
-    package = pkgs.mpv.override {
+    package = pkgs.mpv-unwrapped.wrapper {
+      mpv = pkgs.mpv-unwrapped;
       youtubeSupport = true;
       scripts = [ pkgs.mpvScripts.mpris ];
     };
diff --git a/modules/user/neovim-minimal.nix b/modules/user/neovim-minimal.nix
index 392097d..e319e38 100644
--- a/modules/user/neovim-minimal.nix
+++ b/modules/user/neovim-minimal.nix
@@ -9,12 +9,11 @@
     vimAlias = true;
     vimdiffAlias = true;
     withNodeJs = false;
-    withPython3 = false;
-    withRuby = false;
 
     plugins = with pkgs.vimPlugins; [
-      fzf-vim
+      ctrlp-vim
       lualine-nvim
+      nerdtree
       tokyonight-nvim
       vim-fugitive
       vim-nix
@@ -22,7 +21,14 @@
       vim-signify
       vim-surround
 
+      nvim-cmp
+      nvim-lspconfig
+      cmp-nvim-lsp
+      cmp_luasnip
+      luasnip
+
       (nvim-treesitter.withPlugins (p: with p; [
+        tree-sitter-comment
         tree-sitter-json
         tree-sitter-lua
         tree-sitter-nix
diff --git a/modules/user/neovim.nix b/modules/user/neovim.nix
index 2b8d4c1..4c74919 100644
--- a/modules/user/neovim.nix
+++ b/modules/user/neovim.nix
@@ -1,9 +1,9 @@
-{ config, lib, pkgs, sysConfig, ... }:
+{ config, lib, pkgs, ... }:
 let
   luaconf = pkgs.writeText "config.lua"
     (lib.replaceStrings
-      ["{{OMNISHARP_PATH}}" "{{DART_PATH}}" "{{CATPPUCCIN_FLAVOUR}}" "{{USERNAME}}" "{{HOSTNAME}}"]
-      ["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart" config.catppuccin.nvim.flavor config.home.username sysConfig.networking.hostName]
+      ["{{OMNISHARP_PATH}}" "{{DART_PATH}}" "{{CATPPUCCIN_FLAVOUR}}"]
+      ["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart" config.catppuccin.nvim.flavor]
       (builtins.readFile ../../res/config.lua));
 in {
   systemd.user.tmpfiles.rules = [
@@ -17,35 +17,25 @@ in {
     vimdiffAlias = true;
     #package = pkgs.neovim-nightly;
     withNodeJs = true;
-    withPython3 = true;
-    withRuby = false;
 
     extraPackages = with pkgs; [
-      nixd
       rust-analyzer
-      texlab
-      astro-language-server
-      tailwindcss-language-server
-      diagnostic-languageserver
-      eslint_d
-      typescript-language-server
-      vscode-langservers-extracted
-      yaml-language-server
+      nodePackages."@prisma/language-server"
+      nodePackages.diagnostic-languageserver
+      nodePackages.eslint_d
+      nodePackages.typescript-language-server
+      nodePackages.vscode-langservers-extracted
+      nodePackages.yaml-language-server
     ];
 
     plugins = with pkgs.vimPlugins; [
-      autoclose-nvim
-      auto-save-nvim
       flutter-tools-nvim
       fzf-vim
       fzf-lsp-nvim
       lualine-nvim
-      nvim-ts-autotag
-      nvim-web-devicons
       plenary-nvim
       tokyonight-nvim
       vim-fugitive
-      vim-latex-live-preview
       vim-nix
       vim-repeat
       vim-signify
@@ -55,7 +45,6 @@ in {
 
       nvim-cmp
       nvim-dap
-      nvim-highlight-colors
       nvim-lspconfig
       cmp-nvim-lsp
       cmp_luasnip
@@ -63,33 +52,27 @@ in {
 
       #(pkgs.me.nvim-treesitter-nightly.withPlugins (p: with p; [
       (nvim-treesitter.withPlugins (p: with p; [
-        tree-sitter-astro
         tree-sitter-bash
         tree-sitter-c
         tree-sitter-c-sharp
         tree-sitter-cpp
-        tree-sitter-groovy
         tree-sitter-html
-        tree-sitter-java
         tree-sitter-javascript
         tree-sitter-json
-        tree-sitter-kotlin
-        tree-sitter-latex
         tree-sitter-lua
         tree-sitter-markdown
         tree-sitter-nix
         tree-sitter-php
+        tree-sitter-prisma
         tree-sitter-python
         tree-sitter-query
         tree-sitter-regex
         tree-sitter-rust
-        tree-sitter-swift
         tree-sitter-toml
         tree-sitter-tsx
         tree-sitter-typescript
         tree-sitter-vim
         tree-sitter-vimdoc
-        tree-sitter-xml
         tree-sitter-yaml
       ]))
     ];
diff --git a/modules/user/pass.nix b/modules/user/pass.nix
new file mode 100644
index 0000000..f1d4c3d
--- /dev/null
+++ b/modules/user/pass.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  programs.password-store = {
+    enable = true;
+    package = pkgs.pass.withExtensions (exts: with exts; [ pass-import pass-otp ]);
+  };
+}
diff --git a/modules/user/picom.nix b/modules/user/picom.nix
new file mode 100644
index 0000000..7c7d5e7
--- /dev/null
+++ b/modules/user/picom.nix
@@ -0,0 +1,41 @@
+{ config, ... }: {
+  services.picom = {
+    enable = true;
+
+    # blur = true;
+    # blurExclude = [
+    #   (builtins.concatStringsSep " && " [
+    #     "class_g != 'Alacritty'"
+    #     "class_g != 'kitty'"
+    #     #"class_g != 'Polybar'"
+    #     "class_g != 'URxvt'"
+    #   ])
+    # ];
+    fade = true;
+    fadeDelta = 5;
+    fadeSteps = [ 0.05 0.05 ];
+
+    opacityRules = [
+      "80:class_g = 'Alacritty' && !focused"
+      "95:class_g = 'kitty' && !focused"
+    ];
+    vSync = true;
+
+    settings = {
+      glx-no-stencil = true;
+      glx-copy-from-front = false;
+      glx-no-rebind-pixmap = true;
+      # https://github.com/yshui/picom/issues/578
+      glx-use-copysubbuffer-mesa = false;
+      use-damage = true;
+
+      detect-transient = true;
+      detect-client-leader = true;
+      detect-client-opacity = true;
+      detect-rounded-corners = true;
+      use-ewmh-active-win = true;
+      mark-wmwin-focused = true;
+      mark-ovredir-focused = true;
+    };
+  };
+}
diff --git a/modules/user/polybar.nix b/modules/user/polybar.nix
new file mode 100644
index 0000000..ce71f38
--- /dev/null
+++ b/modules/user/polybar.nix
@@ -0,0 +1,165 @@
+{ config, ... }: {
+  services.polybar =
+  let
+    colours = {
+      background1 = "#1a1b26";
+      background2 = "#9d7cd8";
+      accent = "#c0caf5";
+      foreground2 = "#1a1b26";
+      foreground2trans = "#cc1a1b26";
+    };
+  in {
+    enable = true;
+    script = builtins.readFile ../../scripts/polybar.sh;
+    settings = {
+      "bar/scroller" = {
+        monitor = "DP-1";
+        width = "100%";
+        height = 1;
+        background = colours.background1;
+        spacing = 2;
+        override-redirect = true;
+
+        modules.center = "workspaces-stub";
+        scroll = {
+          up = "#workspaces-stub.prev";
+          down = "#workspaces-stub.next";
+        };
+      };
+
+      "bar/top" = {
+        monitor = "DP-1";
+        width = "100%";
+        height = 29;
+        background = colours.background1;
+        foreground = "#fff";
+        offset-y = 3;
+
+        spacing = 2;
+        padding = {
+          left = 5;
+          right = 5;
+          bottom = 5;
+        };
+        override-redirect = true;
+        wm-restack = "bspwm";
+
+        font = [
+          "NotoSans:style=SemiBold:size=11:antialias=true;2"
+          "NotoSans:size=11:antialias=true;2"
+          "MaterialIcons:size=17:antialias=true;6"
+          "Iosevka:style=Medium:antialias=false:size=19;4"
+
+          "HanaMinA:size=9.8;1"
+          "HanaMinB:size=9.8;1"
+        ];
+
+        modules = {
+          left = "left workspaces right";
+          center = "title";
+          right = "left datetime right";
+        };
+
+        enable-ipc = true;
+        scroll = {
+          up = "#workspaces.prev";
+          down = "#workspaces.next";
+        };
+      };
+
+      "module/left" = {
+        type = "custom/text";
+
+        content = {
+          text = "%{T4}";
+          background = colours.background1;
+          foreground = colours.background2;
+        };
+      };
+
+      "module/right" = {
+        type = "custom/text";
+
+        content = {
+          text = "%{T4}";
+          background = colours.background1;
+          foreground = colours.background2;
+        };
+      };
+
+      "module/workspaces" = {
+        type = "internal/bspwm";
+
+        pin-workspaces = true;
+        enable-click = true;
+        enable-scroll = false;
+        reverse-scroll = false;
+
+        label = {
+          monitor = "";
+          focused = {
+            text = "%{T3}"; # ef4a
+            background = colours.background2;
+            foreground = colours.accent;
+          };
+          occupied = {
+            text = "%{T3}"; # e837
+            background = colours.background2;
+            foreground = colours.background1;
+          };
+          empty = {
+            text = "%{T3}"; # ef4a
+            background = colours.background2;
+            foreground = colours.background1;
+          };
+          urgent = {
+            text = "%{T3}"; # e837
+            background = colours.background2;
+            foreground = colours.background1;
+          };
+
+          separator = {
+            text = " ";
+            background = colours.background2;
+            padding = "0";
+          };
+        };
+      };
+
+      "module/workspaces-stub" = {
+        type = "internal/bspwm";
+        pin-workspaces = true;
+        enable-click = false;
+        enable-scroll = false;
+        reverse-scroll = false;
+        label = {
+          monitor = "";
+          focused = "";
+          occupied = "";
+          empty = "";
+          urgent = "";
+          separator = "";
+        };
+      };
+
+      "module/title" = {
+        type = "internal/xwindow";
+        format = {
+          text = "%{T1}<label>";
+          padding = 4;
+        };
+      };
+
+      "module/datetime" = {
+        type = "internal/date";
+        date = {
+          text = "%{T1}%%{F${colours.foreground2}}%H:%M%%{F-}";
+          alt = "%{T2}%%{F${colours.foreground2trans}}%A, %d %B %Y  %{T1}%%{F${colours.foreground2}}%H:%M%%{F${colours.foreground2trans}}:%{T2}%S%%{F-}";
+        };
+        format = {
+          background = colours.background2;
+        };
+      };
+    };
+  };
+}
diff --git a/modules/user/rofi-wayland.nix b/modules/user/rofi-wayland.nix
new file mode 100644
index 0000000..19e569e
--- /dev/null
+++ b/modules/user/rofi-wayland.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+let
+  theme = pkgs.stdenvNoCC.mkDerivation {
+    pname = "rofi-theme";
+    version = "1.0.0";
+    dontUnpack = true;
+    installPhase = ''
+      cp ${../../res/theme.rasi} $out
+      substituteInPlace $out \
+        --replace-fail "CAT_BACKGROUND" "${config.catppuccin.hexcolors.crust}" \
+        --replace-fail "CAT_TEXT" "${config.catppuccin.hexcolors.text}" \
+        --replace-fail "CAT_ACCENT" "${config.catppuccin.hexcolors.${config.catppuccin.accent}}" \
+        --replace-fail "CAT_PLACEHOLDER" "${config.catppuccin.hexcolors.overlay1}"
+    '';
+  };
+in {
+  programs.rofi = {
+    enable = true;
+    package = pkgs.rofi-wayland;
+    theme = "theme";
+  };
+  xdg.configFile."rofi/theme.rasi".source = theme;
+}
diff --git a/modules/user/rofi.nix b/modules/user/rofi.nix
index 1f11d06..45fcc4d 100644
--- a/modules/user/rofi.nix
+++ b/modules/user/rofi.nix
@@ -1,22 +1,7 @@
-{ config, pkgs, ... }:
-let
-  theme = pkgs.stdenvNoCC.mkDerivation {
-    pname = "rofi-theme";
-    version = "1.0.0";
-    dontUnpack = true;
-    installPhase = ''
-      cp ${../../res/theme.rasi} $out
-      substituteInPlace $out \
-        --replace-fail "CAT_BACKGROUND" "${config.catppuccin.hexcolors.crust}" \
-        --replace-fail "CAT_TEXT" "${config.catppuccin.hexcolors.text}" \
-        --replace-fail "CAT_ACCENT" "${config.catppuccin.hexcolors.${config.catppuccin.accent}}" \
-        --replace-fail "CAT_PLACEHOLDER" "${config.catppuccin.hexcolors.overlay1}"
-    '';
-  };
-in {
+{ config, inputs, ... }: {
   programs.rofi = {
     enable = true;
     theme = "theme";
   };
-  xdg.configFile."rofi/theme.rasi".source = theme;
+  xdg.configFile."rofi/theme.rasi".source = ../../res/theme.rasi;
 }
diff --git a/modules/user/sessionVariables.nix b/modules/user/sessionVariables.nix
index 22a6b09..ef9caab 100644
--- a/modules/user/sessionVariables.nix
+++ b/modules/user/sessionVariables.nix
@@ -6,6 +6,7 @@
       "$PATH"
     ];
 
+    XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
     EDITOR = "nvim";
 
     _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
@@ -21,6 +22,7 @@
     NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
     PUB_CACHE = "${config.xdg.cacheHome}/dart";
     WGETRC = "${config.xdg.configHome}/wgetrc";
+    XINITRC = "${config.xdg.configHome}/xorg/xinitrc";
 
     WINEPREFIX = "${config.xdg.dataHome}/wine64";
     WINEARCH = "win64";
diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix
index ec854c4..998f9f6 100644
--- a/modules/user/spicetify.nix
+++ b/modules/user/spicetify.nix
@@ -1,4 +1,4 @@
-{ config, inputs, lib, pkgs, ... }:
+{ config, inputs, pkgs, ... }:
 let
   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
 in
@@ -8,25 +8,7 @@ in
   programs.spicetify = {
     enable = true;
     alwaysEnableDevTools = true;
-    theme = spicePkgs.themes.catppuccin // {
-      additionalCss = ''
-        /* Removes "About the artist" text in now playing menu */
-        .main-nowPlayingView-sectionHeaderText {
-          display: none;
-        }
-
-        /* Removes gradient in now playing menu */
-        .main-nowPlayingView-contextItemInfo:before {
-          background: none;
-        }
-
-        /* Removes gradient above artist image */
-        /* https://stackoverflow.com/a/77015731 < this is so smart */
-        .main-nowPlayingView-aboutArtistV2ImageContainer.main-nowPlayingView-aboutArtistV2Image {
-          background-size: 0% 0%, cover;
-        }
-      '';
-    };
+    theme = spicePkgs.themes.catppuccin;
     colorScheme = config.catppuccin.flavor;
 
     enabledSnippets = with spicePkgs.snippets; [
@@ -40,11 +22,10 @@ in
       shuffle
       hidePodcasts
 
+      skipStats
       songStats
       history
       volumePercentage
     ];
   };
-
-  home.file.".local/bin/spotify".source = lib.getExe config.programs.spicetify.spicedSpotify;
 }
diff --git a/modules/user/sxhkd.nix b/modules/user/sxhkd.nix
new file mode 100644
index 0000000..b2bda2b
--- /dev/null
+++ b/modules/user/sxhkd.nix
@@ -0,0 +1,65 @@
+{ config, pkgs, ... }:
+let
+  super = "Mod4";
+  alt = "Mod1";
+in {
+  services.sxhkd = {
+    enable = true;
+    keybindings = {
+      # Dunst (Notification daemon)
+      "super + grave" = "dunstctl history-pop";
+      "super + shift + period" = "dunstctl context";
+      "super + shift + space" = "dunstctl close-all";
+
+      # Rofi (App launcher)
+      "super + Return" = "rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'Noto Sans 8'";
+
+      # Printscreen
+      "Print" = "maim -us | tee ~/Pictures/Screenshots/$(date +%s)c.png | xclip -selection clipboard -t image/png";
+      "shift + Print" = "maim -u | tee ~/Pictures/Screenshots/$(date +%s).png | xclip -selection clipboard -t image/png";
+
+      # Quick-kill picom
+      "super + p" = "systemctl --user stop picom";
+      "super + shift + p" = "systemctl --user restart picom";
+
+      # Volume
+      "XF86Audio{RaiseVolume,LowerVolume,Mute}" = "pamixer -{i 5,d 5,t}";
+
+      # Brightness
+      "XF86MonBrightness{Up,Down}" = "light -{A,U} 10";
+      "shift + XF86MonBrightness{Up,Down}" = "light -{A,U} 1";
+
+      # Gamma
+      "ctrl + XF86MonBrightness{Up,Down}" = "xgamma -gamma {1.3,1}";
+
+      "Super_L" = "eww open mainbar";
+      "@Super_L" = "eww close mainbar";
+
+      # Kill focused window
+      "super + {_,shift + }c" = "bspc node -{c,k}";
+
+      # Change focus
+      "super + {h,j,k,l}" = "bspc node -f {west,south,north,east}";
+      "super + {Left,Down,Up,Right}" = "bspc node -f {west,south,north,east}";
+
+      # Switch windows
+      "super + shift + {h,j,k,l}" = "bspc node -s {west,south,north,east}";
+      "super + shift + {Left,Down,Up,Right}" = "bspc node -s {west,south,north,east}";
+
+      # Move focused window
+      "super + shift + {1-9,0}" = "bspc node -d ^{1-9,10}";
+
+      # Toggle tiled/fullscreen/floating
+      "super + {t,f,space}" = "bspc node -t '~{tiled,fullscreen,floating}'";
+
+      # Exit / Restart bspwm
+      "super + shift + {q,r}" = "bspc {quit,wm -r}";
+
+      # Restart sxhkd
+      "super + shift + s" = "pkill -USR1 -x sxhkd";
+
+      # Workspace switching
+      "super + {1-9,0}" = "bspc desktop -f ^{1-9,10}";
+    };
+  };
+}
diff --git a/modules/user/xorg.nix b/modules/user/xorg.nix
new file mode 100644
index 0000000..b8ba9da
--- /dev/null
+++ b/modules/user/xorg.nix
@@ -0,0 +1,51 @@
+{ config, ... }: {
+
+  xsession = {
+    enable = true;
+    profilePath = ".config/xorg/xprofile";
+    scriptPath = ".config/xorg/xsession";
+  };
+
+  xdg.configFile."xorg/xinitrc".source = ../../scripts/xinitrc;
+  xresources = {
+    path = "${config.xdg.configHome}/xorg/xresources";
+    properties = {
+      # special
+      "*.foreground" =  "#c5c8c6";
+      "*.background" =  "#1d1f21";
+      "*.cursorColor" = "#c5c8c6";
+
+      # black
+      "*.color0" =      "#1d1f21";
+      "*.color8" =      "#969896";
+
+      # red
+      "*.color1" =      "#cc342b";
+      "*.color9" =      "#cc342b";
+
+      # green
+      "*.color2" =      "#198844";
+      "*.color10" =     "#198844";
+
+      # yellow
+      "*.color3" =      "#fba922";
+      "*.color11" =     "#fba922";
+
+      # blue
+      "*.color4" =      "#3971ed";
+      "*.color12" =     "#3971ed";
+
+      # magenta
+      "*.color5" =      "#a36ac7";
+      "*.color13" =     "#a36ac7";
+
+      # cyan
+      "*.color6" =      "#3971ed";
+      "*.color14" =     "#3971ed";
+
+      # white
+      "*.color7" =      "#c5c8c6";
+      "*.color15" =     "#ffffff";
+    };
+  };
+}
diff --git a/modules/user/zsh.nix b/modules/user/zsh.nix
index 1eb736c..9f4b920 100644
--- a/modules/user/zsh.nix
+++ b/modules/user/zsh.nix
@@ -38,8 +38,7 @@ let
     jf = "doas journalctl -f";
 
     fl = "cd ~/Projects/flakes";
-    nr = "nh os switch";
-    nb = "nh os boot";
+    nr = "doas nixos-rebuild switch --flake .#${sysConfig.networking.hostName} -v -L";
 
     gs = "git status";
     ga = "git add";
@@ -102,9 +101,10 @@ let
     bindkey -a -r ':'
   '';
 in {
+  programs.command-not-found.enable = true;
   programs.zsh = {
     enable = true;
-    dotDir = "${config.xdg.configHome}/zsh";
+    dotDir = ".config/zsh";
 
     autocd = true;
     defaultKeymap = "viins";
@@ -117,6 +117,14 @@ in {
     };
 
     enableCompletion = true;
+    initExtraBeforeCompInit = ''
+      fpath+=(/run/current-system/sw/share/zsh/site-functions)
+      zstyle ':completion:*' completer _complete
+      zstyle ':completion:*' matcher-list "" 'm:{[:lower:][:upper:]-_}={[:upper:][:lower:]_-}' '+l:|=* r:|=*'
+      zstyle ':completion:*' menu select
+      _comp_options+=(globdots)
+      zmodload zsh/complist
+    '';
 
     localVariables = {
       KEYTIMEOUT = "1";
@@ -130,26 +138,16 @@ in {
       ls = "ls --color=auto --group-directories-first -v";
       diff = "diff -Naur --color=auto";
     };
-    initContent = lib.mkMerge [
-      (lib.mkBefore ''
-        autoload -U colors && colors
-      '')
-      (lib.mkOrder 550 ''
-        fpath+=(/run/current-system/sw/share/zsh/site-functions)
-        zstyle ':completion:*' completer _complete
-        zstyle ':completion:*' matcher-list "" 'm:{[:lower:][:upper:]-_}={[:upper:][:lower:]_-}' '+l:|=* r:|=*'
-        zstyle ':completion:*' menu select
-        _comp_options+=(globdots)
-        zmodload zsh/complist
-      '')
-      (lib.concatStringsSep "\n" [
-        pure
-        cursorShape
-        direnv
-        genAbbrs
-        viExtraNav
-        disableExecute
-      ])
+    initExtraFirst = ''
+      autoload -U colors && colors
+    '';
+    initExtra = lib.concatStringsSep "\n" [
+      pure
+      cursorShape
+      direnv
+      genAbbrs
+      viExtraNav
+      disableExecute
     ];
 
     plugins = builtins.map (e: pluginFromInput e) [
diff --git a/overlays/android-studio.nix b/overlays/android-studio.nix
new file mode 100644
index 0000000..413dfad
--- /dev/null
+++ b/overlays/android-studio.nix
@@ -0,0 +1,27 @@
+self: { bash, buildFHSEnv, cacert, ncurses5, runCommand, ... } @ super:
+let
+  drvName = super.android-studio.name;
+  fhsEnv = buildFHSEnv {
+    name = "${drvName}-fhs-env";
+    # google's analytics calls jdk's getOperatingSystemMXBean which tries to parse cgroups and ultimately fails for whatever reason with an npe
+    unshareCgroup = false;
+    multiPkgs = pkgs: [
+      ncurses5
+
+      (runCommand "fedoracert" {}
+        ''
+        mkdir -p $out/etc/pki/tls/
+        ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs
+        '')
+    ];
+  };
+
+  startScript = ''
+    #!${bash}/bin/bash
+    ${fhsEnv}/bin/${drvName}-fhs-env ${super.android-studio.passthru.unwrapped}/bin/studio.sh "$@"
+  '';
+in {
+  android-studio = super.android-studio.overrideAttrs(_: {
+    inherit startScript;
+  });
+}
diff --git a/overlays/bitwarden-desktop.nix b/overlays/bitwarden-desktop.nix
deleted file mode 100644
index 2d7be24..0000000
--- a/overlays/bitwarden-desktop.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://github.com/NixOS/nixpkgs/pull/374068
-self: super: {
-  bitwarden-desktop = super.bitwarden-desktop.overrideAttrs (o: {
-    preBuild = o.preBuild + ''
-      pushd apps/desktop/desktop_native/proxy
-      cargo build --offline --bin desktop_proxy --release
-      popd
-    '';
-    installPhase = builtins.replaceStrings ["runHook preInstall"] [''
-      runHook preInstall
-
-      install -Dm755 -t $out/bin apps/desktop/desktop_native/target/release/desktop_proxy
-
-      mkdir -p $out/lib/mozilla/native-messaging-hosts
-      substituteAll ${./patches/firefox-native-messaging-host.json} $out/lib/mozilla/native-messaging-hosts/com.8bit.bitwarden.json
-
-    ''] o.installPhase;
-  });
-}
diff --git a/overlays/default.nix b/overlays/default.nix
index cbe3e7e..ff5bad1 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,12 +1,11 @@
 builtins.map (path: import path) [
-  ./bitwarden-desktop.nix
+  ./android-studio.nix
   ./cascadia-code.nix
   ./ccache.nix
   ./eww.nix
-  ./jetbrains.nix
   ./material-icons.nix
-  ./openldap.nix
+  ./rofi.nix
   ./steam.nix
   ./utillinux.nix
-  ./wpa-supplicant.nix
+  ./xinit.nix
 ]
diff --git a/overlays/jetbrains.nix b/overlays/jetbrains.nix
deleted file mode 100644
index dd1d1ad..0000000
--- a/overlays/jetbrains.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# https://github.com/NixOS/nixpkgs/issues/375254
-self: super: {
-  jetbrains = super.jetbrains // {
-    gateway = let
-      unwrapped = super.jetbrains.gateway;
-    in super.buildFHSEnv {
-      name = "gateway";
-      inherit (unwrapped) version;
-
-      runScript = super.writeScript "gateway-wrapper" ''
-        unset JETBRAINS_CLIENT_JDK
-        exec ${unwrapped}/bin/gateway "$@"
-      '';
-
-      meta = unwrapped.meta;
-
-      passthru = {
-        inherit unwrapped;
-      };
-    };
-  };
-}
diff --git a/overlays/linux-lava.nix b/overlays/linux-lava.nix
index 321532f..d83fb98 100644
--- a/overlays/linux-lava.nix
+++ b/overlays/linux-lava.nix
@@ -1,24 +1,21 @@
 self: super: let
   llvmPackages = super.llvmPackages_19;
   clangVersion = super.lib.versions.major llvmPackages.libclang.version;
-  addFlagsScript = "$out/nix-support/add-local-cc-cflags-before.sh";
   cc = llvmPackages.stdenv.cc.override {
     # :sob: see https://github.com/NixOS/nixpkgs/issues/142901
     bintools = llvmPackages.bintools;
-
-    # https://github.com/NixOS/nixpkgs/issues/368850
     extraBuildCommands = ''
-      cat <(echo "NIX_CC_WRAPPER_SUPPRESS_TARGET_WARNING=1") "${addFlagsScript}" > "${addFlagsScript}.new"
-      mv "${addFlagsScript}.new" "${addFlagsScript}"
       substituteInPlace "$out/nix-support/cc-cflags" --replace " -nostdlibinc" ""
+      substituteInPlace "$out/nix-support/add-local-cc-cflags-before.sh" --replace 'echo "Warning: supplying the --target argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2' ""
       echo " -resource-dir=${llvmPackages.libclang.lib}/lib/clang/${clangVersion}" >> $out/nix-support/cc-cflags
     '';
   };
-  stdenv = super.overrideCC llvmPackages.stdenv cc;
-  ccacheStdenv = super.ccacheStdenv.override { inherit stdenv; };
+  stdenv = super.ccacheStdenv.override {
+    stdenv = super.overrideCC llvmPackages.stdenv cc;
+  };
 in {
   linuxLavaEnv = {
-    inherit llvmPackages clangVersion cc stdenv ccacheStdenv;
+    inherit llvmPackages clangVersion cc stdenv;
   };
   rust-bindgen-unwrapped = super.rust-bindgen-unwrapped.override {
     clang = cc;
diff --git a/overlays/openldap.nix b/overlays/openldap.nix
deleted file mode 100644
index f9b2b46..0000000
--- a/overlays/openldap.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-self: super: {
-  # openldap i686 fails checks
-  # issue: https://github.com/NixOS/nixpkgs/issues/514113
-  # workaround: https://github.com/NixOS/nixpkgs/issues/513245#issuecomment-4320293674
-  # fix: https://github.com/NixOS/nixpkgs/pull/515956
-  openldap = super.openldap.overrideAttrs {
-    doCheck = !self.stdenv.hostPlatform.isi686;
-  };
-}
diff --git a/overlays/patches/firefox-native-messaging-host.json b/overlays/patches/firefox-native-messaging-host.json
deleted file mode 100644
index e9f5f99..0000000
--- a/overlays/patches/firefox-native-messaging-host.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "com.8bit.bitwarden",
-  "description": "Bitwarden desktop <-> browser bridge",
-  "path": "@out@/bin/desktop_proxy",
-  "type": "stdio",
-  "allowed_extensions": ["{446900e4-71c2-419f-a6a7-df9c091e268b}"]
-}
diff --git a/overlays/patches/startx.patch b/overlays/patches/startx.patch
new file mode 100644
index 0000000..aba345e
--- /dev/null
+++ b/overlays/patches/startx.patch
@@ -0,0 +1,13 @@
+diff --git a/startx.cpp b/startx.cpp
+index 125c398..296b29f 100644
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -270,7 +270,7 @@ if [ x"$enable_xauth" = x1 ] ; then
+     dummy=0
+ 
+     XCOMM create a file with auth information for the server. ':0' is a dummy.
+-    xserverauthfile=$HOME/.serverauth.$$
++    xserverauthfile=$XAUTHORITY
+     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM
+     xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
diff --git a/overlays/patches/wpa-supplicant.patch b/overlays/patches/wpa-supplicant.patch
deleted file mode 100644
index 7c27be4..0000000
--- a/overlays/patches/wpa-supplicant.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in
-index 58a6228..fbe7de3 100644
---- a/wpa_supplicant/systemd/wpa_supplicant.service.in
-+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
-@@ -7,7 +7,7 @@ Wants=network.target
- [Service]
- Type=dbus
- BusName=fi.w1.wpa_supplicant1
--ExecStart=@BINDIR@/wpa_supplicant -u
-+ExecStart=@BINDIR@/wpa_supplicant -u -q
- 
- [Install]
- WantedBy=multi-user.target
diff --git a/overlays/rofi.nix b/overlays/rofi.nix
new file mode 100644
index 0000000..028cd9a
--- /dev/null
+++ b/overlays/rofi.nix
@@ -0,0 +1,13 @@
+self: super: {
+  rofi-unwrapped = super.rofi-unwrapped.overrideAttrs (_: rec {
+    version = "1.7.2";
+
+    src = super.fetchFromGitHub {
+      owner = "davatorium";
+      repo = "rofi";
+      rev = version;
+      fetchSubmodules = true;
+      sha256 = "0yarkzhn7vxqxafmz196kvklzwdxygbhd0d29gxm7lrfba8brdxy";
+    };
+  });
+}
diff --git a/overlays/steam.nix b/overlays/steam.nix
index d3514f5..5478dba 100644
--- a/overlays/steam.nix
+++ b/overlays/steam.nix
@@ -5,5 +5,9 @@ self: super: {
       keyutils
       gamescope
     ];
+
+    extraLibraries = pkgs: with pkgs; [
+      openssl_1_1
+    ];
   };
 }
diff --git a/overlays/wpa-supplicant.nix b/overlays/wpa-supplicant.nix
deleted file mode 100644
index 1a2cf86..0000000
--- a/overlays/wpa-supplicant.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-self: super: {
-  # Thanks https://discourse.nixos.org/t/journal-logs-spammed-with-ctrl-event-scan-failed/56316/5
-  wpa_supplicant = super.wpa_supplicant.overrideAttrs(o: {
-    patches = o.patches ++ [ ./patches/wpa-supplicant.patch ];
-  });
-}
diff --git a/overlays/xinit.nix b/overlays/xinit.nix
new file mode 100644
index 0000000..6d0daed
--- /dev/null
+++ b/overlays/xinit.nix
@@ -0,0 +1,10 @@
+self: super: {
+  xorg = super.xorg // {
+    xinit = super.xorg.xinit.overrideAttrs (old: {
+      # Some info:
+      # - Make startx use $XAUTHORITY as server auth files instead of .serverauth.$$
+      # - Make startx respect $XINITRC and $XSERVERRC
+      patches = (old.patches or []) ++ [ ./patches/startx.patch ];
+    });
+  };
+}
diff --git a/packages/linux-lava/bluetooth.patch b/packages/linux-lava/bluetooth.patch
deleted file mode 100644
index 87e198c..0000000
--- a/packages/linux-lava/bluetooth.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index ef9689f8776..aabbc031b5f 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -759,6 +759,8 @@ static const struct usb_device_id quirks_table[] = {
- 						     BTUSB_WIDEBAND_SPEECH },
- 	{ USB_DEVICE(0x2b89, 0x8761), .driver_info = BTUSB_REALTEK |
- 						     BTUSB_WIDEBAND_SPEECH },
-+	{ USB_DEVICE(0x2c4e, 0x0115), .driver_info = BTUSB_REALTEK |
-+ 						     BTUSB_WIDEBAND_SPEECH },
- 
- 	/* Additional Realtek 8821AE Bluetooth devices */
- 	{ USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK },
diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix
index aa288f5..a4623d9 100644
--- a/packages/linux-lava/default.nix
+++ b/packages/linux-lava/default.nix
@@ -3,7 +3,6 @@
 , inputs
 , lib
 , linuxLavaEnv
-, useCcache ? false
 , ...
 } @ args:
 
@@ -11,7 +10,7 @@ let
   sources = callPackage ./sources.nix { inherit inputs; };
   kernel = buildLinux (args // {
     inherit (sources) src kernelPatches;
-    stdenv = if useCcache then linuxLavaEnv.ccacheStdenv else linuxLavaEnv.stdenv;
+    inherit (linuxLavaEnv) stdenv;
     version = "${sources.version}-tkg-Lava";
     isZen = true;
     extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ];
@@ -56,10 +55,6 @@ let
       INIT_STACK_ALL_ZERO = yes;
       INIT_STACK_NONE = no;
 
-      # bore
-      SCHED_BORE = yes;
-      MIN_BASE_SLICE_NS = freeform "2000000";
-
       # tickless timers
       HZ_PERIODIC = no;
       NO_HZ = yes;
diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix
index 1ea7dcb..f084b98 100644
--- a/packages/linux-lava/sources.nix
+++ b/packages/linux-lava/sources.nix
@@ -1,16 +1,17 @@
 { fetchFromGitHub, inputs, lib }:
 let
-  version = "7.0.10";
-  kernelHash = "1w4i705i0nl1xqv7fdhdbhy7j3xrzhl31fabs6vmgiw7nf06szxv";
-  kernelPatchHash = "0h7gxqcnww7sj5cdyblzj04775zhavwdylkm2pm91v6xkjbnz1zj";
+  version = "6.13.6";
+  kernelHash = "0vhdz1as27kxav81rkf6fm85sqrbj5hjhz5hpyxcd5b6p1pcr7g7";
+  kernelPatchHash = "11jbq6j7kz47p1291ys9b7v7jh7skaw1n4rj10ahl5m701lsk0vz";
 
   mm = lib.versions.majorMinor version;
-  hasPatch = (builtins.length (builtins.splitVersion version)) == 3;
   tkgPatches = [
     "0002-clear-patches"
     "0003-glitched-base"
-    "0001-bore"
+    "0003-glitched-eevdf-additions"
     "0003-glitched-cfs"
+    "0007-v${mm}-fsync_legacy_via_futex_waitv"
+    "0007-v${mm}-ntsync"
     "0012-misc-additions"
   ];
 
@@ -33,9 +34,8 @@ in {
     sha256 = kernelHash;
   };
 
-  kernelPatches = lib.optionals hasPatch [
+  kernelPatches = [
     kernelPatchSrc
-    (patch ./bluetooth.patch)
   ]
   ++ builtins.map (name: {
     inherit name;
diff --git a/packages/spotify-adblock/0001-cargo.patch b/packages/spotify-adblock/0001-cargo.patch
new file mode 100644
index 0000000..84031b5
--- /dev/null
+++ b/packages/spotify-adblock/0001-cargo.patch
@@ -0,0 +1,141 @@
+From 002a25dd56233d599adda61b298d612a46267407 Mon Sep 17 00:00:00 2001
+From: LavaDesu <me@lava.moe>
+Date: Tue, 14 Sep 2021 08:34:05 +0700
+Subject: [PATCH] cargo
+
+---
+ Cargo.lock | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 122 insertions(+)
+ create mode 100644 Cargo.lock
+
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 00000000000..b952e17ca90
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,122 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++version = 3
++
++[[package]]
++name = "aho-corasick"
++version = "0.7.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "libc"
++version = "0.2.101"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
++
++[[package]]
++name = "memchr"
++version = "2.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.29"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "regex"
++version = "1.5.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.25"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
++
++[[package]]
++name = "serde"
++version = "1.0.130"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.130"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "spotify-adblock"
++version = "1.0.0"
++dependencies = [
++ "lazy_static",
++ "libc",
++ "regex",
++ "serde",
++ "toml",
++]
++
++[[package]]
++name = "syn"
++version = "1.0.76"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+-- 
+2.32.0
+
diff --git a/packages/spotify-adblock/default.nix b/packages/spotify-adblock/default.nix
index 57992de..d076e87 100644
--- a/packages/spotify-adblock/default.nix
+++ b/packages/spotify-adblock/default.nix
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage {
   version = "1.0";
   src = inputs.spotify-adblock;
 
-  cargoHash = "sha256-oGpe+kBf6kBboyx/YfbQBt1vvjtXd1n2pOH6FNcbF8M=";
+  cargoSha256 = "sha256-yxumYGAMObgl1u6GlbEQOKOn1DWxXN8bbT7BjiWT96o=";
 
   patches = [ ./0002-allow-setting-config-from-environment-variable.patch ];
 
diff --git a/res/config-minimal.lua b/res/config-minimal.lua
index c2d3f06..7aade79 100644
--- a/res/config-minimal.lua
+++ b/res/config-minimal.lua
@@ -1,24 +1,20 @@
 -- Keybindings
-local map = vim.keymap.set
+local map = vim.api.nvim_set_keymap
 map('n', '<C-H>', '<C-W>h', { noremap = true })
 map('n', '<C-J>', '<C-W>j', { noremap = true })
 map('n', '<C-K>', '<C-W>k', { noremap = true })
 map('n', '<C-L>', '<C-W>l', { noremap = true })
 map('n', '<C-Q>', ':q<CR>', { noremap = true })
-map('n', '<C-P>', ':Files<CR>', { noremap = true })
 
 -- Autocommands
 vim.cmd('au BufEnter * set noro')
-vim.cmd('au CursorHold * lua vim.diagnostic.open_float(0, { scope = "line", focusable = false })')
 
 -- Settings
-vim.opt.mouse = ""
 vim.opt.relativenumber = true
 vim.opt.number = true
 vim.opt.cursorline = true
 vim.opt.signcolumn = "yes:3"
 vim.opt.title = true
-vim.opt.termguicolors = true
 vim.opt.updatetime = 0
 vim.opt.clipboard:prepend('unnamedplus')
 
@@ -47,9 +43,56 @@ vim.g.signify_sign_delete_first_line = '┏━'
 vim.g.signify_sign_change            = vim.g.signify_sign_add
 vim.g.signify_sign_change_delete     = vim.g.signify_sign_delete
 
+-- Theming
+vim.g.tokyonight_style = 'night'
+vim.cmd[[
+    syntax enable
+    colorscheme tokyonight
+]]
+local colors = require("tokyonight.colors").setup {}
+vim.cmd("highlight SignifySignAdd             guifg="..colors.green)
+vim.cmd("highlight SignifySignChange          guifg="..colors.orange)
+vim.cmd("highlight SignifySignDelete          guifg="..colors.red)
+vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red)
+vim.cmd("highlight SignifySignChangeDelete    guifg="..colors.red)
+
 -- Plugins
-require('nvim-treesitter').setup {
+require('nvim-treesitter.configs').setup {
     highlight = { enable = true },
     indent = { enable = false }
 }
-require('lualine').setup { }
+require('lualine').setup {
+    options = {
+        theme = 'tokyonight'
+    }
+}
+
+-- LSP
+local nvim_lsp = require('lspconfig')
+
+local on_attach = function(client, bufnr)
+    local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+    local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
+
+    buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+    local opts = { noremap = true, silent = true }
+
+    buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+    buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+    buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+    buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+    buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+    buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+    buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+    buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+    buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+    buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+    buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+    buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+    buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line" })<CR>', opts)
+    buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
+    buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
+    buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
+    buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+end
diff --git a/res/config.lua b/res/config.lua
index c0b5dad..4e02a70 100644
--- a/res/config.lua
+++ b/res/config.lua
@@ -1,13 +1,11 @@
 -- Keybindings
-local map = vim.keymap.set
-map('n', '<C-H>', '<C-W>h', { remap = false })
-map('n', '<C-J>', '<C-W>j', { remap = false })
-map('n', '<C-K>', '<C-W>k', { remap = false })
-map('n', '<C-L>', '<C-W>l', { remap = false })
-map('n', '<C-Q>', ':q<CR>', { remap = false })
-map('n', '<C-P>', ':Files<CR>', { remap = false })
-map('n', '<C-/>', 'gcc', { remap = true, silent = true })
-map('v', '<C-/>', 'gc', { remap = true, silent = true })
+local map = vim.api.nvim_set_keymap
+map('n', '<C-H>', '<C-W>h', { noremap = true })
+map('n', '<C-J>', '<C-W>j', { noremap = true })
+map('n', '<C-K>', '<C-W>k', { noremap = true })
+map('n', '<C-L>', '<C-W>l', { noremap = true })
+map('n', '<C-Q>', ':q<CR>', { noremap = true })
+map('n', '<C-P>', ':Files<CR>', { noremap = true })
 
 -- Autocommands
 vim.cmd('au BufEnter * set noro')
@@ -20,7 +18,6 @@ vim.opt.number = true
 vim.opt.cursorline = true
 vim.opt.signcolumn = "yes:3"
 vim.opt.title = true
-vim.opt.termguicolors = true
 vim.opt.updatetime = 0
 vim.opt.clipboard:prepend('unnamedplus')
 
@@ -51,7 +48,6 @@ vim.g.signify_sign_change_delete     = vim.g.signify_sign_delete
 
 -- VimTeX
 vim.g.vimtex_view_method = "zathura"
-vim.g.vimtex_quickfix_open_on_warning = 0
 
 -- Theming
 vim.api.nvim_command("syntax enable")
@@ -68,39 +64,13 @@ vim.cmd("highlight SignifySignChangeDelete    guifg="..colors.red)
 vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.overlay2)
 
 -- Plugins
-require('autoclose').setup {}
-local function autosavecond(buf)
-    if vim.tbl_contains({"astro", "tex"}, vim.fn.getbufvar(buf, "&filetype")) then
-        return true
-    end
-    return false
-end
-require('auto-save').setup {
-    trigger_events = {
-        defer_save = { "InsertLeave", "TextChanged", "TextChangedI" },
-    },
-    debounce_delay = 250,
-    condition = autosavecond,
-}
-require('nvim-ts-autotag').setup {}
-require('nvim-highlight-colors').setup {
-    render = "virtual",
-}
-require('nvim-treesitter').setup {
+require('nvim-treesitter.configs').setup {
     highlight = { enable = true },
     indent = { enable = false }
 }
 require('lualine').setup {
     options = {
-        theme = 'catppuccin'
-    },
-    sections = {
-        lualine_c = {
-            {
-                "filename",
-                path = 1,
-            }
-        }
+        theme = 'tokyonight'
     }
 }
 
@@ -108,72 +78,74 @@ require('lualine').setup {
 -- many thanks to @kristijanhusak
 -- https://github.com/nvim-treesitter/nvim-treesitter/issues/1167#issuecomment-920824125
 function _G.javascript_indent()
-    local line = vim.fn.getline(vim.v.lnum)
-    local prev_line = vim.fn.getline(vim.v.lnum - 1)
-    if line:match('^%s*[%*/]%s*') then
-        if prev_line:match('^%s*%*%s*') then
-            return vim.fn.indent(vim.v.lnum - 1)
-        end
-        if prev_line:match('^%s*/%*%*%s*$') then
-            return vim.fn.indent(vim.v.lnum - 1) + 1
-        end
+  local line = vim.fn.getline(vim.v.lnum)
+  local prev_line = vim.fn.getline(vim.v.lnum - 1)
+  if line:match('^%s*[%*/]%s*') then
+    if prev_line:match('^%s*%*%s*') then
+      return vim.fn.indent(vim.v.lnum - 1)
     end
+    if prev_line:match('^%s*/%*%*%s*$') then
+      return vim.fn.indent(vim.v.lnum - 1) + 1
+    end
+  end
 
-    return vim.fn['GetJavascriptIndent']()
+  return vim.fn['GetJavascriptIndent']()
 end
 
 vim.cmd('au FileType javascript setlocal indentexpr=v:lua.javascript_indent()')
 
 -- LSP
-vim.api.nvim_create_autocmd("LspAttach", {
-    callback = function(args)
-        local client = vim.lsp.get_client_by_id(args.data.client_id)
-        if not client then
-            return
-        end
+local nvim_lsp = require('lspconfig')
 
-        local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(args.buf, ...) end
-        local function buf_set_option(...) vim.api.nvim_buf_set_option(args.buf, ...) end
+local on_attach = function(client, bufnr)
+    local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+    local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
 
-        local opts = { noremap = true, silent = true }
+    local opts = { noremap = true, silent = true }
 
-        buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-        buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-        buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-        buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-        buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-        buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-        buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-        buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-        buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-        buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-        buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-        buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-        buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line" })<CR>', opts)
-        buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
-        buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
-        buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
-        buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
-    end
-})
+    buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+    buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+    buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+    buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+    buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+    buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+    buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+    buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+    buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+    buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+    buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+    buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+    buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line" })<CR>', opts)
+    buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
+    buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
+    buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
+    buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+end
 
-vim.diagnostic.config({
-    focusable = false,
-    virtual_text = false,
-    underline = true,
-    signs = true,
-    update_in_insert = true
-})
+vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
+    vim.lsp.diagnostic.on_publish_diagnostics, {
+        focusable = false,
+        virtual_text = false,
+        underline = true,
+        signs = true,
+        update_in_insert = true
+    }
+)
+vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
+    vim.lsp.handlers.signature_help, { focusable = false }
+)
 
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
 capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 
-local servers = { 'astro', 'clangd', 'cssls', 'html', 'tailwindcss', 'texlab', 'ts_ls', 'yamlls' }
+local servers = { 'cssls', 'html', 'nil_ls', 'prismals', 'ts_ls', 'yamlls' }
 for _, lsp in ipairs(servers) do
-    vim.lsp.config(lsp, {
+    nvim_lsp[lsp].setup {
         capabilities = capabilities,
+        on_attach = on_attach,
         flags = { debounce_text_changes = 150 }
-    })
-    vim.lsp.enable(lsp)
+    }
 end
 
 -- nvim-cmp
@@ -223,16 +195,15 @@ cmp.setup {
 
 -- LSP/Omnisharp
 local pid = vim.fn.getpid()
-vim.lsp.config("omnisharp", {
+nvim_lsp.omnisharp.setup {
     capabilities = capabilities,
     on_attach = on_attach,
     flags = { debounce_text_changes = 150 },
     cmd = { "{{OMNISHARP_PATH}}", "--languageserver", "--hostPID", tostring(pid) }
-})
-vim.lsp.enable("omnisharp")
+}
 
 -- LSP/rust_analyzer
-vim.lsp.config("rust_analyzer", {
+nvim_lsp.rust_analyzer.setup {
     capabilities = capabilities,
     on_attach = on_attach,
     flags = { debounce_text_changes = 150 },
@@ -249,11 +220,11 @@ vim.lsp.config("rust_analyzer", {
             }
         }
     }
-})
-vim.lsp.enable("rust_analyzer")
+}
+
 
 -- LSP/Diagnostics
-vim.lsp.config("diagnosticls", {
+nvim_lsp.diagnosticls.setup {
     capabilities = capabilities,
     on_attach = on_attach,
     flags = { debounce_text_changes = 150 },
@@ -289,34 +260,7 @@ vim.lsp.config("diagnosticls", {
             vue = 'eslint'
         }
     }
-})
-vim.lsp.enable("diagnosticls")
-
--- LSP/nixd
-vim.lsp.config("nixd", {
-  cmd = { "nixd" },
-  filetypes = { "nix" },
-  root_markers = { "flake.nix", ".git" },
-  settings = {
-    nixd = {
-      nixpkgs = {
-        expr = "import <nixpkgs> { }",
-      },
-      formatting = {
-        command = { "nixfmt" },
-      },
-      options = {
-        nixos = {
-          expr = '(builtins.getFlake (toString ./.)).nixosConfigurations.{{HOSTNAME}}.options',
-        },
-        home_manager = {
-          expr = '(builtins.getFlake (builtins.toString ./.)).nixosConfigurations."{{USERNAME}}@{{HOSTNAME}}".options.home-manager.users.type.getSubOptions []',
-        },
-      },
-    },
-  },
-})
-vim.lsp.enable("nixd")
+}
 
 -- LSP/Signatures
 require("lsp_signature").setup {
diff --git a/res/eww-wayland/eww.scss b/res/eww-wayland/eww.scss
new file mode 100644
index 0000000..fda0ae1
--- /dev/null
+++ b/res/eww-wayland/eww.scss
@@ -0,0 +1,90 @@
+$background: EWW_BACKGROUND;
+$accent: EWW_ACCENT;
+$foreground: EWW_TEXT;
+
+* {
+  all: unset;
+}
+
+window {
+    background: transparent;
+}
+
+.bar {
+    margin: 5px 20px 0px 20px;
+}
+
+.widget {
+    background: $background;
+    color: $foreground;
+    font-family: "Noto Sans";
+    font-weight: 600;
+    font-size: 15px;
+    padding: 5px 15px;
+    border-radius: 50px;
+}
+
+.title {
+    margin: 0 5px;
+}
+
+.pill {
+    margin-right: 5px;
+    padding: 5px 10px;
+}
+
+.extended {
+    padding: 5px 15px;
+}
+
+.time {
+    .base {
+        font-weight: 700;
+    }
+    .extension {
+        font-weight: 500;
+        color: rgba($foreground, .7);
+    }
+}
+
+.workspaces {
+    padding: 5px 10px;
+    font-size: 22px;
+
+    button {
+        padding: 0px 2px;
+    }
+
+    .empty, .occupied {
+        color: $accent;
+    }
+}
+
+.widget.line-workspaces {
+    color: transparent;
+    padding: 0;
+    border-radius: 0;
+    font-size: 0;
+
+    button {
+        padding: 0 13px;
+    }
+
+    .empty {
+        background-color: $background;
+    }
+
+    .occupied {
+        background-color: $accent;
+    }
+
+    .focused {
+        background-color: $foreground;
+    }
+}
+
+.pill-icon {
+    color: $accent;
+    font-family: Material Symbols Outlined;
+    font-size: 18px;
+}
diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck
new file mode 100644
index 0000000..288b89c
--- /dev/null
+++ b/res/eww-wayland/eww.yuck
@@ -0,0 +1,157 @@
+(defwindow mainbar :monitor 0
+                   :geometry (geometry :x "0%"
+                                       :y "0%"
+                                       :width "100%"
+                                       :height "30px"
+                                       :anchor "top center")
+                   :stacking "fg"
+                   :exclusive false
+                   :focusable false
+  (bar))
+
+(defwindow mainbar-ext :monitor 1
+                   :geometry (geometry :x "0%"
+                                       :y "0%"
+                                       :width "100%"
+                                       :height "30px"
+                                       :anchor "top center")
+                   :stacking "fg"
+                   :exclusive false
+                   :focusable false
+  (bar))
+
+
+(defvar bat-extended true)
+(defvar bluetooth-extended false)
+(defvar network-extended false)
+(defvar time-extended false)
+(defpoll ptime   :interval "1s"
+  `date +%H:%M`)
+(defpoll petimea :interval "1s" :run-while time-extended
+  `date "+%A, %d %B %Y  "`)
+(defpoll petimeb :interval "1s" :run-while time-extended
+  `date "+:%S"`)
+(defpoll pbat_cap :interval "5s"
+  `cat /sys/class/power_supply/BATT/capacity`)
+(defpoll pbat_status :interval "1s"
+  `cat /sys/class/power_supply/BATT/status`)
+(defpoll network_strength :interval "1s"
+  `nmcli -f IN-USE,SIGNAL device wifi | grep '*' | tr -d -c 0-9`)
+(defpoll bluetooth_device :interval "1s"
+  `bluetoothctl devices Connected | grep Device | cut -d" " -f3-`)
+
+(deflisten lnetwork :initial "" "./scripts/network.sh")
+(deflisten ltitle :initial "" "./scripts/title.sh")
+(deflisten lworkspaces :initial "[]" "./scripts/workspaces.sh")
+(deflisten lcurrent_workspace :initial "1" "./scripts/active-workspace.sh")
+
+(defwidget bar []
+  (eventbox :onscroll "./scripts/scroll.sh {}"
+    (centerbox :orientation "h"
+               :class "bar"
+      (workspaces)
+      (title)
+      (right_bar))))
+
+(defwidget workspaces []
+  (box :class "widget workspaces"
+       :halign "start"
+       :valign "center"
+       :vexpand true
+       :hexpand true
+    (for workspace in lworkspaces
+      (eventbox :cursor "hand"
+        (button :class "${workspace.id == lcurrent_workspace ? "focused" : (workspace.windows > 0 ? "occupied" : "empty")}"
+                :onclick "hyprctl dispatch workspace ${workspace.id}"
+          "${workspace.id == lcurrent_workspace ? "" : (workspace.windows > 0 ? "" : "")}")))))
+
+(defwidget title []
+  (literal :content ltitle))
+
+(defwidget time_extension [text]
+  (revealer :transition "slideleft"
+            :reveal time-extended
+            :duration 150
+    (label :text text
+           :class "extension")))
+
+(defwidget right_bar []
+  (box :orientation "horizontal"
+       :space-evenly false
+       :halign "end"
+    (bluetooth)
+    (network)
+    (battery)
+    (time)))
+
+(defwidget bluetooth []
+  (button :onclick `eww update bluetooth-extended=${bluetooth-extended ? "false" : "true"}`
+    (box :orientation "horizontal"
+         :class {"widget pill" + ((bluetooth-extended && bluetooth_device != "") ? " extended" : "")}
+         :spacing {(bluetooth-extended && bluetooth_device != "") ? 5 : 0}
+         :space-evenly false
+      (label :text { bluetooth_device == "" ? "" : ""}
+             :class "base pill-icon")
+      (revealer :transition "slideleft"
+                :reveal {bluetooth-extended && bluetooth_device != ""}
+                :duration 150
+        (label :text bluetooth_device
+               :class "base")))))
+
+(defwidget network []
+  (button :onclick `eww update network-extended=${network-extended ? "false" : "true"}`
+    (box :orientation "horizontal"
+         :class {"widget pill" + ((network-extended && lnetwork != "Disconnected") ? " extended" : "")}
+         :spacing {(network-extended && lnetwork != "Disconnected") ? 5 : 0}
+         :space-evenly false
+      (label :text {
+          (lnetwork == "Disconnected") ? ""
+        : (network_strength == "") ? ""
+        : (network_strength < 20) ? ""
+        : (network_strength < 30) ? ""
+        : (network_strength < 55) ? ""
+        : (network_strength < 80) ? ""
+        : ""}
+             :class "base pill-icon")
+      (revealer :transition "slideleft"
+                :reveal {network-extended && lnetwork != "Disconnected"}
+                :duration 150
+        (label :text lnetwork
+               :class "base")))))
+
+(defwidget battery []
+  (button :onclick `eww update bat-extended=${bat-extended ? "false" : "true"}`
+    (box :orientation "horizontal"
+         :class {"widget pill" + (bat-extended ? " extended" : "")}
+         :spacing {bat-extended ? 3 : 0}
+         :space-evenly false
+      (label :text {
+          (pbat_status == "Charging" || pbat_status == "Full") ?
+            ( (pbat_cap < 20) ? ""
+            : (pbat_cap < 50) ? ""
+            : (pbat_cap < 100) ? ""
+            : "" )
+        : (pbat_cap < 10) ? ""
+        : (pbat_cap < 20) ? ""
+        : (pbat_cap < 50) ? ""
+        : (pbat_cap < 80) ? ""
+        : ""}
+             :class "base pill-icon")
+      (revealer :transition "slideleft"
+                :reveal bat-extended
+                :duration 150
+        (label :text {pbat_cap + "%"}
+               :class "base")))))
+
+
+(defwidget time []
+  (button :onclick `eww update time-extended=${time-extended ? "false" : "true"}`
+    (box :orientation "horizontal"
+         :space-evenly false
+         :hexpand true
+         :class "widget time"
+      (time_extension :text petimea)
+      (label :text ptime
+             :class "base")
+      (time_extension :text petimeb))))
+
diff --git a/res/eww/scripts/active-workspace.sh b/res/eww-wayland/scripts/active-workspace.sh
similarity index 100%
rename from res/eww/scripts/active-workspace.sh
rename to res/eww-wayland/scripts/active-workspace.sh
diff --git a/res/eww-wayland/scripts/network.sh b/res/eww-wayland/scripts/network.sh
new file mode 100755
index 0000000..7d0c2c8
--- /dev/null
+++ b/res/eww-wayland/scripts/network.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+init=$(nmcli -t -f name,device connection show --active | grep wlp1s0 | cut -d\: -f1)
+
+if [[ -z $init ]]; then
+    echo Disconnected
+else
+    echo $init
+fi
+
+nmcli monitor | while read -r line ; do
+    if [[ $line == *"is now the primary connection" ]]; then
+        conn=$(echo $line | cut -d\' -f2)
+        echo $conn
+    fi
+    if [[ $line == "There's no primary connection" ]]; then
+        echo Disconnected
+    fi
+done
diff --git a/res/eww-wayland/scripts/title.sh b/res/eww-wayland/scripts/title.sh
new file mode 100755
index 0000000..108e0a5
--- /dev/null
+++ b/res/eww-wayland/scripts/title.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env sh
+
+out () {
+    if [ -z "$1" ] || [ "$1" == "null" ]; then
+        echo ""
+    else
+        echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"$1\"))"
+    fi
+}
+
+init=$(hyprctl activewindow -j | jq --raw-output .title)
+trunc=$(echo $init | cut -c-60)
+out "$trunc"
+
+socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}' | while read -r line ; do
+    trunc=$(echo $line | cut -c-60)
+    out "$trunc"
+done
diff --git a/res/eww-wayland/scripts/workspaces.sh b/res/eww-wayland/scripts/workspaces.sh
new file mode 100755
index 0000000..963dbe8
--- /dev/null
+++ b/res/eww-wayland/scripts/workspaces.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+spaces (){
+	WORKSPACE_WINDOWS=$(hyprctl workspaces -j | jq 'map({key: .id | tostring, value: .windows}) | from_entries')
+	seq 1 10 | jq --argjson windows "${WORKSPACE_WINDOWS}" --slurp -Mc 'map(tostring) | map({id: ., windows: ($windows[.]//0)})'
+}
+
+spaces
+socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do
+	spaces
+done
diff --git a/res/eww/eww.scss b/res/eww/eww.scss
index 763e6fd..08b2270 100644
--- a/res/eww/eww.scss
+++ b/res/eww/eww.scss
@@ -1,6 +1,6 @@
-$background: EWW_BACKGROUND;
-$accent: EWW_ACCENT;
-$foreground: EWW_TEXT;
+$background: #1a1b26;
+$accent: #9d7cd8;
+$foreground: #c0caf5;
 
 * {
   all: unset;
@@ -11,7 +11,7 @@ window {
 }
 
 .bar {
-    margin: 5px 20px 5px 20px;
+    margin: 5px 20px 0px 20px;
 }
 
 .widget {
@@ -22,20 +22,6 @@ window {
     font-size: 15px;
     padding: 5px 15px;
     border-radius: 50px;
-    box-shadow: rgba($foreground, .7) 0px 0px 2px;
-}
-
-.title {
-    margin: 0 5px;
-}
-
-.pill {
-    margin-right: 5px;
-    padding: 5px 10px;
-}
-
-.extended {
-    padding: 5px 15px;
 }
 
 .time {
@@ -84,8 +70,3 @@ window {
     }
 }
 
-.pill-icon {
-    color: $accent;
-    font-family: Material Symbols Outlined;
-    font-size: 18px;
-}
diff --git a/res/eww/eww.yuck b/res/eww/eww.yuck
index d72a2cc..a0a433b 100644
--- a/res/eww/eww.yuck
+++ b/res/eww/eww.yuck
@@ -1,57 +1,42 @@
+(defwindow linebar :monitor 0
+                   :geometry (geometry :x "30px"
+                                       :y "0%"
+                                       :width "100%"
+                                       :height "2px"
+                                       :anchor "top center")
+                   :stacking "fg"
+                   :windowtype "dock"
+                   :wm-ignore false
+  (wlinebar))
+
 (defwindow mainbar :monitor 0
-
                    :geometry (geometry :x "0%"
                                        :y "0%"
                                        :width "100%"
                                        :height "30px"
                                        :anchor "top center")
                    :stacking "fg"
-                   :exclusive false
-                   :focusable false
+                   :windowtype "dock"
+                   :wm-ignore false
   (bar))
 
-(defwindow mainbar-ext :monitor 1
-                   :geometry (geometry :x "0%"
-                                       :y "0%"
-                                       :width "100%"
-                                       :height "30px"
-                                       :anchor "top center")
-                   :stacking "fg"
-                   :exclusive false
-                   :focusable false
-  (bar))
+(defvar time-extended false)  ; for :run-while property of below variable
+                              ; when this turns true, the polling starts and
+                              ; var gets updated with given interval
 
-(defvar bat-enabled _BAT_ENABLED_)
-(defvar bt-enabled _BT_ENABLED_)
-(defvar wifi-enabled _WIFI_ENABLED_)
-
-(defvar bat-extended true)
-(defvar bluetooth-extended false)
-(defvar network-extended false)
-(defvar time-extended false)
-
-(defpoll ptime   :interval "1s"
+(defpoll ptime :interval "1s"
+               :run-while !time-extended
   `date +%H:%M`)
-(defpoll petimea :interval "1s" :run-while time-extended
+(defpoll petimea :interval "1s"
+                 :run-while time-extended
   `date "+%A, %d %B %Y  "`)
-(defpoll petimeb :interval "1s" :run-while time-extended
+(defpoll petimeb :interval "1s"
+                 :run-while time-extended
   `date "+:%S"`)
-(defpoll pbat_cap :interval "5s" :run-while bat-enabled
-  `cat /sys/class/power_supply/_BAT_PATH_/capacity`)
-(defpoll pbat_status :interval "1s" :run-while bat-enabled
-  `cat /sys/class/power_supply/_BAT_PATH_/status`)
-(defpoll wifi_ssid :interval "1s" :run-while wifi-enabled
-  `iwctl station wlan0 show | grep "Connected network" | awk '{print $3}'`)
-(defpoll wifi_strength :interval "1s" :run-while wifi-enabled
-  `iw dev wlan0 link | awk '/signal/ {gsub("-",""); print $2}'`)
-(defpoll bluetooth_device :interval "1s" :run-while bt-enabled
-  `bluetoothctl devices Connected | grep Device | cut -d" " -f3-`)
-(defpoll bluetooth_device_count :interval "1s" :run-while bt-enabled
-  `bluetoothctl devices Connected | wc -l`)
 
-(deflisten ltitle :initial "" "./scripts/title.sh")
-(deflisten lworkspaces :initial "[]" "./scripts/workspaces.sh")
-(deflisten lcurrent_workspace :initial "1" "./scripts/active-workspace.sh")
+(deflisten lworkspaces "./scripts/workspaces.sh")
+(deflisten llineworkspaces "./scripts/line-workspaces.sh")
+(deflisten ltitle "./scripts/title.sh")
 
 (defwidget bar []
   (eventbox :onscroll "./scripts/scroll.sh {}"
@@ -59,107 +44,34 @@
                :class "bar"
       (workspaces)
       (title)
-      (right_bar))))
+      (time))))
+
+(defwidget wlinebar []
+  (eventbox :onscroll "./scripts/scroll.sh {}"
+    (line_workspaces)))
 
 (defwidget workspaces []
-  (box :class "widget workspaces"
-       :halign "start"
-       :valign "center"
-       :vexpand true
-       :hexpand true
-    (for workspace in lworkspaces
-      (eventbox :cursor "hand"
-        (button :class "${workspace.id == lcurrent_workspace ? "focused" : (workspace.windows > 0 ? "occupied" : "empty")}"
-                :onclick "hyprctl dispatch workspace ${workspace.id}"
-          "${workspace.id == lcurrent_workspace ? "" : (workspace.windows > 0 ? "" : "")}")))))
+  (literal :content lworkspaces))
+
+(defwidget line_workspaces []
+  (literal :content llineworkspaces))
 
 (defwidget title []
   (literal :content ltitle))
 
 (defwidget time_extension [text]
-  (revealer :transition "slideleft"
-            :reveal time-extended
-            :duration 150
-    (label :text text
-           :class "extension")))
-
-(defwidget right_bar []
-  (box :orientation "horizontal"
-       :space-evenly false
-       :halign "end"
-    (box :visible {bt-enabled} (bluetooth))
-    (box :visible {wifi-enabled} (network))
-    (box :visible {bat-enabled} (battery))
-    (time)))
-
-(defwidget bluetooth []
-  (button :onclick `eww update bluetooth-extended=${bluetooth-extended ? "false" : "true"}`
-    (box :orientation "horizontal"
-         :class {"widget pill" + ((bluetooth-extended && bluetooth_device != "") ? " extended" : "")}
-         :spacing {(bluetooth-extended && bluetooth_device != "") ? 5 : 0}
-         :space-evenly false
-      (label :text { bluetooth_device == "" ? "" : ""}
-             :class "base pill-icon")
-      (revealer :transition "slideleft"
-                :reveal {bluetooth-extended && bluetooth_device != ""}
-                :duration 150
-        (label :text { bluetooth_device_count == "1" ? bluetooth_device : (bluetooth_device_count + " devices") }
-               :class "base")))))
-
-(defwidget network []
-  (button :onclick `eww update network-extended=${network-extended ? "false" : "true"}`
-    (box :orientation "horizontal"
-         :class {"widget pill" + ((network-extended && wifi_ssid != "") ? " extended" : "")}
-         :spacing {(network-extended && wifi_ssid != "") ? 5 : 0}
-         :space-evenly false
-      (label :text {
-          (wifi_ssid == "") ? ""
-        : (wifi_strength == "") ? ""
-        : (wifi_strength < 75) ? ""
-        : (wifi_strength < 65) ? ""
-        : (wifi_strength < 60) ? ""
-        : (wifi_strength < 50) ? ""
-        : ""}
-             :class "base pill-icon")
-      (revealer :transition "slideleft"
-                :reveal {network-extended && wifi_ssid != ""}
-                :duration 150
-        (label :text wifi_ssid
-               :class "base")))))
-
-(defwidget battery []
-  (button :onclick `eww update bat-extended=${bat-extended ? "false" : "true"}`
-    (box :orientation "horizontal"
-         :class {"widget pill" + (bat-extended ? " extended" : "")}
-         :spacing {bat-extended ? 3 : 0}
-         :space-evenly false
-      (label :text {
-          (pbat_status == "Charging" || pbat_status == "Full") ?
-            ( (pbat_cap < 20) ? ""
-            : (pbat_cap < 50) ? ""
-            : (pbat_cap < 100) ? ""
-            : "" )
-        : (pbat_cap < 10) ? ""
-        : (pbat_cap < 20) ? ""
-        : (pbat_cap < 50) ? ""
-        : (pbat_cap < 80) ? ""
-        : ""}
-             :class "base pill-icon")
-      (revealer :transition "slideleft"
-                :reveal bat-extended
-                :duration 150
-        (label :text {pbat_cap + "%"}
-               :class "base")))))
-
+  (label :text text
+         :class "extension"))
 
 (defwidget time []
   (button :onclick `eww update time-extended=${time-extended ? "false" : "true"}`
     (box :orientation "horizontal"
          :space-evenly false
-         :hexpand true
+         :halign "end"
          :class "widget time"
-      (time_extension :text petimea)
+      (time_extension :text {time-extended ? petimea : ""})
       (label :text ptime
              :class "base")
-      (time_extension :text petimeb))))
+      (time_extension :text {time-extended ? petimeb : ""})
+      )))
 
diff --git a/res/eww/scripts/line-workspaces.sh b/res/eww/scripts/line-workspaces.sh
new file mode 100755
index 0000000..960c444
--- /dev/null
+++ b/res/eww/scripts/line-workspaces.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env sh
+
+# Checks if a list ($1) contains an element ($2)
+contains() {
+    for e in $1; do
+        [ "$e" -eq "$2" ] && echo 1 && return
+    done
+    echo 0
+}
+
+print_workspaces() {
+    buf=""
+    desktops=$(bspc query -D --names)
+    focused_desktop=$(bspc query -D -d focused --names)
+    occupied_desktops=$(bspc query -D -d .occupied --names)
+    urgent_desktops=$(bspc query -D -d .urgent --names)
+
+    for d in $desktops; do
+        if [ "$(contains "$focused_desktop" "$d")" -eq 1 ]; then
+            ws=$d
+            class="focused"
+        elif [ "$(contains "$occupied_desktops" "$d")" -eq 1 ]; then
+            ws=$d
+            class="occupied"
+        elif [ "$(contains "$urgent_desktops" "$d")" -eq 1 ]; then
+            ws=$d
+            class="urgent"
+        else
+            ws=$d
+            class="empty"
+        fi
+
+        buf="$buf (eventbox :cursor \"hand\" (button :class \"$class\" :onclick \"bspc desktop -f $ws\" \"\"))"
+    done
+
+    echo "(box :class \"widget line-workspaces\" :halign \"start\" :valign \"center\" :vexpand true :hexpand true $buf)"
+}
+
+# Listen to bspwm changes
+print_workspaces
+bspc subscribe desktop node_transfer | while read -r _ ; do
+    print_workspaces
+done
diff --git a/res/eww/scripts/scroll.sh b/res/eww/scripts/scroll.sh
new file mode 100755
index 0000000..f76b6b0
--- /dev/null
+++ b/res/eww/scripts/scroll.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+translated=$([ "$1" == "up" ] && echo "prev" || echo "next")
+bspc desktop -f $translated
diff --git a/res/eww/scripts/title.sh b/res/eww/scripts/title.sh
index 108e0a5..26664ba 100755
--- a/res/eww/scripts/title.sh
+++ b/res/eww/scripts/title.sh
@@ -1,18 +1,10 @@
 #!/usr/bin/env sh
 
-out () {
-    if [ -z "$1" ] || [ "$1" == "null" ]; then
+xtitle -s | while read -r line ; do
+    trunc=$(echo $line | cut -c-85)
+    if [ -z "$line" ]; then
         echo ""
     else
-        echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"$1\"))"
+        echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"${trunc}\"))"
     fi
-}
-
-init=$(hyprctl activewindow -j | jq --raw-output .title)
-trunc=$(echo $init | cut -c-60)
-out "$trunc"
-
-socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}' | while read -r line ; do
-    trunc=$(echo $line | cut -c-60)
-    out "$trunc"
 done
diff --git a/res/eww/scripts/workspaces.sh b/res/eww/scripts/workspaces.sh
index 963dbe8..3eb9b52 100755
--- a/res/eww/scripts/workspaces.sh
+++ b/res/eww/scripts/workspaces.sh
@@ -1,11 +1,47 @@
 #!/usr/bin/env sh
 
-spaces (){
-	WORKSPACE_WINDOWS=$(hyprctl workspaces -j | jq 'map({key: .id | tostring, value: .windows}) | from_entries')
-	seq 1 10 | jq --argjson windows "${WORKSPACE_WINDOWS}" --slurp -Mc 'map(tostring) | map({id: ., windows: ($windows[.]//0)})'
+# Checks if a list ($1) contains an element ($2)
+contains() {
+    for e in $1; do
+        [ "$e" -eq "$2" ] && echo 1 && return
+    done
+    echo 0
 }
 
-spaces
-socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do
-	spaces
+print_workspaces() {
+    buf=""
+    desktops=$(bspc query -D --names)
+    focused_desktop=$(bspc query -D -d focused --names)
+    occupied_desktops=$(bspc query -D -d .occupied --names)
+    urgent_desktops=$(bspc query -D -d .urgent --names)
+
+    for d in $desktops; do
+        if [ "$(contains "$focused_desktop" "$d")" -eq 1 ]; then
+            ws=$d
+            icon=""
+            class="focused"
+        elif [ "$(contains "$occupied_desktops" "$d")" -eq 1 ]; then
+            ws=$d
+            icon=""
+            class="occupied"
+        elif [ "$(contains "$urgent_desktops" "$d")" -eq 1 ]; then
+            ws=$d
+            icon=""
+            class="urgent"
+        else
+            ws=$d
+            icon=""
+            class="empty"
+        fi
+
+        buf="$buf (eventbox :cursor \"hand\" (button :class \"$class\" :onclick \"bspc desktop -f $ws\" \"$icon\"))"
+    done
+
+    echo "(box :class \"widget workspaces\" :halign \"start\" :valign \"center\" :vexpand true :hexpand true $buf)"
+}
+
+# Listen to bspwm changes
+print_workspaces
+bspc subscribe desktop node_transfer | while read -r _ ; do
+    print_workspaces
 done
diff --git a/scripts/polybar.sh b/scripts/polybar.sh
new file mode 100755
index 0000000..bac8319
--- /dev/null
+++ b/scripts/polybar.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+polybar top      >> ${XDG_RUNTIME_DIR}/bar-top.log 2>&1 &
+polybar scroller >> ${XDG_RUNTIME_DIR}/bar-scroller.log 2>&1 &
diff --git a/scripts/xinitrc b/scripts/xinitrc
new file mode 100755
index 0000000..44caff4
--- /dev/null
+++ b/scripts/xinitrc
@@ -0,0 +1,11 @@
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+    eval $(dbus-launch --exit-with-session --sh-syntax)
+fi
+systemctl --user import-environment DISPLAY XAUTHORITY
+
+if command -v dbus-update-activation-environment > /dev/null 2>&1; then
+    dbus-update-activation-environment DISPLAY XAUTHORITY
+fi
+
+xrdb ${XDG_CONFIG_HOME}/xorg/xresources
+exec ${XDG_CONFIG_HOME}/xorg/xsession
diff --git a/secrets.gcrypt/shared.json b/secrets.gcrypt/shared.json
deleted file mode 100644
index 21378e7..0000000
Binary files a/secrets.gcrypt/shared.json and /dev/null differ
diff --git a/secrets.nix b/secrets.nix
index b1f55e5..7a1ea24 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -1,25 +1,18 @@
 let
-  alyssum = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAp00i2DTwMk9i2WBEwpNTDA51TQJEqzpyCka6znmRzR";
   anemone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEPFifSAybe97xDP/cq6AAjy7Fm0go0dtQ9ICK6JRUgc";
   blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj";
+  caramel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFJT1XYyjDZFHYT/8RdxAReKkeU8QfpLrmMjEeW/80";
+  sugarcane = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIImymDDLSOdLcsox8wxS9Z84fsbsz6Mi58OU0od2p/ZQ";
   dandelion = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUk99ku7+eiIO7Q9sIPlPx3GiUljLv7W404W/zwrtzI";
-  hazel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6mi50ecrrMIn5C4QUyCjPHfSElz0mhevvFCznUzIrK";
 
   rin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15";
 in {
-  "secrets/passwd.age".publicKeys = [ alyssum anemone blossom rin ];
-  "secrets/passwd_smbcilly.age".publicKeys = [ alyssum rin ];
-  "secrets/passwd_smbkujira.age".publicKeys = [ alyssum rin ];
-  "secrets/wpa_conf.age".publicKeys = [ alyssum blossom rin ];
+  "secrets/passwd.age".publicKeys = [ anemone blossom caramel sugarcane rin ];
+  "secrets/wpa_conf.age".publicKeys = [ blossom caramel rin ];
 
-  "secrets/acme_dns.age".publicKeys = [ alyssum dandelion hazel rin ];
-  "secrets/navidrome_env.age".publicKeys = [ alyssum dandelion rin ];
-  "secrets/slskd_env.age".publicKeys = [ anemone dandelion rin ];
-  "secrets/tailscale_auth.age".publicKeys = [ alyssum anemone blossom dandelion rin ];
-  "secrets/warden_admin.age".publicKeys = [ rin ];
-  "secrets/wg_anemone.age".publicKeys = [ anemone rin ];
-  "secrets/wg_dandelion.age".publicKeys = [ dandelion rin ];
-  "secrets/wg_hazel.age".publicKeys = [ hazel rin ];
-  "secrets/wg_hyacinth.age".publicKeys = [ blossom rin ];
-  "secrets/wg_caramel.age".publicKeys = [ rin ];
+  "secrets/acme_dns.age".publicKeys = [ dandelion rin ];
+  "secrets/warden_admin.age".publicKeys = [ caramel rin ];
+  "secrets/wg_blossom.age".publicKeys = [ blossom rin ];
+  "secrets/wg_caramel.age".publicKeys = [ caramel rin ];
+  "secrets/wg_sugarcane.age".publicKeys = [ sugarcane rin ];
 }
diff --git a/secrets/acme_dns.age b/secrets/acme_dns.age
index c440de6..96eb63c 100644
--- a/secrets/acme_dns.age
+++ b/secrets/acme_dns.age
@@ -1,11 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 kOMSPw vqjZO82kILUQaoD9EwOgnmXKD9IyscgtzP65BVKkGhs
-07f0vL5fSq+EVdJ4n3L/q0tGsh0SVLCueTzbrMQC2ok
--> ssh-ed25519 bRFqeQ qZAsyhdIY/fg7weEBYfB/WwFBrr/fDRrjt0J/m+57W4
-FOWjbk7efoVdL9WxjWvaZ/0mJrQ4yj0fN/Fa3zztz84
--> ssh-ed25519 ZAcXHw UHpAQ4nKoGGaZWXVj4UM6uBanOgDpBvG6XdoBvhz6y8
-xF1orqajQxp2QzU/e1sq8lMxz4AQ2Vr5a3wEU55QqyE
--> ssh-ed25519 U9FXlg n/LPuRDZ7N0VbZYLNr86hH/yRuqd2zFC7Nnpooz8d0o
-aZig/wjd5vitGaJwQ89w2M7fj8fAiqTpdDOmLae74sM
---- mXuALIh6k4n0cErsTFnwKemo/r2jFG7mGSTz2M8zXF8
-Zr2��.	��~M��P��XŹ1�)p�9R�9�ScLzhQ���O��0��H7���L�j�5�
�����\��l9�7���ܫn���>��
+-> ssh-ed25519 bRFqeQ KWUiFdB5Lpd1BYGdmO/IcX0Cj9SUowY5sfwWH/FVyAU
+hJKgLSMy/yLfoRtIDVmK71cDoHALXp2rgmJuagpqJ1I
+-> ssh-ed25519 U9FXlg bgY7WWmCyMWJzLSAnyZwCN5Lm29WVUILVkOUDFKgryo
+AZzW/A/rQEmSiy89ixBZHH9TbuLKlyAlWKLNDZj69+k
+--- EoGAYXy1ggHHKrcZqHz4ugM2Biil4BCpFzVjEClsoKY
+�I�z淣�Z��A�v�Xwh|ݧOX���d�uҠ(�nk��	��,��� ����>���5t�u�(�ܸwlp�����[\�/�s�r�p�kۧF���R
\ No newline at end of file
diff --git a/secrets/navidrome_env.age b/secrets/navidrome_env.age
deleted file mode 100644
index 7df364f..0000000
--- a/secrets/navidrome_env.age
+++ /dev/null
@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 kOMSPw s/uDjoILzZ4meH5Thqdly/pPe2bTO7sKHPIsn7B/Ays
-Pg3ePdLimArZbzBJJkole/d6UjUafNayktjKqt9gqv4
--> ssh-ed25519 bRFqeQ /yrku11wKk2gf24aPjSBZ1KBZXLOlSTOgvW13gjzC3M
-xTCWHdq5Vr02v9xDoEZqCcGLIdjZT9s29Gldoz27ow0
--> ssh-ed25519 U9FXlg HhSqF8DRz/vW42Sf34fqGMIgj9Zpc5MeYNhqqsz7fBk
-4IzAURq50rY160/qAzo49cmhV7/skh7PGM8h9qI9WGE
---- aSO1slFKfkECL6Gro84fMiDZ0QLLNbOrfiNegNK7ksc
-i'r��Ќ��l"�j^S�"_�UP��C��xs�1����M��w�ʍ�;#{a��}+��=��eԑ$�#s�z�Ki����J��D�?�>F��8k�Z(���;���)�[��b+�o�@�#2�L,����חL�<\��U���#����>13�p\��IQ)޽��@��p�,C��5�v8M%�NA	r7�ɀ�n��t
�'Ѕֲ��5+�bj��)�Ra�C�
\ No newline at end of file
diff --git a/secrets/passwd.age b/secrets/passwd.age
index 05ad906..7d2a224 100644
Binary files a/secrets/passwd.age and b/secrets/passwd.age differ
diff --git a/secrets/passwd_smbcilly.age b/secrets/passwd_smbcilly.age
deleted file mode 100644
index 41ad172..0000000
--- a/secrets/passwd_smbcilly.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 kOMSPw CQaXT9/nw3NGD2/H/ctSQGXIoacgjfKQ24wkpEieLSQ
-i4xEXgWGQ7xgQyaDQQIeDuiCLjA6Le23qSnv8C1cbcI
--> ssh-ed25519 U9FXlg GL4dCSCku/FA6ipb9XI1AxO4lhm2r/1lRAeqaGrB32o
-+pPgqwnoPi3wJLobTimVMj0rng+XRapRG6jTYFXSsDM
---- eVgn3ON19pqq+L832bqlbkHUQXdaTI+LfSL4bYfEdew
-�*�l\�W�!J7E/����"f@%\���[��j8fӶ��
\ No newline at end of file
diff --git a/secrets/passwd_smbkujira.age b/secrets/passwd_smbkujira.age
deleted file mode 100644
index 71b6bb8..0000000
--- a/secrets/passwd_smbkujira.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 kOMSPw Kn+LPMoyOrVwI/nrGgnxgVA3D+tVY9Tccg/Yx/jL+E8
-IfWiSBh7KgNvgcHlcDzfdcB9nxm1zy12Ae7AGm39fdE
--> ssh-ed25519 U9FXlg 6eIIGEIYDo02FBsgBnwbuOeR8t4xB6jSmLfIL73UCDg
-QOc0ddunQQcVEVD20DKKpn3wZWUSveFJSUTBnv+xnNk
---- MjN2i0FNzbUpBGUDNgWGXrRsYl2gtsQX+JlzZV/fYdw
-T� <�R#d�Ć̎lLk�N���8�c�_N�)��T
\ No newline at end of file
diff --git a/secrets/slskd_env.age b/secrets/slskd_env.age
deleted file mode 100644
index eded5d0..0000000
--- a/secrets/slskd_env.age
+++ /dev/null
@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 ohyStA 3Do7MsCBX9ZgP6pIekvkRisFgF74jq2cKxrjUi2NlhM
-EdfLIUk40isfNBY4CKA0JjHc2RaCM/LJmvQJuue+aYs
--> ssh-ed25519 bRFqeQ XcjdLy6CEELgdN133BkgTG0cUffU6N9nsapB3c9Swyc
-+ILEkir7XMK/xLNrTs2R+pBoucIN7fVEBRZSZwBo7Fs
--> ssh-ed25519 U9FXlg bqpdUcMN/bk7WlIruWmhj0hpFL/CliDHto/P/KaMdxk
-z6wKPbT1OAW7sDjeziwdqs6mf9Rk37xsU9pw4wYMOF4
---- wNvTtQPOTxetOpazjBXo4fR3wPL7CVQq4R30gOj/qQw
-&P+�����S��y�=}��~1�C�����^.�?zL��H��R`akE��R��(4�R!�*l�!���A��~@VG����<��2��-K8H�Pu�2jS#WД�����l>@�a	.Mƞ���Hg[���$�Wˌ�[��"%N�,� rGN�mf�9F��k&~�OW�Z70���t�����?���eOf��A������z�,hq/�Z�&��Fy�5ɾ�BQw���/�"��J�S섘5�f}%B��PĮ�,
r�F`�Nm��n�C�Î��rJ���af� �i�?���0���pz�aV�[��y�j�X4��B>R,�tyO��IW!�(��n#�ܒj>�����58�9���d��0�����mi���%�t�C�R˄^I�r�M�")֙�S�&.)l�z�Өq����:�r���brE@�JǺsM����d��?�Sk
\ No newline at end of file
diff --git a/secrets/tailscale_auth.age b/secrets/tailscale_auth.age
deleted file mode 100644
index be7af43..0000000
--- a/secrets/tailscale_auth.age
+++ /dev/null
@@ -1,13 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 kOMSPw judP6VmZDGErkHfUpCp3xTgJtWVmGv3/tZw3WGyhfhM
-10jxPIR6Qaf/iWLzbWOrFq9XBsm8OC3mcMrxEt+BYQ8
--> ssh-ed25519 ohyStA Xc6TjSJYtJkK1VEauNJKn+RcTdwdkyJ0Sr+tbAJ8rGc
-vzQt4zMdktY5tNvfu9HsKBgJb52uM7x8bhF+WXwpWZ8
--> ssh-ed25519 CUCjXQ r8WxaXpWtaBdMJ2ubaAwJ4ipSz/UtnMs0x3+eI8p0VU
-CdicUH7AE4E4XVHDAeYzQdsYMYA0sCLlt2P4eR24vvs
--> ssh-ed25519 bRFqeQ E9sknPioO9leKqs8bFJDLrAMuRAJf0ZRyGMvy7O5wVA
-KX93oSqGHimM/PaeaoHq1aYVXGG1YsVMO2ihZaM8xVE
--> ssh-ed25519 U9FXlg u7yG7cLylPUgu/Is4xx0BXVhX31vUtgStV5CYa8Cowg
-xAuGYZpMPVQpZYASXrMuqNE9wqqEG3kMLUNjLzPmL4g
---- EoeqIMnX5tR3J51Cz2QEyjsgD/7h468bqjRmt3mOEjY
-��xHQ���)����k�)ĉB�~ە�֖Zv?����%lQx
OwZIs�ۄ�f4�D���ǔ�*�Otݳ�0.m[q�_[�����v���
\ No newline at end of file
diff --git a/secrets/warden_admin.age b/secrets/warden_admin.age
index 1c56924..ef48c4d 100644
Binary files a/secrets/warden_admin.age and b/secrets/warden_admin.age differ
diff --git a/secrets/wg_anemone.age b/secrets/wg_anemone.age
deleted file mode 100644
index 3ed5b37..0000000
Binary files a/secrets/wg_anemone.age and /dev/null differ
diff --git a/secrets/wg_blossom.age b/secrets/wg_blossom.age
new file mode 100644
index 0000000..f7f550e
--- /dev/null
+++ b/secrets/wg_blossom.age
@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 CUCjXQ iM2w01v4y0Q3DVbpGtt6f3HiHMRw7Xr08JgTB6fe8x4
+WiBMVRZr1edBVfLAPAFT4GSEGoyn9jWzO92yysNM9Mo
+-> ssh-ed25519 U9FXlg Bvlaqu4nEbjfBGgBFKDmD1cBbxH2+dyz1BHzegz1AS4
++sf3rC0J2Ik1SNtpr52GxV6G6tzGLiwlvjXFWE3qrSw
+--- yaZjH1jeXqPGiw1lIkH9uz6QJo/nM1lBezbpVlJDNUM
+��cg��j���"�
+U��"�^�����*��A��Dvl2�c�Rq).N�Lt�ZjCB��5��l^�0)�䥆.���
\ No newline at end of file
diff --git a/secrets/wg_caramel.age b/secrets/wg_caramel.age
index a85d63f..37276ac 100644
--- a/secrets/wg_caramel.age
+++ b/secrets/wg_caramel.age
@@ -1,6 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 U9FXlg VpFnvpTVZFSkKRpEgcmuT/WDLIP1ZySFLq2lRvrjq20
-7zQoSoIs1URmAYn2AdjvDTIY8GDYROcSxFq1bcl24Og
---- iaQQUE1/Xj1vxto3d+Llyl6XGrSff5MGPxdCHW9EI40
-����Ʀ�`t��	�\� �
-b��peH���X�3�!�$�3]X�32�t~V�.=��>�$�x�B�KJ�AL:�DD�}5
\ No newline at end of file
+-> ssh-ed25519 krYeuQ vlK9Aa/Fhkj1jTAcccxKnSzj0jNfEoX5ymPhlaqIVSs
+Vb7lRsCmKM0Fvfb+NyNnNCjqCAQsndLNdA1nXFkiOrA
+-> ssh-ed25519 U9FXlg H9ivqARf7cdfyBd4QnlqLiPNpfk2X/eK60K5//+7l1g
+oYgaHVWJ8xc+fmMTMvrXSt1DsVfbNF0z4V+N/C1vwXY
+--- jtu3xxWFDWBtme5eM52EsMmOwKDss8EctnY7FpfQcI4
+��`��s�E��+XV�H�Gɯ�IZ�H{8��Ƣݙ���ۅ�o3c=9����B:gt������l	ё����vJ�>
diff --git a/secrets/wg_dandelion.age b/secrets/wg_dandelion.age
deleted file mode 100644
index 0229699..0000000
--- a/secrets/wg_dandelion.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 bRFqeQ swv/p+w9+aytIkQ/6Yk1jouA+0M3rJabuiOz2rlpyAs
-wt+wnM1EEKAyDNefr9K4+DtZvHcOzz9Y1EBRFkA5Nv4
--> ssh-ed25519 U9FXlg xxV/8JoorO4YWPbwSG7p306Pb2+aT10u9eNR69PhZAA
-rjOOuapa/h1tMYbdOc3Y/fPPzkNcYiamSk6rS/tbhtE
---- UKvt/4aAyYHOk5bhAP55yxPhkxTE94/xEqIqpGF3yiE
-����5;_�E�DB�<k�J~��&�TD��z`/=t��ɲ�؈����;�y�)��%�LٕJ*@��
cx<;�ko��
\ No newline at end of file
diff --git a/secrets/wg_hazel.age b/secrets/wg_hazel.age
deleted file mode 100644
index fa7fbb8..0000000
--- a/secrets/wg_hazel.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 ZAcXHw eEKOjQqzqL9npB+C/wUahKJg58fedM6oxPKuKlMHpRo
-obx/pnoSM0uXYR7EC/yHYVs8gM/W74zoMijdWRpnYv8
--> ssh-ed25519 U9FXlg o8QW/BHBKLHhahpcHf5ZrYIbCzilWVZvXr1nEChAqFM
-fgmtkUzJs2Oeq85JVl0HrHwBg/gjDQfzT5J+9Wyk8Kw
---- yXs0fQOQfJ1NyPAPSr+1nm5/hVds5dhxW4WZagtMna0
-;�ǓוZ�I=Z��[�c�Ϗ7���&.�H�Fk��JUDN������i_N��TȊ�"��l�_G�o)f��s9&
\ No newline at end of file
diff --git a/secrets/wg_hyacinth.age b/secrets/wg_hyacinth.age
deleted file mode 100644
index 082940f..0000000
--- a/secrets/wg_hyacinth.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 CUCjXQ ptHKlNvz+AmnB/Wt9XBBNyfOGeoPG5TbyrXv5993PDQ
-P0C17K+Kz8ocn0vzLf02aaYnxvRM/yjfRLMsBaJhsok
--> ssh-ed25519 U9FXlg /M8ryJjXAdlWhvNHbQgKUxe/UtL7HqEs9RqNDQBW3SM
-p2d9OnOkU2Hx7+Kn+Z66qElFvczd3F4zVm5KXbOzYWY
---- PVd8mrRk/t6qv/U32/AZk9YssRU1yn3CLPeyaEPBXi0
-��:�Dx[cyyۙc4�ɥ�/އ^�.��=�†�ȯo�G�VQdXf���^�@TRe���g���n����9UT�	
\ No newline at end of file
diff --git a/secrets/wg_sugarcane.age b/secrets/wg_sugarcane.age
new file mode 100644
index 0000000..ef79954
--- /dev/null
+++ b/secrets/wg_sugarcane.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 Hx37cw 6W7QYggFHAuAPxCBoTWdwSRxmJhtGHDgg3C2UJ73qgM
+Af4Gpj2kQsNWrMt4ZQ1ItmKsuSq7McE9Ckc9mAkotms
+-> ssh-ed25519 U9FXlg +snitv62lCxu4sMz/iS8mz8I+5KUwtLO0jyAY1epr0s
+ePqUSmK3P3PVLo+IdWK3Gq+7b2kMkbJmpsyXqcWFAf8
+--- oA8Y59o/iow4m2TjmFx5BvClendD1fpi2sRNtxnXz3Y
+�����(G��dm6��i����>�>�(~���B{b�3H��G�7֟[��qB:٬'���I��9���2Ѕ�J��d�}�
\ No newline at end of file
diff --git a/secrets/wpa_conf.age b/secrets/wpa_conf.age
index 555b594..17e93a9 100644
Binary files a/secrets/wpa_conf.age and b/secrets/wpa_conf.age differ
diff --git a/update.sh b/update.sh
index 6167e8c..c9ce776 100755
--- a/update.sh
+++ b/update.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S nix shell 'nixpkgs#git' 'nixpkgs#curl' -c bash
+#!/usr/bin/env -S nix shell 'nixpkgs#git' 'nixpkgs#curl' -c sh
 
 update_kernel() {
     previous_ver=$(cat packages/linux-lava/sources.nix | grep "version =" | sed --expression='s/[^0-9.]//g')
diff --git a/users/hana/default.nix b/users/hana/default.nix
index 69558ea..482323f 100644
--- a/users/hana/default.nix
+++ b/users/hana/default.nix
@@ -1,5 +1,4 @@
 { config, lib, modules, pkgs, ... }: {
-  programs.nh.flake = "/persist/hana/flakes";
   programs.zsh.enable = true;
   users.users.hana = {
     isNormalUser = true;
@@ -8,21 +7,19 @@
     uid = 1002;
     hashedPassword = "$y$j9T$3xCNDudmfrIu5VfQQoDkj/$ugzJWq0gORN9jnhDsREu31CkL3zwniQu6KoLbmg6Wr/";
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15 rin@anemone"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhP8yi/CdACtql3I4j0xI+r0KV4AVCb265Bd/RTFBu4 hana@dandelion"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5l9t8dc6mPsKKYqZlPKvhOdyqz+DS5UOcvHuh3uVGt cilly@hibiscus"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15 rin@blossom"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5l9t8dc6mPsKKYqZlPKvhOdyqz+DS5UOcvHuh3uVGt @strawberry"
     ];
   };
 
-  home-manager.users.hana = { config, lib, pkgs, ... }: {
+  home-manager.users.hana = { config, enableGUI, lib, pkgs, ... }: {
     home = {
       username = "hana";
       homeDirectory = "/home/hana";
-      stateVersion = "24.11";
+      stateVersion = "23.11";
     };
 
     imports = with modules.user; [
-      comma
       direnv
       git
       neovim-minimal
diff --git a/users/rin/packages.nix b/users/rin/packages.nix
index 3fe0129..31454a5 100644
--- a/users/rin/packages.nix
+++ b/users/rin/packages.nix
@@ -1,66 +1,66 @@
-{ config, inputs, pkgs, ... }:
+{ enableGUI, inputs, pkgs, ... }:
 let
   dotnet-combined = (with pkgs.dotnetCorePackages; combinePackages [
-      dotnet_10.sdk
-      aspnetcore_10_0-bin
+      dotnet_8.sdk
+      dotnet_9.sdk
+      aspnetcore_8_0-bin
+      aspnetcore_9_0-bin
   ]);
 in {
-  programs.firefox = {
-    enable = true;
-    nativeMessagingHosts = [];
-  };
+  programs.firefox.enable = true;
 
   home.packages = with pkgs; [
     dconf
+    fd
     ffmpeg
     gnupg
     kitty
-    nodejs_latest
+    nil
+    nodejs-18_x
     pamixer
-    pnpm
-    unrar
-    yt-dlp
-  ] ++ lib.optionals (config.me.environment == "desktop") [
-    krita
-    lutris
-    mangohud
-    inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin
     qmk
-    tetrio-desktop
-    tor-browser
-    virt-manager
-    winetricks
-  ] ++ lib.optionals config.me.gui [
-    android-studio
-    brightnessctl
+    ripgrep
+    unrar
+    weechat
+    yt-dlp
+
+    nodePackages_latest.pnpm
+  ] ++ lib.optionals enableGUI [
+    discord-canary
     drawio
-    evince
+    element-desktop
     eww
     feh
-    feishin
     file-roller
     gamescope
-    gimp3
+    gimp
     grim
+    #kotatogram-desktop
+    krita
     lm_sensors
+    lutris
+    insomnia
     maim
+    mangohud
     me.psensor
+    inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin
+    inputs.nix-gaming.packages.x86_64-linux.wine-osu
     obsidian
     pavucontrol
-    (prismlauncher.override {
-      jdks = [
-        jdk21
-        temurin-bin-25
-      ];
-    })
+    prismlauncher
     qbittorrent
     rivalcfg
     screenkey
     slurp
     swaybg
-    texliveFull
+    (tetrio-desktop.override { withTetrioPlus = true; })
+    tor-browser-bundle-bin
     transmission-remote-gtk
     vesktop
+    virt-manager
+    winetricks
+    xclip
+    xorg.xgamma
     zathura
     zenity
 
diff --git a/users/rin/powercordMediaKeyPatchPatch.patch b/users/rin/powercordMediaKeyPatchPatch.patch
new file mode 100644
index 0000000..d43290c
--- /dev/null
+++ b/users/rin/powercordMediaKeyPatchPatch.patch
@@ -0,0 +1,14 @@
+diff --git a/src/patcher.js b/src/patcher.js
+index d1609554029..780740d7423 100644
+--- a/src/patcher.js
++++ b/src/patcher.js
+@@ -22,7 +22,8 @@ console.log('Hello from Powercord!');
+ 
+ let disableMediaHandling = false;
+ try {
+-  settings = require(join(__dirname, '../settings/pc-general.json'));
++  const { SETTINGS_FOLDER } = require('./fake_node_modules/powercord/constants');
++  settings = require(join(SETTINGS_FOLDER, 'pc-general.json'));
+   disableMediaHandling = settings.disableMediaHandling;
+ } catch (e) {}
+ 
diff --git a/users/rin/default.nix b/users/rin/wayland.nix
similarity index 70%
rename from users/rin/default.nix
rename to users/rin/wayland.nix
index a70d716..8c877f2 100644
--- a/users/rin/default.nix
+++ b/users/rin/wayland.nix
@@ -1,14 +1,13 @@
-{ config, modules, pkgs, ... }: {
-  programs.nh.flake = "/home/rin/Projects/flakes";
+{ config, lib, modules, pkgs, ... }: {
   programs.zsh.enable = true;
   users.users.rin = {
     isNormalUser = true;
-    extraGroups = [ "adbusers" "audio" "corectrl" "dialout" "docker" "libvirtd" "networkmanager" "video" "wheel" "wireshark" ];
+    extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" "wireshark" ];
     shell = pkgs.zsh;
     uid = 1001;
     hashedPasswordFile = config.age.secrets.passwd.path;
   };
-  home-manager.users.rin = { config, lib, pkgs, ... }: {
+  home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: {
     home = {
       username = "rin";
       homeDirectory = "/home/rin";
@@ -21,16 +20,14 @@
       sessionVariables
 
       catppuccin
-      comma
       direnv
       git
       gpg
       neovim
       npm
+      pass
       zsh
-    # HACK: include all gui for now due to infinite recursion (inability to dynamically control imports)
-    # ] ++ lib.optionals config.me.gui [
-    ] ++ [
+    ] ++ lib.optionals enableGUI [
       theming
       xdg
 
@@ -39,10 +36,10 @@
       kitty
       mpv
       obs
-      rofi
+      rofi-wayland
 
       dunst
-      eww
+      eww-wayland
 
       spicetify
     ];
diff --git a/users/rin/xorg.nix b/users/rin/xorg.nix
new file mode 100644
index 0000000..8a6b604
--- /dev/null
+++ b/users/rin/xorg.nix
@@ -0,0 +1,58 @@
+{ config, lib, modules, pkgs, ... }: {
+  programs.zsh.enable = true;
+  users.users.rin = {
+    isNormalUser = true;
+    extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ];
+    shell = pkgs.zsh;
+    uid = 1001;
+    hashedPasswordFile = config.age.secrets.passwd.path;
+  };
+  home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: {
+    home = {
+      username = "rin";
+      homeDirectory = "/home/rin";
+      stateVersion = "21.05";
+      keyboard = null; # see https://github.com/nix-community/home-manager/issues/2219
+    };
+
+    imports = with modules.user; [
+      ./packages.nix
+      sessionVariables
+
+      catppuccin
+      direnv
+      git
+      gpg
+      neovim
+      npm
+      pass
+      zsh
+    ] ++ lib.optionals enableGUI [
+      theming
+      xdg
+
+      kitty
+      mpv
+      obs
+      rofi
+
+      picom
+      bspwm
+      sxhkd
+      xorg
+      dunst
+      eww
+    ];
+
+    services.mpris-proxy.enable = true;
+
+    home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl {
+      url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe";
+      sha256 = "1swn9spxpq6blm74kjmfz4ipq6a8qjzccvb2msb25pf5b1z7jnns";
+    };
+    home.file.".local/bin/osu" = {
+      executable = true;
+      source = ../../scripts/osu;
+    };
+  };
+}