Merge pull request 'Lock file maintenance' (#317 ) from renovate/lock-file-maintenance into main

Lock file maintenance
Merge pull request 'Update DeterminateSystems/update-flake-lock action to v29' (#316 ) from renovate/determinatesystems-update-flake-lock-29.x into main
2026-09-13 04:03:59 +02:00 · 2026-09-13 02:03:56 +00:00 · 2026-09-12 04:04:33 +02:00 · 2026-09-12 02:04:31 +00:00 · 2026-09-12 04:04:25 +02:00 · 2026-09-12 02:04:22 +00:00
227 changed files with 10346 additions and 2594 deletions
@@ -15,13 +15,13 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v6
      - name: Install nix
-        uses: DeterminateSystems/nix-installer-action@v22
+        uses: DeterminateSystems/nix-installer-action@v23
        with:
          github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
          extra_nix_config: |
            experimental-features = nix-command flakes            
      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v28
+        uses: DeterminateSystems/update-flake-lock@v29
        with:
          token: ${{ secrets.GT_TOKEN_FOR_UPDATES }}
          pr-title: "[chore] Update flake.lock"
@@ -2,3 +2,4 @@ result
 age-key.txt
 .decrypted~common.yaml
 .decrypted*
+.tmp
@@ -13,31 +13,6 @@ keys:
    - &sandbox age1pf4auk6u2tmefuqpuc6mntr26cp4wcsmlhnn98arzxsp3753ruqsj0jqk3

 creation_rules:
-  - path_regex: modules/shared/sops/private/iriy.[a-z]+
-    key_groups:
-      - age:
-          - *iriy
-        pgp:
-          - *sora
-  - path_regex: modules/shared/sops/private/avalon.[a-z]+
-    key_groups:
-      - age:
-          - *avalon
-        pgp:
-          - *sora
-  - path_regex: modules/shared/sops/private/valinor.[a-z]+
-    key_groups:
-      - age:
-          - *valinor
-        pgp:
-          - *sora
-  - path_regex: modules/shared/sops/private/asgard.[a-z]+
-    key_groups:
-      - age:
-          - *asgard
-        pgp:
-          - *sora
-
  - path_regex: modules/shared/sops/common.[a-z]+
    key_groups:
      - age:
@@ -54,6 +29,8 @@ creation_rules:
      - age:
          - *ci
          - *sandbox
+        pgp:
+          - *sora

  - path_regex: modules/server/sops/server.[a-z]+
    key_groups:
@@ -1,27 +1,5 @@
 {
  "nodes": {
-    "arion": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "haskell-flake": "haskell-flake",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1770259557,
-        "narHash": "sha256-EvZ09k9+mzXAngPzU2K7oLLUDlKoT1numb4bDb3Gtl4=",
-        "owner": "hercules-ci",
-        "repo": "arion",
-        "rev": "9b24cf65c72cb0e9616e437d55e1ac8e5c6bc715",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "arion",
-        "type": "github"
-      }
-    },
    "base16-schemes": {
      "flake": false,
      "locked": {
@@ -45,11 +23,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1775037210,
-        "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
+        "lastModified": 1786845137,
+        "narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "06648f4902343228ce2de79f291dd5a58ee12146",
+        "rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48",
        "type": "github"
      },
      "original": {
@@ -59,40 +37,32 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "arion",
-          "nixpkgs"
-        ]
-      },
+    "flake-compat": {
+      "flake": false,
      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
        "type": "github"
      },
      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
+        "owner": "edolstra",
+        "repo": "flake-compat",
        "type": "github"
      }
    },
-    "flake-parts_2": {
+    "flake-parts": {
      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
+        "nixpkgs-lib": "nixpkgs-lib_2"
      },
      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
        "type": "github"
      },
      "original": {
@@ -102,12 +72,15 @@
      }
    },
    "hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
      "locked": {
-        "lastModified": 1776983936,
-        "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
+        "lastModified": 1789127271,
+        "narHash": "sha256-vL/Fpo7Zxa7wvO8V5FAToUBvP+K3XsMB1wUglTtd/J0=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
+        "rev": "24cfdc1f9344b90a1eee329a3906e2f39f4d0f1e",
        "type": "github"
      },
      "original": {
@@ -116,22 +89,6 @@
        "type": "github"
      }
    },
-    "haskell-flake": {
-      "locked": {
-        "lastModified": 1675296942,
-        "narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=",
-        "owner": "srid",
-        "repo": "haskell-flake",
-        "rev": "c2cafce9d57bfca41794dc3b99c593155006c71e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "ref": "0.1.0",
-        "repo": "haskell-flake",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -139,16 +96,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1777771528,
-        "narHash": "sha256-YycygK6n7KeW1YCobdFJcORWzkmrvNcp6xT+IovA0d4=",
+        "lastModified": 1789182507,
+        "narHash": "sha256-9nt4W0HNNP84B+b37yRs9Zxat1ZR5guJxEZDEjAgex4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0585fbf645640973e3398863bbaf3bd1ddce4a51",
+        "rev": "b1d1b60084970f9d1e2b72662639dab6d039be71",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -174,11 +131,11 @@
    },
    "nixUnstable": {
      "locked": {
-        "lastModified": 1777641297,
-        "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=",
+        "lastModified": 1789073787,
+        "narHash": "sha256-xfX/toC2QV707s06GbP4II/TxYF0fNQj7s5/LClNDKc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0",
+        "rev": "aff8a0b28396750446e5537a96461bc4facdb287",
        "type": "github"
      },
      "original": {
@@ -188,22 +145,40 @@
        "type": "github"
      }
    },
-    "nixpkgs": {
+    "nixos-wsl": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1777428379,
-        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
+        "lastModified": 1789164534,
+        "narHash": "sha256-DoYGPM6QpnYBLWj9gGw6ZwAzIX+HrAVov1BoT+8Jixo=",
+        "owner": "nix-community",
+        "repo": "nixos-wsl",
+        "rev": "72c92b11bb8289e6651c7fef29cc0a885fd6a255",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
+        "owner": "nix-community",
+        "repo": "nixos-wsl",
        "type": "github"
      }
    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1767892417,
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
    "nixpkgs-lib": {
      "locked": {
        "lastModified": 1697935651,
@@ -219,52 +194,48 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1777578337,
-        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
        "type": "github"
      }
    },
-    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_2"
-      },
+    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1777763626,
-        "narHash": "sha256-UFwZDbdMezNnxZwikhDR4EWiCPUiEmPXHmqLOrcG34g=",
-        "owner": "nix-community",
-        "repo": "nur",
-        "rev": "3873764e5896bd6da6cf0df17172849ea51ac5eb",
+        "lastModified": 1789114715,
+        "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "21a67dc470149f337cecafbe965d8d252a390518",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "repo": "nur",
+        "owner": "nixos",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "root": {
      "inputs": {
-        "arion": "arion",
        "darwin": "darwin",
        "hardware": "hardware",
        "home-manager": "home-manager",
        "nix-colors": "nix-colors",
        "nixUnstable": "nixUnstable",
-        "nixpkgs": "nixpkgs",
-        "nur": "nur",
-        "sops-nix": "sops-nix"
+        "nixos-wsl": "nixos-wsl",
+        "nixpkgs": "nixpkgs_2",
+        "sops-nix": "sops-nix",
+        "vscode-server": "vscode-server"
      }
    },
    "sops-nix": {
@@ -274,11 +245,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1777338324,
-        "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
+        "lastModified": 1788914643,
+        "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
+        "rev": "13616fff713a9f94055c66f15687ebdc17a335df",
        "type": "github"
      },
      "original": {
@@ -286,6 +257,24 @@
        "repo": "sops-nix",
        "type": "github"
      }
+    },
+    "vscode-server": {
+      "inputs": {
+        "flake-parts": "flake-parts"
+      },
+      "locked": {
+        "lastModified": 1784312229,
+        "narHash": "sha256-2uHCSUw341o3my1R0U0YCfbnMEazylxb58evWsjGL50=",
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "rev": "2f984dfbe7e5271b5c413d3e734374cc1306c921",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "type": "github"
+      }
    }
  },
  "root": "root",
