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
deleted file mode 100644
index 6ab9707..0000000
--- a/.github/workflows/autoupdate.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Auto update
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PAT_TOKEN }}
-
-      - name: Check for updates
-        id: check
-        run: |
-          local=$(cat flake.lock | jq ".nodes.nixpkgs.locked.rev")
-          remote=$(curl "https://api.github.com/repos/NixOS/nixpkgs/branches/nixos-unstable/commits?per_page=1" | jq ".commit.sha")
-          if [[ $local == $remote ]]; then
-            echo "skip=1" >> "$GITHUB_OUTPUT"
-          else
-            echo "skip=0" >> "$GITHUB_OUTPUT"
-            branch=$(TZ='Australia/Melbourne' date '+staging_auto/%Y%m%d')
-            echo "branch_name=${branch}" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Install nix
-        if: steps.check.outputs.skip == 0
-        uses: cachix/install-nix-action@v31
-
-      - name: Configure git
-        if: steps.check.outputs.skip == 0
-        run: |
-          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-
-      - name: Update
-        if: steps.check.outputs.skip == 0
-        run: ./update.sh
-
-      - name: Push
-        if: steps.check.outputs.skip == 0
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.PAT_TOKEN }}
-          branch: ${{ steps.check.outputs.branch_name }}
diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 06bed3e..12283a2 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -5,23 +5,35 @@ on:
   workflow_dispatch:
 
 jobs:
+  check:
+    name: Check flake
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: cachix/install-nix-action@v17
+        with:
+          install_url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.12.0pre20220930_89ca75c/install
+          extra_nix_config: experimental-features = nix-command flakes
+      - uses: cachix/cachix-action@v10
+        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:
-      # 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
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: cachix/install-nix-action@v31
-      - uses: cachix/cachix-action@v16
+      - uses: cachix/install-nix-action@v17
+        with:
+          install_url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.12.0pre20220930_89ca75c/install
+          extra_nix_config: experimental-features = nix-command flakes
+      - uses: cachix/cachix-action@v10
         with:
           name: lava
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b2be92b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-result
diff --git a/README.md b/README.md
index daec2a6..c932782 100644
--- a/README.md
+++ b/README.md
@@ -14,18 +14,17 @@ to your liking. Open up `flake.nix`, add your new host config at the bottom, and
 ## Hosts
 | Name      | Description |
 | -------   | ----------- |
-| hyacinth  | Main Desktop PC |
-| anemone   | Main Laptop |
+| blossom   | Laptop and main PC |
 | caramel   | Raspberry Pi 400, stateless |
-| dandelion | ARM OCI VPS, stateless |
+| sugarcane | OVHCloud VPS, stateless |
 
 ## Users
 | Name | Description |
 | ---- | ----------- |
-| rin  | Main user for general usage |
+| rin  | Main user for usage |
 | hana | Lightweight user intended for inspecting stateless hosts |
 
 ## License
-Licensed under CC0
+Licensed under CC0; basically you can fork, modify, redistribute, or do whatever you want I don't really care.
 
 Credit is appreciated but not necessary
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..b43cb71 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,266 +1,65 @@
 {
   "nodes": {
-    "aagl": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1779903856,
-        "narHash": "sha256-uRShMtD6xW3ZKZbCQ6sDzKWEnbBXUg3IGfOARYogKhg=",
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
-        "rev": "50671fc7f29d686f63ef34b603320d44ad7f2d29",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
-        "type": "github"
-      }
-    },
     "agenix": {
       "inputs": {
-        "darwin": "darwin",
-        "home-manager": "home-manager",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1770165109,
-        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "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"
-      },
-      "locked": {
-        "lastModified": 1773403535,
-        "narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
-    "catppuccin-palette": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1774131488,
-        "narHash": "sha256-hsy+GhuM4MSjnwGq1YJSLBFIbVm67SSdPRgObP00mxw=",
-        "owner": "catppuccin",
-        "repo": "palette",
-        "rev": "07d02aa110ef9eb7e7427afca5c73ba9cf7f8ebd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "palette",
-        "type": "github"
-      }
-    },
-    "catppuccin-v1_1": {
-      "locked": {
-        "lastModified": 1734055249,
-        "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=",
-        "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7",
-        "revCount": 326,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz"
-      }
-    },
-    "catppuccin-v1_2": {
-      "locked": {
-        "lastModified": 1734728407,
-        "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=",
-        "rev": "23ee86dbf4ed347878115a78971d43025362fab1",
-        "revCount": 341,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "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": [
-          "agenix",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1744478979,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "lastModified": 1664140963,
+        "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0",
         "type": "github"
       },
       "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "discord-tokyonight": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1632310328,
+        "narHash": "sha256-LcxXTGdo6ZW5glECkH5vgLWAYMZ3ez/3USc059dR9cE=",
+        "owner": "DanisDGK",
+        "repo": "zelk-customizations",
+        "rev": "c5ed0be3f2dd4421c42a4c62d28fc52d18c68ef1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "DanisDGK",
+        "repo": "zelk-customizations",
+        "type": "github"
+      }
+    },
+    "discover": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1663849385,
+        "narHash": "sha256-4yCQqOtOLvpRY4ted28XMvhDmaPS4CI9/mvK/2AAiuQ=",
+        "owner": "trigg",
+        "repo": "Discover",
+        "rev": "de83063f3452b1cdee89b4c3779103eae2c90cbb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "trigg",
+        "repo": "Discover",
         "type": "github"
       }
     },
     "fast-syntax-highlighting": {
       "flake": false,
       "locked": {
-        "lastModified": 1752660993,
-        "narHash": "sha256-ZihUL4JAVk9V+IELSakytlb24BvEEJ161CQEHZYYoSA=",
+        "lastModified": 1664594535,
+        "narHash": "sha256-T4k0pbT7aqLrIRIi2EM15LXCnpRFHzFilAYfRG6kbeY=",
         "owner": "zdharma-continuum",
         "repo": "fast-syntax-highlighting",
-        "rev": "3d574ccf48804b10dca52625df13da5edae7f553",
+        "rev": "770bcd986620d6172097dc161178210855808ee0",
         "type": "github"
       },
       "original": {
@@ -272,11 +71,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
         "type": "github"
       },
       "original": {
@@ -285,71 +84,13 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "neovim-nightly",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
       "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -359,15 +100,12 @@
       }
     },
     "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
       "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
         "type": "github"
       },
       "original": {
@@ -376,189 +114,94 @@
         "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",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nix-gaming",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1778507602,
-        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-gaming",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "agenix",
           "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745494811,
-        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager-stable": {
-      "inputs": {
-        "nixpkgs": [
-          "catppuccin",
-          "nixpkgs-stable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1734366194,
-        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "catppuccin",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1734622215,
-        "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_3": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1779969295,
-        "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "catppuccin",
-          "nuscht-search",
-          "flake-utils"
         ],
-        "nixpkgs": [
-          "catppuccin",
-          "nuscht-search",
-          "nixpkgs"
-        ]
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "lastModified": 1664783440,
+        "narHash": "sha256-KlMwR7mUf5h8MPnzV7nGFUAt6ih/euW5xgvZ5x+hwvI=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "e4e639dd4dc3e431aa5b5f95325f9a66ac7e0dd9",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.0.6",
-        "repo": "ixx",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager-porcupine": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-porcupine"
+        ]
+      },
+      "locked": {
+        "lastModified": 1643735249,
+        "narHash": "sha256-hwX+qvF9fipwItm3V6M3mL3L0Iis+PY2DfXqnhPi+uQ=",
+        "owner": "LavaDesu",
+        "repo": "home-manager",
+        "rev": "ea795dd7acc9ce6069a786f6088a296f8e64c280",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LavaDesu",
+        "ref": "backport/gpg-agent",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager-raccoon": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-raccoon"
+        ],
+        "utils": "utils_2"
+      },
+      "locked": {
+        "lastModified": 1669071065,
+        "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "f7641a3ff398ccce952e19a199d775934e518c1d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-22.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "hosts-blocklists": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1664793452,
+        "narHash": "sha256-LZB8HU8ik7Th13nvHFmCXCYhNT0pvb8xZtX0+MjruzU=",
+        "owner": "notracking",
+        "repo": "hosts-blocklists",
+        "rev": "2c3695f3b725c2fcde171c8401e4b90add04a1e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notracking",
+        "repo": "hosts-blocklists",
         "type": "github"
       }
     },
     "linux-tkg": {
       "flake": false,
       "locked": {
-        "lastModified": 1779857514,
-        "narHash": "sha256-dCrVB3cFvv1d/9wuEejYN131b1phyf6SDy1bcEvtWGo=",
+        "lastModified": 1664728413,
+        "narHash": "sha256-6zgt2t53FQnCHqxu/b0lZLtsvhAdjtLVaeBq3sG1Vu4=",
         "owner": "Frogging-Family",
         "repo": "linux-tkg",
-        "rev": "c9196dea7ee464f7792f94cd39c32431ad9e25ab",
+        "rev": "1d063ca32634997616d9cb1da81253bdedc67054",
         "type": "github"
       },
       "original": {
@@ -567,20 +210,44 @@
         "type": "github"
       }
     },
+    "neovim-flake": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "neovim-nightly",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "contrib",
+        "lastModified": 1664752840,
+        "narHash": "sha256-dxecs+FwU8MWvTOjUiDM1VZh/z8SdDTwVXXMVYI0JVY=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "56998feebd6f7ec0ab68e44cba3425bf39d448b4",
+        "type": "github"
+      },
+      "original": {
+        "dir": "contrib",
+        "owner": "neovim",
+        "repo": "neovim",
+        "type": "github"
+      }
+    },
     "neovim-nightly": {
       "inputs": {
-        "flake-parts": "flake-parts",
-        "neovim-src": "neovim-src",
+        "flake-compat": "flake-compat",
+        "neovim-flake": "neovim-flake",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1780013080,
-        "narHash": "sha256-m984DKbcIeNNuLYFjN3780rPEd55Xe9/cB4BNKkIDvg=",
+        "lastModified": 1664785227,
+        "narHash": "sha256-A2YGAxuT3WY+tPA/ww6JbYvld0acsicvxAIC/5r1gFk=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "c6cc238427db8f61b786a66d7e02cf7724b30226",
+        "rev": "acc75b05773963b245e49f5e51e4fae9dbeea0a5",
         "type": "github"
       },
       "original": {
@@ -589,34 +256,16 @@
         "type": "github"
       }
     },
-    "neovim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1779979065,
-        "narHash": "sha256-3uF/oP2D4Jka3DU2G8qqml75UOzPRrK+FIp+jghOq0s=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "5d85669a33e10f1f156b086562458cbbc8054438",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
     "nix-gaming": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
-        "git-hooks": "git-hooks",
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1779768228,
-        "narHash": "sha256-/dRavNAx/Mp67xcQQ3JBIMyf0cLoXqKedafB1+wksAE=",
+        "lastModified": 1664735521,
+        "narHash": "sha256-+IWo/yZJB29y1ySijHM5qqmN0d5/BmyJpe9CCAEHM80=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "6e7a8414c0f547a86646eb0b56ebf89e7cc217a2",
+        "rev": "e1c0c8935e7f278f137be83718735348136962fa",
         "type": "github"
       },
       "original": {
@@ -625,80 +274,64 @@
         "type": "github"
       }
     },