@@ -3,12 +3,10 @@
  inputs = {
    # Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
    nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
    hardware.url = "github:nixos/nixos-hardware";
-    nur.url = "github:nix-community/nur";
-
    home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@@ -17,40 +15,58 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    # hyprland = {
-    #   url = "github:hyprwm/Hyprland";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
    sops-nix = {
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nix-colors.url = "github:misterio77/nix-colors";
+    nixos-wsl = {
+      url = "github:nix-community/nixos-wsl";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

-    arion.url = "github:hercules-ci/arion";
-    arion.inputs.nixpkgs.follows = "nixpkgs";
-
+    vscode-server = {
+      url = "github:nix-community/nixos-vscode-server";
+      # inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs = inputs:
-    let gen = import ./generator.nix { inherit inputs; };
+    let
+      lib = inputs.nixpkgs.lib;
+      linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
+      supportedSystems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];
+      overlays = import ./overlays { inherit inputs; };
+      mkPkgs = system:
+        import inputs.nixpkgs {
+          inherit system;
+          inherit overlays;
+          config.allowUnfree = true;
+        };
+      gen = import ./generator.nix { inherit inputs mkPkgs supportedSystems; };
+      systemsDir = ./systems;
+      isIgnoredSystemDir = name: lib.hasPrefix "_" name || lib.hasPrefix "." name;
+      systemNames = lib.attrNames (
+        lib.filterAttrs (
+          name: type:
+          type == "directory"
+          && !isIgnoredSystemDir name
+          && builtins.pathExists (systemsDir + "/${name}/cfg.nix")
+        ) (builtins.readDir systemsDir)
+      );
+      hostsByType = systemType:
+        lib.filter (host: ((import (systemsDir + "/${host}/cfg.nix")).syscfg.type or "nixos") == systemType) systemNames;
+      generateHosts = systemType:
+        lib.genAttrs (hostsByType systemType) (host: gen.generate { inherit host; });
    in {
-      devShells = import ./shells { inherit inputs; };
+      devShells = import ./shells {
+        inherit inputs mkPkgs;
+        systems = linuxSystems;
+      };

-      nixosConfigurations = {
-        valinor = gen.generate { host = "valinor"; };
-        iriy = gen.generate { host = "iriy"; };
-        efir = gen.generate { host = "efir"; };
-        avalon = gen.generate { host = "avalon"; };
-        ci = gen.generate { host = "ci"; };
-        sandbox = gen.generate { host = "sandbox"; };
-        gateway = gen.generate { host = "gateway"; };
-      };
-      darwinConfigurations = { asgard = gen.generate { host = "asgard"; }; };
-      homeConfigurations = {
-        yomi = gen.generate { host = "example"; };
-        example = gen.generate { host = "example"; };
-      };
+      nixosConfigurations = generateHosts "nixos";
+      darwinConfigurations = generateHosts "macos";
+      homeConfigurations = generateHosts "home";
    };

  # ===== Unsupported/NotImplemented ======
@@ -1,68 +1,90 @@
-{ inputs, ... }: {
+{ inputs, mkPkgs, supportedSystems, ... }:
+{
  generate = { host }:
    let
      syscfg = import ./systems/${host}/cfg.nix;
      nameValuePair = name: value: { inherit name value; };
-    in ({
-      "nixos" = inputs.nixpkgs.lib.nixosSystem {
-        system = syscfg.syscfg.system;
-        specialArgs = { inherit inputs; };
-        modules = [
-          ./modules/shared/syscfg
-          ./modules/shared/sops
-          ./modules/nixos
-          syscfg
-          ./systems/${host}
-          inputs.arion.nixosModules.arion
-          inputs.sops-nix.nixosModules.sops
-          inputs.home-manager.nixosModules.home-manager
+      systemType = syscfg.syscfg.type or "nixos";
+      defaultSystem =
        {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users = builtins.listToAttrs (map (userConfig:
-              nameValuePair userConfig.username {
-                imports = [
+          nixos = "x86_64-linux";
+          macos = "x86_64-darwin";
+          home = "x86_64-linux";
+        }
+        .${systemType} or (throw "Unsupported system type: ${systemType}");
+      requestedSystem = syscfg.syscfg.system or defaultSystem;
+      system =
+        if builtins.elem requestedSystem supportedSystems then
+          requestedSystem
+        else
+          throw "Unsupported system '${requestedSystem}' for host '${host}'";
+      users = syscfg.syscfg.users or [ ];
+      mkLinuxHomeImports =
+        userConfig:
+        [
          ./modules/shared/syscfg
          ./modules/shared/colors
          ./modules/home
          syscfg
          { usercfg = userConfig; }
          inputs.nix-colors.homeManagerModule
-                  # inputs.hyprland.homeManagerModules.default
          inputs.sops-nix.homeManagerModules.sops
        ];
-              }) syscfg.syscfg.users);
-          }
-        ];
+      mkDarwinHomeImports = [ inputs.nix-colors.homeManagerModule inputs.sops-nix.homeManagerModules.sops ];
+      mkHomeUsers = importsForUser:
+        builtins.listToAttrs (
+          map (userConfig: nameValuePair userConfig.username { imports = importsForUser userConfig; }) users
+        );
+      mkHomeManager = importsForUser: {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit inputs; };
+        home-manager.users = mkHomeUsers importsForUser;
      };
-
-      "macos" = inputs.darwin.lib.darwinSystem {
-        system = syscfg.system;
-        modules = [
+      sharedModules = [
        ./modules/shared/syscfg
        ./modules/shared/sops
        syscfg
        ./systems/${host}
-          inputs.sops-nix.nixosModules.sops
-          inputs.home-manager.darwinModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users = builtins.listToAttrs (map (userConfig:
-              nameValuePair userConfig.username {
-                imports = [
-                  inputs.nix-colors.homeManagerModule
-                  inputs.sops-nix.homeManagerModules.sops
      ];
-              }) syscfg.syscfg.users);
-          }
+      defaultUser =
+        builtins.head (
+          builtins.filter (user: user.username == syscfg.syscfg.defaultUser) users
+          ++ [ { username = syscfg.syscfg.defaultUser; } ]
+        );
+    in
+    (
+      {
+        "nixos" = inputs.nixpkgs.lib.nixosSystem {
+          inherit system;
+          specialArgs = { inherit inputs; };
+          modules = sharedModules ++ [
+            ./modules/nixos
+            inputs.sops-nix.nixosModules.sops
+            inputs.home-manager.nixosModules.home-manager
+
+            inputs.nixos-wsl.nixosModules.wsl
+            inputs.vscode-server.nixosModules.default
+
+            (mkHomeManager mkLinuxHomeImports)
+          ];
+        };
+
+        "macos" = inputs.darwin.lib.darwinSystem {
+          inherit system;
+          modules = sharedModules ++ [
+            inputs.sops-nix.darwinModules.sops
+            inputs.home-manager.darwinModules.home-manager
+            (mkHomeManager (_: mkDarwinHomeImports))
          ];
        };
        "home" = inputs.home-manager.lib.homeManagerConfiguration {
-        modules = [ ./modules/home ];
+          pkgs = mkPkgs system;
+          extraSpecialArgs = { inherit inputs; };
+          modules = mkLinuxHomeImports defaultUser;
        };
        _ = throw "Unsupported system";
-    }.${syscfg.syscfg.type});
+      }
+      .${systemType}
+    );
 }
@@ -1,14 +1,19 @@
-{ lib, config, ... }: {
+{ lib, config, pkgs, ... }: {
+  imports = [ ./network-watchdog.nix ];

  #environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
-  systemd.user.startServices = "sd-switch";
+  systemd.user.startServices = lib.mkIf pkgs.stdenv.isLinux "sd-switch";
  programs.home-manager.enable = true;

  home = {
    username = "${config.usercfg.username}";
-    homeDirectory = "/home/${config.usercfg.username}";
+    homeDirectory =
+      if pkgs.stdenv.isDarwin then
+        "/Users/${config.usercfg.username}"
+      else
+        "/home/${config.usercfg.username}";

-    stateVersion = "24.11";
+    stateVersion = "26.05";
  };


@@ -0,0 +1,52 @@
+{ lib, config, pkgs, ... }:
+let
+  cfg = config.services.network-watchdog;
+  watchdog = "${pkgs.custom.network-watchdog}/bin/network-watchdog";
+  units = map (name: "${name}.service") cfg.units;
+in {
+  # User services that only make sense while online: GUI clients that hold a
+  # socket to a server (jellyfin-mpv-shim, nextcloud-client). Their upstream
+  # units have no network ordering (network-online.target is a system target,
+  # out of reach for user units), so they happily start while offline —
+  # silently dead — and nothing notices a connection dropped by a network
+  # blip. Gate each start on the network being up, restart on failure, and let
+  # a watchdog catch the "up but not connected" state that systemd can't see.
+  # See pkgs.custom.network-watchdog.
+  options.services.network-watchdog.units = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    default = [ ];
+    example = [ "jellyfin-mpv-shim" ];
+    description = "User services (no .service suffix) to gate on the network and keep connected.";
+  };
+
+  config = lib.mkIf (cfg.units != [ ]) {
+    systemd.user.services = lib.genAttrs cfg.units (name: {
+      Service = {
+        ExecStartPre = "${watchdog} wait-online ${name}.service";
+        TimeoutStartSec = "infinity";  # stay in start-pre until the network is back
+        Restart = lib.mkDefault "on-failure";
+        RestartSec = lib.mkDefault 5;
+      };
+    }) // {
+      network-watchdog = {
+        Unit = {
+          Description = "Restart network services that are up but not connected";
+          After = units;
+        };
+        Service = {
+          Type = "oneshot";
+          ExecStart = "${watchdog} check ${lib.concatStringsSep " " units}";
+        };
+      };
+    };
+
+    systemd.user.timers.network-watchdog = {
+      Unit.Description = "Periodic health check for network services";
+      Timer = {
+        OnActiveSec = "60s";
+        OnUnitActiveSec = "60s";
+      };
+      Install.WantedBy = [ "timers.target" ];
+    };
+  };
+}
@@ -1,4 +1,4 @@
 { ... }: {
  imports =
-    [ ./btop ./git ./helix ./kitty ./neofetch ./other ./starship ./zsh ];
+    [ ./btop ./git ./helix ./kitty ./fastfetch ./other ./starship ./zsh ];
 }
@@ -0,0 +1,115 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small",
+        "padding": {
+            "top": 2,
+            "right": 4
+        },
+        "color": {
+            "1": "blue",
+            "2": "white"
+        }
+    },
+    "display": {
+        "separator": "  ",
+        "key": { "width": 16 },
+        "color": {
+            "separator": "90"
+        }
+    },
+    "modules": [
+        {
+            "type": "title",
+            "colorUser": "blue",
+            "colorAt": "90",
+            "colorHost": "cyan"
+        },
+        "separator",
+        {
+            "type": "os",
+            "key": "󱄅  os",
+            "keyColor": "blue",
+            "format": "{2} {8}"
+        },
+        {
+            "type": "kernel",
+            "key": "󰌽  kernel",
+            "keyColor": "blue",
+            "format": "{2}"
+        },
+        {
+            "type": "packages",
+            "key": "󰏗  pkgs",
+            "keyColor": "blue"
+        },
+        {
+            "type": "uptime",
+            "key": "󰅐  uptime",
+            "keyColor": "blue"
+        },
+        "break",
+        {
+            "type": "cpu",
+            "key": "󱛠  cpu",
+            "keyColor": "green",
+            "format": "{1} ({4}t @ {6})"
+        },
+        {
+            "type": "gpu",
+            "key": "󰍹  gpu",
+            "keyColor": "green",
+            "format": "{2} [{6}]"
+        },
+        {
+            "type": "memory",
+            "key": "󰑭  ram",
+            "keyColor": "green"
+        },
+        {
+            "type": "disk",
+            "key": "󰋊  disk",
+            "keyColor": "green",
+            "folders": "/"
+        },
+        "break",
+        {
+            "type": "wm",
+            "key": "󱂬  wm",
+            "keyColor": "yellow",
+            "format": "{2}"
+        },
+        {
+            "type": "terminal",
+            "key": "󰆍  terminal",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "shell",
+            "key": "󱆃  shell",
+            "keyColor": "yellow"
+        },
+        "break",
+        {
+            "type": "command",
+            "key": "󰃑  installed",
+            "keyColor": "magenta",
+            "text": "birth=$(stat -c %W /); echo \"$(( ($(date +%s) - birth) / 86400 )) days\""
+        },
+        {
+            "type": "command",
+            "key": "󰜅  generation",
+            "keyColor": "magenta",
+            "text": "nixos-rebuild list-generations | awk '$NF == \"True\" {print $2, $3}' | xargs -I {} date -d \"{}\" +\"%s\" | awk '{diff=systime()-$1; if(diff<3600) printf \"%d mins\\n\", diff/60; else if(diff<86400) printf \"%.0f hours\\n\", diff/3600; else printf \"%.0f days\\n\", diff/86400}'"
+        },
+        "break",
+        {
+            "type": "colors",
+            "paddingLeft": 1,
+            "block": {
+                "width": 3,
+                "range": [0, 7]
+            }
+        }
+    ]
+}
@@ -0,0 +1,149 @@
+{ pkgs, config, lib, ... }:
+let
+  p = config.colorScheme.palette;
+
+  hexDigits = {
+    "0"=0; "1"=1; "2"=2; "3"=3; "4"=4; "5"=5; "6"=6; "7"=7;
+    "8"=8; "9"=9; "a"=10; "b"=11; "c"=12; "d"=13; "e"=14; "f"=15;
+  };
+  hexByte = h:
+    hexDigits.${lib.toLower (builtins.substring 0 1 h)} * 16 +
+    hexDigits.${lib.toLower (builtins.substring 1 1 h)};
+  rgb = hex:
+    let r = toString (hexByte (builtins.substring 0 2 hex));
+        g = toString (hexByte (builtins.substring 2 2 hex));
+        b = toString (hexByte (builtins.substring 4 2 hex));
+    in "${r};${g};${b}";
+
+  #  in a JSON string → ESC; JSON custom module format uses this directly
+  blk  = c: "\\u001b[38;2;${rgb c}m\\ue0b7●\\ue0b5 \\u001b[0m";
+  row  = cs: " " + builtins.concatStringsSep "" (map blk cs);
+
+  base = row [ p.base00 p.base01 p.base02 p.base03 p.base04 p.base05 p.base06 p.base07 ];
+  alt  = row [ p.alt00  p.alt01  p.alt02  p.alt03  p.alt04  p.alt05  p.alt06  p.alt07  ];
+  high = row [ p.high08 p.high09 p.high0A p.high0B p.high0C p.high0D p.high0E p.high0F ];
+  low  = row [ p.low08  p.low09  p.low0A  p.low0B  p.low0C  p.low0D  p.low0E  p.low0F  ];
+
+  # ── logo colors ── change $1 / $2 to any palette entry ───────────────────
+  logoColor1 = p.base07;
+  logoColor2 = p.base07;
+  # ─────────────────────────────────────────────────────────────────────────
+in lib.mkIf config.syscfg.make.gui {
+  home.packages = with pkgs; [ fastfetch ];
+  xdg.configFile."neofetch/config.conf".source = ./config.conf;
+  xdg.configFile."fastfetch/logo.txt".source = ./logo.txt;
+  xdg.configFile."fastfetch/config.jsonc".text = ''
+    {
+        "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+        "logo": {
+            "type": "file",
+            "source": "~/.config/fastfetch/logo.txt",
+            "color": {
+                "1": "38;2;${rgb logoColor1}",
+                "2": "38;2;${rgb logoColor2}"
+            },
+            "padding": {
+                "top": 1,
+                "right": 4
+            }
+        },
+        "display": {
+            "separator": "  ",
+            "key": { "width": 16 },
+            "color": {
+                "separator": "90"
+            }
+        },
+        "modules": [
+            {
+                "type": "title",
+                "colorUser": "blue",
+                "colorAt": "90",
+                "colorHost": "cyan"
+            },
+            "separator",
+            {
+                "type": "os",
+                "key": "󱄅  os",
+                "keyColor": "blue",
+                "format": "{2} {8}"
+            },
+            {
+                "type": "kernel",
+                "key": "󰌽  kernel",
+                "keyColor": "blue",
+                "format": "{2}"
+            },
+            {
+                "type": "packages",
+                "key": "󰏗  pkgs",
+                "keyColor": "blue"
+            },
+            {
+                "type": "uptime",
+                "key": "󰅐  uptime",
+                "keyColor": "blue"
+            },
+            "break",
+            {
+                "type": "cpu",
+                "key": "󱛠  cpu",
+                "keyColor": "green",
+                "format": "{1} ({4}t @ {6})"
+            },
+            {
+                "type": "gpu",
+                "key": "󰍹  gpu",
+                "keyColor": "green",
+                "format": "{2} [{6}]"
+            },
+            {
+                "type": "memory",
+                "key": "󰑭  ram",
+                "keyColor": "green"
+            },
+            {
+                "type": "disk",
+                "key": "󰋊  disk",
+                "keyColor": "green",
+                "folders": "/"
+            },
+            "break",
+            {
+                "type": "wm",
+                "key": "󱂬  wm",
+                "keyColor": "yellow",
+                "format": "{2}"
+            },
+            {
+                "type": "terminal",
+                "key": "󰆍  terminal",
+                "keyColor": "yellow"
+            },
+            {
+                "type": "shell",
+                "key": "󱆃  shell",
+                "keyColor": "yellow"
+            },
+            "break",
+            {
+                "type": "command",
+                "key": "󰃑  installed",
+                "keyColor": "magenta",
+                "text": "birth=$(stat -c %W /); echo \"$(( ($(date +%s) - birth) / 86400 )) days\""
+            },
+            {
+                "type": "command",
+                "key": "󰜅  generation",
+                "keyColor": "magenta",
+                "text": "nixos-rebuild list-generations | awk '$NF == \"True\" {print $2, $3}' | xargs -I {} date -d \"{}\" +\"%s\" | awk '{diff=systime()-$1; if(diff<3600) printf \"%d mins\\n\", diff/60; else if(diff<86400) printf \"%.0f hours\\n\", diff/3600; else printf \"%.0f days\\n\", diff/86400}'"
+            },
+            "break",
+            { "type": "custom", "format": "${base}" },
+            { "type": "custom", "format": "${alt}"  },
+            { "type": "custom", "format": "${high}" },
+            { "type": "custom", "format": "${low}"  }
+        ]
+    }
+  '';
+}
@@ -0,0 +1,14 @@
+                            
+$2                       $1⢀⣴⣦⡀ 
+$2⢀⣴⣶⣿⣿⣿⣿⣷⣶⣦⣤⣀⡀        $1⢀⣴⣿⡿⠋  
+$2⢸⣿⣿⡿⠋⠉⠁⠉⠉⠉⠙⠛⠿⢷⣦⣄   $1⢀⣴⣿⡿⠋    
+$2⠘⣿⣿⣇   ⢀⣤⣤⣤⣤⣄⣀⠈⠙⠛$1⢀⣴⣿⡿⠋      
+$2 ⠘⣿⣿⣆  ⢸⣿⣿⠛⠛⠛⠛⠿⢃$1⣴⣿⡿⠋        
+$2  ⠈⢻⣿⣧⡀ ⠹⣿⣦⡀ $1⢀⣴⣿⡿⠛$2⠻⣷⣦⡀      
+$2    ⠙⠿⣿⣦⣄⠈⠙⢿⣷$2⣿⣿⣿$2⣿⣶⣄ ⠙⢿⣷⣄    
+$2      ⠈⠻⢿⣷⣦⣄⡈⠙⠛⠛⠋⠙⢿⣷⡀ ⠙⢿⣷⣄  
+$2       $1⢀⣴⣿⡿$2⠿⣿⣷⣶⣤⣤⣤⣼⣿⣷  ⠈⢻⣿⣦ 
+$2     $1⢀⣴⣿⡿⠋   $2⠈⠉⠛⠛⠛⠛⠛⠁    ⣿⣿⡇
+$2   $1⢀⣴⣿⡿⠋       $2⠠⢤⣀⣀⣀⣀⣀⣀⣤⣾⣿⣿⠇
+$2   $1⠻⡿⠋           $2⠈⠉⠙⠛⠛⠛⠛⠛⠛⠁ 
+                            
@@ -1,5 +1,5 @@
-{ config, ... }: {
-  programs.kitty = {
+{ config, lib, ... }: {
+  programs.kitty = lib.mkIf config.syscfg.make.gui {
    enable = true;
    settings = {
      foreground = "#${config.colorScheme.palette.base07}";
@@ -1,4 +0,0 @@
-{ pkgs, config, ... }: {
-  home.packages = with pkgs; [ neofetch ];
-  xdg.configFile."neofetch/config.conf".source = ./config.conf;
-}
@@ -1,18 +1,16 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
  home.packages = with pkgs; [
-    sudo
    ripgrep
    unzip

    socat
-    ripgrep
-
-    appimage-run

    cbonsai
    pipes-rs
    cmatrix
    #cava
    sl
+  ] ++ lib.optionals (config.syscfg.make.gui || config.syscfg.make.develop) [
+    pkgs.appimage-run
  ];
 }
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }: {

  home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
-  home.packages = with pkgs; [ starship ];
  programs.starship = {
    enable = true;
    enableFishIntegration = false;
@@ -1,20 +1,22 @@
-{ lib, config, pkgs, ... }: {
-
-  config = lib.mkIf (config.syscfg.make.develop) {
-    programs.vscode = {
-      enable = true;
-      package = pkgs.vscodium;
-      #profiles.default = {
-        profiles.default.extensions = with pkgs.vscode-extensions; [
+{ lib, config, pkgs, ... }: 
+let
+  exts = with pkgs.vscode-extensions; [
    bbenoist.nix
    esbenp.prettier-vscode
-          golang.go
-          ms-python.vscode-pylance
-          ms-vscode.cpptools
-          dbaeumer.vscode-eslint
-          continue.continue 
+
+    anthropic.claude-code
+    # openai.codex
  ];
-      #};
+in {
+
+  config = lib.mkIf (config.syscfg.make.develop) {
+    programs.vscodium = {
+      enable = true;
+      profiles.default.extensions = exts;
+    };
+    programs.antigravity = {
+      enable = true;
+      profiles.default.extensions = exts;
    };
  };
 }
@@ -4,8 +4,9 @@
    programs.imv.enable = true;

    programs.obs-studio.enable = true;
+    services.jellyfin-mpv-shim.enable = true;

-    home.packages = with pkgs; [ jellyfin-mpv-shim krita gimp darktable ];
+    home.packages = with pkgs; [ krita gimp darktable ];
  };

 }
@@ -1,11 +1,87 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }:
+let
+  configuredMpv = config.programs.mpv.finalPackage;
+in{

  config = lib.mkIf (config.syscfg.make.gui) {
    programs.mpv = {
      enable = true;
-      scripts = with pkgs; [ mpvScripts.mpris ];
+      scripts = with pkgs.mpvScripts; [ mpris ];
+      config = {
+        hwdec ="auto";
+        profile ="high-quality";
+        ytdl-format = "bestvideo+bestaudio";
+      };
+
+      bindings =
+      let
+        shadersPkg = "${pkgs.mpv-shim-default-shaders}/share/mpv-shim-default-shaders/shaders";
+        setShader = message: files:
+          ''no-osd change-list glsl-shaders set "${lib.concatStringsSep ":" files}"; show-text "${message}"'';
+      in
+      {
+        "CTRL+1" = setShader "Anime4K: Mode A+A (Balanced)" [
+          "${shadersPkg}/Anime4K_Clamp_Highlights.glsl"
+          "${shadersPkg}/Anime4K_Restore_CNN_M.glsl"
+          "${shadersPkg}/Anime4K_Upscale_CNN_x2_M.glsl"
+          "${shadersPkg}/Anime4K_Restore_CNN_S.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x2.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x4.glsl"
+          "${shadersPkg}/Anime4K_Upscale_CNN_x2_S.glsl"
+        ];
+        "CTRL+2" = setShader "Anime4K: Mode B+B (Soft)" [
+          "${shadersPkg}/Anime4K_Clamp_Highlights.glsl"
+          "${shadersPkg}/Anime4K_Restore_CNN_Soft_M.glsl"
+          "${shadersPkg}/Anime4K_Upscale_CNN_x2_M.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x2.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x4.glsl"
+          "${shadersPkg}/Anime4K_Restore_CNN_Soft_S.glsl"
+          "${shadersPkg}/Anime4K_Upscale_CNN_x2_S.glsl"
+        ];
+        "CTRL+3" = setShader "Anime4K: Mode C+A (Heavy Denoise)" [
+          "${shadersPkg}/Anime4K_Clamp_Highlights.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x2.glsl"
+          "${shadersPkg}/Anime4K_Upscale_Denoise_CNN_x2_M.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x2.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x4.glsl"
+          "${shadersPkg}/Anime4K_Restore_CNN_S.glsl"
+          "${shadersPkg}/Anime4K_Upscale_CNN_x2_S.glsl"
+        ];
+        "CTRL+4" = setShader "Hybrid: FSRCNNX + Anime4K Balanced" [
+          "${shadersPkg}/Anime4K_Clamp_Highlights.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x2.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x4.glsl"
+          "${shadersPkg}/Anime4K_Restore_CNN_M.glsl"
+          "${shadersPkg}/FSRCNNX_x2_16-0-4-1.glsl"
+          "${shadersPkg}/CAS-scaled.glsl"
+        ];
+
+        "CTRL+5" = setShader "Hybrid: FSRCNNX + Anime4K Fast" [
+          "${shadersPkg}/Anime4K_Clamp_Highlights.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x2.glsl"
+          "${shadersPkg}/Anime4K_AutoDownscalePre_x4.glsl"
+          "${shadersPkg}/Anime4K_Restore_CNN_VL.glsl"
+          "${shadersPkg}/FSRCNNX_x2_16-0-4-1.glsl"
+          "${shadersPkg}/CAS-scaled.glsl"
+        ];
+
+        "CTRL+6" = setShader "Movie: FSRCNNX + Natural Sharp" [
+          "${shadersPkg}/FSRCNNX_x2_16-0-4-1.glsl"
+          "${shadersPkg}/CAS-scaled.glsl"
+        ];
+
+        "CTRL+0" = ''no-osd change-list glsl-shaders clr ""; show-text "GLSL shaders cleared"'';
+      };
+    };#--target-colorspace-hint-mode=source for HDR
+    xdg.configFile."jellyfin-mpv-shim/conf.json".text = builtins.toJSON {
+      "mpv_ext" = true;
+      "mpv_ext_path" = "${configuredMpv}/bin/mpv";
+      "mpv_ext_start" = true;
+      "mpv_ext_no_ovr" = true;
    };

    programs.yt-dlp.enable = true;
+
+    services.network-watchdog.units = [ "jellyfin-mpv-shim" ];
  };
 }
@@ -1,6 +1,8 @@
 { lib, config, ... }: {

  config = lib.mkIf (config.syscfg.make.gui) {
+    services.easyeffects.enable = true;
+
    xdg.configFile."pipewire/pipewire-pulse.conf.d/desktop.conf".text = ''
      context.modules = [
        {   name = libpipewire-module-loopback
@@ -1,26 +1,26 @@
-{ lib, config, pkgs, ... }: {
-
-  config = lib.mkIf (config.syscfg.make.gui) {
-    home.packages = with pkgs; [
-      custom.vosk.base
-      jq
-      (python3.withPackages (ps: with ps; [ translatepy ]))
-    ];
-
-    xdg.configFile."script/transcript-translate.py".text = ''
-      #!/bin/python
-
-      import sys; 
-      from translatepy.translators.google import GoogleTranslate; 
-
+{ lib, config, pkgs, ... }:
+let
+  translateScript = pkgs.writeTextFile {
+    name = "transcript-translate";
+    executable = true;
+    destination = "/bin/transcript-translate";
+    text = ''
+      #!${pkgs.python3.withPackages (ps: [ ps.translatepy ])}/bin/python3
+      import sys
+      from translatepy.translators.google import GoogleTranslate
      if len(sys.argv) != 2:
          print("No language provided.")
-          exit
+          exit(1)
      translator = GoogleTranslate()
      while True:
          for line in sys.stdin:
              sys.stdout.write(translator.translate(line,sys.argv[1]).result+"\n") 
    '';
+  };
+in {
+
+  config = lib.mkIf (config.syscfg.make.gui) {
+    home.packages = [ pkgs.custom.vosk.base ];

    xdg.configFile."script/transcript.sh".text = ''
      #!/bin/sh
@@ -37,22 +37,22 @@
        MODEL_OPTS+="$pair\n"
      done

-      MODEL_OPT=$(echo -e "$MODEL_OPTS" | wofi --dmenu -p "Choose model:")
+      MODEL_OPT=$(echo -e "$MODEL_OPTS" | ${pkgs.wofi}/bin/wofi --dmenu -p "Choose model:")
      MODEL=$(echo "$MODEL_OPT" | awk -F ':' '{print $2}')

      TRANSS="None\nNone-prog\nEnglish\nGerman\nRussian\nJapanese"
-      TRANS=$(echo -e "$TRANSS" | wofi --dmenu -p "Choose translation:")
+      TRANS=$(echo -e "$TRANSS" | ${pkgs.wofi}/bin/wofi --dmenu -p "Choose translation:")

      export VOSK_MODEL=$MODEL
      case $TRANS in
          "None")
-              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' 2>/dev/null
+              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | ${pkgs.jq}/bin/jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' 2>/dev/null
              ;;
          "None-prog")
-              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty, .partial // empty | select(length > 0)' 2>/dev/null
+              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | ${pkgs.jq}/bin/jq --unbuffered -r '.alternatives[0].text // empty, .partial // empty | select(length > 0)' 2>/dev/null
              ;;
          *)
-              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' | python ~/.config/script/transcript-translate.py $TRANS
+              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | ${pkgs.jq}/bin/jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' | ${translateScript}/bin/transcript-translate "$TRANS"
              ;;
      esac
    '';
@@ -1,13 +1,31 @@
 { lib, config, pkgs, ... }: {

  config = lib.mkIf (config.syscfg.make.gui) {
-    services.nextcloud-client.enable = true;
+    services.nextcloud-client = {
+      enable = true;
+      startInBackground = true;
+    };
+    services.network-watchdog.units = [ "nextcloud-client" ];
+
+    systemd.user.services.keepassxc = lib.mkIf (config.usercfg.wm != "X11") {
+      Unit = {
+        Description = "KeePassXC";
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+      Service = {
+        ExecStart = "${pkgs.keepassxc}/bin/keepassxc";
+        Restart = "on-failure";
+        RestartSec = 5;
+      };
+      Install.WantedBy = [ "graphical-session.target" ];
+    };

    home.packages = with pkgs; [
-      xfce.thunar
-      xfce.thunar-volman
-      xfce.thunar-archive-plugin
-      xfce.tumbler
+      thunar
+      thunar-volman
+      thunar-archive-plugin
+      tumbler

      telegram-desktop
      discord-canary
@@ -5,7 +5,7 @@
    home.packages = with pkgs;
      [
        # custom.simc
-        unstable.instawow
+        instawow
      ];

    # templates buggy currently
@@ -1,6 +1,5 @@
 { lib, config, pkgs, ... }:
 let
-  colorVariant = " black";
  gtkThemeFromScheme = import ./gtk-theme-gen.nix { inherit pkgs config; };
  wallpaperGen = import ./wallpaper-gen.nix { inherit pkgs config; };
 in {
@@ -20,6 +19,7 @@ in {
        name = "${config.colorscheme.slug}-Dark";
        package = gtkThemeFromScheme;
      };
+      gtk4.theme = config.gtk.theme; 
      iconTheme = {
        name = "tela-circle-icon-theme";
        package = pkgs.tela-circle-icon-theme;
@@ -31,8 +31,6 @@ in {
      platformTheme.name = "gtk";
    };

-    home.packages = [ wallpaperGen pkgs.swww ];
-
    xdg.configFile."script/wallpaper.sh".text = ''
      #!/bin/sh

@@ -48,9 +46,9 @@ in {
          print "img:" $0 ":text:" image_file;
      }')

-      IMG=$WPDIR/$(echo "$RES" | wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
+      IMG=$WPDIR/$(echo "$RES" | ${pkgs.wofi}/bin/wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
      IMG=$(echo "$IMG" | awk -F ':' '{print $2}')
-      swww img $IMG
+      ${pkgs.awww}/bin/awww img $IMG
    '';
  };
 }
@@ -1,40 +1,150 @@
-{ pkgs, config }:
+{ pkgs, config, lib ? pkgs.lib }:

 let
-  scheme = config.colorScheme;
-  colors = scheme.palette;
-  dither =
-    "atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
-in pkgs.stdenv.mkDerivation rec {
-  pname = "generated-wallpaper";
-  version = "a1676fc2a0e3dfb7bf95d8a89e592830";
-  src = pkgs.fetchFromGitea {
-    domain = "git.helcel.net";
-    owner = "sora";
-    repo = "nixconfig-wallpaper";
-    rev = version;
-    sha256 = "sha256-ZhBjTaKzoiEq1ptMmNWWRPCjLJsvy9My/HuzRaDjX1c=";
+  colors = config.colorScheme.palette;
+  mediaImages = config.syscfg.media.main;
+  mediaNames = map (image: builtins.baseNameOf (toString image)) mediaImages;
+  mediaSourceDir = pkgs.linkFarm "wallpaper-media" (
+    map (image: {
+      name = builtins.baseNameOf (toString image);
+      path = image;
+    }) mediaImages
+  );
+
+  dither = "atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
+  paletteSize = 0;
+
+  hexChars = "0123456789abcdef";
+  hexMap = {
+    "0" = 0; "1" = 1; "2" = 2; "3" = 3;
+    "4" = 4; "5" = 5; "6" = 6; "7" = 7;
+    "8" = 8; "9" = 9; "a" = 10; "b" = 11;
+    "c" = 12; "d" = 13; "e" = 14; "f" = 15;
  };

-  buildInputs = with pkgs; [ custom.repalette nodejs imagemagick gifsicle ];
+  baseColors = [
+    colors.base00
+    colors.base01
+    colors.base02
+    colors.base03
+    colors.base04
+    colors.base05
+    colors.base06
+    colors.base07
+    colors.base08
+    colors.base09
+    colors.base0A
+    colors.base0B
+    colors.base0C
+    colors.base0D
+    colors.base0E
+    colors.base0F
+  ];

-  configurePhase = ''
-    echo "${colors.base00},${colors.base01},\
-          ${colors.base02},${colors.base03},\
-          ${colors.base04},${colors.base05},\
-          ${colors.base06},${colors.base07},\
-          ${colors.base08},${colors.base09},\
-          ${colors.base0A},${colors.base0B},\
-          ${colors.base0C},${colors.base0D},\
-          ${colors.base0E},${colors.base0F}" > palette.in
-  '';
+  round = x: builtins.floor (x + 0.5);
+  clamp = x:
+    if x < 0 then 0 else if x > 255 then 255 else x;
+  parseHexByte = byte:
+    let
+      hi = hexMap.${builtins.substring 0 1 byte};
+      lo = hexMap.${builtins.substring 1 1 byte};
+    in
+    hi * 16 + lo;
+  hexToRgb = hex:
+    let
+      clean = lib.toLower (lib.removePrefix "#" hex);
+    in
+    {
+      r = parseHexByte (builtins.substring 0 2 clean);
+      g = parseHexByte (builtins.substring 2 2 clean);
+      b = parseHexByte (builtins.substring 4 2 clean);
+    };
+  componentToHex = value:
+    let
+      bounded = clamp value;
+      hi = builtins.div bounded 16;
+      lo = bounded - hi * 16;
+    in
+    "${builtins.substring hi 1 hexChars}${builtins.substring lo 1 hexChars}";
+  rgbToHex = color: "${componentToHex color.r}${componentToHex color.g}${componentToHex color.b}";
+
+  getTint = c: weight: round (c + (255 - c) * weight);
+  getShade = c: weight: round (c * weight);
+  tint = color: weight: {
+    r = getTint color.r weight;
+    g = getTint color.g weight;
+    b = getTint color.b weight;
+  };
+  shade = color: weight: {
+    r = getShade color.r weight;
+    g = getShade color.g weight;
+    b = getShade color.b weight;
+  };
+  genPalette = color:
+    let
+      tints =
+        if paletteSize == 0
+        then [ ]
+        else lib.genList (i: tint color ((i + 1.0) / paletteSize)) paletteSize;
+      shades =
+        if paletteSize == 0
+        then [ ]
+        else lib.genList (i: shade color (i * 1.0 / paletteSize)) paletteSize;
+    in
+    lib.reverseList tints ++ [ color ] ++ lib.reverseList shades;
+  keepColor = color:
+    let
+      sum = color.r + color.g + color.b;
+    in
+    sum > 0 && sum < 765;
+
+  paletteColors = lib.concatMap (hex: lib.filter keepColor (genPalette (hexToRgb hex))) baseColors;
+  paletteHex = lib.concatStringsSep "," (map rgbToHex paletteColors);
+  gifPaletteFile = pkgs.writeText "wallpaper-gifpalette.txt" (
+    lib.concatMapStringsSep "\n" (color: "${toString color.r} ${toString color.g} ${toString color.b}") paletteColors
+  );
+
+  buildCommands =
+    lib.concatMapStringsSep "\n" (name:
+      let
+        source = "${mediaSourceDir}/${name}";
+        target = "build/${name}";
+      in
+      if lib.hasSuffix ".gif" (lib.toLower name) then ''
+        gifsicle --use-colormap ${lib.escapeShellArg (toString gifPaletteFile)} < ${lib.escapeShellArg source} > ${lib.escapeShellArg target}
+      '' else ''
+        repalette ${lib.escapeShellArg source} ${lib.escapeShellArg target} -p ${lib.escapeShellArg paletteHex} --dither ${lib.escapeShellArg dither}
+      ''
+    ) mediaNames;
+in
+assert lib.assertMsg
+  (builtins.length mediaNames == builtins.length (lib.unique mediaNames))
+  "syscfg.media.main contains duplicate basenames, which would collide in generated wallpaper output.";
+pkgs.stdenv.mkDerivation {
+  pname = "generated-wallpaper";
+  version = "local";
+  dontUnpack = true;
+
+  nativeBuildInputs = with pkgs; [
+    custom.repalette
+    gifsicle
+  ];

  buildPhase = ''
-    make DITHER=${dither} PALETTE_SIZE=0 all
+    runHook preBuild
+
+    mkdir -p build
+    ${buildCommands}
+
+    runHook postBuild
  '';

  installPhase = ''
+    runHook preInstall
+
    mkdir -p $out/share/wallpaper
-    cp -r build/* $out/share/wallpaper/
+    cp -r build/. $out/share/wallpaper/
+
+    runHook postInstall
  '';
 }
@@ -1 +1 @@
-{ ... }: { imports = [ ./dunst ./eww ./kanshi ./waylock ./wofi ]; }
+{ ... }: { imports = [ ./dunst ./eww ./kanshi ./lockscreen ./wofi ]; }
@@ -8,14 +8,11 @@
      settings = {
        global = {
          follow = "mouse";
-          height = "200";
+          height = "(0, 200)";
          width = "350";
          scale = "0";
-          origin = "top-right";
-          offset = "${
-              toString ((lib.strings.toInt config.colorScheme.palette.gaps-bar)
-                + (lib.strings.toInt config.colorScheme.palette.gaps-screen))
-            }x${config.colorScheme.palette.gaps-screen}";
+          origin = "bottom-right";
+          offset = "(${config.colorScheme.palette.gaps-screen},${config.colorScheme.palette.gaps-screen})";
          notification_limit = "0";
          progress_bar = "true";
          progress_bar_height = "10";
@@ -46,7 +43,7 @@
          min_icon_size = 32;
          max_icon_size = 64;

-          icon_path =
+          icon_path = lib.mkForce 
            "${pkgs.tela-circle-icon-theme}/share/icons/Tela-circle-dark/32/status:${pkgs.tela-circle-icon-theme}/share/icons/Tela-circle-dark/32/device ";
          icon_theme = "Tela-circle-dark";
          enable_recursive_icon_lookup = "true";
@@ -54,7 +51,7 @@
          sticky_history = "yes";
          history_length = "20";

-          dmenu = "wofi --show dmenu -p dunst:";
+          dmenu = "${pkgs.wofi}/bin/wofi --show dmenu -p dunst:";
          browser = "/usr/bin/xdg-open";
          always_run_script = "true";
          title = "Dunst";
@@ -62,8 +59,8 @@
          corner_radius = "${config.colorScheme.palette.border-radius}";
          ignore_dbusclose = "false";
          layer = "top";
-          force_xwayland = "true";
-          force_xinerama = "false";
+          # force_xwayland = "true";
+          # force_xinerama = "false";

          mouse_left_click = "close_current";
          mouse_middle_click = "context";
@@ -91,6 +88,9 @@
          timeout = "10";
          highlight = "#${config.colorScheme.palette.base0E}";
        };
+        experimental = {
+          per_monitor_dpi = true;
+        };
      };
    };
  };
@@ -1,48 +1,108 @@
-.calendar-win {
-}

 calendar {
-  padding: 5pt;
+  padding: $popup-scale * 1.75pt $popup-scale * 1pt;
+  font-size: $popup-scale * 8pt;

-  :selected {
-    color: $base0C;
+  header {
+    padding: $popup-scale * 2pt 0;
+    @include color-body;
  }

-  .header {
-    color: $base05;
-  }
-
-  .highlight {
-    color: $base0C;
-    font-weight: bold;
-  }
-
-  label {
-    font-size: 20pt;
-    color: $base0C;
-  }
-
-  :indeterminate {
-    color: $base03;
-  }
+  :selected      { @include color-accent; }
+  .highlight     { @include color-accent; font-weight: bold; }
+  :indeterminate { color: $base03; }
 }

+.cal-box .sys-section-header { margin-bottom: $popup-scale * 4pt; }
+

 .hour, .month {
  font-weight: bolder;
 }

 .minute, .month {
-  margin-top: -4pt;
+  margin-top: $popup-scale * -4pt;
 }


 .date {
-  color: $base0C;
-  background-color: $base01;
-  border-radius: $border-radius;
+  @include color-accent;
+  @include background-base;
+  @include border-radius;
 }

 .datetime {
  padding: $gaps-window;
 }
+
+// Clock window accents
+.weather-accent { background-color: $base0A; }
+.cal-accent     { background-color: $base0B; }
+.bri-accent     { background-color: $base09; }
+.vol-accent     { background-color: $base0D; }
+.quick-accent   { background-color: $base0E; }
+
+// Quick actions
+.quick-grid { margin-top: $popup-scale * 2pt; }
+
+.quick-btn {
+  @include background-base2;
+  @include border-radius;
+  padding: $popup-scale * 8pt $popup-scale * 4pt;
+  margin: $popup-scale * 4px;
+  min-width: 0;
+  min-height: 0;
+  border: none;
+
+  &:hover {
+    @include background-active;
+    .quick-icon, .quick-label {color: $base01;}
+  }
+}
+
+.quick-btn-active {
+  .quick-icon  { color: $base0E; }
+  .quick-label { color: $base0E; }
+}
+
+.quick-icon  { font-size: 1.5em; @include color-body; }
+.quick-label { font-size: 0.68em; margin-top: $popup-scale * 3pt; @include color-body; }
+
+// Weather section
+.weather-main  { margin-bottom: $popup-scale * 8pt; }
+.weather-icon  { font-size: 2.2em; margin-right: $popup-scale * 12pt; @include color-accent; }
+.weather-temp  { font-size: 1.3em; font-weight: bold; @include color-base; }
+.weather-desc  { font-size: 0.78em; @include color-body; }
+.weather-stats { margin-top: $popup-scale * 4pt; }
+
+// Volume section
+.ctrl-row   { margin-bottom: $popup-scale * 4pt; }
+.ctrl-icon        { font-size: 1.1em; min-width: $popup-scale * 22pt; @include border-radius; @include color-body; }
+.ctrl-icon:hover  { @include background-active; }
+.ctrl-muted       { @include color-inactive; }
+.ctrl-value { font-size: 0.72em; min-width: $popup-scale * 28pt; @include color-active; }
+
+scale.ctrl-slider.ctrl-slider-muted {
+  trough {
+    highlight { background-color: $base03; }
+    slider    { background-color: $base03; }
+  }
+}
+
+scale.ctrl-slider {
+  padding: $popup-scale * 2pt $popup-scale * 4pt;
+  trough {
+    @include border-radius;
+    @include background-base2;
+    min-height: 5px;
+    highlight { background-color: $base0C; @include border-radius; }
+  }
+  slider {
+    background-color: $base07;
+    min-height: 11px;
+    min-width: 11px;
+    @include border-radius;
+    margin: -3px;
+    border: none;
+  }
+}
@@ -0,0 +1,32 @@
+$base00: #000000;
+$base01: #060a0f;
+$base02: #212c38;
+$base03: #3f5268;
+$base04: #617b9a;
+$base05: #90a7c1;
+$base06: #c9d3df;
+$base07: #fcfcfc;
+$base08: #ffac56;
+$base09: #feea74;
+$base0A: #bffe8a;
+$base0B: #4cfefa;
+$base0C: #62acfd;
+$base0D: #9b9bfd;
+$base0E: #fe9bda;
+$base0F: #fc8999;
+
+
+$fg: $base07;
+$bg0: $base00;
+$bg1: $base01;
+
+$border-color: $base03;
+$border-color-focus: $base04;
+$border-radius: 8px;
+$border-width: 2px;
+
+$gaps-screen: 8px;
+$gaps-window: 4px;
+
+$panel-font-size: 10pt;
+$popup-scale: 1;
@@ -1,8 +1,43 @@
+// Bar icons
+.net-icon                { font-size: 14px; padding: 3pt 0; }
+.net-active, .blt-on    { @include color-base; }
+.net-dim                 { @include color-inactive; }
+.blt-connected           { @include color-accent; }

-.net {
-    color: $base07;
+// Popup window section accents
+.wifi-accent { background-color: $base0C; }
+.eth-accent  { background-color: $base0B; }
+.blt-accent  { background-color: $base0D; }
+.usb-accent  { background-color: $base09; }
+
+// Netinfo rows
+.netinfo-row                            { margin-bottom: $popup-scale * 3pt; }
+.netinfo-label, .netinfo-value, .netinfo-dim { font-size: 0.72em; }
+.netinfo-label { @include color-active; min-width: $popup-scale * 60px; }
+.netinfo-value { @include color-body; }
+.netinfo-dim   { color: $base03; margin-bottom: $popup-scale * 4pt; }
+
+// Section toggle button
+.net-toggle-btn {
+  padding: $popup-scale * 2pt $popup-scale * 4pt;
+  @include border-radius;
+  font-size: 1.1em;
 }

-.blt {
-    color: $base0C;
-}
+// Bluetooth device list
+.bt-device-row  { margin-bottom: $popup-scale * 4pt; }
+.bt-device-name { font-size: 0.78em; @include color-body; }
+.bt-device-btn  { padding: $popup-scale * 2pt $popup-scale * 6pt; @include border-radius; font-size: 1em; }
+
+// Shared button states
+.net-toggle-btn:hover,
+.bt-device-btn:hover  { @include background-active; }
+.net-toggle-on, .bt-btn-on   { @include color-base; }
+.net-toggle-off, .bt-btn-off { @include color-inactive; }
+
+// WireGuard
+.wg-accent { background-color: $base0E; }
+.wg-row    { margin-bottom: $popup-scale * 4pt; }
+.wg-name   { font-size: 0.78em; font-weight: bold; }
+.wg-up     { @include color-base; }
+.wg-down   { @include color-inactive; }
@@ -1,26 +1,23 @@
-.powermenu-box {
-    padding-left: 2.5rem;
-    padding-right: 2.5rem;
-    padding-top: 3rem;
-    padding-bottom: 3rem;
-    margin:0 0 0 0;
+.pm-overlay {
+  background-color: rgba(0, 0, 0, 0.55);
 }

-.powermenu-entry {
-    margin: 0 0.5rem;
+.pm-win {
+  padding: $popup-scale * 10pt;
+  font-size: $popup-scale * $panel-font-size;
 }

-.powermenu-button {
-    background-color: $base02;
-    border-radius: 1rem;
-    transition: 0.3s;
-    padding: 3.25rem 4rem;
+.pm-btn {
+  @include background-base2;
+  @include border-radius;
+  padding: $popup-scale * 20pt $popup-scale * 16pt;
+  margin: $popup-scale * 6px;
+
+  &:hover {
+    @include background-active;
+    .pm-icon, .pm-label { color: $base01; }
+  }
 }

-.powermenu-button:hover {
-    background-color:$base03;
-}
-
-.powermenu-icon {
-    font-size: 4rem;
-}
+.pm-icon  { font-size: 2.4em; @include color-body; }
+.pm-label { font-size: 0.70em; margin-top: $popup-scale * 5pt; @include color-body; }
@@ -1,75 +1,90 @@

-.radio-win {
-    //margin: $gaps-screen;
-    //padding: .5em;
-  }
+.radio-accent { background-color: $base0D; }

-.album_art {
+// Now playing
+.radio-now-playing {
+  margin-bottom: $popup-scale * 8pt;
+}
+
+.radio-art {
  background-repeat: no-repeat;
-	background-size: 240px;
-	min-height: 240px;
-	min-width: 240px;
-	margin: $gaps-screen;
-	border-radius: $border-radius;
+  @include border-radius;
+  @include background-base2;
+  min-width: $popup-scale * 72px;
+  min-height: $popup-scale * 72px;
 }

-.song {
-	color: $base0C;
-	font-size: 24px;
+.radio-art-icon {
+  font-size: 2em;
+  @include color-body;
+}
+
+.radio-song {
+  font-size: 0.88em;
  font-weight: bold;
-	margin: 20px 0px 0px 0px;
+  @include color-base;
+  margin-bottom: $popup-scale * 2pt;
 }

-.artist {
-	color: $base0E;
-	font-size: 16px;
-	font-weight: normal;
-	margin: 0px 0px $gaps-screen 0px;
+.radio-artist {
+  font-size: 0.74em;
+  @include color-body;
 }

-.btn_bar {
-	color: $base05;
-	font-size: 20px;
-	font-weight: bold;
-	margin: $gaps-screen 0px;
+// Controls
+.radio-controls {
+  margin-top: $popup-scale * 6pt;
 }

-.btn_play {
-	font-size: 48px;
-	font-weight: bold;
-	margin: 0 12px;
+.radio-ctrl-btn {
+  font-size: 2em;
+  padding: $popup-scale * 4pt $popup-scale * 20pt;
+  @include border-radius;
+  @include color-body;
+  &:hover { @include background-active; @include color-base; }
 }

-.btn_play:hover {
-	color: $base07;
+// Station list
+.station-list {}
+
+scrollbar {
+  background-color: transparent;
+  border: none;
+  min-width: 6px;
+}
+scrollbar trough {
+  @include background-base2;
+  @include border-radius;
+  min-width: 6px;
+}
+scrollbar slider {
+  background-color: $base04;
+  @include border-radius;
+  min-width: 6px;
+  min-height: 20px;
+  &:hover { background-color: $base05; }
 }

-
-.station_list {
-    border-right-color: $base03;
-    border-right-style: solid;
-    border-right-width: $border-width;
-    margin-right: $gaps-screen;
+.station-row {
+  padding: $popup-scale * 4pt $popup-scale * 3pt;
+  @include border-radius;
+  &:hover { @include background-base2; }
 }

-.station_art {
+.station-row-active {
+  .station-name { @include color-accent; }
+}
+
+.station-icon {
  background-repeat: no-repeat;
-	background-size: 50px;
-	min-height: 50px;
-	min-width: 50px;
-	margin: $gaps-window;
-    margin-right: $gaps-screen;
-    background-color: $base00;
-	border-radius: $border-radius;
-    border-color: $base00;
-    border-style: solid;
-    border-width: $border-width;
+  @include border-radius;
+  @include background-base2;
+  min-width: $popup-scale * 28px;
+  min-height: $popup-scale * 28px;
+  margin-right: $popup-scale * 8pt;
 }

-.station_art:hover {
-    border-color: $base04;
-}
-
-.station_sel {
-    border-color: $base03;
+.station-name {
+  font-size: 0.76em;
+  @include color-body;
 }
@@ -1,69 +1,111 @@

-.cpubar {
-color: $base0C;
-}
+// Bar module rings
+.cpubar { color: $base0C; }
+.gpubar { color: $base0E; }
+.membar { color: $base08; }
+.batbar { color: $base0A; } // overridden by .bat-<state> below
+.cpubar, .gpubar, .membar, .batbar { @include background-base2; margin: $gaps-window 0; }

-.gpubar {
-color: $base0E;
-}
-
-.membar {
-color: $base08;
-}
-    
-.batbar {
-color: $base0B;
-}
-
-.cpubar,
-.gpubar,
-.membar,
-.batbar {
-    background-color: $bg0;
-    margin: $gaps-window 0;
-}
-
-.cpu-core-usage, .gpu-core-usage, .memory-usage {
-    background-color: $bg0;
-    border-radius: $border-radius;
-    padding: 2pt;
-    margin: 1pt;
-
-}
-
-.cpu-core-usage trough * {
-    background-color: $base0C;
-    border-radius: $border-radius;
-    padding: 2pt;
-}
-.gpu-core-usage trough * {
-    background-color: $base0E;
-    border-radius: $border-radius;
-    padding: 2pt;
-}
-
-.memory-usage trough * {
-    background-color: $base08;
-    border-radius: $border-radius;
-    padding: 2pt;
-}
-
-
-.spacer {
-    color: $bg1;
-    padding: $gaps-window;
-    margin:0;
-}
-
-.sys-win {
-    // @include window;
-    // background-color: $bg1;
-    // color: $fg;
-    // margin: $gaps-win;
-    padding: 5pt;
-}
+// Window chrome
+.sys-win            { padding: $popup-scale * 10pt; font-size: $popup-scale * $panel-font-size; }
+.sys-section        { margin-bottom: 0; }
+.sys-section-header { margin-bottom: $popup-scale * 10pt; }

 .sys-label {
-    font-weight: bolder;
-    color: $base04;
+  font-size: 0.72em;
+  font-weight: bold;
+  letter-spacing: 0.14em;
+  @include color-body;
 }
+
+.section-accent {
+  min-width: 3px;
+  border-radius: 2px;
+  margin-right: $popup-scale * 8pt;
+}
+
+.cpu-accent { background-color: $base0C; }
+.gpu-accent { background-color: $base0E; }
+.ram-accent { background-color: $base08; }
+.bat-accent { background-color: $base0B; }
+
+.section-sep {
+  background-color: $base03;
+  min-height: 2px;
+  margin: $popup-scale * 6pt 0 $popup-scale * 10pt;
+}
+
+// All rings and progress tracks share the same background
+.cpu-usage-ring, .cpu-freq-ring,
+.gpu-ring, .gpu-freq-ring,
+.ram-ring, .swap-ring, .bat-ring,
+.vram-bar { @include background-base2; }
+
+// Ring colors
+.cpu-usage-ring                { color: $base0C; }
+.cpu-freq-ring, .gpu-freq-ring { color: $base0D; }
+.gpu-ring                      { color: $base0E; }
+.ram-ring                      { color: $base08; }
+.swap-ring                     { color: $base09; }
+
+// Ring margins - freq rings use larger margins for concentric overlay effect
+.cpu-usage-ring, .gpu-ring { margin: $popup-scale * 3pt; }
+.ram-ring, .bat-ring       { margin: $popup-scale * 4pt; }
+.swap-ring                 { margin: $popup-scale * 3.5pt; }
+.cpu-freq-ring             { margin: $popup-scale * 12px; }
+.gpu-freq-ring             { margin: $popup-scale * 13px; }
+
+// Shared label patterns
+.gpu-ring-value, .gpu-stat-value, .ram-used-label { font-weight: bold; @include color-body; }
+.gpu-ring-value { font-size: 0.82em; }
+.gpu-stat-value { font-size: 0.85em; }
+.ram-used-label { font-size: 0.95em; }
+
+.gpu-ring-label, .gpu-stat-label,
+.vram-usage-label, .swap-section-label { font-size: 0.62em; @include color-active; }
+.gpu-ring-label, .vram-usage-label, .swap-section-label { margin-top: 2pt; }
+
+.cpu-core-label  { font-size: 0.7em; @include color-active; }
+.bat-ring-label  { font-size: 0.85em; font-weight: bold; @include color-body; }
+.bat-stat-value  { font-size: 1.05em; font-weight: bold; @include color-body; }
+.bat-stat-label  { font-size: 0.62em; margin-top: 2pt; @include color-active; }
+.ram-total-label { font-size: 0.72em; @include color-active; }
+
+// GPU stats row
+.gpu-stats-row { margin-top: $popup-scale * 6pt; margin-bottom: $popup-scale * 2pt; }
+
+// VRAM
+.vram-row { margin-top: $popup-scale * 6pt; }
+
+.vram-bar {
+  @include border-radius;
+  padding: $popup-scale * 2pt;
+}
+
+.vram-bar trough * {
+  background-color: $base0E;
+  @include border-radius;
+}
+
+// RAM cached ring overrides group background
+.ram-cached-ring {
+  @include color-active;
+  background-color: transparent;
+  margin: $popup-scale * 4pt;
+}
+
+// Battery colour by state (scripts/sys/battery → .bat-<state>):
+// light blue on mains (charging / full / idle), on battery green, orange below
+// 25 %, red at ≤15 %
+.batbar, .bat-ring        { color: $base0A; }
+.bat-charging, .bat-full, .bat-idle { color: $base0B; }
+.bat-low                  { color: $base08; }
+.bat-critical             { color: $base0F; }
+
+// Battery history plot: one vertical bar per bucket, same colours as the ring
+.bat-hist { min-height: 44px; margin-top: $popup-scale * 8pt; }
+.bat-hist-bar { @include background-base2; margin: 0 2px; }
+.bat-hist-bar trough *   { background-color: $base0A; }
+.hist-charging trough *, .hist-idle trough * { background-color: $base0B; }
+.hist-low trough *       { background-color: $base08; }
+.hist-critical trough *  { background-color: $base0F; }
@@ -1,35 +1,28 @@
 .tray * {
-    padding: $border-width 0px;
+  padding: $border-width 0;
 }
+
 .tray menu {
-    background-color: $base01;
-    color: $base07;
  @include border-radius;
  @include border-active;
+  @include background-base;
+  @include color-base;

+  padding: 10px 0;

-	padding: 10px 0px;
-
-	>menuitem {
+  > menuitem {
    margin: 2px $border-width;
-		padding: 0px 10px;
+    padding: 0 10px;

-		&:disabled label {
-			color: $base04;
-		}
-
-		&:hover {
-			background-color: $base0C;
-		}
+    &:disabled label { @include color-active; }
+    &:hover          { @include background-accent; }
  }

  separator {
-		background-color: $base03;
+    @include background-base2;
    padding-top: 1px;
-        margin:10px 0px;
+    margin: 10px 0;

-		&:last-child {
-			padding: unset;
-		}
+    &:last-child { padding: unset; }
  }
 }
@@ -18,8 +18,45 @@
  border-color: $base04;
 }

-@mixin test {
+@mixin background-base {
+  background-color: $base01;
+}
+@mixin background-base2 {
+  background-color: $base02;
+}
+@mixin background-active {
+  background-color: $base04;
+}
+@mixin background-accent {
+  background-color: $base0C;
+}
+@mixin color-base {
+  color: $base07;
+}
+@mixin color-inactive {
+  color: $base02;
+}
+@mixin color-active {
+  color: $base04;
+}
+@mixin color-accent {
+  color: $base0C;
+}
+@mixin color-body {
+  color: $base05;
+}

+@mixin panel-base {
+  @include border-radius;
+  @include border-inactive;
+  @include background-base;
+  @include color-base;
+}
+
+@mixin mod-edge {
+  border-right-style: none;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
 }

 /*  GENERAL */
@@ -31,9 +68,9 @@
 }

 tooltip {
-  background: $base01;
-  border: $border-width solid $base04;
-  border-radius: $border-radius;
+  @include border-active;
+  @include border-radius;
+  @include background-base;

  label {
    font-size: 1rem;
@@ -49,33 +86,21 @@ tooltip {
  font-weight: 900;
 }

-.grey {
-  color: $base02;
-}
+/* WORKSPACE COLORS - emitted dynamically by scripts/workspaces as class names */
+.grey   { color: $base02; }
+.red    { color: $base0F; }
+.orange { color: $base08; }
+.green  { color: $base0B; }
+.blue   { color: $base0C; }

-.red {
-  color: $base0F;
-}
-
-.orange {
-  color: $base08;
-}
-
-.green {
-  color: $base0B;
-}
-
-.blue {
-  color: $base0C;
+.workspace-sep {
+  border-top: 2px solid $base03;
 }

 /* WINDOW WRAPPER CSS */

 .winevent {
-  background-color: $base01;
-  color: $base07;
-  @include border-radius;
-  @include border-inactive;
+  @include panel-base;
 }
 .winevent:hover {
  @include border-active;
@@ -91,19 +116,12 @@ tooltip {
 /* MODULE WRAPPER CSS */

 .modevent {
-  background-color: $base01;
-  color: $base07;
-  @include border-radius;
-  @include border-inactive;
-  border-right-style: none;
-  border-bottom-right-radius: 0;
-  border-top-right-radius: 0;
+  @include panel-base;
+  @include mod-edge;
 }
 .modevent:hover {
  @include border-active;
-  border-right-style: none;
-  border-bottom-right-radius: 0;
-  border-top-right-radius: 0;
+  @include mod-edge;
 }

 .modinner {
@@ -5,8 +5,12 @@
 (include "modules/systray.yuck")
 (include "modules/clock.yuck")

-(include "windows/calendar.yuck")
+(defvar active-panel "")
+
 (include "windows/sys.yuck")
+(include "windows/net.yuck")
+(include "windows/clock.yuck")
+(include "windows/popup.yuck")
 (include "windows/radio.yuck")
 (include "windows/powermenu.yuck")

@@ -48,7 +52,7 @@


 (defwindow bar
-    :monitor 1
+    :monitor 0
    :geometry (geometry
      :x "0%"
      :y "0%"
@@ -1,12 +1,13 @@
 (defvar date_rev false)

+; EWW_TIME ticks every second inside the daemon, so no shell poll is needed.
 (defwidget clock-mod []
  (module
    (eventbox
-      :onhover "${EWW_CMD} update date_rev=true"
-      :onhoverlost "${EWW_CMD} update date_rev=false"
-      :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle calendar)"
-      :onrightclick "(sleep 0.1 && ${EWW_CMD} open --toggle powermenu)"
+      :onhover "${EWW_CMD} --no-daemonize update date_rev=true"
+      :onhoverlost "${EWW_CMD} --no-daemonize update date_rev=false"
+      :onclick "scripts/panel-toggle clock"
+      :onrightclick "scripts/powermenu-toggle"
      (box
        :class "datetime"
        (overlay
@@ -14,29 +15,24 @@
            :orientation "v"
            (label :show-truncated false
              :class "hour"
-              :text {hour})
+              :text {formattime(EWW_TIME, "%H")})
            (label :show-truncated false
              :class "minute"
-              :text {minute}))
+              :text {formattime(EWW_TIME, "%M")}))
          (revealer
            :reveal date_rev
            (box
              :class "date"
              :orientation "v"
-              (label :show-truncated "false" 
+              (label :show-truncated false
                :class "day"
-                :text {day})
-              (label :show-truncated "false"
+                :text {formattime(EWW_TIME, "%d")})
+              (label :show-truncated false
                :class "month"
-                :text {month}))
+                :text {formattime(EWW_TIME, "%m")}))
          )
        )
      )
    )
  )
 )
-
-(defpoll hour	:interval "15s"	"date '+%H'")
-(defpoll minute	:interval "15s"	"date '+%M'")
-(defpoll day	:interval "15s"	"date '+%d'")
-(defpoll month	:interval "15s"	"date '+%m'")
@@ -1,17 +1,35 @@
-(deflisten net :initial '{"name":"","icon":""}'"scripts/net/net")
+(deflisten net
+  :initial '{"wifi":{"connected":false,"enabled":false,"icon":"󰤮","ssid":"","ip":"","freq":0,"band":"","gen":"","signal":0},"ethernet":{"connected":false,"interface":"","ip":"","speed":""},"usb":{"connected":false,"interface":"","ip":""},"wireguard":[],"vpn":{"up":false,"name":""}}'
+  "scripts/net/net")
+
+(deflisten bt
+  :initial '{"powered":false,"connected":false,"device":"","devices":[]}'
+  "scripts/net/bt")

 (defwidget net-mod []
  (module
-    (box
-      :orientation "v"
-      (button
-        :class "net"
-        :tooltip {net.name}
-        {net.icon})
-
-      (button
-        :class "blt"
-        (label :class "icon-text" :text "B"))
-    )
-  )
-)
+    (eventbox
+      :onclick "scripts/panel-toggle net"
+    (box :orientation "v"
+      (label
+        :class "net-icon ${net.ethernet.connected ? 'net-active' : 'net-dim'}"
+        :tooltip {net.ethernet.connected ? "Ethernet: Connected" : "Ethernet: Disconnected"}
+        :text "󰈀")
+      (label
+        :visible {net.usb.connected}
+        :class "net-icon net-active"
+        :tooltip "USB: Connected"
+        :text "󰌷")
+      (label
+        :visible {net.vpn.up}
+        :class "net-icon net-active"
+        :tooltip "VPN: ${net.vpn.name}"
+        :text "󰖂")
+      (label
+        :class "net-icon ${net.wifi.connected ? 'net-active' : 'net-dim'}"
+        :tooltip {net.wifi.connected ? "WiFi: ${net.wifi.ssid}" : "WiFi: Disconnected"}
+        :text {net.wifi.icon})
+      (label
+        :class "net-icon ${bt.connected ? 'blt-connected' : bt.powered ? 'blt-on' : 'net-dim'}"
+        :tooltip {bt.connected ? "Bluetooth: ${bt.device}" : bt.powered ? "Bluetooth: On" : "Bluetooth: Off"}
+        :text {bt.connected ? "󰂱" : bt.powered ? "󰂯" : "󰂲"})))))
@@ -1,42 +1,33 @@
-(deflisten cpu :initial '{}' "scripts/sys/cpu")
-(deflisten gpu :initial '{"devices":[{"GRBM2":{}}]}' "scripts/sys/gpu")
-(deflisten memory :initial '{"human":{"used":"0G","total":"0G"},"used":0.0,"total":1.0}' "scripts/sys/memory")
+(deflisten gpu :initial '{"gfx_pct":0,"mem_pct":0,"media_pct":0,"sclk":0,"mclk":0,"sclk_pct":0,"mclk_pct":0,"vclk":0,"vclk_pct":0,"temp":0,"power":0,"vram_used":0,"vram_total":1}' "scripts/sys/gpu")
+(deflisten memory :initial '{"total":1,"used":0,"cached":0,"human":{"total":"0G","used":"0G","cached":"0G"},"swap":{"total":0,"used":0,"human":{"total":"0G","used":"0G"}}}' "scripts/sys/memory")

-(deflisten battery :initial '{"visible":false,"percentage":0.0,"color":"#FFFFFF"}' "scripts/sys/battery")
+; state: charging | discharging | low (<25%) | critical (≤15%) | full | idle | none — styled via .bat-<state>
+; history: 6 h of {t, p, s} buckets (p = -1 when empty)
+(deflisten battery :initial '{"visible":false,"percentage":0,"wattage":"","status":"","time":"","state":"none","rate":"","history":[]}' "scripts/sys/battery")

 (defwidget sys-mod []
  (module
    (eventbox
-      :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle sys)"
-      (box
-        :orientation "v"
+      :onclick "scripts/panel-toggle sys"
+      (box :orientation "v"
        (circular-progress
          :value {EWW_CPU.avg}
          :class "cpubar"
-            :thickness 6
-            (label :class "icon-text" :text "C"))
-
+          :width 28 :height 28 :thickness 6
+          :tooltip "CPU ${round(EWW_CPU.avg, 0)}%")
        (circular-progress
-            :value {gpu.devices[0].GRBM2?.CommandProcessor-Graphics?.value?:0}
+          :value {gpu.gfx_pct}
          :class "gpubar"
-            :thickness 6
-            (label :class "icon-text" :text "G"))
+          :width 28 :height 28 :thickness 6
+          :tooltip "GPU ${round(gpu.gfx_pct, 0)}%")
        (circular-progress
          :value {100*memory.used/memory.total}
          :class "membar"
-          :thickness 6
-          :tooltip "${memory.human.used} / ${memory.human.total}"
-          (label :class "icon-text" :text "M"))
-
+          :width 28 :height 28 :thickness 6
+          :tooltip "RAM ${memory.human.used} / ${memory.human.total}")
        (circular-progress
          :value {battery.percentage}
-          :class "batbar"
+          :class "batbar bat-${battery.state}"
          :visible {battery.visible}
-          :style "color: ${battery.color};"
-          :thickness 6
-          :tooltip "${battery.status} @ ${battery.wattage}"
-          (label :class "icon-text" :text "B"))
-      )
-    )
-  )
-)
+          :width 28 :height 28 :thickness 6
+          :tooltip "Bat ${round(battery.percentage, 0)}% · ${battery.status} @ ${battery.wattage}")))))
@@ -3,17 +3,18 @@
 (defwidget workspace-mod []
 	(module
 		(eventbox
-		:onscroll "echo {} | sed -e \"s/up/-1/g\" -e \"s/down/+1/g\" | xargs hyprctl dispatch workspace"
+			:onscroll "echo {} | sed -e 's/up/-1/' -e 's/down/+1/' | xargs -I % hyprctl eval \"hl.dispatch(hl.dsp.focus({ workspace = '%' }))\""
 			(box
 				:class "module workspaces"
 				:orientation "v"
 				(for ws in workspace
 					(button
-						:onclick "hyprctl dispatch workspace ${ws.number}"
+						:class `${ws.sep ? "workspace-sep" : ""}`
+						:onclick "hyprctl  eval \"hl.dispatch(hl.dsp.focus({ workspace = '${ws.target}' }))\""
 						(label
 							:show-truncated false
-							:class "icon-text  ${ws.color}"
-							:text `${ws.focused ? "󰜗" : "󰝥"}`
+							:class `icon-text ${ws.color}`
+							:text `${ws.state == "focused" ? "󰜗" : ws.state == "active" ? "󰝥" : "○"}`
 						)
 					)
 				)
@@ -0,0 +1,99 @@
+# ---------------------------------------------------------------------------
+# Shared helpers for the bar scripts.  default.nix inlines this file at the
+# top of every wrapped script, right after setting PATH.
+# ---------------------------------------------------------------------------
+
+# Every eww client call goes through this wrapper.  A client waits only 100 ms
+# for the daemon's reply; a slower command (opening the popup) would otherwise
+# make a plain `eww open` fork a second daemon that takes over the socket —
+# the "two bars" bug.  With --no-daemonize it is just an error, and the daemon
+# still carries out the command.
+eww() { command eww --no-daemonize "$@"; }
+
+# Print the payload only when it differs from the previous one.
+emit() {
+  [[ $1 == "${EMIT_LAST-}" ]] && return 0
+  EMIT_LAST=$1
+  printf '%s\n' "$1"
+}
+
+# Escape a value for use inside a JSON string literal.
+jstr() {
+  local s=$1
+  s=${s//\\/\\\\}
+  s=${s//\"/\\\"}
+  s=${s//$'\n'/\\n}
+  s=${s//$'\t'/\\t}
+  printf '%s' "$s"
+}
+
+# Run a command outside eww's cgroup so a daemon restart cannot kill it
+# (hyprlock, wlsunset, mpv, satty…).  With -u NAME the transient unit gets a
+# fixed name that `systemctl --user stop NAME` can address later.
+#   detach [-u NAME] CMD ARGS...
+detach() {
+  local unit=() cmd
+  if [[ $1 == -u ]]; then unit=(--unit "$2"); shift 2; fi
+  cmd=$(command -v "$1") || { echo "detach: $1 not found" >&2; return 1; }
+  shift
+  systemd-run --user --collect --quiet "${unit[@]}" -- "$cmd" "$@"
+}
+
+# eww kills a click handler that has not returned within the widget's
+# :timeout (200 ms) — less than the eww client calls most handlers make
+# (~50 ms each), let alone bluetoothctl or a station list fetch.  Re-run
+# this script detached and return at once.  Call it with the original
+# arguments, before anything with side effects.
+#   detach_self "$@"
+detach_self() {
+  [[ -n ${EWW_DETACHED-} ]] && return 0
+  EWW_DETACHED=1 setsid -f "$0" "$@"
+  exit 0
+}
+
+# Event multiplexer for listener scripts.  Producers run in the background
+# and write one line per event into a fifo; the main loop re-evaluates the
+# state on every event, coalescing bursts into a single refresh.
+#
+#   mux_init
+#   mux_add  FUNC [ARGS]     run FUNC in the background, stdout → fifo
+#   mux_tick SECONDS         periodic wake-up
+#   mux_loop HANDLER         HANDLER LINE... for every burst (never returns)
+#
+# eww terminates a listener by sending SIGTERM to its whole process group, so
+# the producers die together with the script.  The EXIT trap only removes the
+# fifo — it must never `kill 0`: that signals the shell itself, which
+# re-enters the trap recursively until bash overflows its stack (the
+# bash/volume coredumps in the journal of the previous version).
+mux_init() {
+  MUX_DIR=$(mktemp -d "${XDG_RUNTIME_DIR:-/tmp}/eww-mux.XXXXXX")
+  MUX_FIFO=$MUX_DIR/events
+  MUX_PIDS=()
+  mkfifo "$MUX_FIFO"
+  # Open read+write once: never blocks, and readers never see EOF.
+  exec {MUX_FD}<>"$MUX_FIFO"
+  trap 'mux_cleanup' EXIT
+}
+
+mux_cleanup() {
+  trap - EXIT
+  ((${#MUX_PIDS[@]})) && kill "${MUX_PIDS[@]}" 2>/dev/null
+  rm -rf "$MUX_DIR"
+}
+
+mux_add() {
+  "$@" >&"$MUX_FD" 2>/dev/null &
+  MUX_PIDS+=("$!")
+}
+
+_mux_ticker() { while sleep "$1"; do echo tick; done; }
+mux_tick() { mux_add _mux_ticker "$1"; }
+
+mux_loop() {
+  local handler=$1 line lines
+  while IFS= read -r -u "$MUX_FD" line; do
+    lines=("$line")
+    while IFS= read -r -t 0.15 -u "$MUX_FD" line; do lines+=("$line"); done
+    "$handler" "${lines[@]}"
+  done
+}
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# rfkill everything (wifi + bluetooth); "active" means the wifi is soft-blocked.
+active() { rfkill list wifi 2>/dev/null | grep -q "Soft blocked: yes"; }
+
+case ${1:-} in
+  status) active && echo true || echo false ;;
+  *)
+    detach_self "$@"
+    if active; then
+      rfkill unblock all
+      state=false
+    else
+      rfkill block all
+      state=true
+    fi
+    eww update airplane-mode="$state" 2>/dev/null
+    echo "$state"
+    ;;
+esac
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Backlight brightness (first device under /sys/class/backlight).  Refreshes
+# on backlight udev events, which also fire for the hardware keys.
+#
+#   brightness              status loop (deflisten)
+#   brightness set PERCENT
+
+dev=""
+for d in /sys/class/backlight/*; do
+  [[ -e $d ]] && { dev=${d##*/}; break; }
+done
+
+state() {
+  [[ -n $dev ]] || { printf '{"percent":0,"available":false}'; return; }
+  local max cur
+  max=$(<"/sys/class/backlight/$dev/max_brightness")
+  cur=$(cat "/sys/class/backlight/$dev/actual_brightness" 2>/dev/null \
+    || cat "/sys/class/backlight/$dev/brightness")
+  printf '{"percent":%d,"available":true}' "$(((cur * 100 + max / 2) / max))"
+}
+
+refresh() { emit "$(state)"; }
+_bl_events() { exec udevadm monitor --udev --subsystem-match=backlight; }
+
+case ${1:-} in
+  set) [[ -n $dev ]] && brightnessctl -q -d "$dev" set "${2%.*}%" ;;
+  *)
+    refresh
+    [[ -n $dev ]] || exit 0
+    mux_init
+    mux_add _bl_events
+    mux_loop refresh
+    ;;
+esac
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Pick a colour from the screen into the clipboard, detached from eww.
+eww close popup 2>/dev/null
+eww update active-panel= 2>/dev/null
+detach hyprpicker -a
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Pause / resume dunst notifications.
+case ${1:-} in
+  status) dunstctl is-paused ;;
+  *)
+    detach_self "$@"
+    dunstctl set-paused toggle
+    state=$(dunstctl is-paused)
+    eww update do-not-disturb="$state" 2>/dev/null
+    echo "$state"
+    ;;
+esac
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Lock the session.  hyprlock runs as its own transient unit so that an eww
+# restart can never take the lock screen down with it.
+unit=eww-lock
+eww close popup 2>/dev/null
+eww close powermenu 2>/dev/null
+eww update active-panel= 2>/dev/null
+systemctl --user is-active --quiet "$unit" && exit 0
+detach -u "$unit" hyprlock
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# playerctl pass-through for the media panel buttons.
+exec playerctl "$@"
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Bluetooth state — adapter power, connected device and the paired/trusted
+# device list — from one ObjectManager call on the system bus.  Refreshes on
+# every org.bluez signal (property changes, devices added/removed) and every
+# 60 s.
+
+fallback='{"powered":false,"connected":false,"device":"","devices":[]}'
+
+query() {
+  busctl --system --json=short call org.bluez / org.freedesktop.DBus.ObjectManager GetManagedObjects 2>/dev/null \
+    | jq -c '
+      .data[0] as $o
+      | ($o | to_entries | map(.value["org.bluez.Adapter1"] | select(.) | .Powered.data) | any) as $powered
+      | ($o | to_entries
+          | map(.value["org.bluez.Device1"] | select(.))
+          | map(select(.Paired.data or .Trusted.data or .Connected.data))
+          | map({ mac: .Address.data,
+                  name: (.Alias.data // .Name.data // .Address.data),
+                  connected: (.Connected.data // false),
+                  paired: (.Paired.data // false) })
+          | sort_by((.connected | not), (.paired | not), .name)) as $devices
+      | { powered: $powered,
+          connected: ($devices | any(.connected)),
+          device: ($devices | map(select(.connected)) | .[0].name // ""),
+          devices: $devices }' 2>/dev/null
+}
+
+refresh() {
+  local out
+  out=$(query)
+  emit "${out:-$fallback}"
+}
+
+_bt_events() { exec gdbus monitor --system --dest org.bluez; }
+
+refresh
+mux_init
+mux_add _bt_events
+mux_tick 60
+mux_loop refresh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Connect or disconnect the bluetooth device with MAC $1.
+mac=$1
+[[ -n $mac ]] || exit 64
+detach_self "$@"
+if bluetoothctl info "$mac" 2>/dev/null | grep -q "Connected: yes"; then
+  bluetoothctl disconnect "$mac"
+else
+  bluetoothctl connect "$mac"
+fi
@@ -1,73 +1,136 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env bash
+# Network state for the bar icons and the net panel: wifi, ethernet and USB
+# tethering.  Refreshes on link/address changes and every 30 s (signal level).

-function get_time_ms {
-  date -u +%s%3N
+wifi_iface() { awk 'NR > 2 { sub(":", "", $1); print $1; exit }' /proc/net/wireless; }
+eth_iface() { ip -o link 2>/dev/null | awk '$2 ~ /^en[op]/ { sub(":", "", $2); print $2; exit }'; }
+usb_iface() { ip -o link 2>/dev/null | awk '$2 ~ /^(usb[0-9]|enx)/ { sub(":", "", $2); print $2; exit }'; }
+ipv4() { ip -4 -o addr show "$1" 2>/dev/null | awk '{ print $4; exit }'; }
+
+signal_icon() {
+  local dbm=${1:-}
+  [[ -z $dbm ]] && { echo "󰤮"; return; }
+  if ((dbm >= -50)); then echo "󰤨"
+  elif ((dbm >= -60)); then echo "󰤥"
+  elif ((dbm >= -70)); then echo "󰤢"
+  elif ((dbm >= -80)); then echo "󰤟"
+  else echo "󰤯"; fi
 }

-icons=("󰤯" "󰤟" "󰤢" "󰤥" "󰤨")
+band() {
+  local f=${1:-0}
+  if ((f >= 5925)); then echo "6 GHz"
+  elif ((f >= 4900)); then echo "5 GHz"
+  elif ((f >= 2400)); then echo "2.4 GHz"
+  else echo ""; fi
+}

-function toggle() {
-  status=$(rfkill | grep wlan | awk '{print $4}')
+generation() {
+  case ${1:-} in
+    7) echo "Wi-Fi 7" ;; 6) echo "Wi-Fi 6" ;; 5) echo "Wi-Fi 5" ;; 4) echo "Wi-Fi 4" ;; *) echo "" ;;
+  esac
+}

-  if [ "$status" = "unblocked" ]; then
-    rfkill block wlan
-  else
-    rfkill unblock wlan
+state() {
+  local wifi eth usb
+  wifi=$(wifi_iface)
+  eth=$(eth_iface)
+  usb=$(usb_iface)
+
+  local w_enabled=false w_connected=false w_icon="󰤮" w_ssid="" w_ip="" w_freq=0 w_gen="" w_signal=0 wpa
+  rfkill list wlan 2>/dev/null | grep -q "Soft blocked: yes" || w_enabled=true
+  if [[ -n $wifi ]]; then
+    w_ip=$(ipv4 "$wifi")
+    if [[ -n $w_ip ]]; then
+      w_connected=true
+      wpa=$(wpa_cli -g "/run/wpa_supplicant/$wifi" status 2>/dev/null)
+      w_ssid=$(awk -F= '/^ssid=/ { print $2; exit }' <<<"$wpa")
+      w_freq=$(awk -F= '/^freq=/ { print $2; exit }' <<<"$wpa")
+      w_gen=$(generation "$(awk -F= '/^wifi_generation=/ { print $2; exit }' <<<"$wpa")")
+      w_signal=$(awk -v i="$wifi:" '$1 == i { sub(/\./, "", $4); print $4; exit }' /proc/net/wireless)
+      w_icon=$(signal_icon "$w_signal")
    fi
-}
-
-function gen_wifi() {
-  signal=$(cat /proc/net/wireless | head -n3 | tail -n1 | awk '{print $3}')
-  level=$(awk -v n="$signal" 'BEGIN{print int((n-1)/20)}')
-  if [ "$level" -gt 4 ]; then
-    level=4
  fi

-  icon=${icons[$level]}
-  ip="-"
-  class="net-connected"
-  name_raw=$(wpa_cli status | grep \^ssid= | sed 's/ssid=//g')
-  name=$(printf "%s" $name_raw)
-}
-
-function gen_ethernet() {
-  icon="󰈀"
-  class="net-connected"
-  ip=""
-  name=Wired
-}
-
-function make_content() {
-  local ethernet wifi
-  ethernet=$(ip link | rg "^[0-9]+: en[po]+" | head -n1 | sed 's/[a-zA-Z0-9_,><:\ -]*state //g' | sed 's/ mode [a-zA-Z0-9 ]*//g')
-  wifi=$(wpa_cli status | rg "^wpa_state=" | sed 's/wpa_state=//g')
-
-  # test ethernet first
-  if [[ $ethernet == "UP" ]]; then
-    gen_ethernet
-  elif [[ $wifi == "COMPLETED" ]]; then
-    gen_wifi
-  else
-    icon="󰤮"
-    ip="-"
-    class="net-disconnected"
-    name="Disconnected"
+  local e_connected=false e_ip="" e_speed="" spd
+  if [[ -n $eth ]] && ip -o link show "$eth" 2>/dev/null | grep -q "state UP"; then
+    e_connected=true
+    e_ip=$(ipv4 "$eth")
+    spd=$(cat "/sys/class/net/$eth/speed" 2>/dev/null)
+    [[ ${spd:-0} -gt 0 ]] 2>/dev/null && e_speed="${spd} Mbps"
  fi

-  echo '{"icon": "'$icon'", "name": "'$name'", "ip": "'$ip'", "class": "'$class'"}'
+  local u_connected=false u_ip=""
+  if [[ -n $usb ]]; then
+    u_ip=$(ipv4 "$usb")
+    [[ -n $u_ip ]] && u_connected=true
+  fi
+
+  printf '{"wifi":{"connected":%s,"enabled":%s,"icon":"%s","ssid":"%s","ip":"%s","freq":%s,"band":"%s","gen":"%s","signal":%s},' \
+    "$w_connected" "$w_enabled" "$w_icon" "$(jstr "$w_ssid")" "$w_ip" "${w_freq:-0}" "$(band "$w_freq")" "$w_gen" "${w_signal:-0}"
+  printf '"ethernet":{"connected":%s,"interface":"%s","ip":"%s","speed":"%s"},' \
+    "$e_connected" "$eth" "$e_ip" "$e_speed"
+  printf '"usb":{"connected":%s,"interface":"%s","ip":"%s"},' \
+    "$u_connected" "$usb" "$u_ip"
+  wg_json
+  printf '}'
 }

-if [ "$1" = "toggle" ]; then
-  toggle
-else
-  last_time=$(get_time_ms)
-  make_content
-  ip monitor | while read -r _; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    if [[ $delta -gt 50 ]]; then
-      make_content
-      last_time=$(get_time_ms)
+# --- WireGuard: interfaces from the wireguard-<name>.service units (so a
+# tunnel that is down still shows up) plus any live wireguard-type link.
+# `wg show` needs root, so peer names and the endpoint come from the peer
+# units instead.
+
+wg_ifaces() {
+  {
+    systemctl list-units --all --plain --no-legend 'wireguard-*.service' 2>/dev/null \
+      | awk '$1 !~ /-peer-/ { sub(/^wireguard-/, "", $1); sub(/\.service$/, "", $1); print $1 }'
+    ip -d -o link 2>/dev/null | awk '/ wireguard / { sub(":", "", $2); print $2 }'
+  } | sort -u
+}
+
+human_bytes() {
+  awk -v b="${1:-0}" 'BEGIN {
+    split("B KiB MiB GiB TiB", u, " "); i = 1
+    while (b >= 1024 && i < 5) { b /= 1024; i++ }
+    printf (i == 1 ? "%d %s" : "%.1f %s"), b, u[i] }'
+}
+
+wg_json() { # prints the "wireguard" array and the "vpn" summary
+  local name up ip rx tx peers endpoint peer_unit peer_script sep="" out="[" vpn_up=false vpn_name=""
+  while read -r name; do
+    [[ -n $name ]] || continue
+    up=false ip="" rx=0 tx=0 endpoint=""
+    if [[ -d /sys/class/net/$name ]]; then
+      ip -o link show "$name" 2>/dev/null | grep -q '<[^>]*UP' && up=true
+      ip=$(ipv4 "$name")
+      rx=$(<"/sys/class/net/$name/statistics/rx_bytes")
+      tx=$(<"/sys/class/net/$name/statistics/tx_bytes")
    fi
-  done
-fi
+    peers=$(systemctl list-units --all --plain --no-legend "wireguard-$name-peer-*.service" 2>/dev/null \
+      | awk '{ print $1 }' | sed "s/^wireguard-$name-peer-//; s/\.service\$//" | paste -sd, -)
+    peer_unit=$(systemctl list-units --all --plain --no-legend "wireguard-$name-peer-*.service" 2>/dev/null \
+      | awk 'NR == 1 { print $1 }')
+    # NixOS puts `wg set … endpoint "host:port"` in the peer unit's start script
+    if [[ -n $peer_unit ]]; then
+      peer_script=$(systemctl show -p ExecStart --value "$peer_unit" 2>/dev/null \
+        | sed -n 's/.*path=\([^ ;]*\).*/\1/p' | awk 'NR == 1')
+      [[ -r $peer_script ]] && endpoint=$(grep -o 'endpoint "[^"]*"' "$peer_script" 2>/dev/null \
+        | awk -F'"' 'NR == 1 { print $2 }')
+    fi
+    if [[ $up == true && $vpn_up == false ]]; then vpn_up=true vpn_name=$name; fi
+    [[ -z $vpn_name ]] && vpn_name=$name
+    out+="$sep{\"name\":\"$(jstr "$name")\",\"up\":$up,\"ip\":\"$ip\",\"rx\":\"$(human_bytes "$rx")\",\"tx\":\"$(human_bytes "$tx")\",\"peers\":\"$(jstr "$peers")\",\"endpoint\":\"$(jstr "$endpoint")\"}"
+    sep=,
+  done < <(wg_ifaces)
+  printf '"wireguard":%s],"vpn":{"up":%s,"name":"%s"}' "$out" "$vpn_up" "$(jstr "$vpn_name")"
+}
+
+refresh() { emit "$(state)"; }
+_link_events() { exec ip monitor link address; }
+
+refresh
+mux_init
+mux_add _link_events
+mux_tick 30
+mux_loop refresh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Bring the WireGuard tunnel $1 down (stop its service, which takes the peer
+# units with it) or up (start its target, which pulls service and peers).
+# Needs the polkit rule from modules/nixos/system/network/wireguard.
+name=$1
+[[ -n $name ]] || exit 64
+detach_self "$@"
+if [[ -d /sys/class/net/$name ]]; then
+  systemctl stop "wireguard-$name.service"
+else
+  systemctl start "wireguard-$name.target"
+fi
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Toggle wlsunset.  It runs as the transient user unit eww-nightlight, so it
+# survives eww restarts and can be stopped by name.
+unit=eww-nightlight
+
+active() { systemctl --user is-active --quiet "$unit" || pgrep -x wlsunset >/dev/null; }
+
+case ${1:-} in
+  status) active && echo true || echo false ;;
+  *)
+    detach_self "$@"
+    if active; then
+      systemctl --user stop "$unit" 2>/dev/null
+      pkill -x wlsunset
+      state=false
+    else
+      detach -u "$unit" wlsunset -T 4500 -t 3200
+      state=true
+    fi
+    eww update night-light="$state" 2>/dev/null
+    echo "$state"
+    ;;
+esac
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Toggle a panel of the popup window on the focused monitor.
+#
+# The popup hosts every panel behind revealers, so switching panels while it
+# is open is just a variable update (animated, no scripts restarted).  It is
+# only closed and re-opened when it has to move to another monitor.
+#
+# `eww open popup` takes longer than the client's 100 ms reply deadline, so
+# its exit status and error output are meaningless and ignored (the daemon
+# carries the command out anyway; the lib's eww wrapper makes sure a slow
+# reply can never spawn a second daemon).
+panel=$1
+[[ -n $panel ]] || exit 64
+detach_self "$@"
+
+# One toggle at a time; the lock dies with this process.  fd 9 is closed for
+# every eww call so nothing can inherit it.
+exec 9>"${XDG_RUNTIME_DIR:-/tmp}/eww-panel-toggle.lock"
+flock -n 9 || exit 0
+
+ew() { eww "$@" 9>&-; }
+
+current=$(ew get active-panel 2>/dev/null | tr -d '"')
+popup_screen=$(ew get popup-screen 2>/dev/null | tr -d '"')
+screen=$(eww-bar focused)
+if ew active-windows 2>/dev/null | grep -qx 'popup: popup'; then open=1; else open=0; fi
+
+if ((open)) && [[ $current == "$panel" ]]; then
+  ew update active-panel=
+  ew close popup 2>/dev/null
+elif ((open)) && [[ -n $screen && $popup_screen == "$screen" ]]; then
+  ew update active-panel="$panel"
+else
+  ((open)) && ew close popup 2>/dev/null
+  ew update active-panel="$panel" popup-screen="$screen"
+  if [[ -n $screen ]]; then
+    ew open popup --screen "$screen" >/dev/null 2>&1
+  else
+    ew open popup >/dev/null 2>&1
+  fi
+fi
+exit 0
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Toggle the power-saver profile (power-profiles-daemon).
+active() { [[ $(powerprofilesctl get 2>/dev/null) == power-saver ]]; }
+
+case ${1:-} in
+  status) active && echo true || echo false ;;
+  *)
+    detach_self "$@"
+    if active; then
+      powerprofilesctl set balanced 2>/dev/null
+      state=false
+    else
+      powerprofilesctl set power-saver 2>/dev/null
+      state=true
+    fi
+    eww update power-save="$state" 2>/dev/null
+    echo "$state"
+    ;;
+esac
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Toggle the full-screen power menu on the focused monitor.  The open's exit
+# status is ignored: it exceeds the client's 100 ms reply deadline.
+detach_self "$@"
+eww close popup 2>/dev/null
+eww update active-panel= 2>/dev/null
+screen=$(eww-bar focused)
+if [[ -n $screen ]]; then
+  eww open powermenu --toggle --screen "$screen" >/dev/null 2>&1
+else
+  eww open powermenu --toggle >/dev/null 2>&1
+fi
+exit 0
@@ -1,108 +1,225 @@
 #!/usr/bin/env bash
+# Internet radio (radiorecord.ru) and MPRIS "now playing" for the media panel.
+#
+#   radio                 status loop (deflisten)
+#   radio start ID        tune to station ID
+#   radio toggle          play / stop the last station
+#   radio stop
+#   radio vol PERCENT     volume of the radio stream, else of the external player
+#   radio mute            mute toggle, same target as vol
+#
+# mpv runs as the transient user unit eww-radio: independent of the eww
+# daemon, and `systemctl --user stop eww-radio` always works.

-get_time_ms() {
-  date -u +%s%3N
+api="https://www.radiorecord.ru/api"
+unit=eww-radio
+state_dir=${XDG_STATE_HOME:-$HOME/.local/state}/eww
+cache_dir=${XDG_CACHE_HOME:-$HOME/.cache}/eww
+id_file=$state_dir/radio-station
+mkdir -p "$state_dir" "$cache_dir"
+
+station_ids='[507,522,523,536,537,42532,42602]'
+# Extra stations: {id (unique integer >= 1000000), title, stream_hls, icon_fill_white ("" for none)}
+custom_stations='[]'
+
+default_song='{"artist":"","song":"","image600":""}'
+default_media='{"player":"","status":"Stopped","artist":"","title":"","art":""}'
+stations_cache="$cache_dir/radio-stations-$(cksum <<<"$station_ids$custom_stations" | cut -d' ' -f1).json"
+
+# --- stations --------------------------------------------------------------
+
+# Station list, cached for a day (it only changes with station_ids).
+stations() {
+  if [[ -s $stations_cache && -n $(find "$stations_cache" -mmin -1440 2>/dev/null) ]]; then
+    cat "$stations_cache"
+    return
+  fi
+  local rr out
+  rr=$(curl -sf --compressed --max-time 8 "$api/stations/" 2>/dev/null \
+    | jq -c --argjson ids "$station_ids" \
+      '.result.stations | map(select(.id | IN($ids[]))) | map({id, title, stream_hls, icon_fill_white, radiorecord: true})' 2>/dev/null)
+  if [[ -z $rr || $rr == null ]]; then
+    [[ -s $stations_cache ]] && { cat "$stations_cache"; return; }
+    rr='[]'
+  fi
+  out=$(jq -cn --argjson rr "$rr" --argjson custom "$custom_stations" '$rr + ($custom | map(. + {radiorecord: false}))')
+  [[ $rr != '[]' ]] && printf '%s\n' "$out" >"$stations_cache"
+  printf '%s\n' "$out"
 }

-URL_BASE="https://www.radiorecord.ru/api"
-
-MPV_PID_FILE="/tmp/mpv_radio_pid"
-RADIO_ID_FILE="/tmp/radio_id"
-
-STATIONS="[]"
-
-PID=$( [ -e "$MPV_PID_FILE" ] && cat "$MPV_PID_FILE" || echo 0 )
-RADIO_ID=$( [ -e "$RADIO_ID_FILE" ] && cat "$RADIO_ID_FILE" || echo 0 )
-RADIO_URL=""
-INFO='{"id":null,"artist":null,"song":null,"image600":null}'
-PAUSED=$(( $PID == 0 || $RADIO_ID == 0 ? 1 : 0 ))
-STATUS="{}"
-
-get_radio() {
-  echo "$STATIONS" | jq -r --argjson sel_id "$RADIO_ID" 'map(select(.id == $sel_id)).[0]'
+station() { # ID FIELD
+  jq -r --argjson id "${1:-0}" --arg f "$2" 'first(.[] | select(.id == $id) | .[$f]) // empty' <<<"$STATIONS"
 }

-get_song() {
-  echo $(curl -s "$URL_BASE/station/history/?id=$RADIO_ID" | jq '.result.history[0] | ({id, artist, song, image600})')
+current_id() {
+  local id
+  id=$(cat "$id_file" 2>/dev/null)
+  [[ $id =~ ^[0-9]+$ ]] && echo "$id" || echo 0
 }

+playing() { systemctl --user is-active --quiet "$unit"; }

-update() {
-  PID=$( [ -e "$MPV_PID_FILE" ] && cat "$MPV_PID_FILE" || echo 0 )
-  RADIO_ID=$( [ -e "$RADIO_ID_FILE" ] && cat "$RADIO_ID_FILE" || echo 0 )
-  PAUSED=$(( $PID == 0 && $RADIO_ID > 0 ? 1 : 0 ))
-}
+# --- playback --------------------------------------------------------------

 start() {
-  STATIONS=$(curl -s "$URL_BASE/stations/" | jq --argjson ids '[507,522,523,536,537,42532,42602]' '.result.stations | map(select(.id | IN($ids[]))) | map({id, title, stream_hls, icon_fill_white})')
-  RADIO_URL=$(get_radio | jq -r '.stream_hls')
-  if [ "$PAUSED" = 0 ]; then
-    kill -9 $PID
-  fi
-  mpv "$RADIO_URL" & echo $! > "$MPV_PID_FILE"
-  echo $RADIO_ID > "$RADIO_ID_FILE"
+  local id=${1:-0} url
+  ((id > 0)) || return 1
+  STATIONS=$(stations)
+  url=$(station "$id" stream_hls)
+  [[ -n $url && $url != null ]] || return 1
+  systemctl --user stop "$unit" 2>/dev/null
+  detach -u "$unit" mpv --no-video --really-quiet --audio-client-name="$unit" "$url" || return 1
+  printf '%s\n' "$id" >"$id_file"
 }

+stop() { systemctl --user stop "$unit" 2>/dev/null; }

-toggle() {
-  if [ "$PAUSED" = 1 ]; then
-    echo $RADIO_ID $PID
-    start
+# --- volume ----------------------------------------------------------------
+
+# PipeWire node id of the first stream whose line matches $1 (case-insensitive).
+stream_node() {
+  wpctl status 2>/dev/null | awk -v pat="$1" '
+    /Streams:/ { s = 1; next }
+    /Sinks:|Sources:|Filters:|Clients:/ { s = 0 }
+    s && tolower($0) ~ tolower(pat) && match($0, /[0-9]+\./) { print substr($0, RSTART, RLENGTH - 1); exit }'
+}
+
+external_player() { playerctl -l 2>/dev/null | grep -v '^mpv' | head -n1; }
+
+# "pw NODE" while the radio plays, else "mpris PLAYER" for an external player.
+volume_target() {
+  local n p
+  if playing; then
+    n=$(stream_node "$unit")
+    [[ -n $n ]] && { echo "pw $n"; return; }
+  fi
+  p=$(external_player)
+  [[ -n $p ]] && echo "mpris $p"
+}
+
+get_volume() {
+  local kind target
+  read -r kind target < <(volume_target)
+  case $kind in
+    pw) wpctl get-volume "$target" 2>/dev/null | awk '{ printf "%d", $2 * 100 + 0.5 }' ;;
+    mpris) playerctl -p "$target" volume 2>/dev/null | awk '{ printf "%d", $1 * 100 + 0.5 }' ;;
+  esac
+}
+
+set_volume() {
+  local vol=${1%.*} kind target
+  read -r kind target < <(volume_target)
+  case $kind in
+    pw) wpctl set-volume -l 1.0 "$target" "${vol}%" ;;
+    mpris) playerctl -p "$target" volume "$(awk -v v="$vol" 'BEGIN { printf "%.2f", v / 100 }')" 2>/dev/null ;;
+  esac
+  eww update radio-vol="$vol" 2>/dev/null
+}
+
+toggle_mute() {
+  local kind target n=""
+  read -r kind target < <(volume_target)
+  case $kind in
+    pw) n=$target ;;
+    mpris) n=$(stream_node "${target%%.*}") ;;
+  esac
+  [[ -n $n ]] || return
+  wpctl set-mute "$n" toggle
+  if wpctl get-volume "$n" 2>/dev/null | grep -q MUTED; then muted=true; else muted=false; fi
+  eww update radio-muted="$muted" 2>/dev/null
+}
+
+# --- status loop -----------------------------------------------------------
+
+media_json() { # PLAYER STATUS ARTIST TITLE ART
+  jq -cn --arg player "$1" --arg status "${2:-Stopped}" --arg artist "$3" --arg title "$4" --arg art "$5" \
+    '{player: $player, status: $status, artist: $artist, title: $title, art: $art}'
+}
+
+song_playing() { # ID → SONG from the station history (radiorecord) or the title
+  local id=$1 fetched
+  if [[ $(station "$id" radiorecord) == true ]]; then
+    fetched=$(curl -sf --compressed --max-time 8 "$api/station/history/?id=$id" 2>/dev/null \
+      | jq -c '.result.history[0] | {artist: (.artist // ""), song: (.song // ""), image600: (.image600 // "")}' 2>/dev/null)
+    [[ -n $fetched && $fetched != null ]] && SONG=$fetched
  else
-    kill -9 "$PID"
-    rm -f $MPV_PID_FILE
+    SONG=$(jq -cn --arg t "$(station "$id" title)" '{artist: "", song: $t, image600: ""}')
  fi
 }

-status() {
-  echo $(jq -cnr --argjson pid "$PID" --argjson stations "$STATIONS" --argjson radio_id "$RADIO_ID" --argjson is_paused "$PAUSED" --argjson info "$INFO" '{"is_paused": $is_paused, "song": $info, "radio": $radio_id, "stations": $stations}')
+song_idle() { # ID → placeholder with the station's name and logo
+  SONG=$(jq -cn --arg t "$(station "$1" title)" --arg i "$(station "$1" icon_fill_white)" \
+    '{artist: "", song: $t, image600: $i}')
 }

+# playerctl --follow line: media\tPLAYER\tSTATUS\tARTIST\tTITLE\tART
+media_event() {
+  local player status artist title art
+  IFS=$'\t' read -r player status artist title art <<<"$1"
+  if [[ -z $player ]]; then
+    MEDIA=$default_media MEDIA_PLAYER=""
+  elif [[ $player != mpv* ]]; then # the radio and jellyfin are mpv, not "external"
+    MEDIA=$(media_json "$player" "$status" "$artist" "$title" "$art")
+    MEDIA_PLAYER=$player
+  fi
+}
+
+_media_events() {
+  exec playerctl -a --follow metadata \
+    --format $'media\t{{playerName}}\t{{status}}\t{{artist}}\t{{title}}\t{{mpris:artUrl}}'
+}
+
+refresh() {
+  local line id now
+  for line in "$@"; do
+    [[ $line == media$'\t'* ]] && media_event "${line#media$'\t'}"
+  done
+  # a player that quit without a final metadata line
+  if [[ -n $MEDIA_PLAYER ]] && ! playerctl -l 2>/dev/null | grep -qx "$MEDIA_PLAYER"; then
+    MEDIA=$default_media MEDIA_PLAYER=""
+  fi
+
+  id=$(current_id)
+  now=$SECONDS
+  if playing; then
+    if [[ $PLAYING != true ]] || ((now - LAST_SONG >= 15)); then
+      PLAYING=true
+      song_playing "$id"
+      LAST_SONG=$now
+    fi
+  elif [[ $PLAYING != false ]]; then
+    PLAYING=false
+    song_idle "$id"
+  fi
+
+  emit "$(jq -cn --argjson stations "$STATIONS" --argjson radio "$id" \
+    --argjson paused "$([[ $PLAYING == true ]] && echo 0 || echo 1)" \
+    --argjson song "$SONG" --argjson media "$MEDIA" \
+    '{is_paused: $paused, song: $song, radio: $radio, stations: $stations, media: $media}')"
+
+  local v
+  v=$(get_volume)
+  if [[ -n $v && $v != "$LAST_VOL" ]]; then
+    LAST_VOL=$v
+    eww update radio-vol="$v" 2>/dev/null
+  fi
+}

 status_loop() {
-  STATUS=$(status)
-  echo $STATUS
-  STATIONS=$(curl -s "$URL_BASE/stations/" | jq --argjson ids '[507,522,523,536,537,42532,42602]' '.result.stations | map(select(.id | IN($ids[]))) | map({id, title, stream_hls, icon_fill_white})')
-  last_time_info=0
-  last_time=0
-  while true; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    delta_i=$((current_time - last_time_info))
-    if [[ $delta -gt 1000 ]]; then
-      PID=$( [ -e "$MPV_PID_FILE" ] && cat "$MPV_PID_FILE" || echo 0 )
-      RADIO_ID=$( [ -e "$RADIO_ID_FILE" ] && cat "$RADIO_ID_FILE" || echo 0 )
-      PAUSED=$(( $PID == 0 && $RADIO_ID > 0 ? 1 : 0 ))
-      NEW_STATUS=$(status)
-      if [[ "$NEW_STATUS" != "$STATUS" ]]; then
-        STATUS=$NEW_STATUS
-        echo $STATUS
-      fi
-      last_time=$current_time
-    fi
-    if [[ $delta_i -gt 15000 ]]; then
-      if [ "$PAUSED" = 1 ]; then
-        INFO="{\"id\":null,\"artist\":null,\"song\":null,\"image600\": \"$(get_radio | jq -r '.icon_fill_white')\"}"
-      else
-        INFO=$(echo "$INFO" "$(get_song)" | jq -s ' reduce .[] as $item ( {}; . + (
-            reduce ($item | to_entries[]) as $entry ( {}; if $entry.value != null then .[$entry.key] = $entry.value else . end
-          )) )')
-      fi
-      last_time_info=$current_time
-    fi
-  done
+  STATIONS=$(stations)
+  SONG=$default_song MEDIA=$default_media MEDIA_PLAYER="" PLAYING="" LAST_SONG=0 LAST_VOL=""
+  refresh
+  mux_init
+  mux_add _media_events
+  mux_tick 2
+  mux_loop refresh
 }

-# Main script
-case "$1" in
-  "start")
-    RADIO_ID=$2
-    start
-    ;;
-  "toggle")
-    toggle
-    ;;
-  *)
-    status_loop
-    ;;
+case ${1:-} in
+  start) detach_self "$@"; start "$2" ;;
+  stop) detach_self "$@"; stop ;;
+  toggle) detach_self "$@"; if playing; then stop; else start "$(current_id)"; fi ;;
+  vol) detach_self "$@"; set_volume "$2" ;;
+  mute) detach_self "$@"; toggle_mute ;;
+  *) status_loop ;;
 esac
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Toggle the warm/low-contrast screen shader.  fp16 rendering is switched off
+# with it: the shader is written for 8-bit output.
+shader="$HOME/.config/eww/shaders/read-mode.glsl"
+
+active() { hyprctl getoption decoration:screen_shader 2>/dev/null | grep -qF "$shader"; }
+
+case ${1:-} in
+  status) active && echo true || echo false ;;
+  *)
+    detach_self "$@"
+    if active; then
+      hyprctl eval 'hl.config({ decoration = { screen_shader = "" } })' >/dev/null
+      hyprctl eval 'hl.config({ render = { use_fp16 = 2 } })' >/dev/null
+      state=false
+    else
+      hyprctl eval 'hl.config({ render = { use_fp16 = 0 } })' >/dev/null
+      hyprctl eval "hl.config({ decoration = { screen_shader = \"$shader\" } })" >/dev/null
+      state=true
+    fi
+    eww update read-mode="$state" 2>/dev/null
+    echo "$state"
+    ;;
+esac
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Region screenshot → satty (annotate, copy to clipboard), detached from eww.
+eww close popup 2>/dev/null
+eww update active-panel= 2>/dev/null
+hyprshot=$(command -v hyprshot)
+satty=$(command -v satty)
+wl_copy=$(command -v wl-copy)
+detach "$BASH" -c 'sleep 0.15; "$1" -m region --raw | "$2" --filename - --early-exit --action-on-enter save-to-clipboard --copy-command "$3"' \
+  screenshot "$hyprshot" "$satty" "$wl_copy"
@@ -1,61 +1,118 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env bash
+# Battery state from sysfs; refreshes on power_supply udev events and every
+# 30 s.  Emits a `state` (charging / discharging / low / critical / full /
+# idle) that the CSS maps to a colour, instead of hard-coding one here.
+#
+# Every refresh also appends a sample to $XDG_STATE_HOME/eww/battery.log,
+# which feeds the drain rate (%/h) and the history plot.

-icons=("󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹")
-num_icons=$(awk -v n="${#icons[@]}" 'BEGIN{print 100 / n}')
-BATTERY="/sys/class/power_supply/BAT0"
-
-geticon() {
-  level=$(awk -v n="$CAPACITY" -v c="$num_icons" 'BEGIN{print int(n/c-1)}')
-  echo "${icons[$level]}"
-}
-
-status() {
-  if [ "$STATE" = "Charging" ]; then
-    echo -n "Charging"
-
-    if [ "$RATE" -gt 0 ]; then
-      echo ", $(gettime) left"
-    else
-      echo ""
-    fi
-  elif [ "$STATE" = "Discharging" ]; then
-    echo "$(gettime)h left"
-  else
-    echo "Fully Charged"
-  fi
-}
-
-color() {
-  [ "$CAPACITY" -le 20 ] && echo '#f38ba8' || echo '#a6e3a1'
-}
-
-wattage() {
-  awk -v rate="$RATE" -v uw="1000000" 'BEGIN{print sprintf("%.1f W", rate/uw)}'
-}
-
-gettime() {
-  FULL=$(cat $BATTERY/energy_full)
-  NOW=$(cat $BATTERY/energy_now)
-
-  if [ "$RATE" -gt 0 ]; then
-    if [ "$STATE" = "Discharging" ]; then
-      EX=$(( ($NOW*1.0) / $RATE))
-    else
-      EX=$(( (($FULL - $NOW)*1.0) / $RATE))
-    fi
-    date -u -d@"$(awk -v ex="$EX" 'BEGIN{print ex * 3600}')" +%H:%M
-  fi
-}
-
-if [ -d "$BATTERY" ]; then
-  while true; do
-    RATE=$(cat $BATTERY/power_now)
-    CAPACITY=$(cat $BATTERY/capacity)
-    STATE=$(cat $BATTERY/status)
-
-    echo '{ "visible": true, "icon": "'$(geticon)'", "percentage": '$CAPACITY', "wattage": "'$(wattage)'", "status": "'$(status)'", "color": "'$(color)'" }'
-    sleep 15
-  done
-else
-  echo '{ "visible": false,  "icon": "", "percentage": 0, "wattage": "", "status": "", "color": "#a6e3a1" }'
+bat=""
+for d in /sys/class/power_supply/*; do
+  [[ -r $d/type && $(<"$d/type") == Battery ]] && { bat=$d; break; }
+done
+if [[ -z $bat ]]; then
+  echo '{"visible":false,"percentage":0,"wattage":"","status":"","time":"","state":"none","rate":"","history":[]}'
+  exit 0
 fi
+
+log=${XDG_STATE_HOME:-$HOME/.local/state}/eww/battery.log
+hist_hours=6 buckets=24
+mkdir -p "${log%/*}" && touch "$log"
+
+attr() { # first readable, non-empty attribute of the list, else 0
+  local a v
+  for a in "$@"; do
+    v=$(cat "$bat/$a" 2>/dev/null) && [[ -n $v ]] && { echo "$v"; return; }
+  done
+  echo 0
+}
+
+hours_to_clock() { awk -v h="$1" 'BEGIN { printf "%d:%02d", int(h), int((h - int(h)) * 60 + 0.5) }'; }
+
+# Append "epoch pct state" and, once the head is an hour past the plot window,
+# drop everything older than the window.
+log_sample() {
+  local now=$1 first
+  printf '%s %s %s\n' "$now" "$2" "$3" >> "$log"
+  read -r first _ < "$log"
+  ((first < now - (hist_hours + 1) * 3600)) || return 0
+  awk -v min=$((now - hist_hours * 3600)) '$1 >= min' "$log" > "$log.tmp" && mv "$log.tmp" "$log"
+}
+
+# %/h over the last 30 min of samples in the current state, signed; empty
+# until there are 5 min of them.
+drain_rate() {
+  awk -v now="$1" -v st="$2" '
+    $1 >= now - 1800 && $3 == st { if (!n++) { t0 = $1; p0 = $2 } t1 = $1; p1 = $2 }
+    END { if (n > 1 && t1 - t0 >= 300) printf "%.1f", (p1 - p0) * 3600 / (t1 - t0) }' "$log"
+}
+
+# The plot window split into buckets: mean % of the bucket's samples (-1 when
+# it has none), the state of its last sample, and its start time as label.
+plot() {
+  awk -v now="$1" -v hours="$hist_hours" -v n="$buckets" '
+    BEGIN { w = hours * 3600 / n; t0 = now - hours * 3600 }
+    $1 >= t0 { b = int(($1 - t0) / w); if (b >= n) b = n - 1; sum[b] += $2; cnt[b]++; st[b] = $3 }
+    END {
+      printf "["
+      for (b = 0; b < n; b++) {
+        p = -1; s = "none"
+        if (cnt[b]) {
+          p = sprintf("%.1f", sum[b] / cnt[b])
+          s = st[b] == "c" ? "charging" : st[b] == "d" ? "discharging" : "idle"
+          if (st[b] == "d" && p < 25) s = "low"
+          if (st[b] == "d" && p <= 15) s = "critical"
+        }
+        printf "%s{\"t\":\"%s\",\"p\":%s,\"s\":\"%s\"}", (b ? "," : ""), strftime("%H:%M", t0 + b * w), p, s
+      }
+      printf "]"
+    }' "$log"
+}
+
+state() {
+  local now cap status rate now_e full power pct st time="" wattage state
+  now=$(printf '%(%s)T' -1)
+  cap=$(attr capacity)
+  status=$(attr status)
+  rate=$(attr power_now current_now) # µW or µA
+  now_e=$(attr energy_now charge_now) # µWh or µAh — same unit as rate, so now_e/rate = hours
+  full=$(attr energy_full charge_full)
+  if [[ -r $bat/power_now ]]; then power=$rate; else power=$((rate * $(attr voltage_now) / 1000000)); fi
+  wattage=$(awk -v p="$power" 'BEGIN { printf "%.1f W", p / 1000000 }')
+  pct=$(awk -v n="$now_e" -v f="$full" -v c="$cap" 'BEGIN { printf "%.1f", (f > 0 ? 100 * n / f : c) }')
+  if ((rate > 0)); then
+    case $status in
+      Discharging) time=$(hours_to_clock "$(awk -v n="$now_e" -v r="$rate" 'BEGIN { print n / r }')") ;;
+      Charging) time=$(hours_to_clock "$(awk -v n="$now_e" -v f="$full" -v r="$rate" 'BEGIN { print (f - n) / r }')") ;;
+    esac
+  fi
+  case $status in
+    Charging)
+      state=charging st=c
+      status="Charging${time:+, $time left}"
+      ;;
+    Discharging)
+      state=discharging st=d
+      ((cap < 25)) && state=low
+      ((cap <= 15)) && state=critical
+      status=${time:+$time left}
+      ;;
+    Full)
+      state=full st=i
+      status="Fully charged"
+      ;;
+    *) state=idle st=i ;;
+  esac
+  log_sample "$now" "$pct" "$st"
+  printf '{"visible":true,"percentage":%s,"wattage":"%s","status":"%s","time":"%s","state":"%s","rate":"%s","history":%s}' \
+    "$cap" "$wattage" "$(jstr "$status")" "$time" "$state" "$(drain_rate "$now" "$st")" "$(plot "$now")"
+}
+
+refresh() { emit "$(state)"; }
+_ps_events() { exec udevadm monitor --udev --subsystem-match=power_supply; }
+
+refresh
+mux_init
+mux_add _ps_events
+mux_tick 30
+mux_loop refresh
@@ -1 +0,0 @@
-#!/usr/bin/env zsh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# CPU package temperature in °C from the first known hwmon driver.
+for name in k10temp zenpower coretemp cpu_thermal acpitz; do
+  for d in /sys/class/hwmon/hwmon*; do
+    [[ -r $d/name && $(<"$d/name") == "$name" && -r $d/temp1_input ]] || continue
+    awk '{ printf "%d\n", $1 / 1000 }' "$d/temp1_input"
+    exit 0
+  done
+done
+echo 0
@@ -1,3 +1,24 @@
-#!/usr/bin/env zsh
-
-amdgpu_top -J -s 5000 | sed 's/ //g' 
+#!/usr/bin/env bash
+# AMD GPU activity, clocks, temperature, power and VRAM via amdgpu_top's JSON
+# stream, flattened to what the widgets need.
+exec amdgpu_top -J -s 5000 | jq -c --unbuffered '.devices[0] | {
+  gfx_pct:   (.gpu_activity.GFX.value // 0),
+  mem_pct:   (.gpu_activity.Memory.value // 0),
+  media_pct: (.gpu_activity.MediaEngine.value // 0),
+  sclk:      (.Sensors.GFX_SCLK.value // 0),
+  mclk:      (.Sensors.GFX_MCLK.value // 0),
+  sclk_pct:  (if (.Info["GPU Clock"].max != .Info["GPU Clock"].min) then
+                100 * ((.Sensors.GFX_SCLK.value // 0) - .Info["GPU Clock"].min) / (.Info["GPU Clock"].max - .Info["GPU Clock"].min)
+              else 0 end),
+  mclk_pct:  (if (.Info["Memory Clock"].max != .Info["Memory Clock"].min) then
+                100 * ((.Sensors.GFX_MCLK.value // 0) - .Info["Memory Clock"].min) / (.Info["Memory Clock"].max - .Info["Memory Clock"].min)
+              else 0 end),
+  vclk:      (.gpu_metrics.average_vclk_frequency // 0),
+  vclk_pct:  (if (.Info["GPU Clock"].max > 0) then
+                100 * (.gpu_metrics.average_vclk_frequency // 0) / .Info["GPU Clock"].max
+              else 0 end),
+  temp:       (.Sensors["Edge Temperature"].value // 0),
+  power:      (.Sensors["Average Power"].value // 0),
+  vram_used:  (.VRAM["Total VRAM Usage"].value // 0),
+  vram_total: (.VRAM["Total VRAM"].value // 1)
+}'
@@ -1,12 +1,18 @@
-#!/usr/bin/env zsh
-
-total="$(free --si | rg Mem | awk '{print $2}')"
-
-human() {
-  awk -v mem="$1" 'BEGIN{print sprintf("%.1f%s", mem/1000/(mem > 1000000 ? 1000 : 1), mem > 1000000 ? "G" : "M")}'
-}
-
-free --si -s 3 | rg --line-buffered Mem | while read -r line; do
-  used=$(echo "$line" | awk '{print $3}')
-  echo '{"human": { "total": "'$(human "$total")'", "used": "'$(human "$used")'"}, "total": "'$total'" , "used": "'$used'"}'
+#!/usr/bin/env bash
+# RAM and swap from /proc/meminfo every 3 s.  "used" follows `free`
+# (total - available); "cached" is buffers + page cache + reclaimable slab.
+# Human values use SI units like the previous `free --si`.
+while :; do
+  awk '
+    /^MemTotal:/     { t = $2 }   /^MemAvailable:/ { a = $2 }
+    /^Buffers:/      { b = $2 }   /^Cached:/       { c = $2 }
+    /^SReclaimable:/ { s = $2 }   /^SwapTotal:/    { st = $2 }
+    /^SwapFree:/     { sf = $2 }
+    function h(kb) { return kb >= 1000000 ? sprintf("%.1fG", kb / 1000000) : sprintf("%.0fM", kb / 1000) }
+    END {
+      used = t - a; cached = b + c + s; su = st - sf
+      printf "{\"total\":%d,\"used\":%d,\"cached\":%d,\"human\":{\"total\":\"%s\",\"used\":\"%s\",\"cached\":\"%s\"},", t, used, cached, h(t), h(used), h(cached)
+      printf "\"swap\":{\"total\":%d,\"used\":%d,\"human\":{\"total\":\"%s\",\"used\":\"%s\"}}}\n", st, su, h(st), h(su)
+    }' /proc/meminfo
+  sleep 3
 done
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-function get_time_ms {
-  date -u +%s%3N
-}
-
-icons=("󰛩" "󱩒" "󰛨")
-
-gen_output() {
-  icon="${icons[$(awk -v n="$(brillo)" 'BEGIN{print int(n/34)}')]}"
-  prcnt=$(brillo | xargs printf "%.*f\n" "0")
-  echo '{"percent": '$prcnt', "icon": "'$icon'"}'
-}
-
-if [[ $(brillo 2>/dev/stdout 1>/dev/null | head -n1 | awk '{print $1}') == "No" ]]; then
-  echo  '{"percent":  100, "icon": "󰛨"}'
-elif [ "$1" = "" ]; then
-  # initial
-  last_time=$(get_time_ms)
-  gen_output
-
-  udevadm monitor | rg --line-buffered "backlight" | while read -r _; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    if [[ $delta -gt 50 ]]; then
-      gen_output
-      last_time=$(get_time_ms)
-    fi
-  done
-fi
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-icon() {
-  [ "$STATUS" = "no" ] && echo "󰀞" || echo "󰀝"
-}
-
-toggle() {
-  if [ "$STATUS" = "no" ]; then
-    rfkill block all
-  else
-    rfkill unblock all
-  fi
-}
-
-if [ "$1" = "toggle" ]; then
-  toggle
-else
-  icon
-  rfkill event | while read -r _; do
-    STATUS="$(rfkill list | sed -n 2p | awk '{print $3}')"
-    icon
-  done
-fi
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-icon() {
-  [ "$STATUS" = "no" ] && echo "󰌪" || echo "󱐋"
-}
-
-toggle() {
-  if [ "$STATUS" = "no" ]; then
-    echo ""
-  else
-    echo ""
-  fi
-}
-
-if [ "$1" = "toggle" ]; then
-  toggle
-  icon
-else
-  icon
-fi
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-function get_time_ms {
-  date -u +%s%3N
-}
-
-volicons=("󰕿" "󰖀" "󰕾")
-
-vol() {
-  wpctl get-volume @DEFAULT_AUDIO_"$1"@ | awk '{print int($2*100)}'
-}
-ismuted() {
-  wpctl get-volume @DEFAULT_AUDIO_"$1"@ | rg -qi muted
-  echo -n $?
-}
-setvol() {
-  wpctl set-volume @DEFAULT_AUDIO_"$1"@ "$(awk -v n="$2" 'BEGIN{print (n / 100)}')"
-}
-setmute() {
-  wpctl set-mute @DEFAULT_AUDIO_"$1"@ toggle
-}
-
-gen_output() {
-  percent="$(vol "SINK")"
-  lvl=$(awk -v n="$percent" 'BEGIN{print int(n/34)}')
-  ismuted=$(ismuted "SINK")
-
-  if [ "$ismuted" = 1 ]; then
-    icon="${volicons[$lvl]}"
-  else
-    icon="󰝟"
-  fi
-
-  echo '{"icon": "'$icon'", "percent": '$(vol "SINK")', "microphone": '$(vol "SOURCE")'}'
-}
-
-if [ "$1" = "mute" ]; then
-  if [ "$2" != "SOURCE" ] && [ "$2" != "SINK" ]; then
-    echo "Can only mute SINK or SOURCE"
-    exit 1
-  fi
-  setmute "$2"
-elif [ "$1" = "setvol" ]; then
-  if [ "$2" != "SOURCE" ] && [ "$2" != "SINK" ]; then
-    echo "Can only set volume for SINK or SOURCE"
-    exit 1
-  elif [ "$3" -lt 0 ] || [ "$3" -gt 100 ]; then
-    echo "Volume must be between 0 and 100"
-    exit 1
-  fi
-  setvol "$2" "$3"
-else
-  last_time=$(get_time_ms)
-  gen_output
-
-  pw-cli -m 2>/dev/null | rg --line-buffered "PipeWire:Interface:Client" | while read -r event; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    if [[ $delta -gt 50 ]]; then
-      gen_output
-      last_time=$(get_time_ms)
-    fi
-  done
-fi
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# Default sink / source volume for the popup.  Refreshes on PipeWire events
+# (pactl subscribe on the pipewire-pulse socket) and every 30 s.
+#
+#   volume                 status loop (deflisten)
+#   volume setvol SINK|SOURCE PERCENT
+#   volume mute   SINK|SOURCE
+
+icons=("󰕿" "󰖀" "󰕾")
+
+level() { # prints "<percent> <muted>"
+  wpctl get-volume "@DEFAULT_AUDIO_$1@" 2>/dev/null \
+    | awk '{ printf "%d %s\n", $2 * 100 + 0.5, ($0 ~ /MUTED/) ? "true" : "false" }'
+}
+
+sink_name() {
+  wpctl inspect @DEFAULT_AUDIO_SINK@ 2>/dev/null \
+    | awk -F'"' '/node\.nick/ { n = $2 } /node\.description/ { d = $2 } END { print (n != "" ? n : d) }'
+}
+
+state() {
+  local vol muted mic mic_muted icon mic_icon lvl
+  read -r vol muted < <(level SINK)
+  read -r mic mic_muted < <(level SOURCE)
+  vol=${vol:-0} muted=${muted:-false} mic=${mic:-0} mic_muted=${mic_muted:-false}
+  lvl=$((vol >= 67 ? 2 : vol >= 34 ? 1 : 0))
+  if [[ $muted == true ]]; then icon="󰝟"; else icon=${icons[$lvl]}; fi
+  if [[ $mic_muted == true ]]; then mic_icon="󰍭"; else mic_icon="󰍬"; fi
+  printf '{"icon":"%s","percent":%d,"sink_muted":%s,"mic_icon":"%s","microphone":%d,"source_muted":%s,"sink":"%s"}' \
+    "$icon" "$vol" "$muted" "$mic_icon" "$mic" "$mic_muted" "$(jstr "$(sink_name)")"
+}
+
+refresh() { emit "$(state)"; }
+_pw_events() { pactl subscribe 2>/dev/null | grep --line-buffered -E "on (sink|source|server) "; }
+
+case ${1:-} in
+  mute) wpctl set-mute "@DEFAULT_AUDIO_$2@" toggle ;;
+  setvol) wpctl set-volume -l 1.0 "@DEFAULT_AUDIO_$2@" "${3%.*}%" ;;
+  *)
+    refresh
+    mux_init
+    mux_add _pw_events
+    mux_tick 30
+    mux_loop refresh
+    ;;
+esac
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Wallpaper chooser (wofi + awww), detached from eww.
+eww close popup 2>/dev/null
+eww update active-panel= 2>/dev/null
+detach "$BASH" "$HOME/.config/script/wallpaper.sh"
@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+# Weather from met.no for the IP-geolocated position.  The last result is
+# cached on disk, so re-opening the panel is instant and offline-safe; the
+# network is hit at most every 10 minutes.
+
+fallback='{"temp":0,"feelslike":0,"humidity":0,"wind":0,"desc":"Unavailable","icon":"󰖐","city":""}'
+cache_dir=${XDG_CACHE_HOME:-$HOME/.cache}/eww
+loc_cache=$cache_dir/weather-location.json
+wx_cache=$cache_dir/weather.json
+interval=600
+ua="eww-bar/1.0 cedric.hoelzl@gmail.com"
+mkdir -p "$cache_dir"
+
+fresh() { [[ -s $1 ]] && [[ -n $(find "$1" -mmin "-$2" 2>/dev/null) ]]; } # FILE MINUTES
+
+location() {
+  fresh "$loc_cache" 60 && { cat "$loc_cache"; return; }
+  local data
+  if data=$(curl -sf --max-time 5 "http://ip-api.com/json?fields=lat,lon,city"); then
+    printf '%s' "$data" | tee "$loc_cache"
+  elif [[ -s $loc_cache ]]; then
+    cat "$loc_cache"
+  else
+    return 1
+  fi
+}
+
+icon_for() {
+  case $1 in
+    *thunder*) echo "󰖔" ;;
+    *snow* | *sleet*) echo "󰖘" ;;
+    heavyrain*) echo "󰖖" ;;
+    *rain* | *shower*) echo "󰖗" ;;
+    fog*) echo "󰖑" ;;
+    cloudy*) echo "󰖐" ;;
+    partlycloudy*) echo "󰖕" ;;
+    fair* | clearsky*) echo "󰖙" ;;
+    *) echo "󰖐" ;;
+  esac
+}
+
+desc_for() {
+  local c=$1
+  c=${c%_day}; c=${c%_night}; c=${c%_polartwilight}
+  case $c in
+    clearsky) echo "Clear sky" ;;
+    fair) echo "Fair" ;;
+    partlycloudy) echo "Partly cloudy" ;;
+    cloudy) echo "Cloudy" ;;
+    fog) echo "Foggy" ;;
+    lightrain) echo "Light rain" ;;
+    rain) echo "Rain" ;;
+    heavyrain) echo "Heavy rain" ;;
+    lightrainshowers) echo "Light showers" ;;
+    rainshowers) echo "Rain showers" ;;
+    heavyrainshowers) echo "Heavy showers" ;;
+    lightrainandthunder) echo "Light rain & thunder" ;;
+    rainandthunder) echo "Rain & thunder" ;;
+    heavyrainandthunder) echo "Heavy rain & thunder" ;;
+    *showersandthunder) echo "Showers & thunder" ;;
+    lightsleet | lightsleetshowers) echo "Light sleet" ;;
+    sleet | sleetshowers) echo "Sleet" ;;
+    heavysleet | heavysleetshowers) echo "Heavy sleet" ;;
+    *sleetandthunder) echo "Sleet & thunder" ;;
+    lightsnow | lightsnowshowers) echo "Light snow" ;;
+    snow | snowshowers) echo "Snow" ;;
+    heavysnow | heavysnowshowers) echo "Heavy snow" ;;
+    *snowandthunder) echo "Snow & thunder" ;;
+    *) echo "$c" ;;
+  esac
+}
+
+fetch() {
+  local loc lat lon city data temp humidity wind code feelslike
+  loc=$(location) || return 1
+  read -r lat lon city < <(jq -r '"\(.lat) \(.lon) \(.city)"' <<<"$loc")
+  data=$(curl -sf --max-time 8 -H "User-Agent: $ua" -H "Accept: application/json" \
+    "https://api.met.no/weatherapi/locationforecast/2.0/compact?lat=$lat&lon=$lon") || return 1
+  read -r temp humidity wind code < <(jq -r '
+    .properties.timeseries[0].data
+    | "\(.instant.details.air_temperature | round) \(.instant.details.relative_humidity | round) \(.instant.details.wind_speed * 3.6 | floor) \(.next_1_hours.summary.symbol_code // .next_6_hours.summary.symbol_code // "cloudy")"' <<<"$data")
+  [[ -n $temp ]] || return 1
+  # Apparent temperature: wind chill below 10 °C, otherwise the air temperature.
+  feelslike=$(awk -v t="$temp" -v v="$wind" 'BEGIN {
+    if (v > 4.8 && t < 10) printf "%d", 13.12 + 0.6215 * t - 11.37 * (v ^ 0.16) + 0.3965 * t * (v ^ 0.16)
+    else printf "%d", t }')
+  printf '{"temp":%s,"feelslike":%s,"humidity":%s,"wind":%s,"desc":"%s","icon":"%s","city":"%s"}' \
+    "$temp" "$feelslike" "$humidity" "$wind" "$(desc_for "$code")" "$(icon_for "$code")" "$(jstr "$city")"
+}
+
+refresh() {
+  local out
+  if fresh "$wx_cache" $((interval / 60)); then
+    emit "$(cat "$wx_cache")"
+  elif out=$(fetch); then
+    printf '%s\n' "$out" >"$wx_cache"
+    emit "$out"
+  elif [[ -s $wx_cache ]]; then
+    emit "$(cat "$wx_cache")"
+  else
+    emit "$fallback"
+  fi
+}
+
+refresh
+while sleep "$interval"; do refresh; done
@@ -1,86 +1,135 @@
 #!/usr/bin/env bash
+# Workspace indicator: numbered workspaces 1-9, preceded by named (special)
+# workspaces except the scratchpad.  Keeps a local model of Hyprland's state
+# from socket2 events and only calls hyprctl on structural changes.
+#
+# Entry: {id, name, target, state: focused|active|running|empty,
+#         color: blue|red|grey, sep}

-colors=("blue" "blue" "green" "red")
-empty="grey"
+declare -A ws_windows=() ws_name=() ws_urgent=() mon_active=()
+focused_ws="" focused_monitor=""

-# get initial focused workspace
-focusedws=$(hyprctl -j monitors | jaq -r '.[] | select(.focused == true) | .activeWorkspace.id')
+hypr_json() { hyprctl -j "$1" 2>/dev/null; }

-declare -A o=([1]=0 [2]=0 [3]=0 [4]=0 [5]=0 [6]=0 [7]=0 [8]=0 [9]=0 [10]=0)
-declare -A monitormap
-declare -A workspaces
+load_workspaces() {
+  local raw id windows name
+  raw=$(hypr_json workspaces) || return
+  ws_windows=()
+  ws_name=()
+  while read -r id windows name; do
+    ws_windows[$id]=$windows
+    ws_name[$id]=$name
+  done < <(jaq -r '.[] | "\(.id) \(.windows) \(.name)"' <<<"$raw")
+}

-# set color for each workspace
-status() {
-  if [ "${o[$1]}" -eq 1 ]; then
-    mon=${monitormap[${workspaces[$1]}]}
-    echo -n "${colors[$mon]}"
+load_monitors() {
+  local raw name active focused
+  raw=$(hypr_json monitors) || return
+  mon_active=()
+  while read -r name active focused; do
+    mon_active[$name]=$active
+    if [[ $focused == true ]]; then
+      focused_ws=$active
+      focused_monitor=$name
+    fi
+  done < <(jaq -r '.[] | "\(.name) \(.activeWorkspace.id) \(.focused)"' <<<"$raw")
+}
+
+load_urgent() {
+  local raw id
+  raw=$(hypr_json clients) || return
+  ws_urgent=()
+  while read -r id; do ws_urgent[$id]=1; done \
+    < <(jaq -r '.[] | select(.urgent) | .workspace.id' <<<"$raw")
+}
+
+# Window address → workspace id.  Events carry the address without the 0x
+# prefix that hyprctl uses, which is why urgency never showed up before.
+window_workspace() {
+  hypr_json clients | jaq -r --arg a "0x$1" 'first(.[] | select(.address == $a) | .workspace.id) // empty'
+}
+
+ws_state() { # sets _state / _color for workspace $1
+  local id=$1 mon
+  _state=empty
+  _color=grey
+  if [[ $id == "$focused_ws" ]]; then
+    _state=focused
  else
-    echo -n "$empty"
+    for mon in "${!mon_active[@]}"; do
+      [[ ${mon_active[$mon]} == "$id" ]] && { _state=active; break; }
+    done
+    [[ $_state == empty && ${ws_windows[$id]:-0} -gt 0 ]] && _state=running
+  fi
+  if [[ $_state != empty ]]; then
+    if [[ ${ws_urgent[$id]:-0} == 1 ]]; then _color=red; else _color=blue; fi
  fi
 }

-# handle workspace create/destroy
-workspace_event() {
-  while read -r k v; do workspaces[$k]="$v"; done < <(hyprctl -j workspaces | jaq -jr '.[] | .id, " ", .monitor, "\n"')
-}
-# handle monitor (dis)connects
-monitor_event() {
-  while read -r k v; do monitormap["$k"]=$v; done < <(hyprctl -j monitors | jaq -jr '.[] | .name, " ", .id, "\n"')
+entry() { # id name target [sep]
+  ws_state "$1"
+  printf '{"id":%s,"name":"%s","target":"%s","state":"%s","color":"%s","sep":%s}' \
+    "$1" "$(jstr "$2")" "$(jstr "$3")" "$_state" "$_color" "${4:-false}"
 }

-# get all apps titles in a workspace
-applist() {
-  ws="$1"
-
-  apps=$(hyprctl -j clients | jaq -jr '.[] | select(.workspace.id == '"$ws"') | .title + "\\n"')
-  echo -En "${apps%"\n"}"
-}
-
-# generate the json for eww
 generate() {
-  echo -n '['
-
-  for i in {1..10}; do
-    echo -n ''"$([ "$i" -eq 1 ] || echo ,)" '{"number": "'"$i"'", "color": "'"$(status "$i")"'", "focused": '"$([ "$focusedws" = "$i" ] && echo "true" || echo "false")"'}' #, "tooltip": "'$(applist "$i")'" }'
+  local out='[' sep='' id i named=()
+  for id in "${!ws_name[@]}"; do
+    [[ $id == -* && ${ws_name[$id]} != "special:magic" ]] && named+=("$id")
  done
-
-  echo ']'
+  if ((${#named[@]})); then
+    while read -r id; do
+      out+="$sep$(entry "$id" "${ws_name[$id]}" "name:${ws_name[$id]}")"
+      sep=,
+    done < <(printf '%s\n' "${named[@]}" | sort -n)
+  fi
+  for i in {1..9}; do
+    if ((i == 1 && ${#named[@]})); then
+      out+="$sep$(entry "$i" "$i" "$i" true)"
+    else
+      out+="$sep$(entry "$i" "$i" "$i")"
+    fi
+    sep=,
+  done
+  emit "$out]"
 }

-# setup
-
-# add monitors
-monitor_event
-
-# add workspaces
-workspace_event
-
-# check occupied workspaces
-for num in "${!workspaces[@]}"; do
-  o[$num]=1
-done
-# generate initial widget
+load_workspaces
+load_monitors
+load_urgent
 generate

-# main loop
-socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | rg --line-buffered "workspace|mon(itor)?" | while read -r line; do
-  case ${line%>>*} in
-  "workspace")
-    focusedws=${line#*>>}
+hypr_socket="$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock"
+events='^(workspacev2|focusedmonv2|urgent|openwindow|closewindow|movewindowv2|createworkspacev2|destroyworkspacev2|moveworkspacev2|renameworkspace|monitoraddedv2|monitorremovedv2)>>'
+
+while IFS= read -r line; do
+  event=${line%%>>*}
+  data=${line#*>>}
+  case $event in
+    workspacev2) # WORKSPACEID,WORKSPACENAME
+      focused_ws=${data%%,*}
+      unset "ws_urgent[$focused_ws]"
+      [[ -n $focused_monitor ]] && mon_active[$focused_monitor]=$focused_ws
      ;;
-  "focusedmon")
-    focusedws=${line#*,}
+    focusedmonv2) # MONNAME,WORKSPACEID
+      focused_monitor=${data%%,*}
+      focused_ws=${data#*,}
+      unset "ws_urgent[$focused_ws]"
+      mon_active[$focused_monitor]=$focused_ws
      ;;
-  "createworkspace")
-    o[${line#*>>}]=1
+    urgent) # WINDOWADDRESS
+      id=$(window_workspace "$data")
+      [[ -n $id && $id != "$focused_ws" ]] && ws_urgent[$id]=1
      ;;
-  "destroyworkspace")
-    o[${line#*>>}]=0
+    openwindow | movewindowv2) load_workspaces ;;
+    closewindow)
+      load_workspaces
+      load_urgent
      ;;
-  "monitor"*)
-    monitor_event
+    *)
+      load_workspaces
+      load_monitors
      ;;
  esac
  generate
-done
+done < <(socat -u UNIX-CONNECT:"$hypr_socket" - | rg --line-buffered "$events")
@@ -0,0 +1,133 @@
+#version 320 es
+
+/*
+   I love e-ink displays!
+   The mathematical philosophy here is using deterministic logic (Bayer matrices, arithmetic hashing) 
+   to simulate physical chaos (paper grain, ink bleed). I picked up these concepts in a course 
+   and this is easily the best real-world application of them I've found. 
+   It works brilliantly-looks like real paper, killed my eye strain, and even reduced the insane 
+   reflections from my glossy surface display.
+
+   by @snes19xx, https://github.com/snes19xx
+*/
+
+
+precision highp float;
+in vec2 v_texcoord;
+uniform sampler2D tex;
+out vec4 fragColor;
+
+// 4x4 Bayer Matrix
+// this grid helps break up smooth gradients into texture so it looks less "digital"
+float getBayer(vec2 pos) {
+    int x = int(mod(pos.x, 4.0));
+    int y = int(mod(pos.y, 4.0));
+    const mat4 bayer = mat4(
+        0.0, 12.0,  3.0, 15.0,
+        8.0,  4.0, 11.0,  7.0,
+        2.0, 14.0,  1.0, 13.0,
+        10.0,  6.0,  9.0,  5.0
+    );
+    return bayer[x][y] / 16.0;
+}
+
+// High-performance "Hash12" - No trigonometry
+// old hash used sin() which is slow on gpu. this one just mashes bits together.
+// (https://www.shadertoy.com/view/4djSRW)
+float hash(vec2 p) {
+    // fract() keeps only the decimal part for the wave-like dusty pattern
+    // .1031 is a special prime number to avoid perfect alignments with pixel grid
+    vec3 p3  = fract(vec3(p.xyx) * .1031);
+    
+    // dot product mixes the x, y, z values so they depend on each other
+    p3 += dot(p3, p3.yzx + 33.33);
+    
+    // return the final entangled decimal. deterministically random (afaik).
+    return fract((p3.x + p3.y) * p3.z);
+}
+
+// Multi-octave noise for realistic paper fiber texture
+float paperTexture(vec2 uv) {
+    float n = 0.0;
+    n += hash(uv * 0.3) * 0.6;       // Very large fibers
+    n += hash(uv * 0.8) * 0.4;       // Large fibers
+    n += hash(uv * 2.5) * 0.3;       // Medium detail
+    n += hash(uv * 6.0) * 0.2;       // Fine grain
+    n += hash(uv * 15.0) * 0.1;      // Very fine grain
+    return n / 1.6; // Normalize
+}
+
+// Directional paper grain (simulates paper fibers running in one direction)
+float directionalGrain(vec2 uv) {
+    vec2 direction = vec2(0.7, 0.3); // Fiber direction
+    float grain = 0.0;
+    grain += hash(uv * 3.0 + direction * 2.0) * 0.5;
+    grain += hash(uv * 8.0 + direction * 5.0) * 0.3;
+    return grain / 0.8;
+}
+
+// Subtle vignette for paper edge darkening
+float vignette(vec2 uv) {
+    vec2 center = uv - 0.5;
+    float dist = length(center);
+    // smoothstep creates a signmoid (S-curve) so the shadow falls off naturally
+    return 1.0 - smoothstep(0.4, 1.2, dist) * 0.15;
+}
+
+void main() {
+    vec4 pixColor = texture(tex, v_texcoord);
+    
+    // Luma Conversion
+    // not using average (r+g+b)/3 because eyes see green brighter than blue.
+    float gray = dot(pixColor.rgb, vec3(0.299, 0.587, 0.114));
+    
+    // E-ink characteristic response curve
+    // real e-ink isn't linear. this exponent simulates ink clumping.
+    gray = pow(gray, 1.2);
+    
+    // Better contrast with slight S-curve
+    // clips pure blacks/whites but keeps the middle smooth.
+    gray = smoothstep(0.08, 0.92, gray);
+    
+    // Mid-tone boost
+    float midBoost = smoothstep(0.3, 0.5, gray) * (1.0 - smoothstep(0.5, 0.7, gray));
+    gray += midBoost * 0.1;
+    
+    vec2 screenPos = gl_FragCoord.xy;
+    
+    // PAPER GRAIN 
+    float paperGrain = (paperTexture(screenPos * 0.3) - 0.5) * 0.035; 
+    float dirGrain = (directionalGrain(screenPos * 0.4) - 0.5) * 0.025; // directional grain
+    
+    float bayerValue = getBayer(screenPos);
+    
+    // Apply to bright areas (paper), but also slightly to mid-tones for more visible grain
+    float textureMask = smoothstep(0.5, 0.95, gray); // Lower threshold for more coverage
+    
+    // Apply both grain types
+    gray += paperGrain * textureMask;
+    gray += dirGrain * textureMask * 0.7; // Directional grain is slightly weaker
+    
+    // Increased dithering for more texture
+    float ditherStrength = 0.025; // Increased from 0.018
+    gray += (bayerValue - 0.5) * ditherStrength * textureMask;
+    
+    // Vignette for paper edges
+    float vig = vignette(v_texcoord);
+    gray *= vig;
+    
+    gray = clamp(gray, 0.0, 1.0);
+    
+    // E-ink colors with slight warmth variation
+    vec3 paperColor = vec3(0.94, 0.92, 0.86);
+    vec3 inkColor   = vec3(0.10, 0.10, 0.12);
+    
+    // More noticeable color variation for paper texture
+    float colorVariation = hash(screenPos * 0.08) * 0.02; // Increased from 0.01
+    paperColor += vec3(colorVariation, colorVariation * 0.5, -colorVariation * 0.2);
+    
+    // linear interpolation. paints the gray value onto our specific color palette.
+    vec3 finalColor = mix(inkColor, paperColor, gray);
+    
+    fragColor = vec4(finalColor, pixColor.a);
+}
@@ -1,9 +0,0 @@
-(defwindow calendar
-  :monitor 1
-  :geometry (geometry
-    :x "0%"
-    :y "0%"
-  	:anchor "bottom right"
-    :width "0px"
-    :height "0px")
-  (window (calendar)))
@@ -0,0 +1,133 @@
+
+(deflisten weather
+  :initial '{"temp":0,"feelslike":0,"humidity":0,"wind":0,"desc":"","icon":"󰖐","city":""}'
+  "scripts/weather")
+
+(deflisten volume
+  :initial '{"icon":"󰕾","percent":50,"sink_muted":false,"mic_icon":"󰍬","microphone":50,"source_muted":false,"sink":""}'
+  "scripts/volume")
+
+(deflisten brightness
+  :initial '{"percent":0,"available":false}'
+  "scripts/brightness")
+
+; --- Weather ---
+
+(defwidget weather-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header
+      :title {weather.city != "" ? "Weather · ${weather.city}" : "Weather"}
+      :accent "weather-accent")
+    (box :orientation "h" :space-evenly false :halign "center" :class "weather-main"
+      (label :class "weather-icon" :valign "center" :text {weather.icon})
+      (box :orientation "v" :space-evenly false :valign "center"
+        (label :class "weather-temp" :text "${weather.temp}°C")
+        (label :class "weather-desc" :text {weather.desc})))
+    (box :orientation "h" :space-evenly true :class "weather-stats"
+      (box :orientation "v" :space-evenly false :halign "center"
+        (label :class "gpu-stat-value" :text "${weather.feelslike}°C")
+        (label :class "gpu-stat-label" :text "feels like"))
+      (box :orientation "v" :space-evenly false :halign "center"
+        (label :class "gpu-stat-value" :text "${weather.humidity}%")
+        (label :class "gpu-stat-label" :text "humidity"))
+      (box :orientation "v" :space-evenly false :halign "center"
+        (label :class "gpu-stat-value" :text "${weather.wind} km/h")
+        (label :class "gpu-stat-label" :text "wind")))))
+
+; --- Volume ---
+
+(defwidget vol-row [icon value onchange onclick muted]
+  (box :orientation "h" :space-evenly false :valign "center" :class "ctrl-row"
+    (button
+      :class "ctrl-icon ${muted ? 'ctrl-muted' : ''}"
+      :onclick onclick
+      (label :text icon))
+    (scale
+      :min 0 :max 100 :value value
+      :hexpand true
+      :class "ctrl-slider ${muted ? 'ctrl-slider-muted' : ''}"
+      :onchange {muted ? "true" : onchange})
+    (label :class "ctrl-value ${muted ? 'ctrl-muted' : ''}" :halign "end" :text "${value}%")))
+
+(defwidget volume-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header
+      :title {volume.sink != "" ? "Volume · ${volume.sink}" : "Volume"}
+      :accent "vol-accent")
+    (vol-row
+      :icon    {volume.icon}
+      :value   {volume.percent}
+      :muted   {volume.sink_muted}
+      :onchange "scripts/volume setvol SINK {}"
+      :onclick  "scripts/volume mute SINK")
+    (vol-row
+      :icon    {volume.mic_icon}
+      :value   {volume.microphone}
+      :muted   {volume.source_muted}
+      :onchange "scripts/volume setvol SOURCE {}"
+      :onclick  "scripts/volume mute SOURCE")))
+
+; --- Quick Actions ---
+
+(defpoll power-save     :interval "5s" :initial "false" "scripts/power-save status")
+(defpoll night-light   :interval "5s" :initial "false" "scripts/nightlight status")
+(defpoll read-mode     :interval "5s" :initial "false" "scripts/read-mode status")
+(defpoll airplane-mode :interval "5s" :initial "false" "scripts/airplane-mode status")
+(defpoll do-not-disturb :interval "5s" :initial "false" "scripts/do-not-disturb status")
+
+(defwidget quick-btn [icon label onclick active]
+  (button :class "quick-btn ${active ? 'quick-btn-active' : ''}"
+    :onclick onclick
+    (box :orientation "v" :space-evenly false :halign "center" :valign "center"
+      (label :class "quick-icon" :text icon)
+      (label :class "quick-label" :text label))))
+
+(defwidget quick-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header :title "Quick Actions" :accent "quick-accent")
+    (box :orientation "v" :space-evenly false :class "quick-grid" :spacing 4
+      (box :orientation "h" :space-evenly true
+        (quick-btn :icon "󰌵" :label "Night Light" :onclick "scripts/nightlight"    :active {night-light})
+        (quick-btn :icon "󰂺" :label "Read Mode"   :onclick "scripts/read-mode"     :active {read-mode})
+        (quick-btn :icon "󰸉" :label "Wallpaper"   :onclick "scripts/wallpaper"     :active false))
+      (box :orientation "h" :space-evenly true
+        (quick-btn :icon "󱐋" :label "Power Save"  :onclick "scripts/power-save"    :active {power-save})
+        (quick-btn :icon "󰀞" :label "Airplane"    :onclick "scripts/airplane-mode" :active {airplane-mode})
+        (quick-btn :icon "󰂛" :label "Do Not Dist" :onclick "scripts/do-not-disturb" :active {do-not-disturb}))
+      (box :orientation "h" :space-evenly true
+        (quick-btn :icon "󰹑" :label "Screenshot"  :onclick "scripts/screenshot"    :active false)
+        (quick-btn :icon "󰌾" :label "Lock"         :onclick "scripts/lock"          :active false)
+        (quick-btn :icon "󱉨" :label "Color Pick"   :onclick "scripts/color-pick"    :active false)))))
+
+; --- Brightness ---
+
+(defwidget brightness-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    :visible {brightness.available}
+    (section-header :title "Brightness" :accent "bri-accent")
+    (box :orientation "h" :space-evenly false :valign "center" :class "ctrl-row"
+      (label :class "ctrl-icon" :text "󰃠")
+      (scale
+        :min 1 :max 100 :value {brightness.percent}
+        :hexpand true
+        :class "ctrl-slider"
+        :onchange "scripts/brightness set {}")
+      (label :class "ctrl-value" :halign "end" :text "${brightness.percent}%"))))
+
+; --- Root ---
+
+(defwidget clock-win []
+  (box :class "sys-win" :orientation "v" :space-evenly false
+    (volume-section)
+    (brightness-section)
+    (box :class "section-sep")
+    (quick-section)
+    (box :class "section-sep")
+    (weather-section)
+    (box :class "section-sep")
+    (box :orientation "v" :space-evenly false :class "sys-section cal-box"
+      (section-header :title "Calendar" :accent "cal-accent")
+      (calendar :show-week-numbers false))
+    ))
+
+
@@ -0,0 +1,123 @@
+
+; --- Shared widgets ---
+
+(defwidget netinfo-row [label value]
+  (box :orientation "h" :space-evenly false :class "netinfo-row"
+    (label :class "netinfo-label" :halign "start" :text label)
+    (label :class "netinfo-value" :halign "end" :hexpand true :text value)))
+
+(defwidget section-header-toggle [title accent enabled onclick icon-on icon-off]
+  (box :orientation "h" :space-evenly false :valign "center" :class "sys-section-header"
+    (box :class "section-accent ${accent}")
+    (label :class "sys-label" :text title :hexpand true :halign "start")
+    (button
+      :class "net-toggle-btn ${enabled ? 'net-toggle-on' : 'net-toggle-off'}"
+      :onclick onclick
+      (label :text {enabled ? icon-on : icon-off}))))
+
+; --- WiFi ---
+
+(defwidget wifi-net-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header-toggle
+      :title "WiFi" :accent "wifi-accent"
+      :enabled {net.wifi.enabled}
+      :onclick {net.wifi.enabled ? "rfkill block wlan" : "rfkill unblock wlan"}
+      :icon-on "󰤨" :icon-off "󰖪")
+    (box :orientation "v" :space-evenly false
+      :visible {net.wifi.connected}
+      (netinfo-row :label "SSID"   :value {net.wifi.ssid})
+      (netinfo-row :label "IP"     :value {net.wifi.ip})
+      (netinfo-row :label "Signal" :value "${net.wifi.icon}  ${net.wifi.signal} dBm")
+      (netinfo-row :label "Freq"   :value "${net.wifi.freq} MHz · ${net.wifi.band} · ${net.wifi.gen}"))
+    (label :class "netinfo-dim" :halign "start"
+      :visible {!net.wifi.connected}
+      :text {net.wifi.enabled ? "Not connected" : "Disabled"})))
+
+; --- USB ---
+
+(defwidget usb-net-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header :title "USB" :accent "usb-accent")
+    (netinfo-row :label "Interface" :value {net.usb.interface})
+    (netinfo-row :label "IP"        :value {net.usb.ip})))
+
+; --- Ethernet ---
+
+(defwidget ethernet-net-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header :title "Ethernet" :accent "eth-accent")
+    (box :orientation "v" :space-evenly false
+      :visible {net.ethernet.connected}
+      (netinfo-row :label "Interface" :value {net.ethernet.interface})
+      (netinfo-row :label "IP"        :value {net.ethernet.ip})
+      (netinfo-row :label "Speed"     :value {net.ethernet.speed}))
+    (label :class "netinfo-dim" :halign "start"
+      :visible {!net.ethernet.connected}
+      :text "No carrier")))
+
+; --- Bluetooth ---
+
+(defwidget bt-device-row [device]
+  (box :orientation "h" :space-evenly false :class "bt-device-row" :valign "center"
+    (label :class "bt-device-name" :hexpand true :halign "start" :text {device.name})
+    (button
+      :class "bt-device-btn ${device.connected ? 'bt-btn-on' : 'bt-btn-off'}"
+      :onclick "scripts/net/bt-toggle ${device.mac}"
+      :tooltip {device.connected ? "Disconnect" : "Connect"}
+      (label :text {device.connected ? "󰂱" : "󰂯"}))))
+
+(defwidget bluetooth-net-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header-toggle
+      :title "Bluetooth" :accent "blt-accent"
+      :enabled {bt.powered}
+      :onclick {bt.powered ? "bluetoothctl power off" : "bluetoothctl power on"}
+      :icon-on "󰂯" :icon-off "󰂲")
+    (scroll :vscroll true :hscroll false :height 90
+      :visible {bt.powered}
+      (box :orientation "v" :space-evenly false
+        (for device in {bt.devices}
+          (bt-device-row :device {device}))))
+    (label :class "netinfo-dim" :halign "start"
+      :visible {!bt.powered}
+      :text "Disabled")))
+
+; --- WireGuard ---
+
+(defwidget wg-row [wg]
+  (box :orientation "v" :space-evenly false :class "wg-row"
+    (box :orientation "h" :space-evenly false :valign "center"
+      (label :class "wg-name ${wg.up ? 'wg-up' : 'wg-down'}" :halign "start" :hexpand true :text {wg.name})
+      (button
+        :class "net-toggle-btn ${wg.up ? 'net-toggle-on' : 'net-toggle-off'}"
+        :onclick "scripts/net/wg-toggle ${wg.name}"
+        :tooltip {wg.up ? "Disconnect" : "Connect"}
+        (label :text {wg.up ? "󰖂" : "󰦞"})))
+    (box :orientation "v" :space-evenly false :visible {wg.up}
+      (netinfo-row :label "IP"      :value {wg.ip})
+      (netinfo-row :label "Peer"    :value {wg.endpoint != "" ? "${wg.peers} · ${wg.endpoint}" : wg.peers})
+      (netinfo-row :label "Traffic" :value "󰇚 ${wg.rx}   󰕒 ${wg.tx}"))
+    (label :class "netinfo-dim" :halign "start" :visible {!wg.up} :text "Down")))
+
+(defwidget wireguard-net-section []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header :title "WireGuard" :accent "wg-accent")
+    (for wg in {net.wireguard}
+      (wg-row :wg {wg}))))
+
+; --- Root ---
+
+(defwidget net-win []
+  (box :class "sys-win" :space-evenly false :orientation "v"
+    (box :visible {net.usb.connected} :space-evenly false :orientation "v"
+      (usb-net-section)
+      (box :class "section-sep"))
+    (ethernet-net-section)
+    (box :class "section-sep")
+    (wifi-net-section)
+    (box :class "section-sep")
+    (box :visible {arraylength(net.wireguard) > 0} :space-evenly false :orientation "v"
+      (wireguard-net-section)
+      (box :class "section-sep"))
+    (bluetooth-net-section)))
@@ -0,0 +1,24 @@
+
+; Monitor the popup is currently open on (set by scripts/panel-toggle), so a
+; panel switch on the same monitor is an in-place revealer transition.
+(defvar popup-screen "")
+
+(defwidget popup-win []
+  (box :space-evenly false :orientation "v"
+    (revealer :reveal {active-panel == "sys"} :transition "slidedown" :duration 120
+      (sys-win))
+    (revealer :reveal {active-panel == "net"} :transition "slidedown" :duration 120
+      (net-win))
+    (revealer :reveal {active-panel == "clock"} :transition "slidedown" :duration 120
+      (clock-win))
+    (revealer :reveal {active-panel == "radio"} :transition "slidedown" :duration 120
+      (radio-win))))
+
+(defwindow popup
+  :monitor 0
+  :stacking "overlay"
+  :geometry (geometry
+    :x "0%" :y "0%"
+    :anchor "bottom right"
+    :width "320px" :height "0px")
+  (window (popup-win)))
@@ -1,45 +1,35 @@
-(defwidget powermenu_entry [label icon onclick]
-    (box :orientation "v" :space-evenly false :class "powermenu-entry"
-        (button :class "powermenu-button" :onclick {onclick}
-            :tooltip "${label}"
-            (label :class "powermenu-icon" :text {icon})
-        )
-    )
-)
+
+(defwidget pm-btn [icon label onclick]
+  (button :class "pm-btn" :onclick onclick
+    (box :orientation "v" :space-evenly false :halign "center" :valign "center"
+      (label :class "pm-icon" :text icon)
+      (label :class "pm-label" :text label))))

 (defwidget powermenu []
-    (box :orientation "h" :space-evenly true :valign "center" :halign "center" :class "powermenu-box"
-        (powermenu_entry    :label "Power off" 
-                            :icon "󰐥" 
+  (box :hexpand true :vexpand true :class "pm-overlay"
+    (box :halign "center" :valign "center"
+      (eventbox :class "winevent"
+        (box :class "wininner pm-win"
+          (box :orientation "h" :space-evenly true
+            (pm-btn :icon "󰐥" :label "Power off"
                    :onclick "systemctl poweroff")
-        (powermenu_entry    :label "Reboot" 
-                            :icon "󰜉" 
+            (pm-btn :icon "󰜉" :label "Reboot"
                    :onclick "systemctl reboot")
-        (powermenu_entry    :label "Lock" 
-                            :icon "󰍁" 
-                            :onclick "sleep 0.1 && gtklock & eww close powermenu &")
-
-        (powermenu_entry    :label "Suspend" 
-                            :icon "󰤄" 
-                            :onclick "sleep 0.1 && gtklock & systemctl suspend & eww close powermenu &")
-                                
-        (powermenu_entry    :label "Sign out" 
-                            :icon "󰗼" 
-                            :onclick "hyprctl dispatch exit 0")
-
-        (powermenu_entry    :label "Cancel" 
-                            :icon "󰅖" 
-                            :onclick "eww close powermenu")
-    )
-)
+            (pm-btn :icon "󰍁" :label "Lock"
+                    :onclick "scripts/lock")
+            (pm-btn :icon "󰤄" :label "Suspend"
+                    :onclick "scripts/lock; systemctl suspend")
+            (pm-btn :icon "󰗼" :label "Sign out"
+                    :onclick "hyprctl eval \"hl.dispatch(hl.dsp.exit())\"")
+            (pm-btn :icon "󰅖" :label "Cancel"
+                    :onclick "${EWW_CMD} --no-daemonize close powermenu")))))))

 (defwindow powermenu
-    :monitor 1
+  :monitor 0
  :stacking "overlay"
  :geometry (geometry
    :anchor "center"
    :width "120%"
    :height "120%")
  :namespace "eww-blur"
-    (powermenu)
-)
+  (powermenu))
@@ -1,111 +1,82 @@
-(deflisten radio :initial '{"is_paused":1,"song":{"artist":"","song":"","image600":"https://www.radiorecord.ru/upload/stations_images/record_image600_white_fill.png"},"stations":[]}' "scripts/radio")
-(defvar radio_rev false)
-
-(defwindow radio
-  :monitor 1
-  :geometry (geometry
-    :x "0%"
-    :y "0%"
-  	:anchor "bottom right"
-    :width "0px"
-    :height "0px")
-  (window (radio-win)))

+(deflisten radio
+  :initial '{"is_paused":1,"song":{"artist":"","song":"","image600":""},"radio":0,"stations":[],"media":{"player":"","status":"Stopped","artist":"","title":"","art":""}}'
+  "scripts/radio")
+(defvar radio-vol 80)
+(defvar radio-muted false)

 (defwidget radio-win []
-	(box 
-      :space-evenly false
-      :orientation "h" 
-      (revealer
-        :visible radio_rev
-        :reveal radio_rev
-        :transition "slideleft"
-          (radio-selector))
-      (box
-      :space-evenly false
-      :orientation "v" 
+  (box :class "sys-win" :orientation "v" :space-evenly false

-		(box 
-          :class "album_art" 
-          :style "background-size:cover; background-image: url('${radio.song.image600?:'https://www.radiorecord.ru/upload/stations_images/record_image600_white_fill.png'}');")
-		(box 
-          :space-evenly false
-          :orientation "v"
-			(label 
-              :halign "center" 
-              :class "song" 
-              :wrap "true" 
-              :limit-width 18
-              :text "${radio.song.song?:'...'}")
-			(label 
-              :halign "center" 
-              :class "artist" 
-              :wrap "true" 
-              :limit-width 22
-              :text "${radio.song.artist?:'...'}")
-			(box 
-              :space-evenly true
-              :orientation "h" 
-              :halign "center" 
-              :class "btn_bar"
+    ; --- Now Playing ---
+    (box :orientation "v" :space-evenly false :class "sys-section"
+      (section-header :title "Media" :accent "radio-accent")
+      (box :orientation "h" :space-evenly false :valign "center" :spacing 10 :class "radio-now-playing"
+        (box :class "radio-art"
+          :style "background-image: url('${radio.is_paused == 0 ? radio.song.image600 : (radio.media.status != 'Stopped' ? radio.media.art : radio.song.image600)}'); background-size: cover; background-position: center;"
+          (label :class "radio-art-icon" :halign "center" :valign "center"
+            :visible {radio.is_paused == 0
+              ? radio.song.image600 == ""
+              : (radio.media.status != "Stopped"
+                  ? radio.media.art == ""
+                  : radio.song.image600 == "")}
+            :text "󰝚"))
+        (box :orientation "v" :space-evenly false :hexpand true :valign "center"
+          (label :class "radio-song" :halign "start" :wrap true :limit-width 20
+            :text {radio.is_paused == 0
+              ? (radio.song.song != "" ? radio.song.song : "Tuning in...")
+              : (radio.media.status != "Stopped"
+                ? (radio.media.title != "" ? radio.media.title : "Playing")
+                : (radio.song.song != "" ? radio.song.song : "Nothing playing"))})
+          (label :class "radio-artist" :halign "start" :wrap true :limit-width 22
+            :text {radio.is_paused == 0
+              ? radio.song.artist
+              : (radio.media.status != "Stopped"
+                ? (radio.media.artist != "" ? radio.media.artist : radio.media.player)
+                : "")})))

-                (button
-                :class "btn_left" 
-                :onclick "${EWW_CMD} update radio_rev=${!radio_rev}"
-                (box "󰷐"))
+      ; Controls - hidden only in placeholder state
+      (box :visible {radio.is_paused == 0 || radio.radio > 0 || radio.media.status != "Stopped"}
+        :orientation "v" :space-evenly false :class "radio-controls"
+        (box :orientation "h" :space-evenly true :halign "center"
+          (button :visible {radio.is_paused == 1 && radio.media.status != "Stopped"}
+            :class "radio-ctrl-btn" :timeout "2s" :onclick "scripts/media previous"
+            (label :text "󰒮"))
+          (button :class "radio-ctrl-btn" :timeout "2s"
+            :onclick {radio.is_paused == 1 && radio.media.status != "Stopped" ? "scripts/media play-pause" : "scripts/radio toggle"}
+            (label :text {radio.is_paused == 0 ? "󰏥" : (radio.media.status == "Playing" ? "󰏥" : "󰐌")}))
+          (button :visible {radio.is_paused == 1 && radio.media.status != "Stopped"}
+            :class "radio-ctrl-btn" :timeout "2s" :onclick "scripts/media next"
+            (label :text "󰒭")))
+        (vol-row
+          :icon "󰕾"
+          :value {radio-vol}
+          :onchange "scripts/radio vol {}"
+          :onclick "scripts/radio mute"
+          :muted {radio-muted})))

-				        (button 
-                :class "btn_play" 
-                :timeout "2s"
-                :onclick "scripts/radio toggle" 
-                "${radio.is_paused==1 ? "󰐌" : "󰏥"}")
-
-                (button
-                :class "btn_right" 
-                :onclick ""
-                (box :visible false "󰔶"))
-            )
-		)
-      )
-    )
-)
-
-
-(defwidget radio-selector []
-  (scroll
-    :active true
-    :vscroll true
-    :hscroll false
-
-    (box
-        :class "station_list"
-        :space-evenly false
-        :orientation "v"
+    (box :class "section-sep")

+    ; --- Stations ---
+    (box :orientation "v" :space-evenly false :class "sys-section"
+      (section-header :title "Radio Stations" :accent "radio-accent")
+      (scroll :vscroll true :hscroll false :height 130
+        (box :class "station-list" :space-evenly false :orientation "v"
          (for station in {radio.stations}
            (button
-                :class "station_art ${(radio.radio == station.id)?'station_sel':''}"
+              :class "station-row ${radio.radio == station.id ? 'station-row-active' : ''}"
              :timeout "2s"
              :onclick "scripts/radio start ${station.id}"
-                :tooltip "${station.title}"
-                :style "background-size:cover; background-image: url('${station.icon_fill_white}');"
-            )
-        )
-    )
-  )
-)
+              :tooltip {station.title}
+              (box :orientation "h" :space-evenly false :valign "center"
+                (box :class "station-icon"
+                  :style "background-image: url('${station.icon_fill_white}'); background-size: contain; background-position: center;")
+                (label :class "station-name" :text {station.title}
+                  :hexpand true :halign "start" :limit-width 16)))))))))

 (defwidget radio-mod []
  (module
-    (box
-      :orientation "v"
-      (button
-        :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle --no-daemonize radio)"
-        (label 
-          :show-truncated false
-          :class "icon-text" 
-          :text "󰝚")
-      )
-    )
-  )
-)
+    (eventbox
+      :onclick "scripts/panel-toggle radio"
+      (box :orientation "v"
+        (label :show-truncated false :class "icon-text" :text "󰝚")))))
@@ -1,140 +1,234 @@