-    "nix-index-database": {
+    "nixlib": {
+      "locked": {
+        "lastModified": 1636849918,
+        "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixos-generators": {
       "inputs": {
+        "nixlib": "nixlib",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1779604987,
-        "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
+        "lastModified": 1660727616,
+        "narHash": "sha256-zYTIvdPMYMx/EYqXODAwIIU30RiEHqNHdgarIHuEYZc=",
         "owner": "nix-community",
-        "repo": "nix-index-database",
-        "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
+        "repo": "nixos-generators",
+        "rev": "adccd191a0e83039d537e021f19495b7bad546a1",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "nix-index-database",
+        "repo": "nixos-generators",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1664628729,
+        "narHash": "sha256-A1J0ZPhBfZZiWI6ipjKJ8+RpMllzOMu/An/8Tk3t4oo=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "3024c67a2e9a35450558426c42e7419ab37efd95",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777268161,
-        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1777168982,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1734600368,
-        "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=",
+        "lastModified": 1663491030,
+        "narHash": "sha256-MVsfBhE9US5DvLtBAaTRjwYdv1tLO8xjahM8qLXTgTo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1779536132,
-        "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
+        "rev": "767542707d394ff15ac1981e903e005ba69528b5",
         "type": "github"
       },
       "original": {
@@ -708,197 +341,62 @@
         "type": "github"
       }
     },
-    "nixpkgs_11": {
+    "nixpkgs-porcupine": {
       "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
+        "lastModified": 1659446231,
+        "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_12": {
+    "nixpkgs-raccoon": {
       "locked": {
-        "lastModified": 1770019141,
-        "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
+        "lastModified": 1669465383,
+        "narHash": "sha256-fVbG427suESAEb8/P47O/zD/G9BSeFxLh94IUzgOchs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
+        "rev": "899e7caf59d1954882a8e2dff45ccc0387c186f6",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-22.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
-        "owner": "NixOS",
+        "lastModified": 1664945523,
+        "narHash": "sha256-2vgnMPBqt7JbaTWCnuCz3BrHf4JFpOLA9eADGYwRvzk=",
+        "owner": "LavaDesu",
         "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
+        "rev": "a8a3e6e8067e8b9fe33dc5f78090a7fe5cfe37cd",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "LavaDesu",
+        "ref": "laba/remove-mono",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "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_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",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nuscht-search": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "catppuccin",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733773348,
-        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
-        "type": "github"
-      }
-    },
     "nvim-treesitter": {
       "flake": false,
       "locked": {
-        "lastModified": 1775221900,
-        "narHash": "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE=",
+        "lastModified": 1664785779,
+        "narHash": "sha256-Ia7bexjruXikvfKYM7IQY/+3raa5Y1iLY/kEbO/L8Ac=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "4916d6592ede8c07973490d9322f187e07dfefac",
+        "rev": "7ccb9a056fa43da243e3a439109c354c551c51b6",
         "type": "github"
       },
       "original": {
@@ -907,57 +405,30 @@
         "type": "github"
       }
     },
-    "pastel": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_12",
-        "pnpm2nix": "pnpm2nix"
-      },
+    "packwiz": {
+      "flake": false,
       "locked": {
-        "lastModified": 1775622883,
-        "narHash": "sha256-2+7uCRXn+tn4LVaO7hLKPaezdKPW6HGvTr00aO4Tcxs=",
-        "owner": "cillynder",
-        "repo": "pastel",
-        "rev": "46f6569d5ad41ec1256dbf999d21701f73d6077b",
+        "lastModified": 1661555305,
+        "narHash": "sha256-zx0zvTpnnfRxvjVZwdXNt6obfd8gNiIjBvJnBy3ovts=",
+        "owner": "comp500",
+        "repo": "packwiz",
+        "rev": "c7c2ca786bd050043dc36f5a35fbe7699a29adbc",
         "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",
+        "owner": "comp500",
+        "repo": "packwiz",
         "type": "github"
       }
     },
     "pure": {
       "flake": false,
       "locked": {
-        "lastModified": 1779255807,
-        "narHash": "sha256-UQ0hP3qJd4Qxiw1LXPdb9d0Dc4OSD3HJpgYzaCfujno=",
+        "lastModified": 1662952498,
+        "narHash": "sha256-e1D+9EejlVZxOyErg6eRgawth5gAhv6KpgjhK06ErZc=",
         "owner": "sindresorhus",
         "repo": "pure",
-        "rev": "cc0759a0de620f191510e2e2f9748194a605b54d",
+        "rev": "47c0c881f0e7cfdb5eaccd335f52ad17b897c060",
         "type": "github"
       },
       "original": {
@@ -968,30 +439,28 @@
     },
     "root": {
       "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-palette": "catppuccin-palette",
+        "discord-tokyonight": "discord-tokyonight",
+        "discover": "discover",
         "fast-syntax-highlighting": "fast-syntax-highlighting",
-        "home-manager": "home-manager_3",
+        "home-manager": "home-manager",
+        "home-manager-porcupine": "home-manager-porcupine",
+        "home-manager-raccoon": "home-manager-raccoon",
+        "hosts-blocklists": "hosts-blocklists",
         "linux-tkg": "linux-tkg",
         "neovim-nightly": "neovim-nightly",
         "nix-gaming": "nix-gaming",
-        "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs_11",
+        "nixos-generators": "nixos-generators",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-porcupine": "nixpkgs-porcupine",
+        "nixpkgs-raccoon": "nixpkgs-raccoon",
         "nvim-treesitter": "nvim-treesitter",
-        "pastel": "pastel",
+        "packwiz": "packwiz",
         "pure": "pure",
-        "spicetify-nix": "spicetify-nix",
+        "rust-overlay": "rust-overlay",
         "spotify-adblock": "spotify-adblock",
-        "stevenblack-hosts": "stevenblack-hosts",
+        "tree-sitter-glimmer": "tree-sitter-glimmer",
         "tree-sitter-jsonc": "tree-sitter-jsonc",
         "website": "website",
         "wine-discord-ipc-bridge": "wine-discord-ipc-bridge",
@@ -1001,17 +470,17 @@
     },
     "rust-overlay": {
       "inputs": {
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
-          "aagl",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1777605393,
-        "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=",
+        "lastModified": 1664734860,
+        "narHash": "sha256-Agin7U5+AhlVqPCZAhlAMlRnoV7rGIZXtDsPspF/DRg=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c",
+        "rev": "5db6b63124ccedd61e896ec98def85fb4e6668f4",
         "type": "github"
       },
       "original": {
@@ -1020,35 +489,14 @@
         "type": "github"
       }
     },
-    "spicetify-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1779824049,
-        "narHash": "sha256-dWHVUjP03KSVG1PaLKA6j9EdxWSxSQvipMUIcSyuA/U=",
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "rev": "1362178e5f5f7a848c49fe9dee004ef8824f100a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "type": "github"
-      }
-    },
     "spotify-adblock": {
       "flake": false,
       "locked": {
-        "lastModified": 1773417310,
-        "narHash": "sha256-nwiX2wCZBKRTNPhmrurWQWISQdxgomdNwcIKG2kSQsE=",
+        "lastModified": 1650882246,
+        "narHash": "sha256-YGD3ymBZ2yT3vrcPRS9YXcljGNczJ1vCvAXz/k16r9Y=",
         "owner": "abba23",
         "repo": "spotify-adblock",
-        "rev": "813d3451c53126bf1941baaf8dd37f1152c3f412",
+        "rev": "9ba383b7b41c25c960e91732590ec45be0ff4e73",
         "type": "github"
       },
       "original": {
@@ -1057,105 +505,30 @@
         "type": "github"
       }
     },
-    "stevenblack-hosts": {
+    "tree-sitter-glimmer": {
       "flake": false,
       "locked": {
-        "lastModified": 1779976382,
-        "narHash": "sha256-wt5NGa4K8/vda669UYUmTUt+BR9X5fPnuTZFfQdpLYo=",
-        "owner": "StevenBlack",
-        "repo": "hosts",
-        "rev": "d3e838712512490260f051150e3573eeebecfadb",
+        "lastModified": 1662391283,
+        "narHash": "sha256-0NGlfAhxuBza37dP35uxjsi928+cxihcQSDhwXnitEc=",
+        "owner": "alexlafroscia",
+        "repo": "tree-sitter-glimmer",
+        "rev": "99f2d6519c686dccc20dff513e744c1bb77224fd",
         "type": "github"
       },
       "original": {
-        "owner": "StevenBlack",
-        "repo": "hosts",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
+        "owner": "alexlafroscia",
+        "repo": "tree-sitter-glimmer",
         "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,18 +537,48 @@
         "type": "gitlab"
       }
     },
-    "website": {
-      "flake": false,
+    "utils": {
       "locked": {
-        "lastModified": 1668017714,
-        "narHash": "sha256-ywy/7xeT6FHkF7lcs+stW1WPV+piE8ztSwcQ161iico=",
-        "owner": "cillynder",
-        "repo": "lavadesu.github.io",
-        "rev": "4e30c50be520a0a1bbecf408f056e6aaf135df67",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
-        "owner": "cillynder",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "utils_2": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "website": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648213051,
+        "narHash": "sha256-474ikN1CPqpd7d/E71cq13ZokuSJyMRe0dRFsczqVxE=",
+        "owner": "LavaDesu",
+        "repo": "lavadesu.github.io",
+        "rev": "90c46007ec92fbd818b29c218f99869f594b9d95",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LavaDesu",
         "ref": "master",
         "repo": "lavadesu.github.io",
         "type": "github"
@@ -1184,11 +587,11 @@
     "wine-discord-ipc-bridge": {
       "flake": false,
       "locked": {
-        "lastModified": 1730092778,
-        "narHash": "sha256-jzsbOKMakNQ6RNMlioX088fGzFBDxOP45Atlsfm2RKg=",
+        "lastModified": 1658702597,
+        "narHash": "sha256-9Wd2QUm/pvhTyUc1XPEaSquIu4uReHfPeHsFFq2QOrA=",
         "owner": "0e4ef622",
         "repo": "wine-discord-ipc-bridge",
-        "rev": "86fcbddaf654aec40c6fe6a8293f627340331b0c",
+        "rev": "45e66f9699e0ac6ba5fdef32a6b150ca49fb2303",
         "type": "github"
       },
       "original": {
@@ -1200,29 +603,27 @@
     "zsh-abbr": {
       "flake": false,
       "locked": {
-        "lastModified": 1773890443,
-        "narHash": "sha256-SVuwDeHIBg8yArKGzDEfsG3fz0UwABQoJkyKTQAPUiw=",
-        "ref": "refs/heads/main",
-        "rev": "889f4772c12b9dbe4965bbd56f2572af0a28fa3b",
-        "revCount": 1139,
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/olets/zsh-abbr"
+        "lastModified": 1662597003,
+        "narHash": "sha256-diitszKbu530zXbJx4xmfOjLsITE9ucmWdsz9VTXsKg=",
+        "owner": "olets",
+        "repo": "zsh-abbr",
+        "rev": "2b7b26e6a9d5dc4bc8478e47e92fe9e6ff7825c7",
+        "type": "github"
       },
       "original": {
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/olets/zsh-abbr"
+        "owner": "olets",
+        "repo": "zsh-abbr",
+        "type": "github"
       }
     },
     "zsh-history-substring-search": {
       "flake": false,
       "locked": {
-        "lastModified": 1768499095,
-        "narHash": "sha256-KHujL1/TM5R3m4uQh2nGVC98D6MOyCgQpyFf+8gjKR0=",
+        "lastModified": 1627971553,
+        "narHash": "sha256-8kiPBtgsjRDqLWt0xGJ6vBBLqCWEIyFpYfd+s1prHWk=",
         "owner": "zsh-users",
         "repo": "zsh-history-substring-search",
-        "rev": "14c8d2e0ffaee98f2df9850b19944f32546fdea5",
+        "rev": "4abed97b6e67eb5590b39bcd59080aa23192f25d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5cf3457..378346c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,101 +1,108 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:LavaDesu/nixpkgs/laba/remove-mono";
+    nixpkgs-porcupine.url = "github:NixOS/nixpkgs/nixos-21.11";
+    nixpkgs-raccoon.url = "github:NixOS/nixpkgs/nixos-22.11";
     home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
-    aagl.url = "github:ezKEa/aagl-gtk-on-nix";
-    catppuccin.url = "github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e";
-    catppuccin.inputs.nixpkgs.follows = "nixpkgs";
-    catppuccin-palette = { url = "github:catppuccin/palette"; flake = false; };
+    home-manager-porcupine.url = "github:LavaDesu/home-manager/backport/gpg-agent";
+    home-manager-raccoon.url = "github:nix-community/home-manager/release-22.11";
     neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
+    agenix.url = "github:ryantm/agenix";
+    nixos-generators.url = "github:nix-community/nixos-generators";
+
+    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager-porcupine.inputs.nixpkgs.follows = "nixpkgs-porcupine";
+    home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon";
     neovim-nightly.inputs.nixpkgs.follows = "nixpkgs";
+    nixos-generators.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; };
+    zsh-abbr = { url = "github:olets/zsh-abbr"; flake = false; };
     zsh-history-substring-search = { url = "github:zsh-users/zsh-history-substring-search"; flake = false; };
     fast-syntax-highlighting = { url = "github:zdharma-continuum/fast-syntax-highlighting"; flake = false; };
     pure = { url = "github:sindresorhus/pure"; flake = false; };
 
     # overlays
+    discord-tokyonight = { url = "github:DanisDGK/zelk-customizations"; flake = false; };
+    discover = { url = "github:trigg/Discover"; flake = false; };
     linux-tkg = { url = "github:Frogging-Family/linux-tkg"; flake = false; };
     nvim-treesitter = { url = "github:nvim-treesitter/nvim-treesitter"; flake = false; };
+    packwiz = { url = "github:comp500/packwiz"; flake = false; };
     spotify-adblock = { url = "github:abba23/spotify-adblock"; flake = false; };
+    tree-sitter-glimmer = { url = "github:alexlafroscia/tree-sitter-glimmer"; 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";
+    # shells
+    rust-overlay.url = "github:oxalica/rust-overlay";
+    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, agenix, catppuccin, nixpkgs, ... } @ inputs:
+  outputs = { self, agenix, nixos-generators, nixpkgs, nixpkgs-porcupine, nixpkgs-raccoon, ... } @ inputs:
     let
       overlays = (import ./overlays)
         ++ [(final: prev: {
           me = prev.callPackage ./packages { inherit inputs; } // { inherit inputs; };
         })];
 
-        patchOverlaysWithLinuxLava = nixpkgs: arch: ([(self: super: {
-          linuxLavaNixpkgs = import nixpkgs {
-            overlays = [ (import ./overlays/linux-lava.nix) ] ++ overlays;
-            system = arch;
-          };
-        })] ++ overlays);
-
       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 = [
-            ({
-              nixpkgs.overlays = patchOverlaysWithLinuxLava nixpkgs arch;
-            })
+            { nixpkgs.overlays = overlays; }
             agenix.nixosModules.age
-            catppuccin.nixosModules.catppuccin
             (./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."blossom" = mkSystem nixpkgs "blossom" "x86_64-linux" true [];
+
+      nixosConfigurations."caramel" = mkSystem nixpkgs-raccoon "caramel" "aarch64-linux" false [{
+        nixpkgs.overlays = [
+          (self: super: {
+            makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
+          })
+        ];
+      }];
+      nixosConfigurations."sugarcane" = mkSystem nixpkgs-porcupine "sugarcane" "x86_64-linux" false [];
 
       packages."x86_64-linux" =
         let
-          pkgs = import nixpkgs rec {
-            overlays = patchOverlaysWithLinuxLava nixpkgs system;
+          pkgs = import nixpkgs {
+            inherit overlays;
             system = "x86_64-linux";
           };
         in
         {
-          inherit (pkgs.me) linux-lava spotify-adblock;
-          linux-lava-ccache = pkgs.me.linux-lava.override { useCcache = true; };
+          inherit (pkgs.me) linux-lava;
         };
+
+      packages."aarch64-linux" =
+        let
+          pkgs = import nixpkgs-raccoon {
+            inherit overlays;
+            system = "aarch64-linux";
+          };
+        in
+        {
+          caramel-img = self.nixosConfigurations."caramel".config.system.build.sdImage;
+        };
+
+      # TODO: currently broken
+      # devShells.x86_64-linux = pkgs.callPackage ./shells { inherit inputs; };
     };
 }
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/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
deleted file mode 100644
index 841e909..0000000
--- a/hosts/anemone/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, inputs, modules, overlays, pkgs, ... }: {
-  networking.hostName = "anemone";
-  system.stateVersion = "23.11";
-  time.timeZone = "Australia/Melbourne";
-
-  nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
-  age.secrets = {
-    wg_anemone.file = ../../secrets/wg_anemone.age;
-    passwd.file = ../../secrets/passwd.age;
-  };
-
-  imports = with modules.system; [
-    home-manager
-
-    audio
-    base
-    bluetooth
-    ccache
-    corectrl
-    docker
-    flatpak
-    greetd
-    gui
-    input
-    kernel
-    nix
-    packages
-    printing
-    security
-    snapper
-    tailscale
-    wireguard
-
-    ./filesystem.nix
-    ./kernel.nix
-    ./networking.nix
-
-    ../../users/rin
-
-    modules.services.syncthing
-  ];
-
-  me = {
-    environment = "laptop";
-    batteryDevice = "BATT";
-    kbBacklightDevice = "asus::kbd_backlight";
-    hasFingerprint = true;
-    hidpi = true;
-  };
-
-  programs.wireshark = {
-    enable = true;
-    package = pkgs.wireshark;
-  };
-
-  services.fprintd.enable = true;
-  services.tlp.enable = true;
-
-  programs.kdeconnect.enable = true;
-}
diff --git a/hosts/anemone/filesystem.nix b/hosts/anemone/filesystem.nix
deleted file mode 100644
index 1c984e8..0000000
--- a/hosts/anemone/filesystem.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, lib, ... }:
-let
-  mkLabelMount = label: type: lazy: {
-    device = "/dev/disk/by-label/${label}";
-    fsType = type;
-    options = [ "defaults" "relatime" ] ++ lib.optionals lazy [ "nofail" ];
-  };
-  mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" false // {
-    options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ];
-  };
-  submount = mkBtrfsMount "Anemone";
-in
-{
-  fileSystems = {
-    "/" = {
-      device = "rootfs";
-      fsType = "tmpfs";
-      options = [ "defaults" "size=8G" "mode=755" ];
-    };
-    "/boot" = mkLabelMount "SYSTEM" "vfat" true;
-
-    "/mnt/butter" = submount "/" true;
-    "/nix" = submount "/current/snow" false;
-    "/home" = submount "/current/home" true;
-    "/home/.snapshots" = submount "/snapshot/home" false;
-    "/root" = submount "/current/root" false;
-    "/var" = submount "/current/var" false;
-    "/persist" = {
-      depends = [ "/var" ];
-      device = "/var/persist";
-      fsType = "none";
-      options = [ "bind" ];
-      neededForBoot = true;
-    };
-  };
-}
diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix
deleted file mode 100644
index d959b37..0000000
--- a/hosts/anemone/kernel.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ config, lib, pkgs, ... }: {
-  boot = {
-    consoleLogLevel = 0;
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
-    };
-    initrd = {
-      availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-      systemd.enable = true;
-      verbose = false;
-    };
-    kernelModules = [ "kvm-amd" ];
-    kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava);
-    kernelParams = [
-      "quiet"
-      "console=tty2"
-      "systemd.show_status=0"
-      "rd.systemd.show_status=0"
-      "rd.udev.log_level=3"
-      "udev.log_level=3"
-      "udev.log_priority=3"
-    ];
-  };
-
-  # swapDevices = [{
-  #   device = "/persist/swapfile";
-  #   size = 16 * 1024;
-  # }];
-  #
-  # systemd.sleep.extraConfig = ''
-  #   HibernateMode=shutdown
-  # '';
-  /*
-  services.logind.lidSwitch = "suspend-then-hibernate";
-  systemd.sleep.extraConfig = ''
-    HibernateDelaySec=14400
-    SuspendEstimationSec=3600
-    HibernateOnACPower=true
-  '';
-  */
-
-  powerManagement.cpufreq.min = 400000;
-
-  hardware.cpu.amd.updateMicrocode = true;
-
-  hardware.firmware = let
-    fw = "${pkgs.linux-firmware}/lib/firmware/cirrus/";
-   in [(
-    pkgs.runCommandNoCC "cs35l41-10431683" { } ''
-      mkdir -p $out/lib/firmware/cirrus
-      cd $out/lib/firmware/cirrus
-
-      cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin
-      cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin
-      cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin
-      cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin
-
-      cp ${fw}/cs35l41-dsp1-spk-prot-10431e12.wmfw cs35l41-dsp1-spk-prot-10431683.wmfw
-    ''
-  )];
-}
diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix
deleted file mode 100644
index f5a4dc5..0000000
--- a/hosts/anemone/networking.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ config, ... }: {
-  networking.wireless.iwd.enable = true;
-  environment.etc."NetworkManager/system-connections".source = "/persist/nm_system-connections";
-}
diff --git a/hosts/hyacinth/default.nix b/hosts/blossom/default.nix
similarity index 51%
rename from hosts/hyacinth/default.nix
rename to hosts/blossom/default.nix
index a32d4bd..3a56088 100644
--- a/hosts/hyacinth/default.nix
+++ b/hosts/blossom/default.nix
@@ -1,47 +1,40 @@
 { config, inputs, modules, overlays, pkgs, ... }: {
-  networking.hostName = "hyacinth";
+  networking.hostName = "blossom";
   system.stateVersion = "21.11";
-  time.timeZone = "Australia/Melbourne";
+  time.timeZone = "Asia/Phnom_Penh";
 
-  nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+  nixpkgs.overlays = [ inputs.neovim-nightly.overlay ];
   age.secrets = {
     passwd.file = ../../secrets/passwd.age;
-    wg_hyacinth.file = ../../secrets/wg_hyacinth.age;
+    wg_blossom.file = ../../secrets/wg_blossom.age;
     wpa_conf.file = ../../secrets/wpa_conf.age;
   };
   imports = with modules.system; [
+    inputs.home-manager.nixosModule
     home-manager
 
-    aagl
     audio
     base
-    bluetooth
-    ccache
-    corectrl
-    docker
-    flatpak
     greetd
     gui
     input
     kernel
     nix
     packages
-    printing
     security
     snapper
-    tailscale
     wireguard
 
-    modules.services.syncthing
-
     ./filesystem.nix
     ./kernel.nix
     ./networking.nix
-    ./packages.nix
 
     ../../users/rin
   ];
-  systemd.services.nix-daemon.environment.TMPDIR = "/nix/tmp";
 
-  me.hasBluetooth = true;
+  hardware.opengl.package = (pkgs.mesa.overrideAttrs(o: {
+    patches = o.patches ++ [ ./mesa_mr_17182.patch ];
+  })).drivers;
 }
+
diff --git a/hosts/blossom/filesystem.nix b/hosts/blossom/filesystem.nix
new file mode 100644
index 0000000..9f6bf1c
--- /dev/null
+++ b/hosts/blossom/filesystem.nix
@@ -0,0 +1,41 @@
+{ config, ... }:
+let
+  mkMount = uuid: type: {
+    device = "/dev/disk/by-uuid/${uuid}";
+    fsType = type;
+    options = [ "defaults" "relatime" ];
+  };
+  mkBtrfsMount = subvolid: atime: mkMount "cf0f4302-f006-46a5-afc7-ada04d17f6f2" "btrfs" // {
+    options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvolid=${builtins.toString subvolid}" (if atime then "relatime" else "noatime") ];
+  };
+in
+{
+  fileSystems = {
+    "/" = {
+      device = "rootfs";
+      fsType = "tmpfs";
+      options = [ "defaults" "size=4G" "mode=755" ];
+    };
+    "/boot" = mkMount "186A-A42E" "vfat";
+
+    "/mnt/butter" = mkBtrfsMount 5 true;
+    "/nix" = mkBtrfsMount 257 false;
+    "/home" = mkBtrfsMount 259 true;
+    "/home/.snapshots" = mkBtrfsMount 262 false;
+    "/root" = mkBtrfsMount 260 false;
+    "/var" = mkBtrfsMount 258 false;
+    "/persist" = {
+      depends = [ "/var" ];
+      device = "/var/persist";
+      fsType = "none";
+      options = [ "bind" ];
+      neededForBoot = true;
+    };
+
+    # "/mnt/nfs" = {
+    #   device = "192.168.100.11:/srv/nfs";
+    #   fsType = "nfs";
+    #   options = [ "defaults" ];
+    # };
+  };
+}
diff --git a/hosts/blossom/kernel.nix b/hosts/blossom/kernel.nix
new file mode 100644
index 0000000..935d709
--- /dev/null
+++ b/hosts/blossom/kernel.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }: {
+  boot = {
+    loader = {
+      efi.canTouchEfiVariables = true;
+      grub = {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+        useOSProber = lib.mkForce false;
+      };
+    };
+    initrd.kernelModules = [ "i915" ];
+    kernelParams = [
+      "amdgpu.gpu_recovery=1"
+      "amdgpu.si_support=1"
+      "radeon.si_support=0"
+      "intel_pstate=passive"
+      "msr.allow_writes=on"
+    ];
+    kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava);
+
+    extraModulePackages = [ config.boot.kernelPackages.v4l2loopback.out ];
+    kernelModules = [ "v4l2loopback" ];
+  };
+}
diff --git a/hosts/blossom/mesa_mr_17182.patch b/hosts/blossom/mesa_mr_17182.patch
new file mode 100644
index 0000000..f5d9f51
--- /dev/null
+++ b/hosts/blossom/mesa_mr_17182.patch
@@ -0,0 +1,601 @@
+diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
+new file mode 100644
+index 00000000000..c4dd948333e
+--- /dev/null
++++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
+@@ -0,0 +1,215 @@
++# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17182
++KHR-GL46.buffer_storage.map_persistent_texture,Fail
++KHR-GL46.copy_image.incompatible_formats_compression,Fail
++KHR-GL46.copy_image.invalid_alignment,Fail
++KHR-GL46.copy_image.smoke_test,Fail
++KHR-GL46.direct_state_access.textures_compressed_subimage,Fail
++KHR-GL46.direct_state_access.textures_get_image,Fail
++KHR-GL46.direct_state_access.textures_image_query_errors,Fail
++KHR-GL46.direct_state_access.textures_subimage_errors,Fail
++KHR-GL46.get_texture_sub_image.errors_test,Fail
++KHR-GL46.get_texture_sub_image.functional_test,Fail
++KHR-GL46.internalformat.copy_tex_image.rgb9_e5,Fail
++KHR-GL46.internalformat.texture2d.rgba_unsigned_byte_rgb9_e5,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_red,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_red_rgtc1,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_rg,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_rg_rgtc2,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_rgb,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_rgba,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_signed_red_rgtc1,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_signed_rg_rgtc2,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_srgb,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.compressed_srgb_alpha,Fail
++KHR-GL46.packed_pixels.pbo_rectangle.rgb9_e5,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_red,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_red_rgtc1,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_rg,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_rg_rgtc2,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_rgb,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_rgba,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_signed_red_rgtc1,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_signed_rg_rgtc2,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_srgb,Fail
++KHR-GL46.packed_pixels.rectangle.compressed_srgb_alpha,Fail
++KHR-GL46.packed_pixels.rectangle.rgb9_e5,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_red,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_red_rgtc1,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_rg,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_rg_rgtc2,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_rgb,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_rgba,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_signed_red_rgtc1,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_signed_rg_rgtc2,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_srgb,Fail
++KHR-GL46.packed_pixels.varied_rectangle.compressed_srgb_alpha,Fail
++KHR-GL46.packed_pixels.varied_rectangle.rgb9_e5,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.0_16,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.0_32,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.16_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.16_16,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.16_32,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.16_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.32_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.32_16,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.32_32,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.32_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.4_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.4_16,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.4_32,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgb_s3tc_dxt1.4_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.0_15,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.0_30,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.0_5,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.16_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.16_15,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.16_30,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.16_5,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.32_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.32_15,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.32_30,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.32_5,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.8_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.8_15,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.8_30,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage2d.rgba_astc_8x5.8_5,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_0_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_0_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_16_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_16_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_16_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_16_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_32_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_32_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_32_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_32_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_4_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_4_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_4_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.0_4_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_0_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_0_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_16_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_16_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_16_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_16_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_32_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_32_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_32_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_32_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_4_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_4_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_4_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.16_4_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_0_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_0_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_16_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_16_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_16_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_16_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_32_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_32_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_32_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_32_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_4_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_4_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_4_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.32_4_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_0_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_0_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_16_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_16_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_16_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_16_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_32_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_32_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_32_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_32_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_4_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_4_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_4_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgb_s3tc_dxt1.4_4_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_0_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_0_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_15_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_15_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_15_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_15_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_30_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_30_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_30_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_30_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_5_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_5_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_5_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.0_5_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_0_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_0_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_15_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_15_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_15_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_15_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_30_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_30_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_30_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_30_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_5_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_5_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_5_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.16_5_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_0_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_0_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_15_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_15_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_15_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_15_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_30_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_30_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_30_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_30_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_5_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_5_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_5_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.32_5_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_0_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_0_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_0_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_0_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_15_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_15_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_15_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_15_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_30_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_30_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_30_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_30_8,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_5_0,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_5_1,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_5_4,Fail
++KHR-GL46.pixelstoragemodes.compressedteximage3d.rgba_astc_8x5.8_5_8,Fail
++KHR-GL46.texture_border_clamp.Texture2DArrayCompressed,Fail
++KHR-GL46.texture_border_clamp.Texture2DArrayCompressedLinear,Fail
++KHR-GL46.texture_border_clamp.Texture2DCompressed,Fail
++KHR-GL46.texture_border_clamp.Texture2DCompressedLinear,Fail
++KHR-GL46.texture_cube_map_array.etc2_texture,Fail
++KHR-GL46.texture_filter_anisotropic.drawing,Fail
++KHR-GL46.texture_size_promotion.functional,Fail
++KHR-GL46.texture_view.errors,Fail
++KHR-GL46.texture_view.view_classes,Fail
+diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
+index e0c539bf935..0e4e5533c3c 100644
+--- a/src/intel/isl/isl_format.c
++++ b/src/intel/isl/isl_format.c
+@@ -952,7 +952,10 @@ isl_formats_have_same_bits_per_channel(enum isl_format format1,
+    return fmtl1->channels.r.bits == fmtl2->channels.r.bits &&
+           fmtl1->channels.g.bits == fmtl2->channels.g.bits &&
+           fmtl1->channels.b.bits == fmtl2->channels.b.bits &&
+-          fmtl1->channels.a.bits == fmtl2->channels.a.bits;
++          fmtl1->channels.a.bits == fmtl2->channels.a.bits &&
++          fmtl1->channels.l.bits == fmtl2->channels.l.bits &&
++          fmtl1->channels.i.bits == fmtl2->channels.i.bits &&
++          fmtl1->channels.p.bits == fmtl2->channels.p.bits;
+ }
+ 
+ /**
+diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
+index ec9ba0745e6..90812d305dd 100644
+--- a/src/intel/vulkan/anv_formats.c
++++ b/src/intel/vulkan/anv_formats.c
+@@ -988,6 +988,175 @@ void anv_GetPhysicalDeviceFormatProperties2(
+    }
+ }
+ 
++static bool
++anv_format_supports_usage(
++   VkFormatFeatureFlags2KHR format_feature_flags,
++   VkImageUsageFlags usage_flags)
++{
++   if (usage_flags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) {
++      if (!(format_feature_flags & (VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT |
++                                    VK_FORMAT_FEATURE_2_BLIT_SRC_BIT))) {
++         return false;
++      }
++   }
++
++   if (usage_flags & VK_IMAGE_USAGE_TRANSFER_DST_BIT) {
++      if (!(format_feature_flags & (VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT |
++                                    VK_FORMAT_FEATURE_2_BLIT_DST_BIT))) {
++         return false;
++      }
++   }
++
++   if (usage_flags & VK_IMAGE_USAGE_SAMPLED_BIT) {
++      if (!(format_feature_flags & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT)) {
++         return false;
++      }
++   }
++
++   if (usage_flags & VK_IMAGE_USAGE_STORAGE_BIT) {
++      if (!(format_feature_flags & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT)) {
++         return false;
++      }
++   }
++
++   if (usage_flags & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
++      if (!(format_feature_flags & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT)) {
++         return false;
++      }
++   }
++
++   if (usage_flags & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
++      if (!(format_feature_flags & VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT)) {
++         return false;
++      }
++   }
++
++   if (usage_flags & VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT) {
++      /* Nothing to check. */
++   }
++
++   if (usage_flags & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT) {
++      /* Ignore this flag because it was removed from the
++       * provisional_I_20150910 header.
++       */
++   }
++
++   return true;
++}
++
++static bool
++anv_formats_are_compatible(
++   const struct anv_format *img_fmt, const struct anv_format *img_view_fmt,
++   const struct intel_device_info *devinfo, VkImageTiling tiling)
++{
++   if (img_view_fmt->vk_format == VK_FORMAT_UNDEFINED)
++      return false;
++
++   if (img_fmt == img_view_fmt)
++      return true;
++
++   /* TODO: Handle multi-planar images that can have view of a plane with
++    * possibly different type.
++    */
++   if (img_fmt->n_planes != 1 || img_view_fmt->n_planes != 1)
++      return false;
++
++   const enum isl_format img_isl_fmt =
++      anv_get_format_plane(devinfo, img_fmt->vk_format, 0, tiling).isl_format;
++   const enum isl_format img_view_isl_fmt =
++      anv_get_format_plane(devinfo, img_view_fmt->vk_format, 0, tiling).isl_format;
++   if (img_isl_fmt == ISL_FORMAT_UNSUPPORTED ||
++       img_view_isl_fmt == ISL_FORMAT_UNSUPPORTED)
++      return false;
++
++   /* TODO: Handle VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT. */
++   if (isl_format_is_compressed(img_isl_fmt) !=
++       isl_format_is_compressed(img_view_isl_fmt))
++      return false;
++
++   const struct isl_format_layout *img_fmt_layout =
++      isl_format_get_layout(img_isl_fmt);
++   const struct isl_format_layout *img_view_fmt_layout =
++      isl_format_get_layout(img_view_isl_fmt);
++
++   if (!isl_format_is_compressed(img_isl_fmt)) {
++      /* From the Vulkan 1.3.224 spec "43.1.6. Format Compatibility Classes":
++       *
++       *    "Uncompressed color formats are compatible with each other if they
++       *    occupy the same number of bits per texel block."
++       */
++      return img_fmt_layout->bpb == img_view_fmt_layout->bpb;
++   }
++
++   /* From the Vulkan 1.3.224 spec "43.1.6. Format Compatibility Classes":
++    *
++    *    "Compressed color formats are compatible with each other if the only
++    *    difference between them is the numerical type of the uncompressed
++    *    pixels (e.g. signed vs. unsigned, or SRGB vs. UNORM encoding)."
++    */
++   return img_fmt_layout->txc == img_view_fmt_layout->txc &&
++          isl_formats_have_same_bits_per_channel(img_isl_fmt, img_view_isl_fmt);
++}
++
++/* Returns a set of feature flags supported by any of the VkFormat listed in
++ * format_list_info or any VkFormat compatible with format.
++ */
++static VkFormatFeatureFlags2
++anv_formats_gather_format_features(
++   const struct intel_device_info *devinfo,
++   const struct anv_format *format,
++   VkImageTiling tiling,
++   const struct isl_drm_modifier_info *isl_mod_info,
++   const VkImageFormatListCreateInfo *format_list_info)
++{
++   VkFormatFeatureFlags2KHR all_formats_feature_flags = 0;
++
++   /* We need to check that each of the usage bits are allowed for at least
++    * one of the potential formats.
++    */
++   if (!format_list_info || format_list_info->viewFormatCount == 0) {
++      /* If we specify no list of possible formats, we need to assume that
++       * every compatible format is possible and consider the features
++       * supported by each of them.
++       */
++      for (uint32_t fmt_arr_ind = 0;
++           fmt_arr_ind < ARRAY_SIZE(anv_formats);
++           ++fmt_arr_ind) {
++         for (uint32_t fmt_ind = 0;
++              fmt_ind < anv_formats[fmt_arr_ind].n_formats;
++              ++fmt_ind) {
++            const struct anv_format *possible_anv_format =
++               &(anv_formats[fmt_arr_ind].formats[fmt_ind]);
++
++            if (anv_formats_are_compatible(format, possible_anv_format,
++                                           devinfo, tiling)) {
++               VkFormatFeatureFlags2KHR view_format_features =
++                  anv_get_image_format_features2(devinfo,
++                                                 possible_anv_format->vk_format,
++                                                 possible_anv_format, tiling,
++                                                 isl_mod_info);
++               all_formats_feature_flags |= view_format_features;
++            }
++         }
++      }
++   } else {
++      /* If we provide the list of possible formats, then check just them. */
++      for (uint32_t i = 0; i < format_list_info->viewFormatCount; ++i) {
++         VkFormat vk_view_format = format_list_info->pViewFormats[i];
++         const struct anv_format *anv_view_format =
++            anv_get_format(vk_view_format);
++         VkFormatFeatureFlags2KHR view_format_features =
++            anv_get_image_format_features2(devinfo, vk_view_format,
++                                           anv_view_format, tiling,
++                                           isl_mod_info);
++         all_formats_feature_flags |= view_format_features;
++      }
++   }
++
++   return all_formats_feature_flags;
++}
++
++
+ static VkResult
+ anv_get_image_format_properties(
+    struct anv_physical_device *physical_device,
+@@ -1019,29 +1188,6 @@ anv_get_image_format_properties(
+    }
+ 
+    assert(format->vk_format == info->format);
+-   format_feature_flags = anv_get_image_format_features2(devinfo, info->format,
+-                                                         format, info->tiling,
+-                                                         isl_mod_info);
+-
+-   /* Remove the VkFormatFeatureFlags that are incompatible with any declared
+-    * image view format. (Removals are more likely to occur when a DRM format
+-    * modifier is present).
+-    */
+-   if ((info->flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT) && format_list_info) {
+-      for (uint32_t i = 0; i < format_list_info->viewFormatCount; ++i) {
+-         VkFormat vk_view_format = format_list_info->pViewFormats[i];
+-         const struct anv_format *anv_view_format = anv_get_format(vk_view_format);
+-         VkFormatFeatureFlags2KHR view_format_features =
+-            anv_get_image_format_features2(devinfo, vk_view_format,
+-                                           anv_view_format,
+-                                           info->tiling,
+-                                           isl_mod_info);
+-         format_feature_flags &= view_format_features;
+-      }
+-   }
+-
+-   if (!format_feature_flags)
+-      goto unsupported;
+ 
+    switch (info->type) {
+    default:
+@@ -1083,21 +1229,56 @@ anv_get_image_format_properties(
+       break;
+    }
+ 
+-   /* From the Vulkan 1.2.199 spec:
++   /* From the Vulkan 1.3.218 spec:
++    *
++    *    "For images created without VK_IMAGE_CREATE_EXTENDED_USAGE_BIT a usage
++    *    bit is valid if it is supported for the format the image is created with.
++    *    For images created with VK_IMAGE_CREATE_EXTENDED_USAGE_BIT a usage bit
++    *    is valid if it is supported for at least one of the formats
++    *    a VkImageView created from the image can have."
+     *
+-    *    "VK_IMAGE_CREATE_EXTENDED_USAGE_BIT specifies that the image can be
+-    *    created with usage flags that are not supported for the format the
+-    *    image is created with but are supported for at least one format a
+-    *    VkImageView created from the image can have."
++    *    "VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT specifies that the image can be
++    *    used to create a VkImageView with a different format from the image."
+     *
+-    * If VK_IMAGE_CREATE_EXTENDED_USAGE_BIT is set, views can be created with
+-    * different usage than the image so we can't always filter on usage.
++    * So, if both VK_IMAGE_CREATE_EXTENDED_USAGE_BIT and
++    * VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT are set, views can be created with
++    * different usage than the image, so we can't always filter on usage.
+     * There is one exception to this below for storage.
++    *
++    * TODO: Handle VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT combined
++    * with those flags.
+     */
+-   const VkImageUsageFlags image_usage = info->usage;
+-   VkImageUsageFlags view_usage = image_usage;
+-   if (info->flags & VK_IMAGE_CREATE_EXTENDED_USAGE_BIT)
+-      view_usage = 0;
++   format_feature_flags = anv_get_image_format_features2(devinfo, info->format,
++                                                         format, info->tiling,
++                                                         isl_mod_info);
++
++   if (!anv_format_supports_usage(format_feature_flags, info->usage)) {
++      /* If image format itself does not support the usage, and we don't allow
++       * views formats to support it, then we can't support this usage at all.
++       */
++      if (!(info->flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT) ||
++          !(info->flags & VK_IMAGE_CREATE_EXTENDED_USAGE_BIT))
++         goto unsupported;
++
++      /* From the Vulkan 1.3.224 spec "43.1.6. Format Compatibility Classes":
++       *
++       *    "Each depth/stencil format is only compatible with itself."
++       *
++       * So, other formats also can't help.
++       */
++      if (vk_format_is_depth_or_stencil(info->format))
++         goto unsupported;
++
++      /* Gather all possible format feature flags for the formats listed in
++       * the format list or all the compatible formats.
++       */
++      VkFormatFeatureFlags2 all_formats_feature_flags = format_feature_flags |
++         anv_formats_gather_format_features(devinfo, format, info->tiling,
++                                            isl_mod_info, format_list_info);
++
++      if (!anv_format_supports_usage(all_formats_feature_flags, info->usage))
++         goto unsupported;
++   }
+ 
+    if (info->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
+       /* We support modifiers only for "simple" (that is, non-array
+@@ -1116,7 +1297,7 @@ anv_get_image_format_properties(
+ 
+       if (isl_mod_info->aux_usage == ISL_AUX_USAGE_CCS_E &&
+           !anv_formats_ccs_e_compatible(devinfo, info->flags, info->format,
+-                                        info->tiling, image_usage,
++                                        info->tiling, info->usage,
+                                         format_list_info)) {
+          goto unsupported;
+       }
+@@ -1138,32 +1319,12 @@ anv_get_image_format_properties(
+        (format_feature_flags & (VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR |
+                                 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR)) &&
+        !(info->flags & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT) &&
+-       !(image_usage & VK_IMAGE_USAGE_STORAGE_BIT) &&
++       !(info->usage & VK_IMAGE_USAGE_STORAGE_BIT) &&
+        isl_format_supports_multisampling(devinfo, format->planes[0].isl_format)) {
+       sampleCounts = isl_device_get_sample_counts(&physical_device->isl_dev);
+    }
+ 
+-   if (view_usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) {
+-      if (!(format_feature_flags & (VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR |
+-                                    VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR))) {
+-         goto unsupported;
+-      }
+-   }
+-
+-   if (view_usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT) {
+-      if (!(format_feature_flags & (VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR |
+-                                    VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR))) {
+-         goto unsupported;
+-      }
+-   }
+-
+-   if (view_usage & VK_IMAGE_USAGE_SAMPLED_BIT) {
+-      if (!(format_feature_flags & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR)) {
+-         goto unsupported;
+-      }
+-   }
+-
+-   if (image_usage & VK_IMAGE_USAGE_STORAGE_BIT) {
++   if (info->usage & VK_IMAGE_USAGE_STORAGE_BIT) {
+       /* Non-power-of-two formats can never be used as storage images.  We
+        * only check plane 0 because there are no YCbCr formats with
+        * non-power-of-two planes.
+@@ -1174,24 +1335,6 @@ anv_get_image_format_properties(
+          goto unsupported;
+    }
+ 
+-   if (view_usage & VK_IMAGE_USAGE_STORAGE_BIT) {
+-      if (!(format_feature_flags & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR)) {
+-         goto unsupported;
+-      }
+-   }
+-
+-   if (view_usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
+-      if (!(format_feature_flags & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR)) {
+-         goto unsupported;
+-      }
+-   }
+-
+-   if (view_usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
+-      if (!(format_feature_flags & VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR)) {
+-         goto unsupported;
+-      }
+-   }
+-
+    if (info->flags & VK_IMAGE_CREATE_DISJOINT_BIT) {
+       /* From the Vulkan 1.2.149 spec, VkImageCreateInfo:
+        *
+@@ -1243,16 +1386,6 @@ anv_get_image_format_properties(
+       }
+    }
+ 
+-   if (image_usage & VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT) {
+-      /* Nothing to check. */
+-   }
+-
+-   if (image_usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT) {
+-      /* Ignore this flag because it was removed from the
+-       * provisional_I_20150910 header.
+-       */
+-   }
+-
+    /* From the bspec section entitled "Surface Layout and Tiling",
+     * pre-gfx9 has a 2 GB limitation of the size in bytes,
+     * gfx9 and gfx10 have a 256 GB limitation and gfx11+
diff --git a/hosts/blossom/networking.nix b/hosts/blossom/networking.nix
new file mode 100644
index 0000000..2e0f6a6
--- /dev/null
+++ b/hosts/blossom/networking.nix
@@ -0,0 +1,31 @@
+{ config, ... }: {
+  environment.etc."wpa_supplicant.conf".source = config.age.secrets.wpa_conf.path;
+  networking = {
+    wireless = {
+      enable = true;
+      interfaces = [ "wlp3s0" ];
+    };
+
+    useDHCP = false;
+    interfaces.eno1.useDHCP = false;
+    interfaces.wlp3s0.useDHCP = false;
+
+    interfaces.eno1.ipv4.addresses = [{
+      address = "10.0.0.2";
+      prefixLength = 24;
+    }];
+    interfaces.wlp3s0.ipv4.addresses = [{
+      address = "192.168.100.13";
+      prefixLength = 24;
+    }];
+    defaultGateway = "192.168.100.1";
+    nameservers = [ "192.168.100.15" ];
+
+    extraHosts = ''
+      192.168.100.12 strawberry
+      192.168.100.15 caramel
+
+      10.100.0.1     sugarcane
+    '';
+  };
+}
diff --git a/hosts/caramel/default.nix b/hosts/caramel/default.nix
new file mode 100644
index 0000000..1fc224d
--- /dev/null
+++ b/hosts/caramel/default.nix
@@ -0,0 +1,43 @@
+{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: {
+  networking.hostName = "caramel";
+  system.stateVersion = "22.11";
+  time.timeZone = "Asia/Phnom_Penh";
+
+  age.secrets = {
+    acme_dns.file = ../../secrets/acme_dns.age;
+    passwd.file = ../../secrets/passwd.age;
+    warden_admin.file = ../../secrets/warden_admin.age;
+    wpa_conf.file = ../../secrets/wpa_conf.age;
+    wg_caramel.file = ../../secrets/wg_caramel.age;
+  };
+  imports =
+    (with modules.system; [
+      "${builtins.toString modulesPath}/installer/sd-card/sd-image-aarch64.nix"
+      inputs.home-manager-raccoon.nixosModule
+
+      base
+      home-manager
+      input
+      nix-stable
+      security
+      transmission
+      wireguard
+
+      ./filesystem.nix
+      ./kernel.nix
+      ./image.nix
+      ./networking.nix
+      ./packages.nix
+
+      ../../users/hana
+    ]) ++
+    (with modules.services; [
+#       nginx
+#       postgres
+#       synapse
+      jellyfin
+      sonarr
+      tmptsync
+      unbound
+    ]);
+}
diff --git a/hosts/caramel/filesystem.nix b/hosts/caramel/filesystem.nix
new file mode 100644
index 0000000..5cc264c
--- /dev/null
+++ b/hosts/caramel/filesystem.nix
@@ -0,0 +1,50 @@
+{ config, lib, ... }:
+let
+  bind = src: {
+    depends = [ "/persist" ];
+    device = src;
+    fsType = "none";
+    neededForBoot = true;
+    options = [ "bind" ];
+  };
+in {
+  fileSystems = {
+    "/" = lib.mkForce {
+      device = "rootfs";
+      fsType = "tmpfs";
+      options = [ "defaults" "size=1G" "mode=755" ];
+    };
+
+    # "/nix" = {
+    #   device = "overlayfs";
+    #   fsType = "overlay";
+    #   options = [
+    #     "lowerdir=/mnt/image/nix"
+    #     "upperdir=/persist/nix-overlay"
+    #     "workdir=/persist/.overlaytmp"
+    #   ];
+    #   noCheck = true;
+    #   depends = [ "/mnt/image" "/persist" ];
+    # };
+
+    "/nix" = (bind "/mnt/image/nix") // { depends = [ "/mnt/image" ]; };
+
+    "/mnt/image" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "defaults" "noatime" ];
+      neededForBoot = true;
+    };
+
+    "/persist" = {
+      device = "/dev/disk/by-label/PI_HDD";
+      fsType = "ext4";
+      options = [ "defaults" "relatime" ];
+      neededForBoot = true;
+    };
+
+    "/var/lib/acme" = bind "/persist/acme";
+    "/var/log/journal" = bind "/persist/journal";
+    "/boot" = (bind "/mnt/image/boot") // { depends = [ "/mnt/image" ]; };
+  };
+}
diff --git a/hosts/caramel/image.nix b/hosts/caramel/image.nix
new file mode 100644
index 0000000..a7e9975
--- /dev/null
+++ b/hosts/caramel/image.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }: {
+  sdImage.expandOnBoot = false;
+  boot.postBootCommands = ''
+    # On the first boot do some maintenance tasks
+    if [ -f /mnt/image/nix-path-registration ]; then
+      set -euo pipefail
+      set -x
+      # Figure out device names for the boot device and root filesystem.
+      rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /mnt/image)
+      bootDevice=$(lsblk -npo PKNAME $rootPart)
+      partNum=$(lsblk -npo MAJ:MIN $rootPart | ${pkgs.gawk}/bin/awk -F: '{print $2}')
+
+      # Resize the root partition and the filesystem to fit the disk
+      echo ",+," | sfdisk -N$partNum --no-reread $bootDevice
+      ${pkgs.parted}/bin/partprobe
+      ${pkgs.e2fsprogs}/bin/resize2fs $rootPart
+
+      # Register the contents of the initial Nix store
+      ${config.nix.package.out}/bin/nix-store --load-db < /mnt/image/nix-path-registration
+
+      # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag.
+      touch /etc/NIXOS
+      ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+
+      # Prevents this from running on later boots.
+      rm -f /mnt/image/nix-path-registration
+    fi
+  '';
+}
diff --git a/hosts/caramel/kernel.nix b/hosts/caramel/kernel.nix
new file mode 100644
index 0000000..8c8e9a8
--- /dev/null
+++ b/hosts/caramel/kernel.nix
@@ -0,0 +1,15 @@
+{ config, inputs, lib, pkgs, ... }: {
+  imports = [
+    inputs.nixos-hardware.nixosModules.raspberry-pi-4
+  ];
+  hardware.raspberry-pi."4".fkms-3d.enable = true;
+
+  boot = {
+    initrd.kernelModules = [ "overlay" ];
+    supportedFilesystems = lib.mkForce [ "btrfs" "vfat" ];
+    kernel.sysctl = {
+      "kernel.core_pattern" = "|/bin/false";
+      "kernel.sysrq" = 1;
+    };
+  };
+}
diff --git a/hosts/caramel/networking.nix b/hosts/caramel/networking.nix
new file mode 100644
index 0000000..33dd49c
--- /dev/null
+++ b/hosts/caramel/networking.nix
@@ -0,0 +1,35 @@
+{ config, ... }: {
+  environment.etc."wpa_supplicant.conf".source = config.age.secrets.wpa_conf.path;
+  networking = {
+    firewall.allowedTCPPorts = [ 80 443 ];
+
+    wireless = {
+      enable = true;
+      interfaces = [ "wlan0" ];
+    };
+
+    useDHCP = false;
+    interfaces.wlan0.useDHCP = false;
+
+    interfaces.wlan0.ipv4.addresses = [{
+      address = "192.168.100.15";
+      prefixLength = 24;
+    }];
+    defaultGateway = "192.168.100.1";
+    nameservers = [ "8.8.8.8" ];
+
+    extraHosts = ''
+      192.168.100.12 strawberry
+      192.168.100.13 blossom
+    '';
+  };
+
+  # wait for ntp before connecting to wireguard
+  systemd = {
+    additionalUpstreamSystemUnits = [ "systemd-time-wait-sync.service" ];
+    services = {
+      "systemd-time-wait-sync".wantedBy = [ "multi-user.target" ];
+      "wireguard-wg0".after = [ "time-sync.target" ];
+    };
+  };
+}
diff --git a/hosts/dandelion/packages.nix b/hosts/caramel/packages.nix
similarity index 88%
rename from hosts/dandelion/packages.nix
rename to hosts/caramel/packages.nix
index 2d4bd30..e3e3f15 100644
--- a/hosts/dandelion/packages.nix
+++ b/hosts/caramel/packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ lib, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     git
     htop
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/hyacinth/filesystem.nix b/hosts/hyacinth/filesystem.nix
deleted file mode 100644
index 2757182..0000000
--- a/hosts/hyacinth/filesystem.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ config, lib, ... }:
-let
-  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") ];
-  };
-  mkCakeMount = mkBtrfsMount "CAKE";
-in
-{
-  fileSystems = {
-    "/" = {
-      device = "rootfs";
-      fsType = "tmpfs";
-      options = [ "defaults" "size=24G" "mode=755" ];
-    };
-    "/boot" = mkLabelMount "CUP" "vfat";
-
-    "/mnt/butter" = mkCakeMount "/" true;
-    "/mnt/cream" = mkBtrfsMount "CREAM" "/" true;
-    "/mnt/cream/permanence/.snapshots" = mkBtrfsMount "CREAM" "/snapshot/permanence" false;
-    "/nix" = mkCakeMount "/current/snow" false;
-    "/home" = mkCakeMount "/current/home" true;
-    "/home/.snapshots" = mkCakeMount "/snapshot/home" false;
-    "/root" = mkCakeMount "/current/root" false;
-    "/var" = mkCakeMount "/current/var" false;
-    "/persist" = {
-      depends = [ "/var" ];
-      device = "/var/persist";
-      fsType = "none";
-      options = [ "bind" ];
-      neededForBoot = true;
-    };
-  };
-  services.snapper.configs.cream = {
-      FSTYPE = "btrfs";
-      SUBVOLUME = "/mnt/cream/permanence";
-      TIMELINE_CLEANUP = true;
-      TIMELINE_CREATE = true;
-      TIMELINE_MIN_AGE = "1800";
-      TIMELINE_LIMIT_HOURLY = "5";
-      TIMELINE_LIMIT_DAILY = "7";
-      TIMELINE_LIMIT_WEEKLY = "0";
-      TIMELINE_LIMIT_MONTHLY = "0";
-      TIMELINE_LIMIT_YEARLY = "0";
-    };
-}
diff --git a/hosts/hyacinth/kernel.nix b/hosts/hyacinth/kernel.nix
deleted file mode 100644
index f410014..0000000
--- a/hosts/hyacinth/kernel.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }: {
-  boot = {
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
-    };
-    initrd.availableKernelModules = [ "xhci_pci" "nvme" ];
-    initrd.kernelModules = [ "amdgpu" ];
-    kernelParams = [
-      "amdgpu.gpu_recovery=1"
-      "intel_pstate=passive"
-      "split_lock_detect=off"
-    ];
-    kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava);
-  };
-  hardware.amdgpu.overdrive = {
-    enable = true;
-    ppfeaturemask = "0xffffffff";
-  };
-}
diff --git a/hosts/hyacinth/networking.nix b/hosts/hyacinth/networking.nix
deleted file mode 100644
index 0b2eb03..0000000
--- a/hosts/hyacinth/networking.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, ... }: {
-  environment.etc."wpa_supplicant.conf".source = config.age.secrets.wpa_conf.path;
-  networking = {
-    useDHCP = true;
-    interfaces.enp5s0.useDHCP = false;
-    interfaces.enp5s0.wakeOnLan.enable = true;
-
-    interfaces.enp5s0.ipv4.addresses = [{
-      address = "192.168.1.201";
-      prefixLength = 24;
-    }];
-    defaultGateway = "192.168.1.1";
-    nameservers = [ "8.8.8.8" "8.8.4.4" ];
-
-    extraHosts = ''
-      10.100.0.1     sugarcane
-    '';
-  };
-}
diff --git a/hosts/hyacinth/packages.nix b/hosts/hyacinth/packages.nix
deleted file mode 100644
index 69f9ba1..0000000
--- a/hosts/hyacinth/packages.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    discord
-    jetbrains.idea
-    texliveFull
-  ];
-}
diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix
new file mode 100644
index 0000000..0259c18
--- /dev/null
+++ b/hosts/sugarcane/default.nix
@@ -0,0 +1,28 @@
+{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: {
+  networking.hostName = "sugarcane";
+  system.stateVersion = "21.11";
+  time.timeZone = "Asia/Singapore";
+
+  age.secrets = {
+    passwd.file = ../../secrets/passwd.age;
+    wg_sugarcane.file = ../../secrets/wg_sugarcane.age;
+  };
+  imports = with modules.system; [
+    (modulesPath + "/profiles/qemu-guest.nix")
+    inputs.home-manager-porcupine.nixosModule
+
+    base
+    home-manager
+    input
+    nix-stable
+    security
+    wireguard
+
+    ./filesystem.nix
+    ./kernel.nix
+    ./networking.nix
+    ./packages.nix
+
+    ../../users/hana
+  ];
+}
diff --git a/hosts/sugarcane/filesystem.nix b/hosts/sugarcane/filesystem.nix
new file mode 100644
index 0000000..cc3db8e
--- /dev/null
+++ b/hosts/sugarcane/filesystem.nix
@@ -0,0 +1,29 @@
+{ config, ... }:
+let
+  bind = src: {
+    depends = [ "/nix" ];
+    device = src;
+    fsType = "none";
+    neededForBoot = true;
+    options = [ "bind" ];
+  };
+in {
+  fileSystems = {
+    "/" = {
+      device = "rootfs";
+      fsType = "tmpfs";
+      options = [ "defaults" "size=1G" "mode=755" ];
+    };
+
+    "/nix" = {
+      device = "/dev/disk/by-uuid/19d572a8-1cf6-4b9c-94c6-3ce6be54f719";
+      fsType = "ext4";
+      options = [ "defaults" "noatime" ];
+      neededForBoot = true;
+    };
+
+    "/persist" = bind "/nix/persist";
+    "/var/log/journal" = bind "/nix/persist/journal";
+    "/boot" = bind "/nix/persist/boot";
+  };
+}
diff --git a/hosts/sugarcane/kernel.nix b/hosts/sugarcane/kernel.nix
new file mode 100644
index 0000000..35c4452
--- /dev/null
+++ b/hosts/sugarcane/kernel.nix
@@ -0,0 +1,17 @@
+{ config, inputs, pkgs, ... }: {
+  boot = {
+    loader = {
+      systemd-boot.enable = false;
+      efi.canTouchEfiVariables = true;
+      grub = {
+        enable = true;
+        device = "/dev/sda";
+      };
+    };
+    initrd.kernelModules = [ "nvme" ];
+    kernel.sysctl = {
+      "kernel.core_pattern" = "|/bin/false";
+      "kernel.sysrq" = 1;
+    };
+  };
+}
diff --git a/hosts/sugarcane/networking.nix b/hosts/sugarcane/networking.nix
new file mode 100644
index 0000000..5218f0d
--- /dev/null
+++ b/hosts/sugarcane/networking.nix
@@ -0,0 +1,11 @@
+{ config, ... }: {
+  networking = {
+    useDHCP = false;
+    interfaces.ens3.useDHCP = true;
+
+    extraHosts = ''
+      10.100.0.3 blossom
+      10.100.0.4 strawberry
+    '';
+  };
+}
diff --git a/hosts/alyssum/packages.nix b/hosts/sugarcane/packages.nix
similarity index 88%
rename from hosts/alyssum/packages.nix
rename to hosts/sugarcane/packages.nix
index 2d4bd30..e3e3f15 100644
--- a/hosts/alyssum/packages.nix
+++ b/hosts/sugarcane/packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ lib, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     git
     htop
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..43aa296 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -14,31 +14,19 @@ 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
     ./system/audio.nix
     ./system/base.nix
-    ./system/bluetooth.nix
-    ./system/ccache.nix
-    ./system/corectrl.nix
-    ./system/docker.nix
-    ./system/flatpak.nix
     ./system/greetd.nix
     ./system/gui.nix
     ./system/home-manager.nix
@@ -47,34 +35,33 @@ in {
     ./system/nix.nix
     ./system/nix-stable.nix
     ./system/packages.nix
-    ./system/printing.nix
     ./system/security.nix
     ./system/snapper.nix
-    ./system/tailscale.nix
-    ./system/virtualisation.nix
+    ./system/transmission.nix
     ./system/wireguard.nix
   ];
   user = mkAttrsFromPaths [
-    ./user/catppuccin.nix
-    ./user/comma.nix
+    ./user/bspwm.nix
     ./user/direnv.nix
     ./user/dunst.nix
     ./user/eww.nix
     ./user/git.nix
     ./user/gpg.nix
-    ./user/hypridle.nix
-    ./user/hyprlock.nix
     ./user/kitty.nix
     ./user/mpv.nix
     ./user/neovim.nix
     ./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/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..4b01c80 100644
--- a/modules/services/nginx.nix
+++ b/modules/services/nginx.nix
@@ -1,21 +1,17 @@
-{ config, ... }: {
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+{ config, inputs, ... }: {
   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 +20,23 @@
     recommendedOptimisation = true;
     recommendedGzipSettings = true;
     recommendedProxySettings = true;
+
+    virtualHosts = {
+      "lava.moe" = {
+        useACMEHost = "lava.moe";
+        forceSSL = true;
+        root = inputs.website.outPath;
+      };
+      "_" = {
+        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..dc2f08e 100644
--- a/modules/services/postgres.nix
+++ b/modules/services/postgres.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 let
   dir = "/persist/postgresql/${config.services.postgresql.package.psqlSchema}";
   uid = toString config.ids.uids.postgres;
@@ -8,13 +8,5 @@ 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
-      local  all       all                         trust
-      host   all       all     127.0.0.1/32        trust
-      host   all       all     ::1/128             trust
-    '';
   };
 }
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/aagl.nix b/modules/system/aagl.nix
deleted file mode 100644
index 57826c4..0000000
--- a/modules/system/aagl.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, ... }: {
-  imports = [ inputs.aagl.nixosModules.default ];
-  nix.settings = inputs.aagl.nixConfig;
-  programs.anime-game-launcher.enable = true;
-  programs.sleepy-launcher.enable = true;
-}
diff --git a/modules/system/audio.nix b/modules/system/audio.nix
index 46d50c0..29c17a7 100644
--- a/modules/system/audio.nix
+++ b/modules/system/audio.nix
@@ -17,6 +17,7 @@ let
     rate = toString int.rate;
   };
 in {
+  sound.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -24,32 +25,18 @@ in {
     alsa.support32Bit = true;
     pulse.enable = true;
     jack.enable = true;
-  };
-  services.pipewire.extraConfig.pipewire = {
-    "context.properties" = {
-      "default.clock.rate" = int.rate;
-      "default.clock.quantum" = int.quantum.def;
-      "default.clock.min-quantum" = int.quantum.min;
-      "default.clock.max-quantum" = int.quantum.max;
-    };
 
-    "context.modules" = [
-      {
-        name = "libpipewire-module-rtkit";
-        args = {
-          "nice.level" = -15;
-          "rt.prio" = 88;
-          "rt.time.soft" = 200000;
-          "rt.time.hard" = 200000;
-        };
-      }
-    ];
-    "stream.properties" = {
-      "node.latency" = "${str.quantum.min}/${str.rate}";
-      "resample.quality" = 1;
-    };
-  };
-  services.pipewire.extraConfig.pipewire-pulse = {
+    config.pipewire = {
+      "context.properties" = {
+        "link.max-buffers" = 16;
+        "default.clock.rate" = int.rate;
+        "default.clock.quantum" = int.quantum.def;
+        "default.clock.min-quantum" = int.quantum.min;
+        "default.clock.max-quantum" = int.quantum.max;
+        "core.daemon" = true;
+        "core.name" = "pipewire-0";
+      };
+
       "context.modules" = [
         {
           name = "libpipewire-module-rtkit";
@@ -59,15 +46,57 @@ in {
             "rt.time.soft" = 200000;
             "rt.time.hard" = 200000;
           };
+          flags = [ "ifexists" "nofail" ];
+        }
+        { name = "libpipewire-module-protocol-native"; }
+        { name = "libpipewire-module-profiler"; }
+        { name = "libpipewire-module-metadata"; }
+        { name = "libpipewire-module-spa-device-factory"; }
+        { name = "libpipewire-module-spa-node-factory"; }
+        { name = "libpipewire-module-client-node"; }
+        { name = "libpipewire-module-client-device"; }
+        {
+          name = "libpipewire-module-portal";
+          flags = [ "ifexists" "nofail" ];
+        }
+        { name = "libpipewire-module-access"; args = {}; }
+        { name = "libpipewire-module-adapter"; }
+        { name = "libpipewire-module-link-factory"; }
+        { name = "libpipewire-module-session-manager"; }
+      ];
+      "stream.properties" = {
+        "node.latency" = "${str.quantum.min}/${str.rate}";
+        "resample.quality" = 1;
+      };
+    };
+    config.pipewire-pulse = {
+      "context.modules" = [
+        {
+          name = "libpipewire-module-rtkit";
+          args = {
+            "nice.level" = -15;
+            "rt.prio" = 88;
+            "rt.time.soft" = 200000;
+            "rt.time.hard" = 200000;
+          };
+          flags = [ "ifexists" "nofail" ];
+        }
+        { name = "libpipewire-module-protocol-native"; }
+        { name = "libpipewire-module-client-node"; }
+        { name = "libpipewire-module-adapter"; }
+        { name = "libpipewire-module-metadata"; }
+        {
+          name = "libpipewire-module-protocol-pulse";
+          args = {
+            "pulse.min.req" = "${str.quantum.min}/${str.rate}";
+            "pulse.default.req" = "${str.quantum.def}/${str.rate}";
+            "pulse.max.req" = "${str.quantum.max}/${str.rate}";
+            "pulse.min.quantum" = "${str.quantum.min}/${str.rate}";
+            "pulse.max.quantum" = "${str.quantum.max}/${str.rate}";
+            "server.address" = [ "unix:native" ];
+          };
         }
       ];
-      "pulse.properties" = {
-         "pulse.min.req" = "${str.quantum.min}/${str.rate}";
-         "pulse.default.req" = "${str.quantum.def}/${str.rate}";
-         "pulse.max.req" = "${str.quantum.max}/${str.rate}";
-         "pulse.min.quantum" = "${str.quantum.min}/${str.rate}";
-         "pulse.max.quantum" = "${str.quantum.max}/${str.rate}";
-      };
       "pulse.rules" = [
         {
           # Discord notification sounds fix
@@ -83,6 +112,7 @@ in {
         "node.latency" = "${str.quantum.min}/${str.rate}";
         "resample.quality" = 1;
       };
+    };
   };
 }
 
diff --git a/modules/system/base.nix b/modules/system/base.nix
index c45eb99..0ca07dc 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";
@@ -10,9 +8,7 @@
   };
   environment.pathsToLink = [ "/share/zsh" ];
 
-  i18n.defaultLocale = "en_AU.UTF-8";
-  i18n.extraLocales = [ "en_GB.UTF-8/UTF-8" ];
-
+  i18n.defaultLocale = "en_GB.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/bluetooth.nix b/modules/system/bluetooth.nix
deleted file mode 100644
index 1e2a72e..0000000
--- a/modules/system/bluetooth.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }: {
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
-}
diff --git a/modules/system/ccache.nix b/modules/system/ccache.nix
deleted file mode 100644
index b9e0847..0000000
--- a/modules/system/ccache.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ config, ... }: {
-  programs.ccache.enable = true;
-}
diff --git a/modules/system/corectrl.nix b/modules/system/corectrl.nix
deleted file mode 100644
index 6f6ca01..0000000
--- a/modules/system/corectrl.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  programs.corectrl = {
-    enable = true;
-  };
-}
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/flatpak.nix b/modules/system/flatpak.nix
deleted file mode 100644
index fbb80bb..0000000
--- a/modules/system/flatpak.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }: {
-  services.flatpak.enable = true;
-  xdg.portal = {
-    enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-    config.common.default = "*";
-  };
-}
diff --git a/modules/system/greetd.nix b/modules/system/greetd.nix
index f220847..de3b6cc 100644
--- a/modules/system/greetd.nix
+++ b/modules/system/greetd.nix
@@ -1,18 +1,11 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   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\"'";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && startx\"'";
         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/gui.nix b/modules/system/gui.nix
index 7028dac..e9c81de 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }: {
   fonts = {
-    enableDefaultPackages = true;
+    enableDefaultFonts = true;
     fontconfig = {
       defaultFonts = {
         serif = [ "NotoSerif" ];
@@ -8,13 +8,15 @@
         monospace = [ "CascadiaCode" ];
       };
     };
-    packages = with pkgs; [
-      material-symbols
-      material-icons
+    fonts = with pkgs; [
       cascadia-code
+      font-awesome
+      font-awesome_4
       hanazono
+      material-icons
       noto-fonts
-      noto-fonts-cjk-sans
+      noto-fonts-cjk
+      noto-fonts-extra
       open-sans
       twemoji-color-font
       unifont
@@ -22,10 +24,11 @@
   };
   services.xserver = {
     enable = true;
-    displayManager.lightdm.enable = lib.mkForce false;
+    autorun = false;
+    displayManager = {
+      lightdm.enable = lib.mkForce false;
+      startx.enable = true;
+    };
     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..43bc0ac 100644
--- a/modules/system/home-manager.nix
+++ b/modules/system/home-manager.nix
@@ -1,19 +1,10 @@
-{ config, inputs, modules, ... }: {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
+{ config, enableGUI, inputs, modules, ... }: {
   home-manager = {
     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..17e5416 100644
--- a/modules/system/input.nix
+++ b/modules/system/input.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ config, lib, pkgs, ... }: {
   services.xserver = {
     displayManager = {
       xserverArgs = [
@@ -6,19 +6,14 @@
         "-arinterval 15"
       ];
     };
-  };
-  services.keyd = {
-    enable = true;
-    keyboards = {
-      default = {
-        ids = [ "*" ];
-        settings = {
-          main = {
-            capslock = "esc";
-            esc = "capslock";
-          };
-        };
+    libinput = {
+      enable = true;
+      mouse = {
+        accelSpeed = "0";
+        accelProfile = "flat";
       };
     };
+    xkbOptions = "caps:escape";
   };
+  console.useXkbConfig = true;
 }
diff --git a/modules/system/kernel.nix b/modules/system/kernel.nix
index c0a1bcf..e12c37c 100644
--- a/modules/system/kernel.nix
+++ b/modules/system/kernel.nix
@@ -9,10 +9,9 @@
       "kernel.core_pattern" = "|/bin/false";
       "kernel.sysrq" = 1;
     };
+    loader.grub.useOSProber = true;
   };
   hardware.enableRedistributableFirmware = true;
-  zramSwap = {
-    enable = true;
-    priority = 100;
-  };
+  powerManagement.cpuFreqGovernor = "ondemand";
+  zramSwap.enable = true;
 }
diff --git a/modules/system/nix-stable.nix b/modules/system/nix-stable.nix
index 1884c04..032696d 100644
--- a/modules/system/nix-stable.nix
+++ b/modules/system/nix-stable.nix
@@ -1,23 +1,18 @@
 { config, lib, pkgs, ... }: {
-  nix = {
-    package = pkgs.nixVersions.latest;
-
-    settings = rec {
-      substituters = [
-        "https://cache.nixos.org?priority=10"
-        "https://lava.cachix.org"
-      ];
-      trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0="
-      ];
-      trusted-substituters = substituters;
-    };
+  nix = rec {
+    binaryCaches = [
+      "https://cache.nixos.org?priority=10"
+      "https://lava.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0="
+    ];
+    trustedBinaryCaches = binaryCaches;
 
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
   };
   nixpkgs.config.allowUnfree = true;
-  programs.nh.enable = true;
 }
diff --git a/modules/system/nix.nix b/modules/system/nix.nix
index eb14f73..3152bb9 100644
--- a/modules/system/nix.nix
+++ b/modules/system/nix.nix
@@ -1,10 +1,8 @@
-{ config, inputs, pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   nix = {
-    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-    package = pkgs.nixVersions.latest;
+    package = pkgs.nixUnstable;
 
     settings = rec {
-      extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
       substituters = [
         "https://cache.nixos.org?priority=10"
         "https://lava.cachix.org"
@@ -16,7 +14,6 @@
         "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
       ];
       trusted-substituters = substituters;
-      trusted-users = [ "root" "rin" ];
     };
 
     extraOptions = ''
@@ -24,5 +21,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..b3fca7d 100644
--- a/modules/system/packages.nix
+++ b/modules/system/packages.nix
@@ -1,14 +1,9 @@
-{ pkgs, ... }: {
-  imports = [ ./packages-gui.nix ];
+{ config, enableGUI, lib, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    # ecryptfs
     efibootmgr
-    fd
     git
-    git-crypt
     htop
     jq
-    kitty.terminfo
     libarchive
     lf
     msr-tools
@@ -16,10 +11,27 @@
     neovim
     nfs-utils
     ntfs3g
-    ripgrep
-    rsync
     sshfs
+    rsync
     wget
+  ] ++ lib.optionals enableGUI [
+    gparted
+    gnome.nautilus
   ];
   environment.variables.EDITOR = "nvim";
+  programs.adb.enable = true;
 }
+// (if !enableGUI then {} else {
+  hardware.opengl.extraPackages = with pkgs; [
+    vaapiIntel
+    vaapiVdpau
+    libvdpau-va-gl
+    rocm-opencl-icd
+    rocm-opencl-runtime
+  ];
+  programs.light.enable = true;
+  hardware.opentabletdriver.enable = true;
+  programs.steam.enable = true;
+  services.dbus.packages = [ pkgs.dconf pkgs.gcr ];
+  services.gnome.sushi.enable = true;
+})
diff --git a/modules/system/printing.nix b/modules/system/printing.nix
deleted file mode 100644
index f7ccb20..0000000
--- a/modules/system/printing.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-  services.printing = {
-    enable = true;
-    drivers = with pkgs; [
-      epson-escpr
-      #me.epson-201112j
-    ];
-  };
-}
diff --git a/modules/system/security.nix b/modules/system/security.nix
index f1f087b..a0399f0 100644
--- a/modules/system/security.nix
+++ b/modules/system/security.nix
@@ -1,29 +1,16 @@
-{ config, lib, pkgs, ... }: {
-  networking.firewall =
-  let
-    iptables = "${pkgs.iptables}/bin/iptables";
-    genCmds = type: ''
-      ${iptables} -${type} nixos-fw -p tcp --source 192.168.0.0/16 -j nixos-fw-accept ${if type == "D" then " || true" else ""}
-      ${iptables} -${type} nixos-fw -p udp --source 192.168.0.0/16 -j nixos-fw-accept ${if type == "D" then " || true" else ""}
-    '';
-  in {
+{ config, pkgs, ... }: {
+  networking.firewall = {
     enable = true;
     allowedUDPPortRanges = [ { from = 20000; to = 20100; } ];
     allowedTCPPortRanges = [ { from = 20000; to = 20100; } ];
     trustedInterfaces = [ "wg0" ];
-    logRefusedConnections = false;
-
-    extraCommands = genCmds "I";
-    extraStopCommands = genCmds "D";
   };
 
   services.openssh = {
     enable = true;
-    settings = {
-      PermitRootLogin = "no";
-      PasswordAuthentication = false;
-      X11Forwarding = true;
-    };
+    permitRootLogin = "no";
+    passwordAuthentication = false;
+    forwardX11 = true;
 
     hostKeys = [
       {
@@ -53,33 +40,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/snapper.nix b/modules/system/snapper.nix
index 60cf41e..6883355 100644
--- a/modules/system/snapper.nix
+++ b/modules/system/snapper.nix
@@ -2,16 +2,18 @@
   services.snapper = {
     cleanupInterval = "1h";
     configs.home = {
-      FSTYPE = "btrfs";
-      SUBVOLUME = "/home";
-      TIMELINE_CLEANUP = true;
-      TIMELINE_CREATE = true;
-      TIMELINE_MIN_AGE = "1800";
-      TIMELINE_LIMIT_HOURLY = "5";
-      TIMELINE_LIMIT_DAILY = "7";
-      TIMELINE_LIMIT_WEEKLY = "0";
-      TIMELINE_LIMIT_MONTHLY = "0";
-      TIMELINE_LIMIT_YEARLY = "0";
+      fstype = "btrfs";
+      subvolume = "/home";
+      extraConfig = lib.concatStringsSep "\n" (lib.mapAttrsToList (k: v: "${k}=${v}") {
+        TIMELINE_CLEANUP = "yes";
+        TIMELINE_CREATE = "yes";
+        TIMELINE_MIN_AGE = "1800";
+        TIMELINE_LIMIT_HOURLY = "5";
+        TIMELINE_LIMIT_DAILY = "7";
+        TIMELINE_LIMIT_WEEKLY = "0";
+        TIMELINE_LIMIT_MONTHLY = "0";
+        TIMELINE_LIMIT_YEARLY = "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/virtualisation.nix b/modules/system/virtualisation.nix
deleted file mode 100644
index b575f05..0000000
--- a/modules/system/virtualisation.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-  virtualisation = {
-    spiceUSBRedirection.enable = true;
-    libvirtd = {
-      enable = true;
-      qemu.package = pkgs.qemu_kvm.override { smbdSupport = true; };
-    };
-  };
-}
diff --git a/modules/system/wireguard.nix b/modules/system/wireguard.nix
index 71f85ad..e7d4234 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,48 @@ 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 = {
-    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; };
-      };
+  routeBypass = {
+    caramel = {
+      gateway = "192.168.100.1";
+      interface = "wlan0";
+      routes = [
+        serverIp
+      ];
     };
-    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 ];
-        };
-      };
+    blossom = {
+      gateway = "192.168.100.1";
+      interface = "wlp3s0";
+      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" ];
+    };
+    blossom = {
+      publicKey = "6nVhazYdmC15A/nke9VrqIg3sOBVOmqj4GEsyBq7MVo=";
+      allowedIPs = [ "10.100.0.3/32" ];
+    };
+    strawberry = {
+      publicKey = "Fkcp/VSN4Dkhly8V4hskF4lnDviA7VZHCnWf7OliFCg=";
+      allowedIPs = [ "10.100.0.4/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 +75,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 +93,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..a17e743
--- /dev/null
+++ b/modules/user/bspwm.nix
@@ -0,0 +1,19 @@
+# Depends on eww
+{ config, pkgs, ... }: {
+  xsession.windowManager.bspwm = {
+    enable = true;
+    monitors = { eDP-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
deleted file mode 100644
index 176b42c..0000000
--- a/modules/user/catppuccin.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ config, inputs, lib, pkgs, ... }: {
-  imports = [
-    inputs.catppuccin.homeManagerModules.catppuccin
-  ];
-
-  options.catppuccin.colors = lib.mkOption {
-    type = lib.types.attrs;
-    default = (builtins.fromJSON (builtins.readFile "${inputs.catppuccin-palette}/palette.json"))."${config.catppuccin.flavor}".colors;
-  };
-  options.catppuccin.hexcolors = lib.mkOption {
-    type = lib.types.attrs;
-    default = builtins.mapAttrs (name: value: value.hex) config.catppuccin.colors;
-  };
-
-  config = {
-    catppuccin = {
-      accent = lib.mkDefault "pink";
-      flavor = lib.mkDefault "mocha";
-      kitty.enable = true;
-      gtk.enable = true;
-      hyprlock.enable = true;
-      nvim.enable = true;
-    };
-
-    specialisation = {
-      light.configuration.catppuccin.flavor = "latte";
-      dark.configuration.catppuccin.flavor = "mocha";
-    };
-
-    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/dunst.nix b/modules/user/dunst.nix
index 2ae1404..08f4d62 100644
--- a/modules/user/dunst.nix
+++ b/modules/user/dunst.nix
@@ -12,9 +12,9 @@ in {
       global = {
         monitor = 0;
         follow = "mouse";
-        width = "(100, 450)";
+        width = 460;
         origin = "top-right";
-        offset = "24x50";
+        offset = "24x35";
         notification_limit = 0;
         indicate_hidden = true;
         shrink = true;
@@ -36,7 +36,7 @@ in {
         hide_duplicate_count = true;
         show_indicators = false;
         icon_position = "left";
-        max_icon_size = 40;
+        max_icon_size = 32;
         sticky_history = true;
         history_length = 100;
         browser = "${pkgs.firefox}/bin/firefox -new-tab";
@@ -49,21 +49,21 @@ in {
       };
 
       urgency_low = {
-        background = config.catppuccin.hexcolors.crust;
-        foreground = config.catppuccin.hexcolors.text;
+        background = "#12131b";
+        foreground = "#d8dee8";
         timeout = 3;
       };
 
       urgency_normal = {
-        background = config.catppuccin.hexcolors.crust;
-        foreground = config.catppuccin.hexcolors.text;
+        background = "#12131b";
+        foreground = "#d8dee8";
         timeout = 5;
       };
 
       urgency_critical = {
-        background = config.catppuccin.hexcolors.crust;
-        foreground = config.catppuccin.hexcolors.text;
-        frame_color = config.catppuccin.hexcolors.red;
+        background = "#12131b";
+        foreground = "#d8dee8";
+        # frame_color = "#bf616a";
         timeout = 0;
       };
     };
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..beea776 100644
--- a/modules/user/git.nix
+++ b/modules/user/git.nix
@@ -1,16 +1,14 @@
-{ ... }: {
+{ config, ... }: {
   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..a8ab12f 100644
--- a/modules/user/gpg.nix
+++ b/modules/user/gpg.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, ... }: {
+{ config, enableGUI, ... }: {
   programs.gpg = {
     enable = true;
     homedir = "${config.xdg.dataHome}/gnupg";
   };
   services.gpg-agent = {
     enable = true;
-    pinentry.package = pkgs.pinentry-gnome3;
+    pinentryFlavor = if enableGUI then "gnome3" else "tty";
   };
 }
diff --git a/modules/user/hypridle.nix b/modules/user/hypridle.nix
deleted file mode 100644
index af7af86..0000000
--- a/modules/user/hypridle.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  kblight = "brightnessctl -d ${config.me.kbBacklightDevice}";
-in
-{
-  home.packages = [ config.services.hypridle.package ];
-  services.hypridle = {
-    enable = true;
-    settings = {
-      general = {
-        lock_cmd = "pidof hyprlock || hyprlock";
-        before_sleep_cmd = "${lib.getExe pkgs.playerctl} pause; loginctl lock-session";
-        after_sleep_cmd = "hyprctl dispatch dpms on";
-      };
-
-      listener = lib.optionals (config.me.kbBacklightDevice != null) [
-        {
-          timeout = 120;
-          on-timeout = "${kblight} -s && ${kblight} 0";
-          on-resume = "${kblight} -r";
-        }
-      ] ++ [
-        {
-          timeout = 150;
-          on-timeout = "brightnessctl -s && brightnessctl 50%-";
-          on-resume = "brightnessctl -r";
-        }
-        {
-          timeout = 180;
-          on-timeout = "brightnessctl -r && 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
deleted file mode 100644
index 529c522..0000000
--- a/modules/user/hyprlock.nix
+++ /dev/null
@@ -1,148 +0,0 @@
-{ 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 = {
-      general = {
-        disable_loading_bar = true;
-        hide_cursor = true;
-      };
-      auth = {
-        fingerprint = {
-          enabled = config.me.hasFingerprint;
-          ready_message = "Scan fingerprint to unlock";
-        };
-      };
-      background = {
-        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 [
-        # Fingerprint icon
-        {
-            monitor = "";
-            color = "$text";
-            font_family = "Material Symbols Outlined";
-            font_size = s 64;
-            halign = "center";
-            valign = "top";
-            position = sn [0 100];
-            text = "";
-        }
-        # Fingerprint text
-        {
-          monitor = "";
-          color = "$text";
-          text = "$FPRINTPROMPT";
-          font_size = s 25;
-          font_family = "Open Sans";
-          position = sn [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;
-          text = "$FAIL $ATTEMPTS[]";
-          position = sn [0 200];
-          halign = "center";
-          valign = "center";
-        }
-      ];
-      input-field = {
-        monitor = "";
-        size = s [600 120];
-        outline_thickness = s 4;
-        check_color = "$peach";
-        dots_size = 0.2;
-        dots_spacing = 0.2;
-        dots_center = true;
-        fail_text = "";
-        font_color = "$text";
-        inner_color = "$crust";
-        outer_color = "$base";
-        placeholder_text = "Password";
-        fade_on_empty = false;
-        hide_input = false;
-        capslock_color = "$yellow";
-        position = sn [0 47];
-        halign = "center";
-        valign = "center";
-      };
-    };
-  };
-}
diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix
index ddc189a..a7a7601 100644
--- a/modules/user/kitty.nix
+++ b/modules/user/kitty.nix
@@ -9,11 +9,10 @@
     settings = {
       font_features = "-ss01 +ss19";
       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;
     };
+    extraConfig = builtins.readFile (builtins.fetchurl {
+      url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/eede574f9ef57137e6d7e4bab37b09db636c5a56/extras/kitty_tokyonight_night.conf";
+      sha256 = "0l9yl3qmgf7b10x7hy7q5hma0hsyamq3n14lfbw31cimm6snwim6";
+    });
   };
 }
diff --git a/modules/user/mpv.nix b/modules/user/mpv.nix
index 6ef3da4..c740392 100644
--- a/modules/user/mpv.nix
+++ b/modules/user/mpv.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }: {
+{ config, pkgs, ... }: {
   programs.mpv = {
     enable = true;
-    package = pkgs.mpv.override {
+    package = pkgs.wrapMpv 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..3c7d861 100644
--- a/modules/user/neovim.nix
+++ b/modules/user/neovim.nix
@@ -1,9 +1,7 @@
-{ 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]
+    (lib.replaceStrings ["{{OMNISHARP_PATH}}"] ["${pkgs.omnisharp-roslyn}/bin/OmniSharp"]
       (builtins.readFile ../../res/config.lua));
 in {
   systemd.user.tmpfiles.rules = [
@@ -15,81 +13,52 @@ in {
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
-    #package = pkgs.neovim-nightly;
+    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.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
       vim-surround
-      vimtex
       lsp_signature-nvim
 
       nvim-cmp
-      nvim-dap
-      nvim-highlight-colors
       nvim-lspconfig
       cmp-nvim-lsp
       cmp_luasnip
       luasnip
 
-      #(pkgs.me.nvim-treesitter-nightly.withPlugins (p: with p; [
-      (nvim-treesitter.withPlugins (p: with p; [
-        tree-sitter-astro
-        tree-sitter-bash
-        tree-sitter-c
+      (pkgs.me.nvim-treesitter-nightly.withPlugins (p: with p; [
         tree-sitter-c-sharp
-        tree-sitter-cpp
-        tree-sitter-groovy
+        pkgs.me.tree-sitter-glimmer
         tree-sitter-html
-        tree-sitter-java
         tree-sitter-javascript
         tree-sitter-json
-        tree-sitter-kotlin
-        tree-sitter-latex
+        pkgs.me.tree-sitter-jsonc
         tree-sitter-lua
-        tree-sitter-markdown
         tree-sitter-nix
         tree-sitter-php
-        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-tsx
         tree-sitter-yaml
       ]))
     ];
diff --git a/modules/user/obs.nix b/modules/user/obs.nix
deleted file mode 100644
index 9ad912e..0000000
--- a/modules/user/obs.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }: {
-  programs.obs-studio = {
-    enable = true;
-    plugins = with pkgs.obs-studio-plugins; [
-      obs-pipewire-audio-capture
-      obs-vaapi
-      obs-vkcapture
-    ];
-  };
-}
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..af9593e
--- /dev/null
+++ b/modules/user/picom.nix
@@ -0,0 +1,42 @@
+{ config, ... }: {
+  services.picom = {
+    enable = true;
+    experimentalBackends = 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..7b288a0
--- /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 = "eDP-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 = "eDP-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.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..6c9fab0 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";
@@ -15,16 +16,13 @@
     GNUPGHOME = "${config.xdg.dataHome}/gnupg";
     GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc";
     LESSHISTFILE = "-";
-    LUTRIS_SKIP_INIT = "1";
-    NIXOS_OZONE_WL = "1";
     NODE_REPL_HISTORY = "${config.xdg.dataHome}/nodejs/repl_history";
     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";
-    # Stops wine from creating filetype associations
-    WINEDLLOVERRIDES = "winemenubuilder.exe=d";
   };
 }
diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix
deleted file mode 100644
index ec854c4..0000000
--- a/modules/user/spicetify.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ config, inputs, lib, pkgs, ... }:
-let
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
-in
-{
-  imports = [ inputs.spicetify-nix.homeManagerModules.spicetify ];
-
-  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;
-        }
-      '';
-    };
-    colorScheme = config.catppuccin.flavor;
-
-    enabledSnippets = with spicePkgs.snippets; [
-      removeGradient
-    ];
-    enabledCustomApps = with spicePkgs.apps; [
-      lyricsPlus
-    ];
-    enabledExtensions = with spicePkgs.extensions; [
-      fullAppDisplay
-      shuffle
-      hidePodcasts
-
-      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/theming.nix b/modules/user/theming.nix
index 00ab88f..3cfd758 100644
--- a/modules/user/theming.nix
+++ b/modules/user/theming.nix
@@ -7,22 +7,20 @@
       name = "Open Sans";
       size = 11;
     };
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = if config.catppuccin.flavor == "latte" then "0" else "1";
+    iconTheme = {
+      package = pkgs.yaru-theme;
+      name = "Yaru";
     };
-    gtk4.extraConfig = {
-      gtk-application-prefer-dark-theme = if config.catppuccin.flavor == "latte" then "0" else "1";
+    theme = {
+      name = "Materia-dark";
+      package = pkgs.materia-theme;
     };
   };
 
-  dconf.settings = {
-    "org/gnome/desktop/interface".color-scheme = if config.catppuccin.flavor == "latte" then "prefer-light" else "prefer-dark";
-  };
-
   home.pointerCursor = {
     package = pkgs.yaru-theme;
     name = "Yaru";
-    size = 24;
+    size = 16;
     gtk.enable = true;
     x11.enable = true;
   };
diff --git a/modules/user/xdg.nix b/modules/user/xdg.nix
index 01802f0..8ec181b 100644
--- a/modules/user/xdg.nix
+++ b/modules/user/xdg.nix
@@ -27,12 +27,12 @@ in {
   xdg = {
     enable = true;
     mime.enable = true;
-    # mimeApps = {
-    #   enable = true;
+    mimeApps = {
+      enable = true;
 
-    #   associations.added = mimes;
-    #   defaultApplications = mimes;
-    # };
+      associations.added = mimes;
+      defaultApplications = mimes;
+    };
   };
 
   # XXX: might need to be moved
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..35b5e7c 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";
 
     gs = "git status";
     ga = "git add";
@@ -50,8 +49,7 @@ let
     gco = "git checkout";
     gd = "git diff";
     gds = "git diff --staged";
-    gf = "git commit --amend --reset-author --no-edit";
-    gfe = "git commit --amend --reset-author";
+    gf = "git commit --amend --no-edit --reset-author";
     gl = "git log";
     gr = "git rebase -i";
   };
@@ -98,14 +96,13 @@ let
     bindkey -M vicmd 'k' history-substring-search-up
     bindkey -M vicmd 'j' history-substring-search-down
   '';
-  disableExecute = ''
-    bindkey -a -r ':'
-  '';
 in {
+  programs.command-not-found.enable = true;
   programs.zsh = {
     enable = true;
-    dotDir = "${config.xdg.configHome}/zsh";
+    dotDir = ".config/zsh";
 
+    enableAutosuggestions = true;
     autocd = true;
     defaultKeymap = "viins";
 
@@ -117,6 +114,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,37 +135,22 @@ 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
     ];
 
     plugins = builtins.map (e: pluginFromInput e) [
-      "pure"
       "zsh-abbr"
       "zsh-history-substring-search"
       "fast-syntax-highlighting"
-    ] ++ [{
-      name = "zsh-autosuggestions";
-      src = pkgs.zsh-autosuggestions + "/share/zsh-autosuggestions";
-      file = "zsh-autosuggestions.zsh";
-    }];
+      "pure"
+    ];
   };
 }
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/cascadia-code.nix b/overlays/cascadia-code.nix
deleted file mode 100644
index 59ce553..0000000
--- a/overlays/cascadia-code.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-self: super: {
-  cascadia-code = super.cascadia-code.overrideAttrs(o: {
-    installPhase = (builtins.replaceStrings ["runHook postInstall"] [""] o.installPhase) + ''
-      install -Dm644 otf/static/*.otf -t $out/share/fonts/opentype
-      install -Dm644 ttf/static/*.ttf -t $out/share/fonts/truetype
-      rm $out/share/fonts/opentype/*NF*
-      rm $out/share/fonts/truetype/*NF*
-      runHook postInstall
-    '';
-
-  });
-}
diff --git a/overlays/ccache.nix b/overlays/ccache.nix
deleted file mode 100644
index e88593b..0000000
--- a/overlays/ccache.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-self: super: {
-  ccacheWrapper = super.ccacheWrapper.override {
-    extraConfig = ''
-      export CCACHE_COMPRESS=1
-      export CCACHE_DIR="/var/cache/ccache"
-      export CCACHE_UMASK=007
-      if [ ! -d "$CCACHE_DIR" ]; then
-        echo "====="
-        echo "Directory '$CCACHE_DIR' does not exist"
-        echo "Please create it with:"
-        echo "  sudo mkdir -m0770 '$CCACHE_DIR'"
-        echo "  sudo chown root:nixbld '$CCACHE_DIR'"
-        echo "====="
-        exit 1
-      fi
-      if [ ! -w "$CCACHE_DIR" ]; then
-        echo "====="
-        echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)"
-        echo "Please verify its access permissions"
-        echo "====="
-        exit 1
-      fi
-    '';
-  };
-}
diff --git a/overlays/default.nix b/overlays/default.nix
index cbe3e7e..3b12e27 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,12 +1,9 @@
 builtins.map (path: import path) [
-  ./bitwarden-desktop.nix
-  ./cascadia-code.nix
-  ./ccache.nix
   ./eww.nix
-  ./jetbrains.nix
   ./material-icons.nix
-  ./openldap.nix
+  ./picom.nix
+  ./rofi.nix
   ./steam.nix
-  ./utillinux.nix
-  ./wpa-supplicant.nix
+  ./wlroots.nix
+  ./xinit.nix
 ]
diff --git a/overlays/eww.nix b/overlays/eww.nix
index 8d89aa1..f244a51 100644
--- a/overlays/eww.nix
+++ b/overlays/eww.nix
@@ -1,8 +1,6 @@
 self: super: {
   eww = super.eww.overrideAttrs (old: rec {
-    patches = old.patches ++ [
-      # Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 )
-      ./patches/eww.patch
-    ];
+    # Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 )
+    patches = old.patches ++ [ ./patches/eww.patch ];
   });
 }
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
deleted file mode 100644
index 321532f..0000000
--- a/overlays/linux-lava.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-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" ""
-      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; };
-in {
-  linuxLavaEnv = {
-    inherit llvmPackages clangVersion cc stdenv ccacheStdenv;
-  };
-  rust-bindgen-unwrapped = super.rust-bindgen-unwrapped.override {
-    clang = cc;
-  };
-}
diff --git a/overlays/material-icons.nix b/overlays/material-icons.nix
index 9d1fcf9..9282bb2 100644
--- a/overlays/material-icons.nix
+++ b/overlays/material-icons.nix
@@ -1,11 +1,17 @@
 self: super: {
-  material-icons = let version = "4.0.0"; in (super.fetchFromGitHub {
+  material-icons = let version = "4.0.0"; in super.fetchFromGitHub {
     name = "material-icons-${version}";
 
     owner  = "google";
     repo   = "material-design-icons";
     rev    = version;
 
+    postFetch = ''
+      tar xf $downloadedFile --strip=1
+      mkdir -p $out/share/fonts/opentype $out/share/fonts/truetype
+      cp font/*.ttf $out/share/fonts/truetype
+      cp font/*.otf $out/share/fonts/opentype
+    '';
     sha256 = "05g5b8dn8vkjv98lmfgbd92wb5i8cfgc9j5f9ai86xl4r58yx10a";
 
     meta = with super.lib; {
@@ -15,12 +21,5 @@ self: super: {
       platforms = platforms.all;
       maintainers = with maintainers; [ mpcsh ];
     };
-  }).overrideAttrs(o: {
-    postFetch = ''
-      tar xf $downloadedFile --strip=1
-      mkdir -p $out/share/fonts/opentype $out/share/fonts/truetype
-      cp font/*.ttf $out/share/fonts/truetype
-      cp font/*.otf $out/share/fonts/opentype
-    '';
-  });
+  };
 }
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..da1cdea
--- /dev/null
+++ b/overlays/patches/startx.patch
@@ -0,0 +1,26 @@
+diff --git a/startx.cpp b/startx.cpp
+index 125c398..296b29f 100644
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -47,10 +47,10 @@ XCOMM so export the new PATH just in case the user changes the shell
+ export PATH
+ #endif
+ 
+-userclientrc=$HOME/.xinitrc
++userclientrc="${XINITRC:-$HOME/.xinitrc}"
+ sysclientrc=XINITDIR/xinitrc
+ 
+-userserverrc=$HOME/.xserverrc
++userserverrc="${XSERVERRC:-$HOME/.xserverrc}"
+ sysserverrc=XINITDIR/xserverrc
+ defaultclient=XTERM
+ defaultserver=XSERVER
+@@ -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 KILL 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/picom.nix b/overlays/picom.nix
new file mode 100644
index 0000000..d5b7ef4
--- /dev/null
+++ b/overlays/picom.nix
@@ -0,0 +1,10 @@
+self: super: {
+  picom = super.picom.overrideAttrs (old: {
+    src = super.fetchFromGitHub {
+      repo = "picom";
+      owner = "yshui";
+      rev = "31e58712ec11b198340ae217d33a73d8ac73b7fe";
+      sha256 = "1hg5jfpknbcv9scaghpy2nbrg9cxwm8mkh6znpgbbzr05g7ch6al";
+    };
+  });
+}
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/utillinux.nix b/overlays/utillinux.nix
deleted file mode 100644
index 20db08a..0000000
--- a/overlays/utillinux.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-self: super: {
-  # Waiting for nixpkgs#349783
-  utillinux = self.util-linux;
-}
diff --git a/overlays/wlroots.nix b/overlays/wlroots.nix
new file mode 100644
index 0000000..d9e10cd
--- /dev/null
+++ b/overlays/wlroots.nix
@@ -0,0 +1,7 @@
+self: super: {
+  wlroots = super.wlroots.override {
+    mesa = super.mesa.overrideAttrs(o: {
+      patches = o.patches ++ [ ../hosts/blossom/mesa_mr_17182.patch ];
+    });
+  };
+}
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..df006f1
--- /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 ++ [ ./patches/startx.patch ];
+    });
+  };
+}
diff --git a/packages/default.nix b/packages/default.nix
index 4ae8658..03498eb 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,12 +1,16 @@
 {
   callPackage,
-  linuxLavaNixpkgs,
   inputs
-}: {
-  linux-lava = linuxLavaNixpkgs.callPackage ./linux-lava { inherit inputs; };
+}: rec {
+  discord-tokyonight = callPackage ./discord-tokyonight { inherit inputs; };
+  discover-overlay = callPackage ./discover { inherit inputs; };
+  linux-lava = callPackage ./linux-lava { inherit inputs; };
   nvim-treesitter-nightly = callPackage ./nvim-treesitter-nightly { inherit inputs; };
-  psensor = callPackage ./psensor { };
+  packwiz = callPackage ./packwiz { inherit inputs; };
   spotify-adblock = callPackage ./spotify-adblock { inherit inputs; };
+  tetrio-desktop = callPackage ./tetrio/base.nix { };
+  tetrio-desktop-plus = callPackage ./tetrio/plus.nix { inherit tetrio-desktop; };
+  tree-sitter-glimmer = callPackage ./tree-sitter-glimmer { inherit inputs; };
   tree-sitter-jsonc = callPackage ./tree-sitter-jsonc { inherit inputs; };
   wine-discord-ipc-bridge = callPackage ./wine-discord-ipc-bridge { inherit inputs; };
 }
diff --git a/packages/discord-tokyonight/default.nix b/packages/discord-tokyonight/default.nix
new file mode 100644
index 0000000..d9a3832
--- /dev/null
+++ b/packages/discord-tokyonight/default.nix
@@ -0,0 +1,14 @@
+{
+  inputs,
+  stdenvNoCC
+}:
+stdenvNoCC.mkDerivation {
+  pname = "discord-tokyonight";
+  version = "1.0.0";
+  dontUnpack = true;
+  installPhase = ''
+    cp -r ${inputs.discord-tokyonight} $out
+    chmod u+w $out
+    cp ${./powercord_manifest.json} $out/powercord_manifest.json
+  '';
+}
diff --git a/packages/discord-tokyonight/powercord_manifest.json b/packages/discord-tokyonight/powercord_manifest.json
new file mode 100644
index 0000000..16efa69
--- /dev/null
+++ b/packages/discord-tokyonight/powercord_manifest.json
@@ -0,0 +1,8 @@
+{
+    "version": "1.0",
+    "name": "Tokyo Night Colours",
+    "author": "DanisDGK",
+    "license": "MIT",
+    "theme": "colors/tokyonight_night.css",
+    "description": "Tokyonight colourscheme"
+}
diff --git a/packages/discover/default.nix b/packages/discover/default.nix
new file mode 100644
index 0000000..883fdf6
--- /dev/null
+++ b/packages/discover/default.nix
@@ -0,0 +1,26 @@
+{ inputs
+, python3Packages
+, gtk3
+, gobject-introspection
+, wrapGAppsHook
+, ...
+}:
+python3Packages.buildPythonApplication {
+  pname = "discover-overlay";
+  version = "1.0";
+  src = inputs.discover;
+
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
+  propagatedBuildInputs = with python3Packages; [
+    gtk3
+    gobject-introspection
+    pygobject3
+    websocket-client
+    pyxdg
+    requests
+    python-pidfile
+    pillow
+  ];
+}
diff --git a/packages/linux-lava/atomic-async-page-flips.patch b/packages/linux-lava/atomic-async-page-flips.patch
new file mode 100644
index 0000000..9c41421
--- /dev/null
+++ b/packages/linux-lava/atomic-async-page-flips.patch
@@ -0,0 +1,227 @@
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+index 288fce7dc0e..ad0341d89ec 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+@@ -2791,6 +2791,7 @@ static int dce_v10_0_sw_init(void *handle)
+ 	adev_to_drm(adev)->mode_config.funcs = &amdgpu_mode_funcs;
+ 
+ 	adev_to_drm(adev)->mode_config.async_page_flip = true;
++	adev_to_drm(adev)->mode_config.atomic_async_page_flip_not_supported = true;
+ 
+ 	adev_to_drm(adev)->mode_config.max_width = 16384;
+ 	adev_to_drm(adev)->mode_config.max_height = 16384;
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+index cbe5250b31c..dda923cc908 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+@@ -2909,6 +2909,7 @@ static int dce_v11_0_sw_init(void *handle)
+ 	adev_to_drm(adev)->mode_config.funcs = &amdgpu_mode_funcs;
+ 
+ 	adev_to_drm(adev)->mode_config.async_page_flip = true;
++	adev_to_drm(adev)->mode_config.atomic_async_page_flip_not_supported = true;
+ 
+ 	adev_to_drm(adev)->mode_config.max_width = 16384;
+ 	adev_to_drm(adev)->mode_config.max_height = 16384;
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+index b1c44fab074..dcef4f873b6 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+@@ -2670,6 +2670,7 @@ static int dce_v6_0_sw_init(void *handle)
+ 
+ 	adev_to_drm(adev)->mode_config.funcs = &amdgpu_mode_funcs;
+ 	adev_to_drm(adev)->mode_config.async_page_flip = true;
++	adev_to_drm(adev)->mode_config.atomic_async_page_flip_not_supported = true;
+ 	adev_to_drm(adev)->mode_config.max_width = 16384;
+ 	adev_to_drm(adev)->mode_config.max_height = 16384;
+ 	adev_to_drm(adev)->mode_config.preferred_depth = 24;
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+index a22b45c9279..569bd11532e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+@@ -2688,6 +2688,7 @@ static int dce_v8_0_sw_init(void *handle)
+ 	adev_to_drm(adev)->mode_config.funcs = &amdgpu_mode_funcs;
+ 
+ 	adev_to_drm(adev)->mode_config.async_page_flip = true;
++	adev_to_drm(adev)->mode_config.atomic_async_page_flip_not_supported = true;
+ 
+ 	adev_to_drm(adev)->mode_config.max_width = 16384;
+ 	adev_to_drm(adev)->mode_config.max_height = 16384;
+diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+index 651e3c10936..831923c468d 100644
+--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
++++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+@@ -639,6 +639,7 @@ static int atmel_hlcdc_dc_modeset_init(struct drm_device *dev)
+ 	dev->mode_config.max_height = dc->desc->max_height;
+ 	dev->mode_config.funcs = &mode_config_funcs;
+ 	dev->mode_config.async_page_flip = true;
++	dev->mode_config.atomic_async_page_flip_not_supported = true;
+ 
+ 	return 0;
+ }
+diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
+index 79730fa1dd8..ee24ed7e2ed 100644
+--- a/drivers/gpu/drm/drm_atomic_uapi.c
++++ b/drivers/gpu/drm/drm_atomic_uapi.c
+@@ -1278,6 +1278,18 @@ static void complete_signaling(struct drm_device *dev,
+ 	kfree(fence_state);
+ }
+ 
++static void
++set_async_flip(struct drm_atomic_state *state)
++{
++	struct drm_crtc *crtc;
++	struct drm_crtc_state *crtc_state;
++	int i;
++
++	for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
++		crtc_state->async_flip = true;
++	}
++}
++
+ int drm_mode_atomic_ioctl(struct drm_device *dev,
+ 			  void *data, struct drm_file *file_priv)
+ {
+@@ -1318,9 +1330,16 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
+ 	}
+ 
+ 	if (arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) {
+-		drm_dbg_atomic(dev,
+-			       "commit failed: invalid flag DRM_MODE_PAGE_FLIP_ASYNC\n");
+-		return -EINVAL;
++		if (!dev->mode_config.async_page_flip) {
++			drm_dbg_atomic(dev,
++				       "commit failed: DRM_MODE_PAGE_FLIP_ASYNC not supported\n");
++			return -EINVAL;
++		}
++		if (dev->mode_config.atomic_async_page_flip_not_supported) {
++			drm_dbg_atomic(dev,
++				       "commit failed: DRM_MODE_PAGE_FLIP_ASYNC not supported with atomic\n");
++			return -EINVAL;
++		}
+ 	}
+ 
+ 	/* can't test and expect an event at the same time. */
+@@ -1418,6 +1437,9 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
+ 	if (ret)
+ 		goto out;
+ 
++	if (arg->flags & DRM_MODE_PAGE_FLIP_ASYNC)
++		set_async_flip(state);
++
+ 	if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) {
+ 		ret = drm_atomic_check_only(state);
+ 	} else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
+diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
+index 8faad23dc1d..6c399e50e40 100644
+--- a/drivers/gpu/drm/drm_ioctl.c
++++ b/drivers/gpu/drm/drm_ioctl.c
+@@ -302,6 +302,11 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_
+ 	case DRM_CAP_CRTC_IN_VBLANK_EVENT:
+ 		req->value = 1;
+ 		break;
++	case DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP:
++		req->value = drm_core_check_feature(dev, DRIVER_ATOMIC) &&
++			     dev->mode_config.async_page_flip &&
++			     !dev->mode_config.atomic_async_page_flip_not_supported;
++		break;
+ 	default:
+ 		return -EINVAL;
+ 	}
+diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
+index fc5d94862ef..8793efbc049 100644
+--- a/drivers/gpu/drm/i915/display/intel_display.c
++++ b/drivers/gpu/drm/i915/display/intel_display.c
+@@ -8616,6 +8616,7 @@ static void intel_mode_config_init(struct drm_i915_private *i915)
+ 	mode_config->funcs = &intel_mode_funcs;
+ 
+ 	mode_config->async_page_flip = HAS_ASYNC_FLIPS(i915);
++	mode_config->atomic_async_page_flip_not_supported = true;
+ 
+ 	/*
+ 	 * Maximum framebuffer dimensions, chosen to match
+diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
+index a2f5df568ca..2b5c4f24aed 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_display.c
++++ b/drivers/gpu/drm/nouveau/nouveau_display.c
+@@ -699,6 +699,7 @@ nouveau_display_create(struct drm_device *dev)
+ 		dev->mode_config.async_page_flip = false;
+ 	else
+ 		dev->mode_config.async_page_flip = true;
++	dev->mode_config.atomic_async_page_flip_not_supported = true;
+ 
+ 	drm_kms_helper_poll_init(dev);
+ 	drm_kms_helper_poll_disable(dev);
+diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
+index f12675e3d26..1185275c3f8 100644
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -1588,6 +1588,7 @@ int radeon_modeset_init(struct radeon_device *rdev)
+ 
+ 	if (radeon_use_pflipirq == 2 && rdev->family >= CHIP_R600)
+ 		rdev->ddev->mode_config.async_page_flip = true;
++	rdev->ddev->mode_config.atomic_async_page_flip_not_supported = true;
+ 
+ 	if (ASIC_IS_DCE5(rdev)) {
+ 		rdev->ddev->mode_config.max_width = 16384;
+diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
+index b45dcdfd730..44102b80eb6 100644
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -1048,6 +1048,7 @@ int vc4_kms_load(struct drm_device *dev)
+ 	dev->mode_config.helper_private = &vc4_mode_config_helpers;
+ 	dev->mode_config.preferred_depth = 24;
+ 	dev->mode_config.async_page_flip = true;
++	dev->mode_config.atomic_async_page_flip_not_supported = true;
+ 
+ 	ret = vc4_ctm_obj_init(vc4);
+ 	if (ret)
+diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
+index 6b5e0129534..1b535d94f2f 100644
+--- a/include/drm/drm_mode_config.h
++++ b/include/drm/drm_mode_config.h
+@@ -917,6 +917,17 @@ struct drm_mode_config {
+ 	 */
+ 	bool async_page_flip;
+ 
++	/**
++	 * @atomic_async_page_flip_not_supported:
++	 *
++	 * If true, the driver does not support async page-flips with the
++	 * atomic uAPI. This is only used by old drivers which haven't yet
++	 * accomodated for &drm_crtc_state.async_flip in their atomic logic,
++	 * even if they have &drm_mode_config.async_page_flip set to true.
++	 * New drivers shall not set this flag.
++	 */
++	bool atomic_async_page_flip_not_supported;
++
+ 	/**
+ 	 * @fb_modifiers_not_supported:
+ 	 *
+diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
+index 642808520d9..b1962628ecd 100644
+--- a/include/uapi/drm/drm.h
++++ b/include/uapi/drm/drm.h
+@@ -706,7 +706,8 @@ struct drm_gem_open {
+ /**
+  * DRM_CAP_ASYNC_PAGE_FLIP
+  *
+- * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC.
++ * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC for legacy
++ * page-flips.
+  */
+ #define DRM_CAP_ASYNC_PAGE_FLIP		0x7
+ /**
+@@ -767,6 +768,13 @@ struct drm_gem_open {
+  * Documentation/gpu/drm-mm.rst, section "DRM Sync Objects".
+  */
+ #define DRM_CAP_SYNCOBJ_TIMELINE	0x14
++/**
++ * DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP
++ *
++ * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC for atomic
++ * commits.
++ */
++#define DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP	0x15
+ 
+ /* DRM_IOCTL_GET_CAP ioctl argument type */
+ struct drm_get_cap {
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..6ca8677 100644
--- a/packages/linux-lava/default.nix
+++ b/packages/linux-lava/default.nix
@@ -1,115 +1,74 @@
 { buildLinux
 , callPackage
 , inputs
+, kernelPatches
 , lib
-, linuxLavaEnv
-, useCcache ? false
 , ...
 } @ args:
 
 let
   sources = callPackage ./sources.nix { inherit inputs; };
-  kernel = buildLinux (args // {
-    inherit (sources) src kernelPatches;
-    stdenv = if useCcache then linuxLavaEnv.ccacheStdenv else linuxLavaEnv.stdenv;
-    version = "${sources.version}-tkg-Lava";
-    isZen = true;
-    extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ];
-    # TODO:
-    # some stuff is set in pkgs/os-specific/linux/kernel/common-config.nix
-    # but i have no idea how to change it
-    structuredExtraConfig = with lib.kernel; builtins.mapAttrs (_: value: lib.mkForce value) {
-      LOCALVERSION = freeform "-tkg-Lava";
-      ZENIFY = yes;
-      WINESYNC = module;
+in buildLinux (args // {
+  inherit (sources) src kernelPatches;
+  version = "${sources.version}-tkg-Lava";
+  isZen = true;
+  # TODO:
+  # some stuff is set in pkgs/os-specific/linux/kernel/common-config.nix
+  # but i have no idea how to change it
+  structuredExtraConfig = with lib.kernel; builtins.mapAttrs (_: value: lib.mkForce value) {
+    LOCALVERSION = freeform "-tkg-Lava";
+    ZENIFY = yes;
+    MHASWELL = yes;
+    WINESYNC = module;
 
-      #tkg defaults
-      DYNAMIC_FAULT = no;
-      DEFAULT_FQ_CODEL = no;
-      WERROR = no;
-      NTP_PPS = no;
-      ZSWAP_COMPRESSOR_DEFAULT_LZO = no;
-      PROFILE_ALL_BRANCHES = no;
-      CRYPTO_LZ4 = yes;
-      CRYPTO_LZ4HC = yes;
-      LZ4_COMPRESS = yes;
-      LZ4HC_COMPRESS = yes;
-      ZSWAP_COMPRESSOR_DEFAULT_LZ4 = yes;
-      DEBUG_FORCE_FUNCTION_ALIGN_64B = no;
-      X86_P6_NOP = no;
-      RCU_STRICT_GRACE_PERIOD = no;
-      ZSWAP_COMPRESSOR_DEFAULT = freeform "lz4";
-      CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = yes;
-      CPU_FREQ_DEFAULT_GOV_ONDEMAND = no;
-      CPU_FREQ_DEFAULT_GOV_CONSERVATIVE = no;
-      CPU_FREQ_DEFAULT_GOV_PERFORMANCE = no;
-      CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF = no;
-      BLK_DEV_LOOP = module;
-      I2C_NCT6775 = module; # openrgb
+    # tickless timers
+    HZ_PERIODIC = no;
+    NO_HZ = yes;
+    NO_HZ_COMMON = yes;
+    NO_HZ_FULL = yes;
+    NO_HZ_FULL_NODEF = yes;
+    NO_HZ_IDLE = no;
+    TICK_CPU_ACCOUNTING = no;
+    VIRT_CPU_ACCOUNTING_GEN = yes;
+    CONTEXT_TRACKING = yes;
+    CONTEXT_TRACKING_FORCE = no;
+    HZ_1000 = yes;
+    HZ_1000_NODEF = yes;
 
-      # clang/llvm
-      LTO_CLANG_FULL = no;
-      LTO_CLANG_THIN = yes;
-      LTO_NONE = no;
-      KCSAN = no;
-      INIT_ON_FREE_DEFAULT_ON = yes;
-      INIT_STACK_ALL_ZERO = yes;
-      INIT_STACK_NONE = no;
+    # preempt
+    PREEMPT = yes;
+    PREEMPT_COUNT = yes;
+    PREEMPT_VOLUNTARY = no;
+    PREEMPTION = yes;
+    PREEMPT_DYNAMIC = yes;
 
-      # bore
-      SCHED_BORE = yes;
-      MIN_BASE_SLICE_NS = freeform "2000000";
+    # scheduler
+    SCHED_BORE = yes;
 
-      # tickless timers
-      HZ_PERIODIC = no;
-      NO_HZ = yes;
-      NO_HZ_COMMON = yes;
-      NO_HZ_FULL = yes;
-      NO_HZ_FULL_NODEF = yes;
-      NO_HZ_IDLE = no;
-      TICK_CPU_ACCOUNTING = no;
-      VIRT_CPU_ACCOUNTING_GEN = yes;
-      CONTEXT_TRACKING = yes;
-      CONTEXT_TRACKING_FORCE = no;
-      HZ_1000 = yes;
-      HZ_1000_NODEF = yes;
+    # disable numa
+    NUMA = no;
+    AMD_NUMA = no;
+    ACPI_NUMA = no;
+    X86_64_ACPI_NUMA = no;
+    NODES_SPAN_OTHER_NODES = no;
+    NUMA_EMU = no;
+    NODES_SHIFT = no;
+    NEED_MULTIPLE_NODES = no;
+    USE_PERCPU_NUMA_NODE_ID = no;
 
-      # preempt
-      PREEMPT = yes;
-      PREEMPT_COUNT = yes;
-      PREEMPT_VOLUNTARY = no;
-      PREEMPTION = yes;
-      PREEMPT_DYNAMIC = yes;
+    # disable ftrace
+    FUNCTION_TRACER = no;
+    FUNCTION_GRAPH_TRACER = no;
 
-      # disable numa
-      NUMA = no;
-      AMD_NUMA = no;
-      ACPI_NUMA = no;
-      X86_64_ACPI_NUMA = no;
-      NODES_SPAN_OTHER_NODES = no;
-      NUMA_EMU = no;
-      NODES_SHIFT = no;
-      NEED_MULTIPLE_NODES = no;
-      USE_PERCPU_NUMA_NODE_ID = no;
-
-      # disable ftrace
-      FUNCTION_TRACER = no;
-      FUNCTION_GRAPH_TRACER = no;
-
-      # disable misc debugging
-      SLUB_DEBUG = no;
-      PM_DEBUG = no;
-      PM_ADVANCED_DEBUG = no;
-      PM_SLEEP_DEBUG = no;
-      ACPI_DEBUG = no;
-      SCHED_DEBUG = no;
-      LATENCYTOP = no;
-      DEBUG_PREEMPT = no;
-    };
-    ignoreConfigErrors = true;
-  } // (args.argsOverride or {}));
-in kernel.overrideAttrs(old: {
-  # :sob: see https://github.com/NixOS/nixpkgs/issues/37249
-  passthru = kernel.passthru;
-  hardeningDisable = (old.hardeningDisable or []) ++ [ "strictoverflow" ];
-})
+    # disable misc debugging
+    SLUB_DEBUG = no;
+    PM_DEBUG = no;
+    PM_ADVANCED_DEBUG = no;
+    PM_SLEEP_DEBUG = no;
+    ACPI_DEBUG = no;
+    SCHED_DEBUG = no;
+    LATENCYTOP = no;
+    DEBUG_PREEMPT = no;
+  };
+  ignoreConfigErrors = true;
+} // (args.argsOverride or {}))
diff --git a/packages/linux-lava/si-manual-clocking.patch b/packages/linux-lava/si-manual-clocking.patch
new file mode 100644
index 0000000..8bb08cb
--- /dev/null
+++ b/packages/linux-lava/si-manual-clocking.patch
@@ -0,0 +1,209 @@
+From 0120e137d9c3aebcb9ac7bd319216a92fbed7499 Mon Sep 17 00:00:00 2001
+From: LavaDesu <me@lava.moe>
+Date: Mon, 3 Oct 2022 22:55:47 +0700
+Subject: [PATCH] Lava's amdgpu patches
+
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h         |   4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c |   2 +-
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c          | 106 ++++++++++++++++++++
+ drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c  |  17 ++++
+ 4 files changed, 128 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+index d597e2656c4..6eec6b36c52 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+@@ -215,6 +215,10 @@ extern int amdgpu_noretry;
+ extern int amdgpu_force_asic_type;
+ extern int amdgpu_smartshift_bias;
+ extern int amdgpu_use_xgmi_p2p;
++extern uint amdgpu_force_mclk;
++extern uint amdgpu_force_sclk;
++extern uint amdgpu_force_vddc;
++extern uint amdgpu_force_vddci;
+ #ifdef CONFIG_HSA_AMD
+ extern int sched_policy;
+ extern bool debug_evictions;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+index 782cbca3753..8cb600cb3b4 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+@@ -58,7 +58,7 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,
+ 	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
+ 	int r;
+ 
+-	if (pci_p2pdma_distance_many(adev->pdev, &attach->dev, 1, true) < 0)
++	if (pci_p2pdma_distance_many(adev->pdev, &attach->dev, 1, amdgpu_dpm == 1) < 0)
+ 		attach->peer2peer = false;
+ 
+ 	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
+diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+index 5e318b3f6c0..8da0b91d3ad 100644
+--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
++++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+@@ -35,6 +35,11 @@
+ #include <linux/pm_runtime.h>
+ #include <asm/processor.h>
+ 
++__u32 amdgpu_force_mclk = 0;
++__u32 amdgpu_force_sclk = 0;
++__u32 amdgpu_force_vddc = 0;
++__u32 amdgpu_force_vddci = 0;
++
+ static const struct cg_flag_name clocks[] = {
+ 	{AMD_CG_SUPPORT_GFX_FGCG, "Graphics Fine Grain Clock Gating"},
+ 	{AMD_CG_SUPPORT_GFX_MGCG, "Graphics Medium Grain Clock Gating"},
+@@ -1912,6 +1917,94 @@ static int ss_bias_attr_update(struct amdgpu_device *adev, struct amdgpu_device_
+ 	return 0;
+ }
+ 
++/*
++ * DOC: pp_override_mclk
++ *
++ * It's like pp_od_clk_voltage but worse and can potentially destroy your gpu idk
++ */
++static ssize_t amdgpu_get_pp_override_mclk(struct device *dev,
++		struct device_attribute *attr,
++		char *buf)
++{
++	DRM_INFO("[Lava] Read pp_override_mclk\n");
++	return sprintf(buf, "%u", amdgpu_force_mclk);
++}
++static ssize_t amdgpu_set_pp_override_mclk(struct device *dev,
++		struct device_attribute *attr,
++		const char *buf,
++		size_t count)
++{
++	sscanf(buf, "%u", &amdgpu_force_mclk);
++	DRM_INFO("[Lava] Write pp_override_mclk, %u\n", amdgpu_force_mclk);
++	return count;
++}
++
++/**
++ * DOC: pp_override_sclk
++ *
++ * pp_override_mclk but sclk
++ */
++static ssize_t amdgpu_get_pp_override_sclk(struct device *dev,
++		struct device_attribute *attr,
++		char *buf)
++{
++	DRM_INFO("[Lava] Read pp_override_sclk\n");
++	return sprintf(buf, "%u", amdgpu_force_sclk);
++}
++static ssize_t amdgpu_set_pp_override_sclk(struct device *dev,
++		struct device_attribute *attr,
++		const char *buf,
++		size_t count)
++{
++	sscanf(buf, "%u", &amdgpu_force_sclk);
++	DRM_INFO("[Lava] Write pp_override_sclk, %u\n", amdgpu_force_sclk);
++	return count;
++}
++
++/**
++ * DOC: pp_override_vddc
++ *
++ * pp_override_mclk but vddc
++ */
++static ssize_t amdgpu_get_pp_override_vddc(struct device *dev,
++		struct device_attribute *attr,
++		char *buf)
++{
++	DRM_INFO("[Lava] Read pp_override_vddc\n");
++	return sprintf(buf, "%u", amdgpu_force_vddc);
++}
++static ssize_t amdgpu_set_pp_override_vddc(struct device *dev,
++		struct device_attribute *attr,
++		const char *buf,
++		size_t count)
++{
++	sscanf(buf, "%u", &amdgpu_force_vddc);
++	DRM_INFO("[Lava] Write pp_override_vddc, %u\n", amdgpu_force_vddc);
++	return count;
++}
++
++/**
++ * DOC: pp_override_vddci
++ *
++ * pp_override_mclk but vddci
++ */
++static ssize_t amdgpu_get_pp_override_vddci(struct device *dev,
++		struct device_attribute *attr,
++		char *buf)
++{
++	DRM_INFO("[Lava] Read pp_override_vddci\n");
++	return sprintf(buf, "%u", amdgpu_force_vddci);
++}
++static ssize_t amdgpu_set_pp_override_vddci(struct device *dev,
++		struct device_attribute *attr,
++		const char *buf,
++		size_t count)
++{
++	sscanf(buf, "%u", &amdgpu_force_vddci);
++	DRM_INFO("[Lava] Write pp_override_vddci, %u\n", amdgpu_force_vddci);
++	return count;
++}
++
+ static struct amdgpu_device_attr amdgpu_device_attrs[] = {
+ 	AMDGPU_DEVICE_ATTR_RW(power_dpm_state,				ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),
+ 	AMDGPU_DEVICE_ATTR_RW(power_dpm_force_performance_level,	ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),
+@@ -1944,6 +2037,11 @@ static struct amdgpu_device_attr amdgpu_device_attrs[] = {
+ 			      .attr_update = ss_power_attr_update),
+ 	AMDGPU_DEVICE_ATTR_RW(smartshift_bias,				ATTR_FLAG_BASIC,
+ 			      .attr_update = ss_bias_attr_update),
++
++	AMDGPU_DEVICE_ATTR_RW(pp_override_mclk,				ATTR_FLAG_BASIC),
++	AMDGPU_DEVICE_ATTR_RW(pp_override_sclk,				ATTR_FLAG_BASIC),
++	AMDGPU_DEVICE_ATTR_RW(pp_override_vddc,				ATTR_FLAG_BASIC),
++	AMDGPU_DEVICE_ATTR_RW(pp_override_vddci,			ATTR_FLAG_BASIC),
+ };
+ 
+ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_attr *attr,
+@@ -1976,6 +2074,14 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_
+ 		*states = ATTR_STATE_UNSUPPORTED;
+ 		if (amdgpu_dpm_is_overdrive_supported(adev))
+ 			*states = ATTR_STATE_SUPPORTED;
++	} else if (DEVICE_ATTR_IS(pp_override_mclk)) {
++		*states = ATTR_STATE_SUPPORTED;
++	} else if (DEVICE_ATTR_IS(pp_override_sclk)) {
++		*states = ATTR_STATE_SUPPORTED;
++	} else if (DEVICE_ATTR_IS(pp_override_vddc)) {
++		*states = ATTR_STATE_SUPPORTED;
++	} else if (DEVICE_ATTR_IS(pp_override_vddci)) {
++		*states = ATTR_STATE_SUPPORTED;
+ 	} else if (DEVICE_ATTR_IS(mem_busy_percent)) {
+ 		if (adev->flags & AMD_IS_APU || gc_ver == IP_VERSION(9, 0, 1))
+ 			*states = ATTR_STATE_UNSUPPORTED;
+diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
+index 49c398ec0aa..1f3f8a210e7 100644
+--- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
++++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
+@@ -3507,6 +3507,23 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,
+ 							&max_mclk_vddc);
+ 
+ 	for (i = 0; i < ps->performance_level_count; i++) {
++		if (amdgpu_force_mclk) {
++			if (ps->performance_levels[i].mclk > amdgpu_force_mclk)
++				ps->performance_levels[i].mclk = amdgpu_force_mclk;
++		}
++		if (amdgpu_force_sclk) {
++			if (ps->performance_levels[i].sclk > amdgpu_force_sclk)
++				ps->performance_levels[i].sclk = amdgpu_force_sclk;
++		}
++		if (amdgpu_force_vddc) {
++			if (ps->performance_levels[i].vddc > amdgpu_force_vddc)
++				ps->performance_levels[i].vddc = amdgpu_force_vddc;
++		}
++		if (amdgpu_force_vddci) {
++			if (ps->performance_levels[i].vddci > amdgpu_force_vddci)
++				ps->performance_levels[i].vddci = amdgpu_force_vddci;
++		}
++
+ 		if (max_sclk_vddc) {
+ 			if (ps->performance_levels[i].sclk > max_sclk_vddc)
+ 				ps->performance_levels[i].sclk = max_sclk_vddc;
+-- 
+2.36.1
+
diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix
index 1ea7dcb..ccbd6c6 100644
--- a/packages/linux-lava/sources.nix
+++ b/packages/linux-lava/sources.nix
@@ -1,16 +1,20 @@
 { fetchFromGitHub, inputs, lib }:
 let
-  version = "7.0.10";
-  kernelHash = "1w4i705i0nl1xqv7fdhdbhy7j3xrzhl31fabs6vmgiw7nf06szxv";
-  kernelPatchHash = "0h7gxqcnww7sj5cdyblzj04775zhavwdylkm2pm91v6xkjbnz1zj";
+  version = "6.0.0";
+  kernelHash = "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w";
+  #kernelPatchHash = "0y25zs7rlk9dz9ppyr76rv6id64j3f4hpby4wljmy7p9z9wba30s";
 
   mm = lib.versions.majorMinor version;
-  hasPatch = (builtins.length (builtins.splitVersion version)) == 3;
   tkgPatches = [
+    "0001-mm-Support-soft-dirty-flag-reset-for-VA-range"
     "0002-clear-patches"
+    "0002-mm-Support-soft-dirty-flag-read-with-reset"
     "0003-glitched-base"
-    "0001-bore"
     "0003-glitched-cfs"
+    "0003-glitched-cfs-additions"
+    "0007-v${mm}-fsync1_via_futex_waitv"
+    "0007-v${mm}-winesync"
+    "0010-lru_${mm}"
     "0012-misc-additions"
   ];
 
@@ -18,28 +22,42 @@ let
     name = "patch-${path}";
     patch = path;
   };
-  kernelPatchSrc = {
-    name = "patch";
+  # kernelPatchSrc = {
+  #   name = "patch";
+  #   patch = builtins.fetchurl {
+  #     url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${version}.xz";
+  #     sha256 = kernelPatchHash;
+  #   };
+  # };
+
+  borePatch = {
+    name = "bore-patch";
     patch = builtins.fetchurl {
-      url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${version}.xz";
-      sha256 = kernelPatchHash;
+      url = "https://raw.githubusercontent.com/CachyOS/kernel-patches/faaa50992e7ddea9191eb51920ffbf41226c9741/${mm}/sched/0001-bore.patch";
+      sha256 = "1a3vypmrlr20fdvzshgqad3c64bh5hd4295p42j0260dz7vzbf7v";
     };
   };
 in {
   inherit version;
 
+  # src = builtins.fetchurl {
+  #   url = "https://git.kernel.org/torvalds/t/linux-${mm}${rc}.tar.gz";
+  #   sha256 = kernelHash;
+  # };
   src = builtins.fetchurl {
     url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${mm}.tar.xz";
     sha256 = kernelHash;
   };
 
-  kernelPatches = lib.optionals hasPatch [
-    kernelPatchSrc
-    (patch ./bluetooth.patch)
+  kernelPatches = [
+    #kernelPatchSrc
+    borePatch
+    (patch ./si-manual-clocking.patch)
+    (patch ./atomic-async-page-flips.patch)
+    (patch ./winesync-hotfix.patch)
   ]
   ++ builtins.map (name: {
     inherit name;
     patch = "${inputs.linux-tkg}/linux-tkg-patches/${mm}/${name}.patch";
-  }) tkgPatches
-  ++ [ ];
+  }) tkgPatches;
 }
diff --git a/packages/linux-lava/winesync-hotfix.patch b/packages/linux-lava/winesync-hotfix.patch
new file mode 100644
index 0000000..4677994
--- /dev/null
+++ b/packages/linux-lava/winesync-hotfix.patch
@@ -0,0 +1,12 @@
+diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
+index 1fc89b8ef43..c2064a35688 100644
+--- a/tools/testing/selftests/Makefile
++++ b/tools/testing/selftests/Makefile
+@@ -13,7 +13,6 @@ TARGETS += damon
+ TARGETS += drivers/dma-buf
+ TARGETS += drivers/s390x/uvdevice
+ TARGETS += drivers/net/bonding
+-TARGETS += drivers/net/team
+ TARGETS += efivarfs
+ TARGETS += exec
+ TARGETS += filesystems
diff --git a/packages/packwiz/default.nix b/packages/packwiz/default.nix
new file mode 100644
index 0000000..3a54208
--- /dev/null
+++ b/packages/packwiz/default.nix
@@ -0,0 +1,9 @@
+{ inputs
+, buildGoModule
+}:
+buildGoModule {
+  pname = "packwiz";
+  version = inputs.packwiz.shortRev;
+  src = inputs.packwiz;
+  vendorSha256 = "1f2xh8czq8fh823dyp54rdv5mmb9gf62f5fimdah4wmghqw4wbzy";
+}
diff --git a/packages/psensor/default.nix b/packages/psensor/default.nix
deleted file mode 100644
index 165cc73..0000000
--- a/packages/psensor/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, pkg-config
-, lm_sensors
-, libgtop
-, libatasmart
-, gtk3
-, libnotify
-, udisks2
-, wrapGAppsHook3
-, libappindicator
-, linuxPackages
-}:
-let
-  libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
-in
-stdenv.mkDerivation rec {
-  pname = "psensor";
-
-  version = "1.2.1";
-
-  src = fetchurl {
-    url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz";
-    sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8";
-  };
-
-  nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
-
-  buildInputs = [
-    lm_sensors
-    libgtop
-    libatasmart
-    gtk3
-    libnotify
-    udisks2
-    libappindicator
-  ];
-
-  preConfigure = ''
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include -Wno-error"
-    NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib"
-  '';
-
-  meta = with lib; {
-    description = "Graphical hardware monitoring application for Linux";
-    homepage = "https://wpitchoune.net/psensor/";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ ];
-    mainProgram = "psensor";
-  };
-}
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/0002-allow-setting-config-from-environment-variable.patch b/packages/spotify-adblock/0002-allow-setting-config-from-environment-variable.patch
index e2f23bc..aade0fe 100644
--- a/packages/spotify-adblock/0002-allow-setting-config-from-environment-variable.patch
+++ b/packages/spotify-adblock/0002-allow-setting-config-from-environment-variable.patch
@@ -11,11 +11,19 @@ diff --git a/src/lib.rs b/src/lib.rs
 index 5a0d7bd961e..86f2ac04ebf 100644
 --- a/src/lib.rs
 +++ b/src/lib.rs