+(defpoll cpu-freq-min :interval "60s" :initial "0"
+  "awk '{print $1/1000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq")
+(defpoll cpu-freq-max :interval "60s" :initial "1"
+  "awk '{print $1/1000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq")
+(defpoll cpu-temp :interval "4s" :initial "0"
+  "scripts/sys/cputemp")
+(defpoll cpu-freq-avg :interval "2s" :initial "0"
+  "awk '{sum+=$1; count++} END {printf \"%.1f\", sum/count/1000000}' /sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq")
+
+; The CPU grid is fed by the EWW_CPU magic variable (2 s); jq() reshapes the
+; core list into rows of four.
+
+; --- Shared ---
+
+(defwidget section-header [title accent]
+  (box :orientation "h" :space-evenly false :valign "center" :class "sys-section-header"
+    (box :class "section-accent ${accent}")
+    (label :class "sys-label" :text title)))
+
+; --- CPU ---
+
+(defwidget cpu-core-cell [core]
+  (overlay
+    (circular-progress
+      :width 60 :height 60
+      :value {core.usage}
+      :start-at 0
+      :clockwise true
+      :thickness 7
+      :class "cpu-usage-ring")
+    (circular-progress
+      :value {100 * (core.freq - cpu-freq-min) / (cpu-freq-max - cpu-freq-min)}
+      :start-at 0
+      :clockwise true
+      :thickness 4
+      :class "cpu-freq-ring")
+    (box :halign "center" :valign "center"
+      (label :class "cpu-core-label" :text "${core.core}"))
+  )
+)
+
 (defwidget cpu-sys-win []
-  (box
-    :orientation "v"
-    :space-evenly false
-    (box :class "sys-label" "CPU")
-    (box
-      :orientation "v"
-      (for core in {EWW_CPU.cores}
-        (box
-          :space-evenly false
-          :class "cpu-core ${core.core}"
-          (progress
-            :value {core.usage}
-            :orientation "h"
-            :flipped true
-            :class "cpu-core-usage"
-            :tooltip "${core.core} @ ${core.freq}Mhz"
-          )
-        )
-      )
-    )
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header :title "CPU" :accent "cpu-accent")
+    (box :orientation "v" :space-evenly false :halign "center"
+      (for row in {jq(EWW_CPU.cores, '[.[] | .core |= ltrimstr("cpu")] | [range(0; length; 4) as $i | .[$i:$i + 4]]')}
+        (box :orientation "h" :space-evenly false
+          (for core in {row}
+            (cpu-core-cell :core {core})))))
+    (box :orientation "h" :space-evenly true :class "gpu-stats-row"
+      (box :orientation "v" :halign "center" :space-evenly false
+        (label :class "gpu-stat-value" :text "${cpu-temp}°C")
+        (label :class "gpu-stat-label" :text "temp"))
+      (box :orientation "v" :halign "center" :space-evenly false
+        (label :class "gpu-stat-value" :text "${cpu-freq-avg}GHz")
+        (label :class "gpu-stat-label" :text "avg clk"))
+      (box :orientation "v" :halign "center" :space-evenly false
+        (label :class "gpu-stat-value" :text "${round(EWW_CPU.avg, 0)}%")
+        (label :class "gpu-stat-label" :text "usage")))
  )
 )

+; --- GPU ---
+
 (defwidget gpu-sys-win []
-  (box
-    :orientation "v"
-    :space-evenly false
-    (box :class "sys-label" "GPU")
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header :title "GPU" :accent "gpu-accent")
+    (box :orientation "h" :space-evenly true
+      ; GFX - outer: activity%, inner: clock% of range
+      (box :orientation "v" :space-evenly false :halign "center"
+        (overlay
+          (circular-progress :width 68 :height 68
+            :value {gpu.gfx_pct}
+            :start-at 0 :clockwise true :thickness 7
+            :class "gpu-ring"
+            :tooltip "GFX  ${round(gpu.gfx_pct, 1)}%\nClock  ${gpu.sclk} MHz (${round(gpu.sclk_pct, 0)}% of range)")
+          (circular-progress
+            :value {gpu.sclk_pct}
+            :start-at 0 :clockwise true :thickness 4
+            :class "gpu-freq-ring")
+          (box :halign "center" :valign "center"
+            (label :class "gpu-ring-value" :text "${round(gpu.gfx_pct, 0)}%")))
+        (label :class "gpu-ring-label" :text "GFX" :halign "center"))
+      ; Memory - outer: activity%, inner: memory clock% of range
+      (box :orientation "v" :space-evenly false :halign "center"
+        (overlay
+          (circular-progress :width 68 :height 68
+            :value {gpu.mem_pct}
+            :start-at 0 :clockwise true :thickness 7
+            :class "gpu-ring"
+            :tooltip "Memory  ${round(gpu.mem_pct, 1)}%\nClock  ${gpu.mclk} MHz (${round(gpu.mclk_pct, 0)}% of range)")
+          (circular-progress
+            :value {gpu.mclk_pct}
+            :start-at 0 :clockwise true :thickness 4
+            :class "gpu-freq-ring")
+          (box :halign "center" :valign "center"
+            (label :class "gpu-ring-value" :text "${round(gpu.mem_pct, 0)}%")))
+        (label :class "gpu-ring-label" :text "Mem" :halign "center"))
+      ; Media - outer: activity%, inner: video clock% of GPU clock max
+      (box :orientation "v" :space-evenly false :halign "center"
+        (overlay
+          (circular-progress :width 68 :height 68
+            :value {gpu.media_pct}
+            :start-at 0 :clockwise true :thickness 7
+            :class "gpu-ring"
+            :tooltip "Media Engine  ${round(gpu.media_pct, 1)}%\nVideo Clock  ${gpu.vclk} MHz")
+          (circular-progress
+            :value {gpu.vclk_pct}
+            :start-at 0 :clockwise true :thickness 4
+            :class "gpu-freq-ring")
+          (box :halign "center" :valign "center"
+            (label :class "gpu-ring-value" :text "${round(gpu.media_pct, 0)}%")))
+        (label :class "gpu-ring-label" :text "Med" :halign "center")))
+    (box :orientation "v" :space-evenly false :class "vram-row"
      (progress
-      :value {gpu.devices[0].GRBM2?.CommandProcessor-Compute?.value?:0.0}
-      :orientation "h"
-      :flipped true
-      :class "gpu-core-usage"
-      :tooltip "Compute"
+        :value {100 * gpu.vram_used / gpu.vram_total}
+        :orientation "h" :flipped true :hexpand true
+        :class "vram-bar"
+        :tooltip "VRAM  ${round(100 * gpu.vram_used / gpu.vram_total, 1)}%")
+      (box :orientation "h" :space-evenly false
+        (label :class "vram-usage-label" :halign "start" :hexpand true :text "VRAM")
+        (label :class "vram-usage-label" :halign "end"
+          :text "${round(gpu.vram_used / 1024, 1)} / ${round(gpu.vram_total / 1024, 1)} GiB")))
+    (box :orientation "h" :space-evenly true :class "gpu-stats-row"
+      (box :orientation "v" :halign "center" :space-evenly false
+        (label :class "gpu-stat-value" :text "${gpu.temp}°C")
+        (label :class "gpu-stat-label" :text "temp"))
+      (box :orientation "v" :halign "center" :space-evenly false
+        (label :class "gpu-stat-value" :text "${gpu.power}W")
+        (label :class "gpu-stat-label" :text "power")))
  )