+@@ -7,6 +7,7 @@ use lazy_static::lazy_static;
+ use libc::{addrinfo, c_char, dlsym, EAI_FAIL, RTLD_NEXT};
+ use regex::Regex;
+ use serde::Deserialize;
++use std::env;
+ use std::ffi::CStr;
+ use std::fs::read_to_string;
+ use std::mem;
 @@ -44,6 +45,7 @@ struct Config {
  lazy_static! {
      static ref CONFIG: Config = {
          let config_paths = vec![
-+            PathBuf::from(std::env::var("SPOTIFY_ADBLOCK_CONFIG").unwrap_or("".into())),
++            PathBuf::from(env::var("SPOTIFY_ADBLOCK_CONFIG").unwrap_or("".into())),
              PathBuf::from("config.toml"),
              #[allow(deprecated)] // std::env::home_dir() is only broken on Windows
              std::env::home_dir().unwrap().join(".config/spotify-adblock/config.toml"),
diff --git a/packages/spotify-adblock/default.nix b/packages/spotify-adblock/default.nix
index 57992de..f275545 100644
--- a/packages/spotify-adblock/default.nix
+++ b/packages/spotify-adblock/default.nix
@@ -7,7 +7,8 @@ rustPlatform.buildRustPackage {
   version = "1.0";
   src = inputs.spotify-adblock;
 
-  cargoHash = "sha256-oGpe+kBf6kBboyx/YfbQBt1vvjtXd1n2pOH6FNcbF8M=";
+  cargoSha256 = "1dabmqjvbxdgs8im7asilv4nnx6xzcbwbiy924sci1zbd5isxgfx";
+  cargoPatches = [ ./0001-cargo.patch ];
 
   patches = [ ./0002-allow-setting-config-from-environment-variable.patch ];
 
diff --git a/packages/tetrio/base.nix b/packages/tetrio/base.nix
new file mode 100644
index 0000000..aba2897
--- /dev/null
+++ b/packages/tetrio/base.nix
@@ -0,0 +1,81 @@
+# Copied from https://github.com/NixOS/nixpkgs/pull/146940
+
+{ stdenv
+, lib
+, fetchurl
+, autoPatchelfHook
+, alsa-lib
+, cups
+, libX11
+, libXScrnSaver
+, libXtst
+, mesa
+, nss
+, systemd
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tetrio-desktop";
+  version = "8.0.0";
+
+  src = fetchurl {
+    url = "https://web.archive.org/web/20211228025517/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb";
+    name = "${pname}.deb";
+    sha256 = "1nlblfhrph4cw8rpic9icrs78mzrxyskl7ggyy2i8bk9i07i21xf";
+  };
+
+  nativeBuildInputs = [
+    alsa-lib
+    autoPatchelfHook
+    cups
+    libX11
+    libXScrnSaver
+    libXtst
+    mesa
+    nss
+    wrapGAppsHook
+  ];
+
+  dontWrapGApps = true;
+
+  libPath = lib.makeLibraryPath [
+    alsa-lib
+    cups
+    libX11
+    libXScrnSaver
+    libXtst
+    mesa
+    nss
+    systemd
+  ];
+
+  unpackPhase = ''
+    mkdir -p $TMP/${pname} $out/bin
+    cp $src $TMP/${pname}.deb
+    ar vx $TMP/${pname}.deb
+    tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${pname}/
+  '';
+
+  installPhase = ''
+    cp -R $TMP/${pname}/{usr/share,opt} $out/
+    wrapProgram $out/opt/TETR.IO/${pname} \
+      --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/TETR.IO
+    ln -s $out/opt/TETR.IO/${pname} $out/bin/
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace "Exec=\"/opt/TETR.IO/${pname}\"" "Exec=\"$out/opt/TETR.IO/${pname}\""
+  '';
+
+  meta = with lib; {
+    homepage = "https://tetr.io";
+    downloadPage = "https://tetr.io/about/desktop/";
+    description = "TETR.IO desktop client";
+    longDescription = ''
+      TETR.IO is a modern yet familiar online stacker.
+      Play against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours!
+    '';
+    platforms = [ "x86_64-linux" ];
+    license = licenses.unfree;
+    #maintainers = with maintainers; [ wackbyte ];
+  };
+}
diff --git a/packages/tetrio/plus.nix b/packages/tetrio/plus.nix
new file mode 100644
index 0000000..d82fc60
--- /dev/null
+++ b/packages/tetrio/plus.nix
@@ -0,0 +1,32 @@
+{
+  symlinkJoin,
+  stdenvNoCC,
+  tetrio-desktop,
+  unzip
+}:
+let
+  version = "0.23.7";
+  patchedAsar = stdenvNoCC.mkDerivation {
+    inherit version;
+    name = "tetrio-plus";
+    src = builtins.fetchurl {
+      url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/e51f2fd7a1370bf4ceeecd371204c2e1/tetrio-plus_0.23.7_app.asar.zip";
+      sha256 = "03nla54r6s2xhd1ipxl0ffx6q0brby1jlxdx8p2q1nw80dx4gf1l";
+    };
+    dontUnpack = true;
+
+    nativeBuildInputs = [ unzip ];
+    buildPhase = ''
+      mkdir -p $out
+      unzip $src -d $out
+    '';
+    dontInstall = true;
+  };
+in tetrio-desktop.overrideAttrs(old: {
+  pname = "tetrio-desktop-plus";
+  version = old.version + "+${version}";
+
+  installPhase = old.installPhase + ''
+    cp ${patchedAsar}/app.asar $out/opt/TETR.IO/resources
+  '';
+})
diff --git a/packages/tree-sitter-glimmer/default.nix b/packages/tree-sitter-glimmer/default.nix
new file mode 100644
index 0000000..0a816d8
--- /dev/null
+++ b/packages/tree-sitter-glimmer/default.nix
@@ -0,0 +1,9 @@
+{
+  callPackage,
+  inputs
+}:
+callPackage (inputs.nixpkgs + "/pkgs/development/tools/parsing/tree-sitter/grammar.nix") {} {
+  language = "glimmer";
+  version = "1.0.0";
+  source = inputs.tree-sitter-glimmer;
+}
diff --git a/packages/tree-sitter-jsonc/default.nix b/packages/tree-sitter-jsonc/default.nix
index ad36b85..d41efc9 100644
--- a/packages/tree-sitter-jsonc/default.nix
+++ b/packages/tree-sitter-jsonc/default.nix
@@ -5,5 +5,5 @@
 callPackage (inputs.nixpkgs + "/pkgs/development/tools/parsing/tree-sitter/grammar.nix") {} {
   language = "jsonc";
   version = "1.0.0";
-  src = inputs.tree-sitter-jsonc;
+  source = inputs.tree-sitter-jsonc;
 }
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..ce3c2b7 100644
--- a/res/config.lua
+++ b/res/config.lua
@@ -1,26 +1,22 @@
 -- 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')
 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')
 
@@ -49,15 +45,17 @@ 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
 
--- VimTeX
-vim.g.vimtex_view_method = "zathura"
-vim.g.vimtex_quickfix_open_on_warning = 0
-
 -- Theming
-vim.api.nvim_command("syntax enable")
-local colors = require("catppuccin.palettes").get_palette "{{CATPPUCCIN_FLAVOUR}}"
+require("tokyonight").setup({
+    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.peach)
+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)
@@ -65,42 +63,16 @@ vim.cmd("highlight SignifySignChangeDelete    guifg="..colors.red)
 -- Set this specific highlight group in rust
 -- Shown when using #[cfg] directives, entire chunks of disabled code has squiggly lines and I don't want
 -- to see it
-vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.overlay2)
+vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.comment)
 
 -- 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 +80,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 }
+)
 
-capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
+capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
 
-local servers = { 'astro', 'clangd', 'cssls', 'html', 'tailwindcss', 'texlab', 'ts_ls', 'yamlls' }
+local servers = { 'cssls', 'html', 'rnix', 'tsserver', '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 +197,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 },
@@ -243,17 +216,14 @@ vim.lsp.config("rust_analyzer", {
                     enforce = true,
                     group = "module"
                 }
-            },
-            diagnostics = {
-                disabled = { "incorrect-ident-case" }
             }
         }
     }