-    (progress
-      :value {gpu.devices[0].GRBM2?.CommandProcessor-Fetcher?.value?:0.0}
-      :orientation "h"
-      :flipped true
-      :class "gpu-core-usage"
-      :tooltip "Fetcher"
-    )
-    (progress
-      :value {gpu.devices[0].GRBM2?.CommandProcessor-Graphics?.value?:0.0}
-      :orientation "h"
-      :flipped true
-      :class "gpu-core-usage"
-      :tooltip "Graphics"
-    )
-    (box :class "spacer")
-    (progress
-      :value {gpu.devices[0]?.gpu_activity?.GFX?.value?:0.0}
-      :orientation "h"
-      :flipped true
-      :class "gpu-core-usage"
-      :tooltip "GFX"
-    )    
-    (progress
-      :value {gpu.devices[0]?.gpu_activity?.Memory?.value?:0.0}
-      :orientation "h"
-      :flipped true
-      :class "gpu-core-usage"
-      :tooltip "Memory"
-    )
-    (progress
-      :value {gpu.devices[0]?.gpu_activity?.MediaEngine?.value?:0.0}
-      :orientation "h"
-      :flipped true
-      :class "gpu-core-usage"
-      :tooltip "Media"
-    )
-    (box :class "spacer")
-    (progress
-      :value {100*(gpu.devices[0]?.VRAM?.TotalVRAMUsage?.value?:0.0)/(gpu.devices[0]?.VRAM?.TotalVRAM?.value?:1.0)}
-      :orientation "h"
-      :flipped true
-      :class "gpu-core-usage"
-      :tooltip "VRAM"
+)
+
+; --- RAM ---
+
+(defwidget ram-sys-win []
+  (box :orientation "v" :space-evenly false :class "sys-section"
+    (section-header :title "RAM" :accent "ram-accent")
+    (box :orientation "h" :space-evenly false :halign "center" :spacing 16 :valign "center"
+      (overlay
+        (circular-progress
+          :width 88 :height 88
+          :value {100*memory.used/memory.total}
+          :start-at 0
+          :clockwise true
+          :thickness 9
+          :class "ram-ring"
+          :tooltip "RAM\nUsed   ${memory.human.used} / ${memory.human.total}\nCached ${memory.human.cached}")
+        (circular-progress
+          :value {100*memory.cached/memory.total}
+          :start-at {100*memory.used/memory.total}
+          :clockwise true
+          :thickness 9
+          :class "ram-cached-ring")
+        (box :orientation "v" :valign "center" :halign "center" :space-evenly false
+          (label :class "ram-used-label" :text "${memory.human.used}")
+          (label :class "ram-total-label" :text "${memory.human.total}")))
+      (box :orientation "v" :space-evenly false :halign "center" :valign "center"
+        (overlay
+          (circular-progress
+            :width 72 :height 72
+            :value {memory.swap.total > 0 ? 100 * memory.swap.used / memory.swap.total : 0}
+            :start-at 0 :clockwise true :thickness 7
+            :class "swap-ring"
+            :tooltip "Swap\n${memory.swap.human.used} / ${memory.swap.human.total}")
+          (box :orientation "v" :valign "center" :halign "center" :space-evenly false
+            (label :class "ram-used-label" :text "${memory.swap.human.used}")
+            (label :class "ram-total-label" :text "${memory.swap.human.total}"))))
    )
  )
 )