-})
-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 +259,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 {
@@ -326,15 +269,4 @@ require("lsp_signature").setup {
 }
 
 -- LSP/fzf
-require("fzf_lsp").setup()
-
--- LSP/flutter
-require("flutter-tools").setup {
-    debugger = {
-        enabled = true
-    },
-    lsp = {
-        on_attach = on_attach,
-        cmd = { "{{DART_PATH}}", "language-server", "--protocol=lsp" }
-    }
-}
+require'fzf_lsp'.setup()
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/active-workspace.sh b/res/eww/scripts/active-workspace.sh
deleted file mode 100755
index d4e6b87..0000000
--- a/res/eww/scripts/active-workspace.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id'
-
-socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - |
-  stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}'
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/res/theme.rasi b/res/theme.rasi
index b7fd398..fbf45e4 100644
--- a/res/theme.rasi
+++ b/res/theme.rasi
@@ -12,9 +12,9 @@ configuration {
 @theme "/dev/null"
 
 * {
-  bg:                              CAT_BACKGROUND;
-  fg:                              CAT_TEXT;
-  button:                          CAT_ACCENT;
+  bg:                              #12131b;
+  fg:                              #f3f6ff;
+  button:                          #ae58c8;
 
   background-color:                @bg;
   text-color:                      @fg;
@@ -30,7 +30,7 @@ prompt { enabled: false; }
 
 entry {
   placeholder:                    "Search";
-  placeholder-color:              CAT_PLACEHOLDER;
+  placeholder-color:              #f3f6ff90;
   transparency:                   "real";
   expand:                         true;
   font:                           "Noto Sans 32";
@@ -70,7 +70,7 @@ element-text {
   margin:                         0% 3% 0.5% 3%;
   background-color:               inherit;
   text-color:                     inherit;
-  font:                           "Noto Sans Medium 12";
+  font:                           "Noto Sans 12";
 }
 
 element-icon {
@@ -85,5 +85,4 @@ element-icon {
 element selected {
   background-color:               @button;
   border-radius:                  8px;
-  text-color:                     @bg;
 }
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..a713b13 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -1,25 +1,16 @@
 let
-  alyssum = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAp00i2DTwMk9i2WBEwpNTDA51TQJEqzpyCka6znmRzR";
-  anemone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEPFifSAybe97xDP/cq6AAjy7Fm0go0dtQ9ICK6JRUgc";
   blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj";
-  dandelion = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUk99ku7+eiIO7Q9sIPlPx3GiUljLv7W404W/zwrtzI";
-  hazel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6mi50ecrrMIn5C4QUyCjPHfSElz0mhevvFCznUzIrK";
+  caramel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFJT1XYyjDZFHYT/8RdxAReKkeU8QfpLrmMjEeW/80";
+  sugarcane = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIImymDDLSOdLcsox8wxS9Z84fsbsz6Mi58OU0od2p/ZQ";
 
   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 = [ 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 = [ caramel 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..aae2a16 100644
--- a/secrets/acme_dns.age
+++ b/secrets/acme_dns.age
@@ -1,11 +1,10 @@
 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 U9FXlg dDnXFO4iUwixemx1WPFZSM15/z7xtAGjZxriBbsURRg
+uv6gdP/LDmZMZu/B3IWWYEzfR+H7TJsR3Zo8hYzthQE
+-> ssh-ed25519 krYeuQ Yo3FXb2pDijXv2JxYvNP3IF0DADygWjIHEoUlfCw3zc
+vly4m2xyGfuJxBPue0mk9dodc4YAEKYTWLwx9ljVhWs
+-> ,-grease
+v4PvG0kmxXhjh7Jf
+--- 6yg8u5a9px36osMqiVI4ZPfea+ySjKB8GR/TcCG/ZXU
+q�T!�|E�#����r��Q��TQM�ɑIX#�:f|kSi�s^~�^��_��K�}�"�I)G��I�
+~�ы�*�4�A^w(���
\ 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..0e7d693 100644
--- a/secrets/passwd.age
+++ b/secrets/passwd.age
@@ -1,11 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 kOMSPw rWkX3HSRLDrGS1MJhIttcTrDpUkpKuvgzzj8VGYwo00
-ei4Smot7TzHG267tZOTHZGP/r708VyXsth6JkutoD0M
--> ssh-ed25519 ohyStA i3Os44jBRhjApBM+LB2OBtN5Va5B4Rn9ns1T5ZgHsjw
-chQ66k2O/5vKQ/H3UK/SpyAVyMijeFzPamZrUuA2gFE
--> ssh-ed25519 CUCjXQ bcoF9UqyTLIkv8voU3MqN8Z3ewXbIkDwdTD0MAbNiwA
-clZLUvkiT8kXITUh3n1khtUKRhzSEfql1+LaTpGyXtE
--> ssh-ed25519 U9FXlg ICIR8S4zMAdXicH72HzJeeQfffjNThvSDkGc9fkRKQQ
-lr3xEi63dR+sywvIrbOTWkYyd9jTX619LHvZU9H9+Bw
---- P7jilfDiKJ6O6vXk5s3FimCLHRQoVatVwoEjzoYncdg
-��$�a�s�[ԡ`��|��7�n��YYU6#�8Fl���W'��H;��O)OM�B�1�b_�i�S��pg��u-��yh�V�B�<!���T���'}�'}�·�����p���K�CKZ����Γ0�5yOI
\ No newline at end of file
+-> ssh-ed25519 U9FXlg U5BvNdCURLw3Za/EFnyiwJWE+nR05pw6N/gyCCtejRg
+UwW0knEEwdbsNIDF8pCIbwwf4X5hahwZ0Cx8w2+b6i0
+-> ssh-ed25519 Hx37cw vO0M5kzkG7BtuNpC5+xtM663HKqj80KQ0qWh+wkSPxM
+lbTCCCv+VNuGXPmpC7rzLeTlqZWqAXzc24eZ1gZShBI
+-> ssh-ed25519 krYeuQ DCsEUqV49Wg4BdWydxKmVQnFZrwxpFd6ZhJ1w9RyC3w
+gio9eITeS3kjOW/jtm2ajmKqvBecj+rjlvAqLILuiW4
+-> ssh-ed25519 CUCjXQ eGjsQfi+/Habc+KcQZRtVp2T+Vs/QK+VR6tmouxkzWw
+y1aAwk8qJ4m0xmIGsQbMnT01+zawmp0B34tUX+mPkSw
+-> 4"nrU-grease hfIl x e)a
+xyMmSA
+--- ISCslqpC6CkOA7RcpPOtAC8JA68s3AhMdYdeDlJOW6M
+�\o�$�;�|����*��,<����
+��y�C� ����YSA��uۈ�������U��2������`DU�w�,��f~S���|B��2��;��c+ձa�)���F$�TܸrЫv�^s�A�tdò�XP
\ No newline at end of file
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..972ef49 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..6b5df62
--- /dev/null
+++ b/secrets/wg_blossom.age
@@ -0,0 +1,11 @@
+age-encryption.org/v1
+-> ssh-ed25519 U9FXlg Y/Q29duiKdP+fV11ellTIMtHFyi9saczXfbcnq7iB0s
+D9P8MAHlFOLR7P8Ux90CjljnhExARGnuSuw24AXOr5c
+-> ssh-ed25519 CUCjXQ eGpAJd5fydYBlC7o34CP7091jg4O4NsuLji1/rYtQVg
+9/rgYCpe9wcCrLM7fTYI92oa+3+SAEK6ZgJNmBeOtnM
+-> A-grease xTj~+6%4 aF]RZn tj](JCp
+5iDN8bexrr7eNqyFwBNCUefrOqAIS10KppbrdDJH1+fD0TkUifEOjcM2uV/+3tH2
+dYX5eM94zkmwxw
+--- QKnJmu6ICTTfadXCKLKii03FXVTBqAFvbAZVHGzGLzE
+��<G��4q��#g��
�J_��^o��4G�V���5�
+�Ȋ$��w�T�����l��t��!�a�wŘ�[ń�
diff --git a/secrets/wg_caramel.age b/secrets/wg_caramel.age
index a85d63f..2a18202 100644
Binary files a/secrets/wg_caramel.age and b/secrets/wg_caramel.age differ
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..9c96739
Binary files /dev/null and b/secrets/wg_sugarcane.age differ
diff --git a/secrets/wpa_conf.age b/secrets/wpa_conf.age
index 555b594..60be4db 100644
Binary files a/secrets/wpa_conf.age and b/secrets/wpa_conf.age differ
diff --git a/shells/cs/default.nix b/shells/cs/default.nix
new file mode 100644
index 0000000..8f7e42a
--- /dev/null
+++ b/shells/cs/default.nix
@@ -0,0 +1,14 @@
+{
+  callPackage,
+  lib,
+  mkShell,
+  dotnetCorePackages
+}:
+mkShell {
+  nativeBuildInputs = [ (with dotnetCorePackages; combinePackages [ sdk_6_0 runtime_6_0 ]) ];
+  DOTNET_CLI_TELEMETRY_OPTOUT = 1;
+
+  passthru = {
+    osu = callPackage ./osu.nix {};
+  };
+}
diff --git a/shells/cs/osu.nix b/shells/cs/osu.nix
new file mode 100644
index 0000000..cfaba27
--- /dev/null
+++ b/shells/cs/osu.nix
@@ -0,0 +1,80 @@
+# Flake for development on https://github.com/ppy/osu
+{
+  lib,
+  mkShell,
+  writeScript,
+  stdenv,
+  stdenvNoCC,
+
+  dotnetCorePackages,
+
+  alsa-lib,
+  ffmpeg_4,
+  icu,
+  lttng-ust,
+  numactl,
+  openssl,
+  SDL2
+}:
+let
+  baseBuild = "-f net5.0 -v minimal osu.Desktop -- $@";
+
+  deps = [
+    alsa-lib ffmpeg_4 icu lttng-ust numactl openssl SDL2 
+  ];
+
+  fixSdl = writeScript "osu-fixsdl" ''
+    ln -sft osu.Desktop/bin/Debug/net5.0/linux-x64/ ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}
+    ln -sft osu.Desktop/bin/Release/net5.0/linux-x64/ ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}
+  '';
+  buildScript = writeScript "osu-build" ''
+    rm -f osu.Desktop/bin/Debug/net5.0/linux-x64/libSDL2.so
+    dotnet build -c Debug -r linux-x64 ${baseBuild} && ${fixSdl}
+  '';
+  buildReleaseScript = writeScript "osu-build-rel" ''
+    rm -f osu.Desktop/bin/Release/net5.0/linux-x64/libSDL2.so
+    dotnet build -c Release -r linux-x64 /property:Version=$OSU_VERSION ${baseBuild} && ${fixSdl}
+  '';
+  publishScript = writeScript "osu-publish" ''
+    rm -f osu.Desktop/bin/Release/net5.0/linux-x64/libSDL2.so
+    dotnet publish -c Release -r linux-x64 --self-contained false ${baseBuild} && ${fixSdl}
+  '';
+  publishWinScript = writeScript "osu-publish-win" ''
+    dotnet publish -c Release -r win-x64 --self-contained false -o build-win ${baseBuild}
+  '';
+  runScript = writeScript "osu-run" ''
+    ${buildScript} && dotnet run --no-build -c Debug -f net5.0 -r linux-x64 -p osu.Desktop -v minimal -- $@
+  '';
+  runReleaseScript = writeScript "osu-run-rel" ''
+    ${buildReleaseScript} && dotnet run --no-build -c Release -f net5.0 -r linux-x64 -p osu.Desktop -v minimal -- $@
+  '';
+
+  scripts = stdenvNoCC.mkDerivation {
+    pname = "osu-scripts";
+    version = "1.0.0";
+    dontUnpack = true;
+    installPhase = ''
+      mkdir $out
+      cp ${fixSdl} $out/osu-fixsdl
+      cp ${buildScript} $out/osu-build
+      cp ${buildReleaseScript} $out/osu-build-rel
+      cp ${publishScript} $out/osu-publish
+      cp ${publishWinScript} $out/osu-publish-win
+      cp ${runScript} $out/osu-run
+      cp ${runReleaseScript} $out/osu-run-rel
+    '';
+  };
+in mkShell {
+  nativeBuildInputs = [
+    icu
+
+    (with dotnetCorePackages; combinePackages [ sdk_5_0 runtime_5_0 ])
+  ];
+
+  DOTNET_CLI_TELEMETRY_OPTOUT = 1;
+  DRI_PRIME = 1;
+  LD_LIBRARY_PATH = lib.makeLibraryPath deps;
+  shellHook = ''
+    export PATH="${scripts}:$PATH"
+  '';
+}
diff --git a/shells/default.nix b/shells/default.nix
new file mode 100644
index 0000000..d4a08da
--- /dev/null
+++ b/shells/default.nix
@@ -0,0 +1,7 @@
+{ callPackage, inputs }: {
+  cs = callPackage ./cs {};
+  flutter = callPackage ./flutter {};
+  js = callPackage ./js {};
+  php = callPackage ./php {};
+  rust = callPackage ./rust { inherit inputs; };
+}
diff --git a/shells/flutter/default.nix b/shells/flutter/default.nix
new file mode 100644
index 0000000..0f49c4d
--- /dev/null
+++ b/shells/flutter/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  mkShell,
+
+  flutter,
+  clang,
+  cmake,
+  ninja,
+  pkg-config,
+
+  atk,
+  cairo,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  harfbuzz,
+  libGL,
+  pango,
+  wayland,
+  xorg,
+}:
+let
+  makeIncludePath = lib.makeSearchPathOutput "include" "include";
+
+  includePath = makeIncludePath [
+    xorg.xorgproto
+    xorg.libX11.dev
+  ];
+in mkShell {
+  nativeBuildInputs = [
+    flutter
+    clang
+    cmake
+    ninja
+    pkg-config
+  ];
+
+  C_INCLUDE_PATH = includePath;
+  CPLUS_INCLUDE_PATH = includePath;
+
+  LD_LIBRARY_PATH = lib.makeLibraryPath "/lib" [
+    atk
+    cairo
+    gdk-pixbuf
+    glib
+    gtk3
+    harfbuzz
+    libGL
+    pango
+    wayland
+    xorg.libX11
+  ];
+}
diff --git a/shells/js/default.nix b/shells/js/default.nix
new file mode 100644
index 0000000..12fac7d
--- /dev/null
+++ b/shells/js/default.nix
@@ -0,0 +1,19 @@
+{
+  mkShell,
+
+  nodejs-16_x,
+  nodePackages,
+  watchman
+}:
+mkShell {
+  buildInputs = [
+    nodejs-16_x
+    watchman
+
+    nodePackages.pnpm
+  ];
+
+  shellHook = ''
+    export PATH="$(readlink -f ./node_modules/.bin):$PATH"
+  '';
+}
diff --git a/shells/php/default.nix b/shells/php/default.nix
new file mode 100644
index 0000000..f0777dd
--- /dev/null
+++ b/shells/php/default.nix
@@ -0,0 +1,16 @@
+{
+  callPackage,
+  mkShell,
+  php80,
+  php80Packages,
+}:
+mkShell {
+  buildInputs = [
+    php80
+    php80Packages.composer
+  ];
+
+  passthru = {
+    osu-web = callPackage ./osu-web.nix {};
+  };
+}
diff --git a/shells/php/osu-web.nix b/shells/php/osu-web.nix
new file mode 100644
index 0000000..582979b
--- /dev/null
+++ b/shells/php/osu-web.nix
@@ -0,0 +1,26 @@
+# Flake for development on https://github.com/ppy/osu-web
+{
+  mkShell,
+  nodejs-14_x,
+  nodePackages,
+  php80,
+  php80Packages,
+  python3
+}:
+let
+  phpPkg = php80.withExtensions ({ enabled, all }:
+    enabled ++ [ all.intl all.redis ]
+  );
+in mkShell {
+  buildInputs = [
+    nodejs-14_x
+    nodePackages.yarn
+    phpPkg
+    php80Packages.composer
+    python3
+  ];
+
+  shellHook = ''
+    export PATH="$(readlink -f ./node_modules/.bin):$PATH"
+  '';
+}
diff --git a/shells/rust/default.nix b/shells/rust/default.nix
new file mode 100644
index 0000000..65f1877
--- /dev/null
+++ b/shells/rust/default.nix
@@ -0,0 +1,25 @@
+{
+  inputs,
+  mkShell,
+
+  pkg-config
+}:
+let
+  overlays = [ (import inputs.rust-overlay) ];
+  pkgs = import inputs.nixpkgs {
+    inherit system overlays;
+  };
+
+  toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain;
+
+  rustPlatform = pkgs.makeRustPlatform {
+    inherit (toolchain) cargo rustc;
+  };
+in mkShell {
+  nativeBuildInputs = [
+    toolchain
+    pkg-config
+  ];
+
+  RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+}
diff --git a/update.sh b/update.sh
deleted file mode 100755
index 6167e8c..0000000
--- a/update.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env -S nix shell 'nixpkgs#git' 'nixpkgs#curl' -c bash
-
-update_kernel() {
-    previous_ver=$(cat packages/linux-lava/sources.nix | grep "version =" | sed --expression='s/[^0-9.]//g')
-    kernel_ver=$(curl -s https://www.kernel.org/finger_banner | grep -m1 stable | awk '{print $NF}')
-
-    if [ "$previous_ver" = "$kernel_ver" ]; then
-        return
-    fi
-
-    kernel_major=$(cut -d '.' -f 1 <<< "$kernel_ver")
-    kernel_mmver=$(cut -d '.' -f 1,2 <<< "$kernel_ver")
-
-    hash_mm=$(nix-prefetch-url "https://cdn.kernel.org/pub/linux/kernel/v${kernel_major}.x/linux-${kernel_mmver}.tar.xz")
-    hash_patch=$(nix-prefetch-url "https://cdn.kernel.org/pub/linux/kernel/v${kernel_major}.x/patch-${kernel_ver}.xz")
-
-    sed -i "/version =/c\  version = \"${kernel_ver}\";" packages/linux-lava/sources.nix
-    sed -i "/kernelHash =/c\  kernelHash = \"${hash_mm}\";" packages/linux-lava/sources.nix
-    sed -i "/kernelPatchHash =/c\  kernelPatchHash = \"${hash_patch}\";" packages/linux-lava/sources.nix
-
-    git add packages/linux-lava/sources.nix
-    git commit -m "packages/linux-lava: bump to ${kernel_ver}"
-}
-
-bump_inputs() {
-    nix flake update
-    git add flake.lock
-    git commit -m "flake: bump inputs"
-}
-
-bump_inputs
-update_kernel
diff --git a/users/hana/default.nix b/users/hana/default.nix
index 69558ea..a7c683a 100644
--- a/users/hana/default.nix
+++ b/users/hana/default.nix
@@ -1,28 +1,24 @@
 { config, lib, modules, pkgs, ... }: {
-  programs.nh.flake = "/persist/hana/flakes";
-  programs.zsh.enable = true;
   users.users.hana = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
     shell = pkgs.zsh;
     uid = 1002;
-    hashedPassword = "$y$j9T$3xCNDudmfrIu5VfQQoDkj/$ugzJWq0gORN9jnhDsREu31CkL3zwniQu6KoLbmg6Wr/";
+    passwordFile = config.age.secrets.passwd.path;
     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 = "21.11";
     };
 
     imports = with modules.user; [
-      comma
       direnv
       git
       neovim-minimal
diff --git a/users/rin/default.nix b/users/rin/default.nix
index a70d716..e453d61 100644
--- a/users/rin/default.nix
+++ b/users/rin/default.nix
@@ -1,14 +1,12 @@
-{ config, modules, pkgs, ... }: {
-  programs.nh.flake = "/home/rin/Projects/flakes";
-  programs.zsh.enable = true;
+{ config, lib, modules, pkgs, ... }: {
   users.users.rin = {
     isNormalUser = true;
-    extraGroups = [ "adbusers" "audio" "corectrl" "dialout" "docker" "libvirtd" "networkmanager" "video" "wheel" "wireshark" ];
+    extraGroups = [ "adbusers" "audio" "video" "wheel" ];
     shell = pkgs.zsh;
     uid = 1001;
-    hashedPasswordFile = config.age.secrets.passwd.path;
+    passwordFile = 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";
@@ -20,36 +18,30 @@
       ./packages.nix
       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
 
-      hypridle
-      hyprlock
       kitty
       mpv
-      obs
       rofi
 
       dunst
       eww
+      picom
 
-      spicetify
+      xorg
+      sxhkd
+      bspwm
     ];
 
-    services.mpris-proxy.enable = true;
-    home.packages = [ pkgs.wl-clipboard ];
-
     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";
diff --git a/users/rin/packages.nix b/users/rin/packages.nix
index 3fe0129..16adde9 100644
--- a/users/rin/packages.nix
+++ b/users/rin/packages.nix
@@ -1,70 +1,47 @@
-{ config, inputs, pkgs, ... }:
-let
-  dotnet-combined = (with pkgs.dotnetCorePackages; combinePackages [
-      dotnet_10.sdk
-      aspnetcore_10_0-bin
-  ]);
-in {
+{ config, enableGUI, inputs, pkgs, ... }: {
   programs.firefox = {
     enable = true;
-    nativeMessagingHosts = [];
+    package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.passff-host ]; };
   };
 
   home.packages = with pkgs; [
     dconf
+    fd
     ffmpeg
     gnupg
     kitty
-    nodejs_latest
+    nodejs-16_x
     pamixer
-    pnpm
+    ripgrep
+    rnix-lsp
     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
-    drawio
-    evince
+    weechat
+    youtube-dl
+
+    nodePackages_latest.pnpm
+  ] ++ lib.optionals enableGUI [
+    discord-canary
+    element-desktop
     eww
     feh
-    feishin
-    file-roller
     gamescope
-    gimp3
-    grim
-    lm_sensors
+    gimp
+    gnome.file-roller
+    kotatogram-desktop
+    krita
+    insomnia
     maim
-    me.psensor
-    obsidian
+    me.tetrio-desktop-plus
+    obs-studio
+    openjdk17
     pavucontrol
-    (prismlauncher.override {
-      jdks = [
-        jdk21
-        temurin-bin-25
-      ];
-    })
-    qbittorrent
-    rivalcfg
+    polymc
     screenkey
-    slurp
-    swaybg
-    texliveFull
+    tor-browser-bundle-bin
     transmission-remote-gtk
-    vesktop
-    zathura
-    zenity
-
-    (vscode.fhsWithPackages (_: [ dotnet-combined ]))
-    dotnet-combined
+    inputs.nix-gaming.packages.x86_64-linux.wine-osu
+    winetricks
+    xclip
+    xorg.xgamma
   ];
 }
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) {}
+