-(defwidget ram-sys-win []
-  (box
-    :orientation "v"
-    :space-evenly false
-    (box :class "sys-label" "RAM")
-    (progress
-      :value {100*memory.used/memory.total}
-      :orientation "h"
-      :flipped true
-      :class "memory-usage"
-      :tooltip "RAM"
-    )
+; --- Battery ---
+
+(defwidget bat-stat [value label]
+  (box :orientation "v" :halign "center" :valign "center" :space-evenly false
+    (label :class "bat-stat-value" :text value)
+    (label :class "bat-stat-label" :text label)))
+
+; left: draw while on battery, charge rate while charging; right: time left / to full
+(defwidget bat-sys-win []
+  (box :orientation "v" :space-evenly false :class "sys-section" :visible {battery.visible}
+    (section-header :title "Battery" :accent "bat-accent")
+    (box :orientation "h" :space-evenly true :valign "center"
+      (bat-stat
+        :value {battery.state == "charging"
+                  ? (battery.rate == "" ? "—" : "${battery.rate} %/h")
+                  : (battery.state == "discharging" || battery.state == "low" || battery.state == "critical"
+                      ? battery.wattage : "—")}
+        :label {battery.state == "charging" ? "charging" : "draw"})
+      (overlay
+        (circular-progress
+          :width 72 :height 72
+          :value {battery.percentage}
+          :start-at 0
+          :clockwise true
+          :thickness 7
+          :class "bat-ring bat-${battery.state}"
+          :tooltip "Battery  ${round(battery.percentage, 0)}%\n${battery.status} @ ${battery.wattage}")
+        (label :class "bat-ring-label"
+          :text "${round(battery.percentage, 0)}%"))
+      (bat-stat
+        :value {battery.time == "" ? "—" : battery.time}
+        :label {battery.state == "charging" ? "to full" : "left"}))
+    ; 6 h history, one bar per 15 min bucket, coloured like the ring
+    (box :orientation "h" :space-evenly true :class "bat-hist"
+      (for b in {battery.history}
+        (progress :orientation "v" :flipped true
+          :value {b.p < 0 ? 0 : b.p}
+          :class "bat-hist-bar hist-${b.s}"
+          :tooltip {b.p < 0 ? b.t : "${b.t}  ${round(b.p, 0)}%"})))
+    (box :orientation "h" :space-evenly false
+      (label :class "gpu-stat-label" :halign "start" :hexpand true :text "-6h")
+      (label :class "gpu-stat-label" :halign "end" :text "now"))
  )
 )

+; --- Root ---
+
 (defwidget sys-win []
  (box
    :class "sys-win"
-    :space-evenly false
-    :orientation "h"
-    (box
    :space-evenly false
    :orientation "v"
    (cpu-sys-win)
-      (box :class "spacer")
-      (box :class "spacer")
+    (box :class "section-sep")
    (gpu-sys-win)
-      (box :class "spacer")
-      (box :class "spacer")
+    (box :class "section-sep")
    (ram-sys-win)
-    )
-    (box
-      :visible {battery.visible}
-      :height 200
-      (graph
-        :height 200
-        :value {battery.percentage}
-        :time-range "30min"
-        :min "0.0"
-        :max "100.0"
-        :dynamic true
-      )
-    )
+    (box :class "section-sep" :visible {battery.visible})
+    (bat-sys-win)
  )
 )
-
-(defwindow sys
-  :monitor 1
-  :stacking "overlay"
-  :geometry (geometry
-    :x "0%"
-    :y "0%"
-  	:anchor "bottom right"
-    :width "0px"
-    :height "0px")
-  (window (sys-win)))
@@ -1,21 +1,127 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }:
+let
+  ewwBar = "${pkgs.custom.eww-bar}/bin/eww-bar";
+
+  # Every script ships as a bash wrapper that pins PATH to its dependencies
+  # and inlines the shared helpers, so the sources under bar/scripts stay
+  # plain shell files.
+  baseInputs = with pkgs; [ coreutils findutils gawk gnugrep gnused systemd util-linux ];
+  mkScript = name: src: inputs: pkgs.writeShellScriptBin name ''
+    export PATH="${lib.makeBinPath (baseInputs ++ inputs)}:$PATH"
+    ${builtins.readFile ./bar/scripts/_lib.sh}
+    ${builtins.readFile src}
+  '';
+
+  scripts = with pkgs; {
+    # bar
+    "scripts/workspaces"       = mkScript "workspaces"       ./bar/scripts/workspaces       [ hyprland jaq socat ripgrep ];
+    "scripts/panel-toggle"     = mkScript "panel-toggle"     ./bar/scripts/panel-toggle     [ eww custom.eww-bar ];
+    "scripts/powermenu-toggle" = mkScript "powermenu-toggle" ./bar/scripts/powermenu-toggle [ eww custom.eww-bar ];
+    "scripts/net/net"          = mkScript "net"              ./bar/scripts/net/net          [ iproute2 wpa_supplicant ];
+    "scripts/net/bt"           = mkScript "bt"               ./bar/scripts/net/bt           [ jq glib ];
+    "scripts/net/bt-toggle"    = mkScript "bt-toggle"        ./bar/scripts/net/bt-toggle    [ bluez ];
+    "scripts/net/wg-toggle"    = mkScript "wg-toggle"        ./bar/scripts/net/wg-toggle    [ ];
+    "scripts/sys/gpu"          = mkScript "gpu"              ./bar/scripts/sys/gpu          [ custom.amdgpu_top jq ];
+    "scripts/sys/memory"       = mkScript "memory"           ./bar/scripts/sys/memory       [ ];
+    "scripts/sys/battery"      = mkScript "battery"          ./bar/scripts/sys/battery      [ ];
+    "scripts/sys/cputemp"      = mkScript "cputemp"          ./bar/scripts/sys/cputemp      [ ];
+    # popup panels
+    "scripts/volume"           = mkScript "volume"           ./bar/scripts/volume           [ wireplumber pulseaudio ];
+    "scripts/brightness"       = mkScript "brightness"       ./bar/scripts/brightness       [ brightnessctl ];
+    "scripts/weather"          = mkScript "weather"          ./bar/scripts/weather          [ jq curl ];
+    "scripts/radio"            = mkScript "radio"            ./bar/scripts/radio            [ eww jq curl mpv playerctl wireplumber ];
+    "scripts/media"            = mkScript "media"            ./bar/scripts/media            [ playerctl ];
+    # quick actions (long-running ones are detached via systemd-run)
+    "scripts/nightlight"       = mkScript "nightlight"       ./bar/scripts/nightlight       [ eww wlsunset procps ];
+    "scripts/read-mode"        = mkScript "read-mode"        ./bar/scripts/read-mode        [ eww hyprland ];
+    "scripts/airplane-mode"    = mkScript "airplane-mode"    ./bar/scripts/airplane-mode    [ eww ];
+    "scripts/do-not-disturb"   = mkScript "do-not-disturb"   ./bar/scripts/do-not-disturb   [ eww dunst ];
+    "scripts/power-save"       = mkScript "power-save"       ./bar/scripts/power-save       [ eww power-profiles-daemon ];
+    "scripts/lock"             = mkScript "lock"             ./bar/scripts/lock             [ eww hyprlock ];
+    "scripts/screenshot"       = mkScript "screenshot"       ./bar/scripts/screenshot       [ eww hyprshot satty wl-clipboard ];
+    "scripts/color-pick"       = mkScript "color-pick"       ./bar/scripts/color-pick       [ eww hyprpicker ];
+    "scripts/wallpaper"        = mkScript "wallpaper"        ./bar/scripts/wallpaper        [ eww ];
+  };
+in {

  config = lib.mkIf (config.usercfg.wm == "Wayland") {
-    home.packages = with pkgs; [ eww jq jaq custom.amdgpu_top ];
+    home.packages = [ pkgs.eww pkgs.custom.eww-bar ];

-    xdg.configFile."eww" = {
-      source = lib.cleanSourceWith {
-        filter = name: _type:
-          let baseName = baseNameOf (toString name);
-          in !(lib.hasSuffix ".nix" baseName) && (baseName != "_colors.scss");
-        src = lib.cleanSource ./bar/.;
+    # The daemon and the bar are one unit: it starts and stops with the
+    # graphical session, opens the bar once the daemon answers, and is
+    # restarted on crash.  `eww-bar` (packages/eww-bar) does the heavy
+    # lifting; kanshi calls `eww-bar place` to move the bar between outputs.
+    systemd.user.services.eww = {
+      Unit = {
+        Description = "eww daemon and bar";
+        Documentation = "https://elkowar.github.io/eww/";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" ];
+        ConditionEnvironment = "WAYLAND_DISPLAY";
+        # Cap crash loops (e.g. a broken config) without giving up for good:
+        # the watchdog resets the counter and tries again later.
+        StartLimitIntervalSec = 60;
+        StartLimitBurst = 5;
+      };
+      Service = {
+        Type = "simple";
+        ExecStartPre = "${ewwBar} clean";
+        ExecStart = "${lib.getExe pkgs.eww} daemon --no-daemonize";
+        ExecStartPost = "${ewwBar} open";
+        ExecReload = "${ewwBar} reload";
+        Restart = "always";
+        RestartSec = 2;
+        TimeoutStartSec = 30;
+        TimeoutStopSec = 5;
+      };
+      Install.WantedBy = [ "graphical-session.target" ];
    };

+    # Liveness check: `eww ping` only proves the socket is up, so the check
+    # also lists the windows through the GTK main loop.  Two consecutive
+    # failures (≈40 s) restart the daemon; a missing bar is simply reopened.
+    systemd.user.services.eww-watchdog = {
+      Unit = {
+        Description = "eww health check";
+        After = [ "eww.service" ];
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${ewwBar} check";
+      };
+    };
+    systemd.user.timers.eww-watchdog = {
+      Unit = {
+        Description = "Periodic eww health check";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" ];
+      };
+      Timer = {
+        OnActiveSec = "30s";
+        OnUnitActiveSec = "20s";
+        AccuracySec = "5s";
+      };
+      Install.WantedBy = [ "graphical-session.target" ];
+    };
+
+    xdg.configFile = lib.mkMerge [
+      {
+        "eww" = {
+          source = lib.cleanSourceWith {
+            # scripts/ is shipped through the wrappers below, never verbatim
+            filter = name: _type:
+              let
+                baseName = baseNameOf (toString name);
+                relPath = lib.removePrefix (toString ./bar + "/") (toString name);
+              in !(lib.hasSuffix ".nix" baseName)
+              && (baseName != "_colors.scss")
+              && !(lib.hasPrefix "scripts/" relPath);
+            src = lib.cleanSource ./bar/.;
+          };
          recursive = true;
        };

-    # colors file
-    xdg.configFile."eww/css/_colors.scss".text = ''
+        "eww/css/_colors.scss".text = ''
          $base00: #${config.colorScheme.palette.base00};
          $base01: #${config.colorScheme.palette.base01};
          $base02: #${config.colorScheme.palette.base02};
@@ -45,6 +151,16 @@

          $gaps-screen: ${config.colorScheme.palette.gaps-screen}px;
          $gaps-window: ${config.colorScheme.palette.gaps-window}px;
+
+          $panel-font-size: 10pt;
+          $popup-scale: 1.25;
        '';
+      }
+
+      (lib.mapAttrs' (rel: drv: {
+        name = "eww/${rel}";
+        value.source = "${drv}/bin/${drv.name}";
+      }) scripts)
+    ];
  };
 }
@@ -1,109 +1,160 @@
-{ config, lib, ... }: {
+{ config, lib, pkgs, ... }:
+let
+  # Re-place the bar on the profile's main output.  eww-bar waits for the
+  # daemon (kanshi and eww.service start together at login), and resolves the
+  # monitor by description on every hotplug, so the bar follows the profile
+  # instead of a GDK monitor index that changes as outputs come and go.
+  placeBar = screen: "${pkgs.custom.eww-bar}/bin/eww-bar place '${screen}'";
+
+  baseOutput = {
+    position = "0,0";
+    scale = 1.0;
+    adaptiveSync = true;
+    status = "enable";
+    transform = "normal";
+  };
+  aocT = "AOC 24E1W1 GNSKCHA086899";
+  aocB = "AOC 24E1W1 GNSKBHA080346";
+  lgM = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
+  valinorM = "Lenovo Group Limited *";
+in {

  config = lib.mkIf (config.usercfg.wm == "Wayland") {
+    systemd.user.services.kanshi.Unit.After = lib.mkForce [ config.services.kanshi.systemdTarget "awww.service" ];
+
    services.kanshi = {
      enable = true;
      systemdTarget = "graphical-session.target";
      settings = [
-        {
-          profile.name = "tower_0";
-          profile.outputs = [
-            {
+        {output = baseOutput//{
+          criteria = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
+          # mode = "2560x1440@480.168";
+          mode = "2560x1440@240.083";
+          # mode = "1920x1080x240.084";
+          adaptiveSync = false;
+        };}
+        {output = baseOutput//{
          criteria = "AOC 24E1W1 GNSKCHA086899";
          mode = "1920x1080@60.000";
-              position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
-            }
-            {
+          transform = "180"; 
+        };}
+        {output = baseOutput//{
          criteria = "AOC 24E1W1 GNSKBHA080346";
          mode = "1920x1080@60.000";
-              position = "1920,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
-            }
-          ];
-        }
-        {
-          profile.name = "tower_1";
-          profile.outputs = [
-            {
-              criteria = "AOC 24E1W1 GNSKCHA086899";
-              mode = "1920x1080@60.000";
-              position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
-            }
-            {
-              criteria = "AOC 24E1W1 GNSKBHA080346";
-              mode = "1920x1080@60.000";
-              position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
-            }
-            {
-              criteria = "LG UNKNOWN_TBD";
-              mode = "1920x1080@144.000";
-              position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
-            }
-          ];
-        }
-        {
-          profile.name = "laptop_0";
-          profile.outputs = [{
-            criteria = "LG Display 0x060A Unknown";
+        };}
+        {output = baseOutput//{
+          criteria = "Lenovo Group Limited *";
          mode = "1920x1080@60.020";
-            position = "0,0";
-            scale = 1.0;
-            status = "enable";
-          }];
-        }
-        {
-          profile.name = "laptop_1";
-          profile.outputs = [
-            {
-              criteria = "CEX CX133 0x00000001";
-              mode = "2560x1600@59.972";
-              position = "0,0";
-              scale = 1.0;
-              status = "enable";
-            }
-            {
-              criteria = "LG Display 0x060A Unknown";
-              mode = "1920x1080@60.020";
-              position = "2560,0";
-              scale = 1.0;
-              status = "enable";
-            }
-          ];
-        }
-        {
-          profile.name = "laptop_2";
-          profile.outputs = [
-            {
+        };}
+        {output = baseOutput//{
          criteria = "AOC 16G3 1DDP7HA000348";
          mode = "1920x1080@144.000";
+        };}
+        {profile = {
+          name = "tower_00";
+          outputs = [
+            {
+              criteria = aocT;
              position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
            }
            {
-              criteria = "LG Display 0x060A Unknown";
-              mode = "1920x1080@60.020";
-              position = "1920,0";
-              scale = 1.0;
-              status = "enable";
+              criteria = aocB;
+              position = "0,1080";
+            }
+            {
+              criteria = lgM;
+              position = "1920,720";
            }
          ];
+          exec = [
+            (placeBar "desc:${aocB}")
+            "${pkgs.writeShellScript "kanshi-hyprland-init" ''
+              #!/usr/bin/env bash
+              ${pkgs.hyprland}/bin/hyprctl eval '
+                hl.workspace_rule({ workspace = "1", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "2", monitor = "desc:${aocT}", default = true })
+                hl.workspace_rule({ workspace = "3", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "4", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "5", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "6", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "7", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "8", monitor = "desc:${aocT}", default = true })
+                hl.workspace_rule({ workspace = "9", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "name:X", monitor = "desc:${lgM}", default = true })
+              '
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${aocT}" })); hl.dispatch(hl.dsp.focus({ workspace = "2" }));'
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${lgM}" })); hl.dispatch(hl.dsp.focus({ workspace = "name:X" }));'
+              #${pkgs.hyprland}/bin/hyprctl eval 'hl.monitor({ output = "desc:${lgM}", cm = "hdr" });'
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${aocB}" }));'
+
+            ''}"
+            "${pkgs.awww}/bin/awww restore"
+          ];
+        };}
+        {profile = {
+          name = "tower_01";
+          outputs = [
+            {
+              criteria = "AOC 24E1W1 GNSKCHA086899";
+              transform = "180"; 
+              position = "0,0";
            }
+            {
+              criteria = "AOC 24E1W1 GNSKBHA080346";
+              position = "0,1080";
+            }
+          ];
+          exec = [ 
+            
+            "${pkgs.writeShellScript "kanshi-hyprland-init" ''
+              #!/usr/bin/env bash
+              ${pkgs.hyprland}/bin/hyprctl eval '
+                hl.workspace_rule({ workspace = "1", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "2", monitor = "DP-2", default = true })
+                hl.workspace_rule({ workspace = "3", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "4", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "5", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "6", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "7", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "8", monitor = "DP-2", default = true })
+                hl.workspace_rule({ workspace = "9", monitor = "DP-1", default = true })
+              '
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "DP-2" })); hl.dispatch(hl.dsp.focus({ workspace = "2" }));'
+          
+            ''}"
+            "${pkgs.awww}/bin/awww restore"
+            (placeBar "desc:${aocB}")
+          ];
+        };}
+        {profile = {
+          name = "valinor00";
+          outputs = [
+            {
+              criteria = "Lenovo Group Limited *";
+              position = "0,0";
+            }
+          ];
+          exec = [
+            "${pkgs.writeShellScript "kanshi-hyprland-init" ''
+              #!/usr/bin/env bash
+              ${pkgs.hyprland}/bin/hyprctl eval '
+                hl.workspace_rule({ workspace = "1", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "2", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "3", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "4", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "5", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "6", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "7", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "8", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "9", monitor = "eDP-1", default = true })
+              '
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "eDP-1" })); hl.dispatch(hl.dsp.focus({ workspace = "1" }));'
+          
+            ''}"
+            "${pkgs.awww}/bin/awww restore"
+            (placeBar "desc:Lenovo Group Limited")
+          ];
+        };}
      ];
    };
  };
@@ -0,0 +1,113 @@
+{ lib, pkgs, config, ... }: {
+  config = lib.mkIf (config.usercfg.wm == "Wayland") {
+    programs.hyprlock = {
+      enable = true;
+      settings = {
+        general = {
+          grace = 5;                        # grace=5
+          no_fade_in = false;               # fade-in=0.2 (handled dynamically)
+          ignore_empty_input = true;        # ignore-empty-password
+        };
+
+        background = [
+          # 1. OLED MONITOR (Pure Black) 
+          {
+            monitor = "desc:LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
+            color = "rgba(0,0,0,1.0)";      # Pure black OLED protection
+            path = "";                      # Explicitly no screenshot
+            zindex = 0;   
+          }
+          # 2. ALL OTHER MONITORS (Pixelated Screenshot)
+          {
+            monitor = "";
+            path = "screenshot";            # screenshots
+            blur_passes = 2;                # effect-pixelate=5 approximation
+            blur_size = 4;
+            noise = 0.01;
+            zindex = -1;   
+          }
+        ];
+
+        input-field = {
+          monitor = "";
+          placeholder_text = "";
+          fail_text = "";
+
+          size = "200, 200";                # Custom sizing matching indicator-radius
+          outline_thickness = 30;           # indicator-thickness=30
+          
+          dots_size = 0.33;
+          dots_spacing = 0.15;
+          dots_center = true;
+          fade_on_empty = true;
+          hide_input = true;
+          dots_text_format = "*";
+          font_family = "IBM Plex Mono";    # font=IBM Plex Mono
+          
+          # --- Outer Rings / Outline Colors ---
+          # key-hl-color, bs-hl-color, caps-lock-key-hl-color
+          check_color = "rgb(${config.colorScheme.palette.base0C})";       # key-hl
+          fail_color = "rgb(${config.colorScheme.palette.base0F})";        # inside-wrong
+          capslock_color = "rgb(${config.colorScheme.palette.base09})";    # caps-lock-key-hl
+          
+          # --- Inner/Outer Core Colors ---
+          # Replicating your transparent rings with solid action states
+          outer_color = "rgba(${config.colorScheme.palette.base00}00)";    # ring-color (Transparent)
+          inner_color = "rgba(${config.colorScheme.palette.base0C}00)";    # inside-color (Transparent)
+          font_color = "rgba(${config.colorScheme.palette.base00}00)";     # text-color (Transparent)
+
+          fail_transition = 300;
+        };
+      };
+    };
+    xdg.configFile."swaylock/config".text = ''
+      screenshots
+      grace-no-mouse
+      grace-no-touch
+      grace=5
+      effect-pixelate=5
+      fade-in=0.2
+
+      ignore-empty-password
+      font=IBM Plex Mono
+
+      color=${config.colorScheme.palette.base00}00
+
+      indicator-radius=100
+      indicator-thickness=30
+
+      separator-color=${config.colorScheme.palette.base00}00
+
+      inside-color=${config.colorScheme.palette.base0C}00
+      inside-clear-color=${config.colorScheme.palette.base08}FF
+      inside-caps-lock-color=${config.colorScheme.palette.base09}00
+      inside-ver-color=${config.colorScheme.palette.base0C}FF
+      inside-wrong-color=${config.colorScheme.palette.base0F}FF
+
+
+      ring-color=${config.colorScheme.palette.base00}00
+      ring-clear-color=${config.colorScheme.palette.base00}00
+      ring-caps-lock-color=${config.colorScheme.palette.base00}00
+      ring-ver-color=${config.colorScheme.palette.base00}00
+      ring-wrong-color=${config.colorScheme.palette.base00}00
+
+      line-color=${config.colorScheme.palette.base00}00
+      line-clear-color=${config.colorScheme.palette.base00}00
+      line-caps-lock-color=${config.colorScheme.palette.base00}00
+      line-ver-color=${config.colorScheme.palette.base00}00
+      line-wrong-color=${config.colorScheme.palette.base00}00
+
+      text-color=${config.colorScheme.palette.base00}00
+      text-clear-color=${config.colorScheme.palette.base00}00
+      text-caps-lock-color=${config.colorScheme.palette.base00}00
+      text-ver-color=${config.colorScheme.palette.base00}00
+      text-wrong-color=${config.colorScheme.palette.base00}00
+
+
+      key-hl-color=${config.colorScheme.palette.base0C}FF
+      bs-hl-color=${config.colorScheme.palette.base08}FF
+      caps-lock-key-hl-color=${config.colorScheme.palette.base09}FF
+      caps-lock-bs-hl-color=${config.colorScheme.palette.base09}FF
+    '';
+  };
+}
@@ -19,8 +19,6 @@ let
 in {
  config = lib.mkIf (config.usercfg.wm == "Wayland") {

-    home.packages = [ pkgs.custom.amdgpu_top pkgs.jq ];
-
    programs.waybar = {
      enable = true;
      package = pkgs.waybar;
@@ -146,8 +144,8 @@ in {
            "9" = [ ];
            "10" = [ ];
          };
-          "on-scroll-up" = "hyprctl dispatch workspace r-1";
-          "on-scroll-down" = "hyprctl dispatch workspace r+1";
+          "on-scroll-up" = "hyprctl eval \"hl.dispatch(hl.dsp.focus({ workspace = '-1' }))\"";
+          "on-scroll-down" = "hyprctl eval \"hl.dispatch(hl.dsp.focus({ workspace = '+1' }))\"";
        };

        "backlight" = {
@@ -203,8 +201,7 @@ in {
        "custom/gpu" = {
          "exec" = jsonOutput "gpu" {
            tooltip = "...";
-            percentage = ''
-              $(amdgpu_top -J -n 1 | jq -r '.devices[0].GRBM2."Command Processor -  Graphics".value')'';
+            percentage = ''$(${lib.getExe pkgs.custom.amdgpu_top} -J -n 1 | ${pkgs.jq}/bin/jq -r '.devices[0].GRBM2."Command Processor -  Graphics".value')'';
          };
          "return-type" = "json";
          "interval" = 5;
@@ -232,7 +229,7 @@ in {
        "custom/powermenu" = {
          "format" = "{icon}";
          "format-icons" = [ "󰐥" ];
-          "on-click" = "eww open powermenu";
+          "on-click" = "eww-open-on-current-screen powermenu";
          "tooltip" = false;
        };
        "tray" = {
@@ -1,56 +0,0 @@
-{ lib, pkgs, config, ... }: {
-  config = lib.mkIf (config.usercfg.wm == "Wayland") {
-
-    home.packages = with pkgs; [ swayidle swaylock-effects ];
-
-    xdg.configFile."swaylock/config".text = ''
-      screenshots
-      grace-no-mouse
-      grace-no-touch
-      grace=5
-      effect-pixelate=5
-      fade-in=0.2
-
-      ignore-empty-password
-      font=IBM Plex Mono
-
-      color=${config.colorScheme.palette.base00}00
-
-      indicator-radius=100
-      indicator-thickness=30
-
-      separator-color=${config.colorScheme.palette.base00}00
-
-      inside-color=${config.colorScheme.palette.base0C}00
-      inside-clear-color=${config.colorScheme.palette.base08}FF
-      inside-caps-lock-color=${config.colorScheme.palette.base09}00
-      inside-ver-color=${config.colorScheme.palette.base0C}FF
-      inside-wrong-color=${config.colorScheme.palette.base0F}FF
-
-
-      ring-color=${config.colorScheme.palette.base00}00
-      ring-clear-color=${config.colorScheme.palette.base00}00
-      ring-caps-lock-color=${config.colorScheme.palette.base00}00
-      ring-ver-color=${config.colorScheme.palette.base00}00
-      ring-wrong-color=${config.colorScheme.palette.base00}00
-
-      line-color=${config.colorScheme.palette.base00}00
-      line-clear-color=${config.colorScheme.palette.base00}00
-      line-caps-lock-color=${config.colorScheme.palette.base00}00
-      line-ver-color=${config.colorScheme.palette.base00}00
-      line-wrong-color=${config.colorScheme.palette.base00}00
-
-      text-color=${config.colorScheme.palette.base00}00
-      text-clear-color=${config.colorScheme.palette.base00}00
-      text-caps-lock-color=${config.colorScheme.palette.base00}00
-      text-ver-color=${config.colorScheme.palette.base00}00
-      text-wrong-color=${config.colorScheme.palette.base00}00
-
-
-      key-hl-color=${config.colorScheme.palette.base0C}FF
-      bs-hl-color=${config.colorScheme.palette.base08}FF
-      caps-lock-key-hl-color=${config.colorScheme.palette.base09}FF
-      caps-lock-bs-hl-color=${config.colorScheme.palette.base09}FF
-    '';
-  };
-}
@@ -1,7 +1,6 @@
 { lib, config, pkgs, ... }: {

  config = lib.mkIf (config.usercfg.wm == "Wayland") {
-    home.packages = with pkgs; [ wofi ];
    xdg.configFile."wofi/config".text = ''
      width=280
      lines=10
@@ -1,53 +1,49 @@
 { lib, config, pkgs, ... }: 
 let
-  dbus-hyprland-environment = pkgs.writeTextFile {
-    name = "dbus-hyprland-environment";
-    destination = "/bin/dbus-hyprland-environment";
-    executable = true;
-    text = ''
-      dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=hyprland
-      systemctl --user stop pipewire wireplumber xdg-desktop-portal-hyprland xdg-desktop-portal-gtk
-      systemctl --user start pipewire wireplumber xdg-desktop-portal-hyprland xdg-desktop-portal-gtk
+  #Bookmark: javascript:(function(){window.location.href='mpv://'+encodeURIComponent(window.location.href);})();
+  mpvHandler = pkgs.writeShellScriptBin "mpv-handler" ''
+    #!/bin/bash
+    exec 2>> /tmp/mpv-handler-debug.log
+    set -x
+    RAW_URL="$1"
+    STRIPPED_URL="''${RAW_URL:6}"
+    URL=$(printf '%b' "''${STRIPPED_URL//%/\\x}")
+    exec ${config.programs.mpv.finalPackage}/bin/mpv "$URL"
  '';
-  };
-in {
+in
+{
  config = lib.mkIf (config.usercfg.wm == "Wayland") {

    home.packages = with pkgs; [
-      dbus-hyprland-environment
      wayland

-      hyprpicker
-      
-      hyprshot
      slurp
-      satty
-
      swappy
-      cliphist
-      wl-clipboard

      wlr-randr
      wdisplays
      kanshi

      glib
-
-      brightnessctl
-      swww
    ];

+
+    xdg.desktopEntries."mpv-handler" = {
+      name = "MPV Scheme Handler";
+      exec = "${mpvHandler}/bin/mpv-handler %u";
+      terminal = false;
+      mimeType = [ "x-scheme-handler/mpv" ];
+    };
+
    xdg.mimeApps = {
      enable = true;
      defaultApplications = {
-        "x-scheme-handler/discord-409416265891971072" =
-          [ "discord-409416265891971072.desktop" ];
-        "x-scheme-handler/discord-402572971681644545" =
-          [ "discord-402572971681644545.desktop" ];
-        "x-scheme-handler/discord-696343075731144724" =
-          [ "discord-696343075731144724.desktop" ];
-        "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
-        "x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
+        # --- System & Directories ---
+        "inode/directory" = [ "thunar.desktop" ];
+        "x-scheme-handler/file" = [ "thunar.desktop" ];
+
+        # --- Web & Browsing ---
+        "x-scheme-handler/unknown" = [ "firefox.desktop" ];
        "x-scheme-handler/http" = [ "firefox.desktop" ];
        "x-scheme-handler/https" = [ "firefox.desktop" ];
        "x-scheme-handler/chrome" = [ "firefox.desktop" ];
@@ -59,16 +55,77 @@ in {
        "application/x-extension-xhtml" = [ "firefox.desktop" ];
        "application/x-extension-xht" = [ "firefox.desktop" ];

+        # --- Chat & Social Protocol Schemes ---
+        "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
+        "x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
+        "x-scheme-handler/discord-409416265891971072" = [ "discord-409416265891971072.desktop" ];
+        "x-scheme-handler/discord-402572971681644545" = [ "discord-402572971681644545.desktop" ];
+        "x-scheme-handler/discord-696343075731144724" = [ "discord-696343075731144724.desktop" ];
+
+        # --- Documents & Source Code (VSCodium) ---
        "application/pdf" = [ "org.pwmt.zathura-pdf-mupdf.desktop" ];
        "text/plain" = [ "vscodium.desktop" ];
+        "text/markdown" = [ "vscodium.desktop" ];
+        "text/xml" = [ "vscodium.desktop" ];
+        "text/csv" = [ "vscodium.desktop" ];
+        "text/css" = [ "vscodium.desktop" ];
+        "application/xml" = [ "vscodium.desktop" ];
+        "application/json" = [ "vscodium.desktop" ];
+        "application/toml" = [ "vscodium.desktop" ];
+        "application/yaml" = [ "vscodium.desktop" ];
+        "application/javascript" = [ "vscodium.desktop" ];
+        "application/x-shellscript" = [ "vscodium.desktop" ];

+        # --- Video & Audio (MPV) ---
+        "x-scheme-handler/mpv" = [ "mpv-handler.desktop" ];
        "video/mp4" = [ "mpv.desktop" ];
+        "video/mkv" = [ "mpv.desktop" ];
+        "video/webm" = [ "mpv.desktop" ];
+        "video/x-matroska" = [ "mpv.desktop" ];
+        "video/quicktime" = [ "mpv.desktop" ];
+        "video/x-msvideo" = [ "mpv.desktop" ];
+        "video/x-flv" = [ "mpv.desktop" ];
+        "video/3gpp" = [ "mpv.desktop" ];
+        "audio/mp3" = [ "mpv.desktop" ];
+        "audio/mpeg" = [ "mpv.desktop" ];
+        "audio/ogg" = [ "mpv.desktop" ];
+        "audio/wav" = [ "mpv.desktop" ];
+        "audio/x-wav" = [ "mpv.desktop" ];
+        "audio/flac" = [ "mpv.desktop" ];
+        "audio/x-flac" = [ "mpv.desktop" ];
+        "audio/mp4" = [ "mpv.desktop" ];
+        "audio/aac" = [ "mpv.desktop" ];
+        "audio/x-matroska-audio" = [ "mpv.desktop" ];
+        "audio/x-mpegurl" = [ "mpv.desktop" ];
+        "audio/mpegurl" = [ "mpv.desktop" ];

+        # --- Images (IMV) ---
        "image/png" = [ "imv-dir.desktop" ];
        "image/jpg" = [ "imv-dir.desktop" ];
+        "image/jpeg" = [ "imv-dir.desktop" ];
+        "image/webp" = [ "imv-dir.desktop" ];
+        "image/gif" = [ "imv-dir.desktop" ];
+        "image/svg+xml" = [ "imv-dir.desktop" ];
+        "image/x-canon-cr2" = [ "imv-dir.desktop" ];
+        "image/bmp" = [ "imv-dir.desktop" ];
+        "image/tiff" = [ "imv-dir.desktop" ];
+        "image/heic" = [ "imv-dir.desktop" ];
+        "image/avif" = [ "imv-dir.desktop" ];
+
+        # --- Archives (Engrampa) ---
+        "application/zip" = [ "engrampa.desktop" ];
+        "application/x-tar" = [ "engrampa.desktop" ];
+        "application/x-gzip" = [ "engrampa.desktop" ];
+        "application/x-bzip2" = [ "engrampa.desktop" ];
+        "application/x-7z-compressed" = [ "engrampa.desktop" ];
+        "application/x-rar" = [ "engrampa.desktop" ];
      };
+
      associations = {
-        removed = { "application/pdf" = [ "krita_pdf.desktop" ]; };
+        removed = {
+          "application/pdf" = [ "krita_pdf.desktop" ];
+          "application/zip" = [ "org.prismlauncher.PrismLauncher.desktop" ];
+        };
      };
    };
  };
@@ -1,231 +1,310 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }: let
+  lua = lib.generators.mkLuaInline;
+
+  bind = keys: dispatcher: { _args = [ keys dispatcher ]; };
+  bindOpts = keys: dispatcher: opts: { _args = [ keys dispatcher opts ]; };
+
+  dsp = {
+    exec = cmd: lua ''hl.dsp.exec_cmd("${cmd}")'';
+    close = lua "hl.dsp.window.close()";
+    exit = lua "hl.dsp.exit()";
+    float = lua ''hl.dsp.window.float({ action = "toggle" })'';
+    fullscreen = lua "hl.dsp.window.fullscreen()";
+    pseudo = lua "hl.dsp.window.pseudo()";
+    layout = msg: lua ''hl.dsp.layout("${msg}")'';
+    focus = dir: lua ''hl.dsp.focus({ direction = "${dir}" })'';
+    swap = dir: lua ''hl.dsp.window.swap({ direction = "${dir}" })'';
+    toggleSpecial = name: lua ''hl.dsp.workspace.toggle_special("${name}")'';
+    moveToSpecial = name: lua ''hl.dsp.window.move({ workspace = "special:${name}" })'';
+    focusWorkspace = ws: lua ''hl.dsp.focus({ workspace = "${toString ws}" })'';
+    moveToWorkspace = ws: lua ''hl.dsp.window.move({ workspace = "${toString ws}", follow = false})'';
+    drag = lua "hl.dsp.window.drag()";
+    resize = lua "hl.dsp.window.resize()";
+  };
+  
+
+  startupScript = pkgs.writeShellScriptBin "hyprland-start" ''
+    sleep 2
+    firefox &
+    # telegram-desktop &
+    # discord &
+  '';
+in {
  config = lib.mkIf (config.usercfg.wm == "Wayland") {
+    services.awww.enable = true;

    wayland.windowManager.hyprland = {
      enable = true;
      xwayland.enable = true;
-      extraConfig = ''
-        monitor=,preferred,auto,auto
-        env=bitdepth,10
-        input {
-            kb_layout = us, ru
-            kb_variant = intl, phonetic
-            kb_options = grp:ctrls_toggle
-
-            follow_mouse = 1
-
-            sensitivity = 0
-                        
-            touchpad {
-                natural_scroll=no
-                disable_while_typing=true
-                scroll_factor=1
-                disable_while_typing=0
-                tap-to-click=0
-            }
-        }
-                        
-        misc {
-            disable_hyprland_logo=true
-            animate_mouse_windowdragging=false
-            animate_manual_resizes=false
-                          
-            vrr=1
-        }
-                        
-        general {
-            gaps_in = ${config.colorScheme.palette.gaps-window}
-            gaps_out = ${config.colorScheme.palette.gaps-screen}
-            border_size = ${config.colorScheme.palette.border-width}
-                                      
-            col.active_border = rgb(${config.colorScheme.palette.base04})
-            col.inactive_border = rgb(${config.colorScheme.palette.base03})
-                          
-            layout = dwindle
-        }
-                        
-        decoration {
-            rounding = ${config.colorScheme.palette.border-radius}
-                          
-            blur {
-                enabled = true
-                size = 2
-                passes = 1
-                new_optimizations = true
-            }
-            #multisample_edges = true
-
-            #opactity
-            inactive_opacity = 1.0
-            active_opacity = 1.0
-            fullscreen_opacity = 1.0
-                                      
-            # shadow
-            # drop_shadow = no
-            # shadow_range = 60
-            # shadow_offset = 0 5
-            # shadow_render_power = 4
-            #col.shadow = rgba(00000099)
-        }
-                        
-        animations {
-            enabled = true
-            bezier = customcurve, 0.0, 0.9, 0.1, 1.0
-
-            animation = windows, 1, 4, customcurve
-            animation = windowsOut, 1, 4, customcurve, popin 50%
-            animation = border, 1, 10, customcurve
-            animation = borderangle, 0, 1, customcurve
-            animation = fade, 1, 4, customcurve
-            animation = workspaces, 1, 4, customcurve
-        }
-                        
-        dwindle {
-            pseudotile = yes
-            preserve_split = yes 
-        }
-
-        master {
-            new_status = master
-        }
-
-        gesture = 3, vertical, workspace
-                        
-        exec-once = eww open bar
-        #exec-once = waybar
-        exec-once = dunst
-
-        exec-once = swww init
-
-        exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-        exec-once = /nix/store/$(ls -la /nix/store | grep 'polkit-gnome' | grep '4096' | awk '{print $9}' | sed -n '$p')/libexec/polkit-gnome-authentication-agent-1 & 
-
-        exec-once = wl-paste --type text --watch cliphist store #Stores only text data
-        exec-once = wl-paste --type image --watch cliphist store #Stores only image data
-
-        exec-once = swayidle -w timeout 600 'swaylock' before-sleep 'swaylock'
-
-
-        #windowrules
-        windowrule = noshadow, floating:0
-
-        windowrule = float, title:^(flying_kitty)$
-        windowrule = size 1100 600, title:^(flying_kitty)$
-        windowrule = move center, title:^(flying_kitty)$
-        windowrule = animation slide, title:^(flying_kitty)$
-        windowrule = float, title:^(Volume Control)$
-        windowrule = float, title:^(Picture-in-Picture)$
-        windowrule = float, title:^(Steam)$
-
-        windowrulev2 = workspace 2 silent, class:^(org.telegram.desktop)$
-        windowrulev2 = workspace 2 silent, class:^(discord)$
-
-        windowrulev2 = workspace 8 silent, class:^(org.keepassxc.KeePassXC)$
-        windowrulev2 = workspace 8 silent, title:^(Nextcloud)$
-        windowrulev2 = workspace 8 silent, class:^(Tk)$,title:^(Server Configuration)$
-
-        #SPECIAL FLOATERS
-        windowrulev2 = float,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC -  Access Request)$
-        windowrulev2 = pin,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC -  Access Request)$
-        windowrulev2 = float,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$
-        windowrulev2 = pin,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$
-        windowrulev2 = float,title:^(Open)$
-        windowrulev2 = float,title:^(Choose Files)$
-        windowrulev2 = float,title:^(Save As)$
-        windowrulev2 = float,title:^(Confirm to replace files)$
-        windowrulev2 = float,title:^(File Operation Progress)$
-        windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$
-        windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$
-        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Picture-in-Picture)$
-        windowrulev2 = float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
-        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
-        windowrulev2 = float,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
-        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
-        windowrulev2 = float,class:^(org.telegram.desktop)$,title:^(Media viewer)$
-        windowrulev2 = center,class:^(org.telegram.desktop)$,title:^(Media viewer)$
-
-        #SPECIAL NO SLEEP
-        windowrulev2 = idleinhibit fullscreen, class:^(.*)
-        windowrulev2 = idleinhibit focus, class:^(steam_app_.*)$
-        windowrulev2 = idleinhibit focus, class:^(mpv)$
-
-        layerrule = blur,^(eww-blur)
-
-        #binds
-        bind = SUPER, RETURN, exec, kitty
-
-        bind = SUPER_SHIFT, RETURN,togglespecialworkspace,
-        # bind = SUPER_SHIFT, RETURN, exec, kitty --title flying_kitty --single-instance
-        bind = SUPER, Q, killactive, 
-        bind = SUPER, T, togglefloating, 
-        bind = SUPER, F, fullscreen, 
-
-        bind = SUPER, D, exec, wofi -modi --show drun
-        bind = SUPER SHIFT,D,exec, ~/.config/hypr/themes/apatheia/eww/launch_bar 
-
-        bind = SUPER, V, exec, cliphist list | wofi -dmenu | cliphist decode | wl-copy
-        bind = , PRINT, exec, hyprshot -m region --raw | satty --filename - --early-exit --action-on-enter save-to-clipboard --copy-command 'wl-copy'
-
-        bind = SUPER, L, exec, swaylock 
-
-        bind = SUPER, left, movefocus, l
-        bind = SUPER, right, movefocus, r
-        bind = SUPER, up, movefocus, u
-        bind = SUPER, down, movefocus, d
-
-        bind = SUPER, 1, workspace, 1
-        bind = SUPER, 2, workspace, 2
-        bind = SUPER, 3, workspace, 3
-        bind = SUPER, 4, workspace, 4
-        bind = SUPER, 5, workspace, 5
-        bind = SUPER, 6, workspace, 6
-        bind = SUPER, 7, workspace, 7
-        bind = SUPER, 8, workspace, 8
-        bind = SUPER, 9, workspace, 9
-        bind = SUPER, 0, workspace, 10
-
-        bind = SUPER SHIFT, 1, movetoworkspacesilent, 1
-        bind = SUPER SHIFT, 2, movetoworkspacesilent, 2
-        bind = SUPER SHIFT, 3, movetoworkspacesilent, 3
-        bind = SUPER SHIFT, 4, movetoworkspacesilent, 4
-        bind = SUPER SHIFT, 5, movetoworkspacesilent, 5
-        bind = SUPER SHIFT, 6, movetoworkspacesilent, 6
-        bind = SUPER SHIFT, 7, movetoworkspacesilent, 7
-        bind = SUPER SHIFT, 8, movetoworkspacesilent, 8
-        bind = SUPER SHIFT, 9, movetoworkspacesilent, 9
-        bind = SUPER SHIFT, 0, movetoworkspacesilent, 10
-
-        bind = SUPER, mouse_down, workspace, e+1
-        bind = SUPER, mouse_up, workspace, e-1
-
-        bindm = SUPER, mouse:272, movewindow
-        bindm = SUPER, mouse:273, resizewindow
-        bind = , XF86AudioPlay, exec, playerctl play-pause
-        bind = , XF86AudioPrev, exec, playerctl previous
-        bind = , XF86AudioNext, exec, playerctl next
-        bind = , XF86AudioRaiseVolume, exec, amixer -q sset 'Master' 5%+
-        bind = , XF86AudioLowerVolume, exec, amixer -q sset 'Master' 5%-
-        bind = , XF86AudioMute, exec, amixer -q sset 'Master' toggle
-        bind = , XF86MonBrightnessUp, exec, brightnessctl s 5%+
-        bind = , XF86MonBrightnessDown, exec, brightnessctl s 5%-
-
-        exec-once = [workspace special silent] kitty --title flying_kitty
-        exec-once = sh ~/.config/startup.sh
-      '';
+      configType = "lua";
+      settings = {
+        on = {
+          _args = [
+            "hyprland.start"
+            (lua ''
+              function()
+                hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
+                hl.exec_cmd("${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1")
+                hl.exec_cmd("${pkgs.wl-clipboard}/bin/wl-paste --type text --watch ${lib.getExe pkgs.cliphist} store")
+                hl.exec_cmd("${pkgs.wl-clipboard}/bin/wl-paste --type image --watch ${lib.getExe pkgs.cliphist} store")
+                hl.exec_cmd("${lib.getExe pkgs.swayidle} -w timeout 600 '${pkgs.hyprlock}/bin/hyprlock' before-sleep '${pkgs.hyprlock}/bin/hyprlock'")
+                hl.exec_cmd("${lib.getExe startupScript}")
+                hl.exec_cmd("[workspace special:magic silent] kitty --title flying_kitty")
+              end'')
+          ];
        };

-    xdg.configFile."startup.sh".text = ''
-      #!/bin/sh
-      sleep 2
-      keepassxc & 
-      firefox & 
-      jellyfin-mpv-shim & 
-      easyeffects --gapplication-service &
+        monitor = [{
+          output = "";
+          mode = "preferred";
+          position = "auto";
+          scale = "auto";
+          bitdepth = 10;
+          cm = "dcip3"; #auto"; #hdr";#
+          sdrbrightness = 0.85;
+          sdrsaturation = 1.0;
+          sdr_max_luminance = 600;
+          sdr_min_luminance = 0.0005;
+        }];

-      sleep 2
-      nextcloud & 
-      #telegram-desktop&
-      #discord&
-    '';
+        config = {
+          input = {
+            kb_layout = "us";
+            kb_variant = "intl";#, phonetic";
+            kb_options = "grp:alt_shift_toggle";
+            follow_mouse = 1;
+            sensitivity = 0;
+
+            touchpad = {
+              natural_scroll = false;
+              scroll_factor = 1;
+              disable_while_typing = false;
+              tap_to_click = false;
+            };
+          };
+          render = {
+            cm_enabled = true;
+            cm_auto_hdr = 1;
+          };
+          quirks = {
+            prefer_hdr = 1;
+          };
+          misc = {
+            force_default_wallpaper = 0;
+            disable_hyprland_logo = true;
+            disable_splash_rendering = true;
+            animate_mouse_windowdragging = false;
+            animate_manual_resizes = false;
+          };
+          debug = {
+            vfr = false;
+          };
+          ecosystem = {
+            no_update_news = true;
+            no_donation_nag = true;
+          };
+          general = {
+            gaps_in = config.colorScheme.palette.gaps-window;
+            gaps_out = config.colorScheme.palette.gaps-screen;
+            border_size = lib.toInt config.colorScheme.palette.border-width;
+            col = {
+              active_border = "rgb(${config.colorScheme.palette.base04})";
+              inactive_border = "rgb(${config.colorScheme.palette.base03})";
+            };
+            layout = "dwindle";
+          };
+
+          decoration = {
+            rounding = lib.toInt config.colorScheme.palette.border-radius;
+            inactive_opacity = 1.0;
+            active_opacity = 1.0;
+            fullscreen_opacity = 1.0;
+
+            blur = {
+              enabled = true;
+              size = 2;
+              passes = 1;
+              new_optimizations = true;
+            };
+          };
+
+          dwindle = {
+            #pseudotile = true;
+            preserve_split = true;
+          };
+          animations = {
+            enabled = true;
+          };
+
+          master = {
+            new_status = "master";
+          };
+        };
+
+        curve = [{
+          _args = [
+            "customcurve"
+            {
+              type = "bezier";
+              points = lua "{ {0.0, 0.9}, {0.1, 1.0} }";
+            }
+          ];
+        }];
+
+        animation = [
+          { leaf = "windows"; enabled = true; speed = 4; bezier = "customcurve"; }
+          { leaf = "windowsOut"; enabled = true; speed = 4; bezier = "customcurve"; style = "popin 80%"; }
+          { leaf = "border"; enabled = true; speed = 10; bezier = "customcurve"; }
+          { leaf = "borderangle"; enabled = true; speed = 1; bezier = "customcurve"; }
+          { leaf = "fade"; enabled = true; speed = 4; bezier = "customcurve"; }
+          { leaf = "workspaces"; enabled = true; speed = 4; bezier = "customcurve"; }
+        ];
+
+
+        gesture = {
+          fingers = 3;
+          direction = "vertical";
+          action = "workspace";
+        };
+
+        window_rule = [
+          { match.title = "noshadow"; float= false;}
+          {
+            match.title = "^(flying_kitty)$";
+            float = true;
+            center = true;
+            size = "1100 600";
+            move = "{0 600}";
+            animation = "slide";
+          }
+          { match.title = "^(Volume Control)$"; float = true; }
+          { match.title = "^(Picture-in-Picture)$"; float = true; }
+          { match.title = "^(Steam)$"; float = true; }
+          # --- Chat & Workspace Assignments ---
+            { match.class = "^(org.telegram.desktop)$"; workspace = "2 silent"; }
+            { match.class = "^(discord)$"; workspace = "2 silent"; }
+            { match.class = "^(org.keepassxc.KeePassXC)$"; workspace = "8 silent"; }
+            { match.title = "^(Nextcloud)$"; workspace = "8 silent"; }
+            { match.class = "^(org.telegram.desktop)$"; match.title = "^(Media viewer)$"; float = true; center = true; }
+            { 
+              match.class = "^(Tk)$"; 
+              match.title = "^(Server Configuration)$"; 
+              workspace = "8 silent"; 
+            }
+              # --- KeePassXC Dialogs ---
+            {
+              match.class = "^(org.keepassxc.KeePassXC)$";
+              match.title = "^(KeePassXC -  Access Request)$";
+              float = true;
+              pin = true;
+            }
+            {
+              match.class = "^(org.keepassxc.KeePassXC)$";
+              match.title = "^(Unlock Database - KeePassXC)$";
+              float = true;
+              pin = true;
+            }
+            # --- Generic System / File Dialogs ---
+            { match.title = "^(Open)$"; float = true; }
+            { match.title = "^(Choose Files)$"; float = true; }
+            { match.title = "^(Save As)$"; float = true; }
+            { match.title = "^(Confirm to replace files)$"; float = true; }
+            { match.title = "^(File Operation Progress)$"; float = true; }
+
+            # --- Firefox Window Rules ---
+            {
+              match.class = "^(firefox)$";
+              match.title = "^(Picture-in-Picture)$";
+              float = true;
+              pin = true;
+              suppress_event = "fullscreen";
+            }
+            {
+              match.class = "^(firefox)$";
+              match.title = "^(Firefox — Sharing Indicator)$";
+              float = true;
+              suppress_event = "fullscreen";
+            }
+            {
+              match.class = "^(firefox)$";
+              match.title = "^(Extension:.* Mozilla Firefox)$";
+              float = true;
+              suppress_event = "fullscreen";
+            }
+
+            # --- Telegram Media Viewer ---
+            {
+              match.class = "^(org.telegram.desktop)$";
+              match.title = "^(Media viewer)$";
+              float = true;
+              center = true;
+            }
+
+            # --- Idle Inhibition ---
+            { match.class = "^(.*)$"; idle_inhibit = "fullscreen"; }
+            { match.class = "^(steam_app_.*)$"; idle_inhibit = "focus"; }
+            { match.class = "^(mpv)$"; idle_inhibit = "focus"; }
+
+        ];
+
+        layer_rule = [ {
+          match.namespace = "^eww%-blur$";
+          blur = true;
+          ignore_alpha = 0.0;
+        }];
+
+        bind = [
+          (bind "SUPER + RETURN" (dsp.exec "kitty"))
+          (bind "SUPER + SHIFT + RETURN" (dsp.toggleSpecial "magic"))
+          (bind "SUPER + SHIFT + S" (dsp.moveToSpecial "magic"))
+          (bind "SUPER + Q" dsp.close)
+          (bind "SUPER + T" dsp.float)
+          (bind "SUPER + F" dsp.fullscreen)
+          (bind "SUPER + P" dsp.pseudo)
+          (bind "SUPER + J" (dsp.layout "togglesplit"))
+          (bind "SUPER + D" (dsp.exec "${lib.getExe pkgs.wofi} -modi --show drun"))
+          (bind "SUPER + SHIFT + D" (dsp.exec "~/.config/hypr/themes/apatheia/eww/launch_bar"))
+          (bind "SUPER + V" (dsp.exec "${lib.getExe pkgs.cliphist} list | ${lib.getExe pkgs.wofi} -dmenu | ${lib.getExe pkgs.cliphist} decode | ${pkgs.wl-clipboard}/bin/wl-copy"))
+          (bind "PRINT" (dsp.exec "${lib.getExe pkgs.hyprshot} -m region --raw | ${lib.getExe pkgs.satty} --filename - --early-exit --action-on-enter save-to-clipboard --copy-command '${pkgs.wl-clipboard}/bin/wl-copy'"))
+          (bind "SUPER + L" (dsp.exec "${pkgs.hyprlock}/bin/hyprlock"))
+          (bind "SUPER + left" (dsp.focus "left"))
+          (bind "SUPER + right" (dsp.focus "right"))
+          (bind "SUPER + up" (dsp.focus "up"))
+          (bind "SUPER + down" (dsp.focus "down"))
+          (bind "SUPER + mouse_down" (dsp.focusWorkspace "e+1"))
+          (bind "SUPER + mouse_up" (dsp.focusWorkspace "e-1"))
+
+          (bind "SUPER + 1" (dsp.focusWorkspace 1))
+          (bind "SUPER + SHIFT + 1" (dsp.moveToWorkspace 1))
+          (bind "SUPER + 2" (dsp.focusWorkspace 2))
+          (bind "SUPER + SHIFT + 2" (dsp.moveToWorkspace 2))
+          (bind "SUPER + 3" (dsp.focusWorkspace 3))
+          (bind "SUPER + SHIFT + 3" (dsp.moveToWorkspace 3))
+          (bind "SUPER + 4" (dsp.focusWorkspace 4))
+          (bind "SUPER + SHIFT + 4" (dsp.moveToWorkspace 4))
+          (bind "SUPER + 5" (dsp.focusWorkspace 5))
+          (bind "SUPER + SHIFT + 5" (dsp.moveToWorkspace 5))
+          (bind "SUPER + 6" (dsp.focusWorkspace 6))
+          (bind "SUPER + SHIFT + 6" (dsp.moveToWorkspace 6))
+          (bind "SUPER + 7" (dsp.focusWorkspace 7))
+          (bind "SUPER + SHIFT + 7" (dsp.moveToWorkspace 7))
+          (bind "SUPER + 8" (dsp.focusWorkspace 8))
+          (bind "SUPER + SHIFT + 8" (dsp.moveToWorkspace 8))
+          (bind "SUPER + 9" (dsp.focusWorkspace 9))
+          (bind "SUPER + SHIFT + 9" (dsp.moveToWorkspace 9))
+          (bind "XF86AudioPlay" (dsp.exec "${lib.getExe pkgs.playerctl} play-pause"))
+          (bind "XF86AudioPrev" (dsp.exec "${lib.getExe pkgs.playerctl} previous"))
+          (bind "XF86AudioNext" (dsp.exec "${lib.getExe pkgs.playerctl} next"))
+          (bindOpts "XF86AudioRaiseVolume" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+") { locked = true; repeating = true; })
+          (bindOpts "XF86AudioLowerVolume" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") { locked = true; repeating = true; })
+          (bindOpts "XF86AudioMute" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle") { locked = true; })
+          (bindOpts "XF86AudioMicMute" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle") { locked = true; })
+          (bindOpts "XF86MonBrightnessUp" (dsp.exec "${lib.getExe pkgs.brightnessctl} s 5%+") { locked = true; repeating = true; })
+          (bindOpts "XF86MonBrightnessDown" (dsp.exec "${lib.getExe pkgs.brightnessctl} s 5%-") { locked = true; repeating = true; })
+          (bindOpts "SUPER + mouse:272" dsp.drag { mouse = true; })
+          (bindOpts "SUPER + mouse:273" dsp.resize { mouse = true; })
+        ];
+      };
+    };
  };
 }
@@ -1,13 +1,12 @@
 { config, pkgs, ... }: {

-  home.packages = with pkgs; [ xdg-user-dirs ];
-
+  xdg.enable = true;
  xdg.userDirs.enable = true;
  xdg.userDirs.desktop = "${config.home.homeDirectory}/desktop";
  xdg.userDirs.documents = "${config.home.homeDirectory}/desktop";
  xdg.userDirs.download = "${config.home.homeDirectory}/downloads";
  xdg.userDirs.extraConfig = {
-    XDG_MISC_DIR = "${config.home.homeDirectory}/misc";
+    MISC = "${config.home.homeDirectory}/misc";
  };
  xdg.userDirs.music = "${config.home.homeDirectory}/media/music";
  xdg.userDirs.pictures = "${config.home.homeDirectory}/media/photo";
@@ -15,5 +14,5 @@
  xdg.userDirs.templates = "${config.home.homeDirectory}/media/template";
  xdg.userDirs.videos = "${config.home.homeDirectory}/media/video";
  xdg.userDirs.createDirectories = true;
-
+  xdg.userDirs.setSessionVariables = true;
 }
@@ -108,8 +108,6 @@
      bspc desktop -f 0

      telegram-desktop &
-      nextcloud &
-      jellyfin-mpv-shim &
      #flameshot &

      sleep 2
@@ -118,7 +116,6 @@

      ibus-daemon -drx

-      easyeffects --gapplication-service &
      bspc desktop -f 0
    '';

@@ -13,6 +13,7 @@ in {
      # wireplumber.enable = true;
    };

-    environment.systemPackages = with pkgs; [ easyeffects alsa-utils ];
+    programs.dconf.enable = true;
+    environment.systemPackages = with pkgs; [ alsa-utils ];
  };
 }
@@ -5,7 +5,7 @@
      enable = true;
      settings = rec {
        initial_session = {
-          command = "zsh";
+          command = "start-hyprland";
          user = "${config.syscfg.defaultUser}";
        };
        default_session = initial_session;
@@ -3,7 +3,7 @@
    programs.xwayland.enable = true;
    services.xserver = {
      enable = true;
-      videoDrivers = [ "amd" ];
+      videoDrivers = [ "amdgpu" ];
      xkb = {
        layout = "us";
        variant = "intl";
@@ -1,3 +1,23 @@
-{ ... }: {
-  imports = [ ./dbus ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
+{ config, lib, ... }: {
+  imports = [ ./dbus ./docs ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
+
+  services.journald.extraConfig = ''
+    SystemMaxUse=512M
+    SystemMaxFileSize=64M
+    MaxRetentionSec=1month
+    RateLimitIntervalSec=30s
+    RateLimitBurst=10000
+  '';
+
+  systemd.services.systemd-user-sessions = {
+    after = lib.mkForce ([
+      "system.slice"
+      "systemd-journald.socket"
+      "sysinit.target"
+      "remote-fs.target"
+      "nss-user-lookup.target"
+      "home.mount"
+      "basic.target"
+    ] ++ map (user: "home-manager-${user.username}.service") config.syscfg.users);
+  };
 }
@@ -0,0 +1,14 @@
+{ config, lib, ... }:
+let
+  cfg = config.syscfg.make;
+  withDocs = cfg.gui || cfg.develop || cfg.serverExtras;
+in
+{
+  documentation = lib.mkIf (!withDocs) {
+    enable = false;
+    man.enable = false;
+    info.enable = false;
+    doc.enable = false;
+    nixos.enable = false;
+  };
+}
@@ -1,6 +1,6 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }: {

-  fonts = {
+  fonts = lib.mkIf (config.syscfg.make.gui || config.syscfg.make.serverExtras) {
    enableDefaultPackages = false;
    fontDir.enable = true;

@@ -1,4 +1,5 @@
-{ ... }: {
-  services.fwupd.enable = true;
-  hardware.enableAllFirmware = true;
+{ config, lib, ... }: {
+  services.fwupd.enable = lib.mkDefault (config.syscfg.make.gui || config.syscfg.make.power);
+  hardware.enableAllFirmware = false;
+  services.power-profiles-daemon.enable = lib.mkDefault config.syscfg.make.gui;
 }
@@ -2,7 +2,19 @@
 let isSANDBOX = builtins.elem config.syscfg.hostname [ "sandbox" ];
 in {
  config = lib.mkIf (!isSANDBOX) {
+    boot.kernelParams = [ 
+      "amdgpu.gpu_recovery=1"
+      "amdgpu.psr=0"
+      "amdgpu.dcfeaturemask=0x2"
+      "async_probe=tpm*"     # Load TPM in parallel without blocking udev
+      "8250.nr_uarts=0"      # Stop scanning for old motherboard serial lines (ttyS0-S3)
+    ];
+    boot.initrd = {
+      compressor = "zstd";
+      checkJournalingFS = false;
+    };
    boot.loader = {
+      timeout = 2;
      systemd-boot = {
        enable = true;
        configurationLimit = 8;
@@ -1 +1 @@
-{ ... }: { imports = [ ./base ./boot ./fs ./graphics ./power ./udev ./virt ]; }
+{ ... }: { imports = [ ./base ./boot ./fs ./graphics ./power ./udev ./virt ./wsl ]; }
@@ -1,6 +1,9 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }:
+let
+  hasNfsFileSystems = lib.any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") (lib.attrValues config.fileSystems);
+in {
  services.fstrim.enable = true; # Improves SSD life
-  services.gvfs.enable = true; # User Mounted FS
+  services.gvfs.enable = config.syscfg.make.gui; # User Mounted FS

-  environment.systemPackages = with pkgs; [ nfs-utils ];
+  environment.systemPackages = lib.optionals hasNfsFileSystems [ pkgs.nfs-utils ];
 }
--- a/Show More
+++ b/Show More