migrate lock for oled

.gitea/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
         uses: cachix/install-nix-action@v31
 
     #  - uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v14
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
       - uses: DeterminateSystems/flake-checker-action@v12
 
       - name: "Install Cachix ❄️"

.gitignore

@@ -2,3 +2,4 @@ result
 age-key.txt
 .decrypted~common.yaml
 .decrypted*
+.tmp

.sops.yaml

@@ -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:

flake.lock

@@ -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": 1781242433,
-        "narHash": "sha256-bchLZZ3sRn740zyvD2icZSnNoTaanN0nw7l6fjVXO+E=",
+        "lastModified": 1779036909,
+        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "aabb2037edfc0f210723b72cd5f528aab5dd3f0b",
+        "rev": "56c666e108467d87d13508936aade6d567f2a501",
         "type": "github"
       },
       "original": {
@@ -59,28 +37,23 @@
         "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",
@@ -101,16 +74,34 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "hardware": {
       "inputs": {
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1781168557,
-        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
+        "lastModified": 1780065812,
+        "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
+        "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144",
         "type": "github"
       },
       "original": {
@@ -119,22 +110,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": [
@@ -142,16 +117,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1779506708,
-        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
+        "lastModified": 1779726825,
+        "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
+        "rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -177,11 +152,11 @@
     },
     "nixUnstable": {
       "locked": {
-        "lastModified": 1781229721,
-        "narHash": "sha256-ORvqDbb/LYxiJljGIejapjkc/kJbVote2N1WSb9W45I=",
+        "lastModified": 1780030872,
+        "narHash": "sha256-u6WU/yd/o8iYQrHX3RAwO1hYa3LkoSL+WNQD0rJfJZQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "173d0ad7a974f8543a9ab01d2271b2e290341b33",
+        "rev": "e9a7635a57597d9754eccebdfc7045e6c8600e6b",
         "type": "github"
       },
       "original": {
@@ -191,6 +166,27 @@
         "type": "github"
       }
     },
+    "nixos-wsl": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1780169171,
+        "narHash": "sha256-3HBYDfBgZ+ph52HS6Ks/bMMwuh2uONIT72sZ1CtLE/s=",
+        "owner": "nix-community",
+        "repo": "nixos-wsl",
+        "rev": "998b2821c30b2938637230916904ceb8757c79e8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-wsl",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1767892417,
@@ -221,47 +217,33 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1780952837,
-        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
+        "lastModified": 1780203844,
+        "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
+        "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1781074563,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3"
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1781316142,
-        "narHash": "sha256-4zZEWkH6M/k6NxKm3o79FgG3lUS0gLLxPJFe9D1DUZo=",
+        "lastModified": 1780265777,
+        "narHash": "sha256-t/KORFHEv8Jn2vFmVfv4Zffekv+MUogI2KgtxuCcEmQ=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "42ffe33a22df19445788fff40b01c6bf1f8ba3c7",
+        "rev": "39917b7f68263188707925ffe26c9df6ef4e7d64",
         "type": "github"
       },
       "original": {
@@ -272,15 +254,16 @@
     },
     "root": {
       "inputs": {
-        "arion": "arion",
         "darwin": "darwin",
         "hardware": "hardware",
         "home-manager": "home-manager",
         "nix-colors": "nix-colors",
         "nixUnstable": "nixUnstable",
+        "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "vscode-server": "vscode-server"
       }
     },
     "sops-nix": {
@@ -290,11 +273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780547341,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "lastModified": 1777944972,
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
@@ -302,6 +285,42 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "vscode-server": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770124655,
+        "narHash": "sha256-yHmd2B13EtBUPLJ+x0EaBwNkQr9LTne1arLVxT6hSnY=",
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "rev": "92ce71c3ba5a94f854e02d57b14af4997ab54ef0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -3,12 +3,15 @@
   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";
+    nur = {
+      url = "github:nix-community/nur";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     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 +20,48 @@
       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;
+      gen = import ./generator.nix { inherit inputs; };
+      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 == systemType)
+          systemNames;
+      generateHosts = systemType:
+        lib.genAttrs
+          (hostsByType systemType)
+          (host: gen.generate { inherit host; });
     in {
       devShells = import ./shells { inherit inputs; };
 
-      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 ======

generator.nix

@@ -5,7 +5,7 @@
       nameValuePair = name: value: { inherit name value; };
     in ({
       "nixos" = inputs.nixpkgs.lib.nixosSystem {
-        system = syscfg.syscfg.system;
+        system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
           ./modules/shared/syscfg
@@ -13,9 +13,12 @@
           ./modules/nixos
           syscfg
           ./systems/${host}
-          inputs.arion.nixosModules.arion
           inputs.sops-nix.nixosModules.sops
           inputs.home-manager.nixosModules.home-manager
+
+          inputs.nixos-wsl.nixosModules.wsl
+          inputs.vscode-server.nixosModules.default
+
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
@@ -29,7 +32,6 @@
                   syscfg
                   { usercfg = userConfig; }
                   inputs.nix-colors.homeManagerModule
-                  # inputs.hyprland.homeManagerModules.default
                   inputs.sops-nix.homeManagerModules.sops
                 ];
               }) syscfg.syscfg.users);
@@ -38,7 +40,7 @@
       };
 
       "macos" = inputs.darwin.lib.darwinSystem {
-        system = syscfg.system;
+        system = "x86_64-darwin";
         modules = [
           ./modules/shared/syscfg
           ./modules/shared/sops

modules/home/base/default.nix

@@ -8,7 +8,7 @@
     username = "${config.usercfg.username}";
     homeDirectory = "/home/${config.usercfg.username}";
 
-    stateVersion = "24.11";
+    stateVersion = "26.05";
   };
 
 

modules/home/cli/default.nix

@@ -1,4 +1,4 @@
 { ... }: {
   imports =
-    [ ./btop ./git ./helix ./kitty ./neofetch ./other ./starship ./zsh ];
+    [ ./btop ./git ./helix ./kitty ./fastfetch ./other ./starship ./zsh ];
 }

modules/home/cli/fastfetch/config.jsonc

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

modules/home/cli/fastfetch/default.nix

@@ -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 {
+  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}"  }
+        ]
+    }
+  '';
+}

modules/home/cli/fastfetch/logo.txt

@@ -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⠈⠉⠙⠛⠛⠛⠛⠛⠛⠁ 
+                            

modules/home/cli/neofetch/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, config, ... }: {
-  home.packages = with pkgs; [ neofetch ];
-  xdg.configFile."neofetch/config.conf".source = ./config.conf;
-}

modules/home/cli/other/default.nix

@@ -1,11 +1,9 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
-    sudo
     ripgrep
     unzip
 
     socat
-    ripgrep
 
     appimage-run
 

modules/home/cli/starship/default.nix

@@ -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;

modules/home/gui/apps/develop/vscodium/default.nix

@@ -1,9 +1,8 @@
 { lib, config, pkgs, ... }: {
 
   config = lib.mkIf (config.syscfg.make.develop) {
-    programs.vscode = {
+    programs.vscodium = {
       enable = true;
-      package = pkgs.vscodium;
       #profiles.default = {
         profiles.default.extensions = with pkgs.vscode-extensions; [
           bbenoist.nix
@@ -12,7 +11,6 @@
           ms-python.vscode-pylance
           ms-vscode.cpptools
           dbaeumer.vscode-eslint
-          continue.continue 
         ];
       #};
     };

modules/home/gui/apps/mpv/default.nix

@@ -4,7 +4,7 @@
     programs.mpv = {
       enable = true;
       scripts = with pkgs; [ mpvScripts.mpris ];
-    };
+    };#--target-colorspace-hint-mode=source for HDR
 
     programs.yt-dlp.enable = true;
   };

modules/home/gui/apps/vosk/default.nix

@@ -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
     '';

modules/home/gui/base/default.nix

@@ -4,10 +4,10 @@
     services.nextcloud-client.enable = true;
 
     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

modules/home/gui/theme/default.nix

@@ -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
     '';
   };
 }

modules/home/gui/theme/wallpaper-gen.nix

@@ -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
   '';
 }

modules/home/wayland/apps/default.nix

@@ -1 +1 @@
-{ ... }: { imports = [ ./dunst ./eww ./kanshi ./waylock ./wofi ]; }
+{ ... }: { imports = [ ./dunst ./eww ./kanshi ./lockscreen ./wofi ]; }

modules/home/wayland/apps/dunst/default.nix

@@ -46,7 +46,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 +54,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";

modules/home/wayland/apps/eww/bar/css/_clock.scss

@@ -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  { @include color-accent; }
+  .quick-label { @include color-accent; }
+}
+
+.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;
+  }
+}

modules/home/wayland/apps/eww/bar/css/_colors.scss

@@ -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;

modules/home/wayland/apps/eww/bar/css/_net.scss

@@ -1,8 +1,36 @@
+// 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; }

modules/home/wayland/apps/eww/bar/css/_powermenu.scss

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

modules/home/wayland/apps/eww/bar/css/_radio.scss

@@ -1,75 +1,90 @@
 
-.radio-win {
-    //margin: $gaps-screen;
-    //padding: .5em;
-  }
+.radio-accent { background-color: $base0D; }
 
-.album_art {
-    background-repeat: no-repeat;
-	background-size: 240px;
-	min-height: 240px;
-	min-width: 240px;
-	margin: $gaps-screen;
-	border-radius: $border-radius;
+// Now playing
+.radio-now-playing {
+  margin-bottom: $popup-scale * 8pt;
 }
 
-.song {
-	color: $base0C;
-	font-size: 24px;
-	font-weight: bold;
-	margin: 20px 0px 0px 0px;
+.radio-art {
+  background-repeat: no-repeat;
+  @include border-radius;
+  @include background-base2;
+  min-width: $popup-scale * 72px;
+  min-height: $popup-scale * 72px;
 }
 
-.artist {
-	color: $base0E;
-	font-size: 16px;
-	font-weight: normal;
-	margin: 0px 0px $gaps-screen 0px;
+.radio-art-icon {
+  font-size: 2em;
+  @include color-body;
 }
 
-.btn_bar {
-	color: $base05;
-	font-size: 20px;
-	font-weight: bold;
-	margin: $gaps-screen 0px;
+.radio-song {
+  font-size: 0.88em;
+  font-weight: bold;
+  @include color-base;
+  margin-bottom: $popup-scale * 2pt;
 }
 
-.btn_play {
-	font-size: 48px;
-	font-weight: bold;
-	margin: 0 12px;
+.radio-artist {
+  font-size: 0.74em;
+  @include color-body;
 }
 
-.btn_play:hover {
-	color: $base07;
+// Controls
+.radio-controls {
+  margin-top: $popup-scale * 6pt;
 }
 
-
-.station_list {
-    border-right-color: $base03;
-    border-right-style: solid;
-    border-right-width: $border-width;
-    margin-right: $gaps-screen;
+.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; }
 }
 
-.station_art {
-    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;
+// 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_art:hover {
-    border-color: $base04;
+.station-row {
+  padding: $popup-scale * 4pt $popup-scale * 3pt;
+  @include border-radius;
+  &:hover { @include background-base2; }
 }
 
-.station_sel {
-    border-color: $base03;
+.station-row-active {
+  .station-name { @include color-accent; }
+}
+
+.station-icon {
+  background-repeat: no-repeat;
+  @include border-radius;
+  @include background-base2;
+  min-width: $popup-scale * 28px;
+  min-height: $popup-scale * 28px;
+  margin-right: $popup-scale * 8pt;
+}
+
+.station-name {
+  font-size: 0.76em;
+  @include color-body;
 }

modules/home/wayland/apps/eww/bar/css/_sys.scss

@@ -1,69 +1,93 @@
 
-.cpubar {
-color: $base0C;
-}
+// Bar module rings
+.cpubar { color: $base0C; }
+.gpubar { color: $base0E; }
+.membar { color: $base08; }
+.batbar { color: $base0B; }
+.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.7em; @include color-body; }
+.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;
 }

modules/home/wayland/apps/eww/bar/css/_systray.scss

@@ -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 border-radius;
+  @include border-active;
+  @include background-base;
+  @include color-base;
 
+  padding: 10px 0;
 
-	padding: 10px 0px;
+  > menuitem {
+    margin: 2px $border-width;
+    padding: 0 10px;
 
-	>menuitem {
-        margin: 2px $border-width;
-		padding: 0px 10px;
+    &:disabled label { @include color-active; }
+    &:hover          { @include background-accent; }
+  }
 
-		&:disabled label {
-			color: $base04;
-		}
+  separator {
+    @include background-base2;
+    padding-top: 1px;
+    margin: 10px 0;
 
-		&:hover {
-			background-color: $base0C;
-		}
-	}
-
-	separator {
-		background-color: $base03;
-		padding-top: 1px;
-        margin:10px 0px;
-
-		&:last-child {
-			padding: unset;
-		}
-	}
+    &:last-child { padding: unset; }
+  }
 }

modules/home/wayland/apps/eww/bar/eww.scss

@@ -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 {

modules/home/wayland/apps/eww/bar/eww.yuck

@@ -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%"

modules/home/wayland/apps/eww/bar/modules/clock.yuck

@@ -5,8 +5,8 @@
     (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)"
+      :onclick "(sleep 0.1 && scripts/panel-toggle clock)"
+      :onrightclick "(sleep 0.1 && scripts/powermenu-toggle)"
       (box
         :class "datetime"
         (overlay
@@ -14,10 +14,10 @@
             :orientation "v"
             (label :show-truncated false 
               :class "hour" 
-              :text {hour})
+              :text {time.hour})
             (label :show-truncated false
             :class "minute"
-              :text {minute}))
+              :text {time.minute}))
           (revealer
             :reveal date_rev
             (box
@@ -25,10 +25,10 @@
               :orientation "v"
               (label :show-truncated "false"
                 :class "day"
-                :text {day})
+                :text {time.day})
               (label :show-truncated "false"
                 :class "month"
-                :text {month}))
+                :text {time.month}))
           )
         )
       )
@@ -36,7 +36,5 @@
   )
 )
 
-(defpoll hour	:interval "15s"	"date '+%H'")
-(defpoll minute	:interval "15s"	"date '+%M'")
-(defpoll day	:interval "15s"	"date '+%d'")
-(defpoll month	:interval "15s"	"date '+%m'")
+(defpoll time :interval "15s" "date '+{\"hour\":\"%H\",\"minute\":\"%M\",\"day\":\"%d\",\"month\":\"%m\"}'")
+

modules/home/wayland/apps/eww/bar/modules/net.yuck

@@ -1,17 +1,30 @@
-(deflisten net :initial '{"name":"","icon":""}'"scripts/net/net")
+(deflisten net
+  :initial '{"wifi":{"connected":false,"enabled":false,"icon":"󰤮","ssid":""},"ethernet":{"connected":false},"usb":{"connected":false}}'
+  "scripts/net/net")
+
+(deflisten bluetooth
+  :initial '{"powered":false,"connected":false,"device":""}'
+  "scripts/net/bluetooth")
 
 (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 "(sleep 0.1 && 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
+        :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 ${bluetooth.connected ? 'blt-connected' : bluetooth.powered ? 'blt-on' : 'net-dim'}"
+        :tooltip {bluetooth.connected ? "Bluetooth: ${bluetooth.device}" : bluetooth.powered ? "Bluetooth: On" : "Bluetooth: Off"}
+        :text {bluetooth.connected ? "󰂱" : bluetooth.powered ? "󰂯" : "󰂲"})))))

modules/home/wayland/apps/eww/bar/modules/sys.yuck

@@ -1,42 +1,32 @@
-(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 '{"human":{"used":"0G","total":"0G","cached":"0G"},"used":0.0,"total":1.0,"cached":0.0}' "scripts/sys/memory")
 
 (deflisten battery :initial '{"visible":false,"percentage":0.0,"color":"#FFFFFF"}' "scripts/sys/battery")
 
 (defwidget sys-mod []
   (module
     (eventbox
-      :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle sys)"
-      (box
-        :orientation "v"
-          (circular-progress
-            :value {EWW_CPU.avg}
-            :class "cpubar"
-            :thickness 6
-            (label :class "icon-text" :text "C"))
-
-          (circular-progress
-            :value {gpu.devices[0].GRBM2?.CommandProcessor-Graphics?.value?:0}
-            :class "gpubar"
-            :thickness 6
-            (label :class "icon-text" :text "G"))
+      :onclick "(sleep 0.1 && scripts/panel-toggle sys)"
+      (box :orientation "v"
+        (circular-progress
+          :value {EWW_CPU.avg}
+          :class "cpubar"
+          :width 28 :height 28 :thickness 6
+          :tooltip "CPU ${round(EWW_CPU.avg, 0)}%")
+        (circular-progress
+          :value {gpu.gfx_pct}
+          :class "gpubar"
+          :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"
           :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}")))))

modules/home/wayland/apps/eww/bar/modules/workspaces.yuck

@@ -1,23 +1,24 @@
 (deflisten workspace :initial '[]' "scripts/workspaces")
 
 (defwidget workspace-mod []
-  	(module
-  	  	(eventbox
-		:onscroll "echo {} | sed -e \"s/up/-1/g\" -e \"s/down/+1/g\" | xargs hyprctl dispatch workspace"
+	(module
+		(eventbox
+			: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" ? "󰝥" : "○"}`
 						)
 					)
 				)
 			)
-	  	)
+		)
 	)
 )

modules/home/wayland/apps/eww/bar/scripts/brightness

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+BACKLIGHT="/sys/class/backlight"
+DEV=$(ls "$BACKLIGHT" 2>/dev/null | head -n1)
+
+gen_output() {
+  if [ -z "$DEV" ]; then
+    echo '{"percent":0,"available":false}'
+    return
+  fi
+  max=$(cat "$BACKLIGHT/$DEV/max_brightness")
+  cur=$(cat "$BACKLIGHT/$DEV/actual_brightness" 2>/dev/null || cat "$BACKLIGHT/$DEV/brightness")
+  percent=$(awk -v c="$cur" -v m="$max" 'BEGIN{print int(c/m*100+0.5)}')
+  printf '{"percent":%d,"available":true}\n' "$percent"
+}
+
+case "$1" in
+  set)
+    [ -z "$DEV" ] && exit 0
+    brightnessctl -d "$DEV" set "${2}%" -q 2>/dev/null
+    ;;
+  *)
+    gen_output
+    [ -z "$DEV" ] && exit 0
+    udevadm monitor --udev --subsystem-match=backlight 2>/dev/null | while read -r _; do
+      gen_output
+    done
+    ;;
+esac

modules/home/wayland/apps/eww/bar/scripts/color-pick

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+eww close popup 2>/dev/null
+hyprpicker -a

modules/home/wayland/apps/eww/bar/scripts/lock

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+eww close popup 2>/dev/null
+eww close powermenu 2>/dev/null
+# swaylock #swaylock-effects
+hyprlock
+# gtklock

modules/home/wayland/apps/eww/bar/scripts/media

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+playerctl "$@"

modules/home/wayland/apps/eww/bar/scripts/net/bluetooth

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+emit() {
+  local powered=false connected=false device=""
+
+  if bluetoothctl show 2>/dev/null | grep -q "Powered: yes"; then
+    powered=true
+    while IFS= read -r line; do
+      local mac info
+      mac=$(echo "$line" | awk '{ print $2 }')
+      info=$(bluetoothctl info "$mac" 2>/dev/null)
+      if echo "$info" | grep -q "Connected: yes"; then
+        device=$(echo "$info" | awk -F': ' '/^\tName:/ { print $2; exit }')
+        connected=true
+        break
+      fi
+    done < <(bluetoothctl devices 2>/dev/null)
+  fi
+
+  printf '{"powered":%s,"connected":%s,"device":"%s"}\n' "$powered" "$connected" "$device"
+}
+
+emit
+
+tmp=$(mktemp -d)
+pipe="$tmp/bt-events"
+mkfifo "$pipe"
+trap 'rm -rf "$tmp"; kill 0 2>/dev/null' EXIT INT TERM
+
+# Poll every 10s as reliable fallback for missed events
+(while true; do sleep 10; echo poll; done) > "$pipe" &
+
+# bluetoothctl monitor for reactive device connect/disconnect events
+(bluetoothctl monitor 2>/dev/null | grep --line-buffered -E "Powered|Connected|Device") > "$pipe" &
+
+while IFS= read -r _ < "$pipe"; do
+  emit
+done

modules/home/wayland/apps/eww/bar/scripts/net/bt-devices

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+emit() {
+  local first=true arr=""
+  while IFS= read -r line; do
+    local mac name connected
+    mac=$(echo "$line" | awk '{ print $2 }')
+    name=$(echo "$line" | awk '{ $1=$2=""; sub(/^ +/, ""); print }')
+    info=$(bluetoothctl info "$mac" 2>/dev/null)
+    connected=$(echo "$info" | grep -q "Connected: yes" && echo true || echo false)
+    $first || arr="${arr},"
+    arr="${arr}{\"mac\":\"${mac}\",\"name\":\"${name}\",\"connected\":${connected}}"
+    first=false
+  done < <(bluetoothctl devices 2>/dev/null)
+  echo "[${arr}]"
+}
+
+emit
+
+tmp=$(mktemp -d)
+pipe="$tmp/bt-dev-events"
+mkfifo "$pipe"
+trap 'rm -rf "$tmp"; kill 0 2>/dev/null' EXIT INT TERM
+
+# Poll every 10s as fallback for missed events
+(while true; do sleep 10; echo poll; done) > "$pipe" &
+
+# Reactive updates from D-Bus
+(bluetoothctl monitor 2>/dev/null | grep --line-buffered -E "Connected|Device|Powered") > "$pipe" &
+
+while IFS= read -r _ < "$pipe"; do
+  emit
+done

modules/home/wayland/apps/eww/bar/scripts/net/bt-toggle

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+mac="$1"
+if bluetoothctl info "$mac" 2>/dev/null | grep -q "Connected: yes"; then
+  bluetoothctl disconnect "$mac"
+else
+  bluetoothctl connect "$mac"
+fi

modules/home/wayland/apps/eww/bar/scripts/net/net

@@ -1,73 +1,64 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env bash
 
-function get_time_ms {
-  date -u +%s%3N
+get_wifi_iface() {
+  awk 'NR > 2 { gsub(":", "", $1); print $1; exit }' /proc/net/wireless
 }
 
-icons=("󰤯" "󰤟" "󰤢" "󰤥" "󰤨")
-
-function toggle() {
-  status=$(rfkill | grep wlan | awk '{print $4}')
-
-  if [ "$status" = "unblocked" ]; then
-    rfkill block wlan
-  else
-    rfkill unblock wlan
-  fi
+get_usb_iface() {
+  ip link 2>/dev/null | awk '
+    /^[0-9]+: usb[0-9]/ { gsub(":", "", $2); print $2; exit }
+    /^[0-9]+: enx/      { gsub(":", "", $2); print $2; exit }
+  '
 }
 
-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
+signal_icon() {
+  local dbm="$1"
+  if [ -z "$dbm" ]; then echo "󰤮"; return; fi
+  if   [ "$dbm" -ge -50 ]; then echo "󰤨"
+  elif [ "$dbm" -ge -60 ]; then echo "󰤥"
+  elif [ "$dbm" -ge -70 ]; then echo "󰤢"
+  elif [ "$dbm" -ge -80 ]; then echo "󰤟"
+  else echo "󰤯"; fi
+}
+
+make_content() {
+  local wifi_iface eth_iface
+
+  wifi_iface=$(get_wifi_iface)
+  eth_iface=$(ip link | awk '/^[0-9]+: en[po]/ { gsub(":",""); print $2; exit }')
+
+  # Ethernet
+  local eth_connected=false
+  if [ -n "$eth_iface" ]; then
+    eth_state=$(ip link show "$eth_iface" 2>/dev/null | awk '/state/ { print $9 }')
+    [ "$eth_state" = "UP" ] && eth_connected=true
   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"
+  # USB tethering
+  local usb_iface usb_connected=false
+  usb_iface=$(get_usb_iface)
+  if [ -n "$usb_iface" ] && ip -4 addr show "$usb_iface" 2>/dev/null | grep -q "inet "; then
+    usb_connected=true
   fi
 
-  echo '{"icon": "'$icon'", "name": "'$name'", "ip": "'$ip'", "class": "'$class'"}'
+  # WiFi - use IP presence as connection indicator (more reliable than wpa_cli)
+  local wifi_connected=false wifi_enabled=false wifi_icon="󰤮" wifi_ssid=""
+  if ! rfkill list wlan 2>/dev/null | grep -q "Soft blocked: yes"; then
+    wifi_enabled=true
+  fi
+  if [ -n "$wifi_iface" ] && ip -4 addr show "$wifi_iface" 2>/dev/null | grep -q "inet "; then
+    wifi_connected=true
+    wifi_ssid=$(wpa_cli -g "/run/wpa_supplicant/$wifi_iface" status 2>/dev/null \
+      | awk -F= '/^ssid=/ { print $2 }')
+    signal=$(awk -v iface="$wifi_iface" '$1 == iface ":" { gsub(/\./, "", $4); print $4; exit }' /proc/net/wireless)
+    wifi_icon=$(signal_icon "$signal")
+  fi
+
+  printf '{"wifi":{"connected":%s,"enabled":%s,"icon":"%s","ssid":"%s"},"ethernet":{"connected":%s},"usb":{"connected":%s}}\n' \
+    "$wifi_connected" "$wifi_enabled" "$wifi_icon" "$wifi_ssid" "$eth_connected" "$usb_connected"
 }
 
-if [ "$1" = "toggle" ]; then
-  toggle
-else
-  last_time=$(get_time_ms)
+make_content
+ip monitor | while read -r _; do
   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)
-    fi
-  done
-fi
+done

modules/home/wayland/apps/eww/bar/scripts/net/netinfo

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+get_wifi_iface() {
+  awk 'NR > 2 { gsub(":", "", $1); print $1; exit }' /proc/net/wireless
+}
+
+get_usb_iface() {
+  ip link 2>/dev/null | awk '
+    /^[0-9]+: usb[0-9]/ { gsub(":", "", $2); print $2; exit }
+    /^[0-9]+: enx/      { gsub(":", "", $2); print $2; exit }
+  '
+}
+
+freq_band() {
+  local f="$1"
+  if   [ "$f" -ge 6000 ] 2>/dev/null; then echo "6 GHz"
+  elif [ "$f" -ge 5000 ] 2>/dev/null; then echo "5 GHz"
+  elif [ "$f" -ge 2400 ] 2>/dev/null; then echo "2.4 GHz"
+  else echo ""; fi
+}
+
+wifi_gen_label() {
+  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
+}
+
+make_content() {
+  local wifi_iface eth_iface
+  wifi_iface=$(get_wifi_iface)
+  eth_iface=$(ip link | awk '/^[0-9]+: en[po]/ { gsub(":",""); print $2; exit }')
+
+  local wifi_ssid="" wifi_ip="" wifi_freq=0 wifi_band="" wifi_gen="" wifi_signal=0
+  if [ -n "$wifi_iface" ] && ip -4 addr show "$wifi_iface" 2>/dev/null | grep -q "inet "; then
+    local wpa
+    wpa=$(wpa_cli -g "/run/wpa_supplicant/$wifi_iface" status 2>/dev/null)
+    wifi_ssid=$(echo "$wpa"    | awk -F= '/^ssid=/            { print $2 }')
+    wifi_ip=$(ip -4 addr show "$wifi_iface" | awk '/inet / { print $2 }')
+    wifi_freq=$(echo "$wpa"   | awk -F= '/^freq=/             { print $2 }')
+    local gen
+    gen=$(echo "$wpa"         | awk -F= '/^wifi_generation=/  { print $2 }')
+    wifi_band=$(freq_band "$wifi_freq")
+    wifi_gen=$(wifi_gen_label "$gen")
+    wifi_signal=$(awk -v iface="$wifi_iface" \
+      '$1 == iface ":" { gsub(/\./, "", $4); print $4; exit }' /proc/net/wireless)
+  fi
+
+  local eth_ip="" eth_speed="" eth_state="down"
+  if [ -n "$eth_iface" ]; then
+    eth_state=$(ip link show "$eth_iface" 2>/dev/null | awk '/state/ { print tolower($9) }')
+    if [ "$eth_state" = "up" ]; then
+      eth_ip=$(ip -4 addr show "$eth_iface" | awk '/inet / { print $2 }')
+      local spd
+      spd=$(cat /sys/class/net/"$eth_iface"/speed 2>/dev/null)
+      [ "${spd:-0}" -gt 0 ] 2>/dev/null && eth_speed="${spd} Mbps"
+    fi
+  fi
+
+  local usb_iface usb_ip=""
+  usb_iface=$(get_usb_iface)
+  if [ -n "$usb_iface" ] && ip -4 addr show "$usb_iface" 2>/dev/null | grep -q "inet "; then
+    usb_ip=$(ip -4 addr show "$usb_iface" | awk '/inet / { print $2 }')
+  fi
+
+  # shellcheck disable=SC2059
+  printf '{"wifi":{"ssid":"%s","ip":"%s","freq":%s,"band":"%s","gen":"%s","signal":%s},' \
+    "$wifi_ssid" "$wifi_ip" "${wifi_freq:-0}" "$wifi_band" "$wifi_gen" "${wifi_signal:-0}"
+  printf '"ethernet":{"state":"%s","ip":"%s","speed":"%s","interface":"%s"},' \
+    "$eth_state" "$eth_ip" "$eth_speed" "${eth_iface:-}"
+  printf '"usb":{"interface":"%s","ip":"%s"}}\n' \
+    "${usb_iface:-}" "$usb_ip"
+}
+
+make_content
+ip monitor | while read -r _; do
+  make_content
+done

modules/home/wayland/apps/eww/bar/scripts/nightlight

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+case "$1" in
+  status)
+    pgrep -x wlsunset >/dev/null 2>&1 && echo true || echo false
+    ;;
+  *)
+    if pgrep -x wlsunset >/dev/null 2>&1; then
+      pkill -x wlsunset && echo false
+    else
+      wlsunset -T 4500 -t 3200 & echo true
+    fi
+    ;;
+esac

modules/home/wayland/apps/eww/bar/scripts/panel-toggle

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+PANEL="$1"
+
+# Atomic lock: flock acquires exclusively or exits immediately.
+# Released automatically when the process exits (no trap needed).
+exec 9>"/tmp/eww_panel_toggle.lock"
+flock -n 9 || exit 0
+
+CURRENT=$(eww get active-panel 2>/dev/null | tr -d '"')
+
+if [ "$CURRENT" = "$PANEL" ]; then
+  eww update active-panel=""
+  eww close popup 2>/dev/null
+else
+  eww update active-panel="$PANEL"
+  eww close popup 2>/dev/null
+  eww-open-on-current-screen popup
+fi

modules/home/wayland/apps/eww/bar/scripts/power-save

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+case "$1" in
+  status)
+    powerprofilesctl get | grep -q power-saver && echo true || echo false
+    ;;
+  *)
+    if powerprofilesctl get | grep -q power-saver; then
+      powerprofilesctl set balanced 2>/dev/null || true
+      echo false
+    else
+      powerprofilesctl set power-saver 2>/dev/null || true
+      echo true
+    fi
+    ;;
+esac

modules/home/wayland/apps/eww/bar/scripts/powermenu-toggle

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+eww close popup 2>/dev/null
+eww update active-panel=""
+eww-open-on-current-screen powermenu --toggle

modules/home/wayland/apps/eww/bar/scripts/radio

@@ -1,106 +1,227 @@
 #!/usr/bin/env bash
 
-get_time_ms() {
-  date -u +%s%3N
-}
-
 URL_BASE="https://www.radiorecord.ru/api"
-
 MPV_PID_FILE="/tmp/mpv_radio_pid"
 RADIO_ID_FILE="/tmp/radio_id"
 
-STATIONS="[]"
+STATION_IDS='[507,522,523,536,537,42532,42602]'
 
-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 ))
+# Custom (non-radiorecord) stations
+# id must be a unique integer >= 1000000 to avoid collision with radiorecord IDs.
+# icon_fill_white: URL to station icon image, or "" for none.
+CUSTOM_STATIONS='[
+]'
+
+STATIONS="[]"
+DEFAULT_INFO='{"artist":"","song":"","image600":""}'
+DEFAULT_MEDIA='{"player":"","status":"Stopped","artist":"","title":"","art":""}'
+
+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 ? 1 : 0 ))
+INFO="$DEFAULT_INFO"
+MEDIA="$DEFAULT_MEDIA"
 STATUS="{}"
 
-get_radio() {
-  echo "$STATIONS" | jq -r --argjson sel_id "$RADIO_ID" 'map(select(.id == $sel_id)).[0]'
+get_stations() {
+  local rr
+  rr=$(curl -s --compressed "$URL_BASE/stations/" 2>/dev/null \
+    | jq --argjson ids "$STATION_IDS" \
+        '.result.stations | map(select(.id | IN($ids[]))) | map({id, title, stream_hls, icon_fill_white, "radiorecord": true})' 2>/dev/null)
+  jq -n \
+    --argjson rr "${rr:-[]}" \
+    --argjson custom "$CUSTOM_STATIONS" \
+    '$rr + ($custom | map(. + {"radiorecord": false}))'
 }
 
 get_song() {
-  echo $(curl -s "$URL_BASE/station/history/?id=$RADIO_ID" | jq '.result.history[0] | ({id, artist, song, image600})')
+  curl -s --compressed "$URL_BASE/station/history/?id=$RADIO_ID" \
+    | jq '.result.history[0] | {artist, song, image600}'
 }
 
-
-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 ))
+get_stream_url() {
+  echo "$STATIONS" | jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].stream_hls // empty'
 }
 
-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
+get_player_info() {
+  local player status artist title art
+  # exclude mpv (radio) so it never appears as "external player"
+  player=$(playerctl -l 2>/dev/null | grep -Ev '^mpv' | head -1)
+  if [ -z "$player" ]; then
+    echo '{"player":"","status":"Stopped","artist":"","title":"","art":""}'
+    return
   fi
-  mpv "$RADIO_URL" & echo $! > "$MPV_PID_FILE"
-  echo $RADIO_ID > "$RADIO_ID_FILE"
+  status=$(playerctl -p "$player" status 2>/dev/null || echo "Stopped")
+  artist=$(playerctl -p "$player" metadata artist 2>/dev/null || echo "")
+  title=$(playerctl -p "$player" metadata title 2>/dev/null || echo "")
+  art=$(playerctl -p "$player" metadata mpris:artUrl 2>/dev/null || echo "")
+  jq -cnr --arg player "$player" --arg status "$status" \
+    --arg artist "$artist" --arg title "$title" --arg art "$art" \
+    '{player:$player, status:$status, artist:$artist, title:$title, art:$art}'
 }
 
+update_state() {
+  PID=$([ -e "$MPV_PID_FILE" ] && cat "$MPV_PID_FILE" || echo 0)
+  RADIO_ID=$([ -e "$RADIO_ID_FILE" ] && cat "$RADIO_ID_FILE" || echo 0)
+  if [ "$PID" -gt 0 ] && ! kill -0 "$PID" 2>/dev/null; then
+    PID=0
+    rm -f "$MPV_PID_FILE"
+  fi
+  PAUSED=$(( PID == 0 ? 1 : 0 ))
+}
 
-toggle() {
-  if [ "$PAUSED" = 1 ]; then
-    echo $RADIO_ID $PID
-    start
+emit_status() {
+  jq -cnr \
+    --argjson stations "${STATIONS:-[]}" \
+    --argjson radio_id "${RADIO_ID:-0}" \
+    --argjson is_paused "${PAUSED:-1}" \
+    --argjson info "${INFO:-$DEFAULT_INFO}" \
+    --argjson media "${MEDIA:-$DEFAULT_MEDIA}" \
+    '{"is_paused": $is_paused, "song": $info, "radio": $radio_id, "stations": $stations, "media": $media}'
+}
+
+get_stream_node() {
+  local name="$1"
+  wpctl status 2>/dev/null | awk -v pat="$name" '
+    /Streams:/ { in_s = 1 }
+    /Sinks:|Sources:|Clients:/ { in_s = 0 }
+    in_s && /[0-9]+\./ && tolower($0) ~ tolower(pat) {
+      match($0, /[0-9]+/); print substr($0, RSTART, RLENGTH); exit
+    }
+  '
+}
+
+get_mpv_node() {
+  get_stream_node "mpv"
+}
+
+get_volume() {
+  if [ "$PID" -gt 0 ] && kill -0 "$PID" 2>/dev/null; then
+    local node_id; node_id=$(get_mpv_node)
+    [ -n "$node_id" ] && wpctl get-volume "$node_id" 2>/dev/null \
+      | awk '{printf "%d", $2 * 100}'
   else
-    kill -9 "$PID"
-    rm -f $MPV_PID_FILE
+    local player; player=$(playerctl -l 2>/dev/null | grep -Ev '^mpv' | head -1)
+    [ -n "$player" ] && playerctl -p "$player" volume 2>/dev/null \
+      | awk '{printf "%d", $1 * 100}'
   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}')
+do_vol() {
+  local vol="${1%.*}"
+  if [ "$PID" -gt 0 ] && kill -0 "$PID" 2>/dev/null; then
+    local node_id; node_id=$(get_mpv_node)
+    [ -n "$node_id" ] && wpctl set-volume "$node_id" "${vol}%"
+  else
+    playerctl volume "$(awk -v v="$vol" 'BEGIN{printf "%.2f", v/100}')" 2>/dev/null
+  fi
+  eww update radio-vol="$vol"
 }
 
+do_mute() {
+  local node_id
+  if [ "$PID" -gt 0 ] && kill -0 "$PID" 2>/dev/null; then
+    node_id=$(get_mpv_node)
+  else
+    local player; player=$(playerctl -l 2>/dev/null | grep -Ev '^mpv' | head -1)
+    [ -n "$player" ] && node_id=$(get_stream_node "${player%%.*}")
+  fi
+  [ -z "$node_id" ] && return
+  wpctl set-mute "$node_id" toggle
+  if wpctl get-volume "$node_id" 2>/dev/null | grep -q MUTED; then
+    eww update radio-muted=true
+  else
+    eww update radio-muted=false
+  fi
+}
+
+do_start() {
+  [ "$RADIO_ID" -le 0 ] && return
+  STATIONS=$(get_stations)
+  RADIO_URL=$(get_stream_url)
+  [ -z "$RADIO_URL" ] || [ "$RADIO_URL" = "null" ] && return
+  [ "$PID" -gt 0 ] && kill "$PID" 2>/dev/null
+  nohup mpv --no-video --quiet "$RADIO_URL" >/dev/null 2>&1 &
+  echo $! > "$MPV_PID_FILE"
+  echo "$RADIO_ID" > "$RADIO_ID_FILE"
+}
 
 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
+  STATIONS=$(get_stations)
+  echo "$(emit_status)"
+
+  last_pid_check=0
+  last_song_fetch=0
+  last_media_fetch=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
+    now=$(date -u +%s%3N)
+
+    if (( now - last_pid_check > 1000 )); then
+      update_state
+      NEW_STATUS=$(emit_status)
+      if [ "$NEW_STATUS" != "$STATUS" ]; then STATUS=$NEW_STATUS; echo "$STATUS"; fi
+      last_pid_check=$now
     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')\"}"
+
+    if (( now - last_song_fetch > 15000 )); then
+      if [ "$PAUSED" = 0 ]; then
+        IS_RR=$(echo "$STATIONS" | jq --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].radiorecord // true')
+        if [ "$IS_RR" = "true" ]; then
+          FETCHED=$(get_song)
+          INFO=$(echo "$INFO" "$FETCHED" | jq -s '
+            reduce .[] as $x ({}; . + ($x | with_entries(select(.value != null))))')
+        else
+          STATION_TITLE=$(echo "$STATIONS" | jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].title // ""')
+          INFO=$(jq -cnr --arg title "$STATION_TITLE" '{artist:"",song:$title,image600:""}')
+        fi
       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
-          )) )')
+        STATION_IMG=$(echo "$STATIONS" \
+          | jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].icon_fill_white // ""')
+        STATION_TITLE=$(echo "$STATIONS" \
+          | jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].title // ""')
+        INFO=$(jq -cnr --arg img "$STATION_IMG" --arg title "$STATION_TITLE" \
+          '{artist:"",song:$title,image600:$img}')
       fi
-      last_time_info=$current_time
+      NEW_STATUS=$(emit_status)
+      if [ "$NEW_STATUS" != "$STATUS" ]; then STATUS=$NEW_STATUS; echo "$STATUS"; fi
+      last_song_fetch=$now
     fi
+
+    if (( now - last_media_fetch > 3000 )); then
+      MEDIA=$(get_player_info)
+      NEW_STATUS=$(emit_status)
+      if [ "$NEW_STATUS" != "$STATUS" ]; then STATUS=$NEW_STATUS; echo "$STATUS"; fi
+      VOL=$(get_volume)
+      [ -n "$VOL" ] && eww update radio-vol="$VOL" 2>/dev/null
+      last_media_fetch=$now
+    fi
+
+    sleep 0.5
   done
 }
 
-# Main script
 case "$1" in
-  "start")
-    RADIO_ID=$2
-    start
+  start)
+    RADIO_ID="$2"
+    echo "$RADIO_ID" > "$RADIO_ID_FILE"
+    do_start
     ;;
-  "toggle")
-    toggle
+  vol)
+    do_vol "$2"
+    ;;
+  mute)
+    update_state
+    do_mute
+    ;;
+  toggle)
+    update_state
+    if [ "$PAUSED" = 1 ]; then
+      [ "$RADIO_ID" -gt 0 ] && do_start
+    else
+      [ "$PID" -gt 0 ] && kill "$PID" 2>/dev/null
+      rm -f "$MPV_PID_FILE"
+    fi
     ;;
   *)
     status_loop

modules/home/wayland/apps/eww/bar/scripts/screenshot

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+eww close popup 2>/dev/null
+sleep 0.15
+hyprshot -m region --raw | satty --filename - --early-exit --action-on-enter save-to-clipboard --copy-command wl-copy

modules/home/wayland/apps/eww/bar/scripts/sys/cpu

@@ -1 +0,0 @@
-#!/usr/bin/env zsh

modules/home/wayland/apps/eww/bar/scripts/sys/cpugrid

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+COLS=4
+declare -A prev_idle prev_total
+
+emit_grid() {
+  local rows=() row_items=()
+  while IFS= read -r line; do
+    [[ $line =~ ^cpu([0-9]+) ]] || continue
+    local core="${BASH_REMATCH[1]}"
+    read -ra f <<< "$line"
+    local idle=$(( f[4] + f[5] ))
+    local total=0
+    for x in "${f[@]:1}"; do (( total += x )); done
+
+    local usage="0.0"
+    if [[ -n "${prev_total[$core]+x}" ]]; then
+      local dt=$(( total - prev_total[$core] ))
+      local di=$(( idle  - prev_idle[$core]  ))
+      (( dt > 0 )) && usage=$(awk "BEGIN{printf \"%.1f\", 100*(1-$di/$dt)}")
+    fi
+    prev_idle[$core]=$idle
+    prev_total[$core]=$total
+
+    local freq=0
+    local fpath="/sys/devices/system/cpu/cpu${core}/cpufreq/scaling_cur_freq"
+    [[ -r $fpath ]] && freq=$(( $(< "$fpath") / 1000 ))
+
+    row_items+=("{\"core\":$core,\"usage\":$usage,\"freq\":$freq}")
+
+    if (( ${#row_items[@]} == COLS )); then
+      local row; printf -v row '%s,' "${row_items[@]}"; row="${row%,}"
+      rows+=("[$row]")
+      row_items=()
+    fi
+  done < /proc/stat
+
+  if (( ${#row_items[@]} > 0 )); then
+    local row; printf -v row '%s,' "${row_items[@]}"; row="${row%,}"
+    rows+=("[$row]")
+  fi
+
+  local out; printf -v out '%s,' "${rows[@]}"; out="${out%,}"
+  echo "[$out]"
+}
+
+while true; do
+  emit_grid
+  sleep 2
+done

modules/home/wayland/apps/eww/bar/scripts/sys/cputemp

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+dir=$(grep -rl k10temp /sys/class/hwmon/*/name 2>/dev/null | head -1 | xargs dirname)
+awk '{printf "%.0f\n", $1/1000}' "$dir/temp1_input"

modules/home/wayland/apps/eww/bar/scripts/sys/gpu

@@ -1,3 +1,22 @@
-#!/usr/bin/env zsh
-
-amdgpu_top -J -s 5000 | sed 's/ //g' 
+#!/usr/bin/env bash
+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)
+}'

modules/home/wayland/apps/eww/bar/scripts/sys/memory

@@ -8,5 +8,6 @@ human() {
 
 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'"}'
+  cached=$(echo "$line" | awk '{print $6}')
+  echo '{"human": {"total": "'$(human "$total")'", "used": "'$(human "$used")'", "cached": "'$(human "$cached")'"}, "total": "'$total'", "used": "'$used'", "cached": "'$cached'"}'
 done

modules/home/wayland/apps/eww/bar/scripts/sys/swap

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+free --si | awk '/Swap/ {
+  used=$3; total=$2
+  u = sprintf("%.1fG", used/1000000)
+  t = sprintf("%.1fG", total/1000000)
+  printf "{\"used\":%d,\"total\":%d,\"human\":{\"used\":\"%s\",\"total\":\"%s\"}}\n", used, total, u, t
+}'

modules/home/wayland/apps/eww/bar/scripts/unused/brightness

@@ -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

modules/home/wayland/apps/eww/bar/scripts/unused/flightmode

@@ -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

modules/home/wayland/apps/eww/bar/scripts/unused/powermode

@@ -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

modules/home/wayland/apps/eww/bar/scripts/unused/volume

@@ -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

modules/home/wayland/apps/eww/bar/scripts/volume

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+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)}')
+  sink_muted=$(ismuted "SINK")
+  source_muted=$(ismuted "SOURCE")
+  sink=$(wpctl inspect @DEFAULT_AUDIO_SINK@ 2>/dev/null | grep -m1 'node\.nick' | sed 's/.*= "\(.*\)"/\1/')
+
+  [ "$sink_muted"   = 0 ] && icon="󰝟"   || icon="${volicons[$lvl]}"
+  [ "$source_muted" = 0 ] && mic_icon="󰍭" || mic_icon="󰍬"
+
+  printf '{"icon":"%s","percent":%s,"sink_muted":%s,"mic_icon":"%s","microphone":%s,"source_muted":%s,"sink":"%s"}\n' \
+    "$icon" "$percent" "$([ "$sink_muted" = 0 ] && echo true || echo false)" \
+    "$mic_icon" "$(vol SOURCE)" "$([ "$source_muted" = 0 ] && echo true || echo false)" "$sink"
+}
+
+case "$1" in
+  mute)   setmute "$2" ;;
+  setvol) setvol  "$2" "$3" ;;
+  *)
+    gen_output
+
+    tmp=$(mktemp -d)
+    pipe="$tmp/vol-events"
+    mkfifo "$pipe"
+    trap 'rm -rf "$tmp"; kill 0 2>/dev/null' EXIT INT TERM
+
+    # 2s polling fallback
+    (while true; do sleep 2; echo poll; done) > "$pipe" &
+    # PipeWire property-change events (fires on mute/volume change)
+    (pw-cli -m 2>/dev/null | grep --line-buffered "changed") > "$pipe" &
+
+    while IFS= read -r _ < "$pipe"; do
+      gen_output
+    done
+    ;;
+esac

modules/home/wayland/apps/eww/bar/scripts/wallpaper

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+nohup bash "$HOME/.config/script/wallpaper.sh" >/dev/null 2>&1 &

modules/home/wayland/apps/eww/bar/scripts/weather

@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+
+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"
+UA="eww-bar/1.0 cedric.hoelzl@gmail.com"
+
+mkdir -p "$CACHE_DIR"
+
+get_location() {
+  # Cache location for 1 hour; IP rarely changes
+  if [ -f "$LOC_CACHE" ] && [ -n "$(find "$LOC_CACHE" -mmin -60 2>/dev/null)" ]; then
+    cat "$LOC_CACHE"
+    return 0
+  fi
+  data=$(curl -sf --max-time 5 "http://ip-api.com/json?fields=lat,lon,city") || return 1
+  echo "$data" | tee "$LOC_CACHE"
+}
+
+icon_for() {
+  case "$1" in
+    *thunder*)                     echo "󰖔" ;;
+    *snow*|*sleet*)                echo "󰖘" ;;
+    heavyrain*|*heavyrainshowers*) echo "󰖖" ;;
+    *rain*|*shower*)               echo "󰖗" ;;
+    fog*)                          echo "󰖑" ;;
+    cloudy*)                       echo "󰖐" ;;
+    partlycloudy*)                 echo "󰖕" ;;
+    fair*|clearsky*)               echo "󰖙" ;;
+    *)                             echo "󰖐" ;;
+  esac
+}
+
+desc_for() {
+  case "$(echo "$1" | sed 's/_day//;s/_night//;s/_polartwilight//')" 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 "$1" ;;
+  esac
+}
+
+fetch() {
+  loc=$(get_location) || { echo "$FALLBACK"; return; }
+  lat=$(echo "$loc" | jq -r '.lat')
+  lon=$(echo "$loc" | jq -r '.lon')
+  city=$(echo "$loc" | jq -r '.city')
+
+  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") \
+    || { echo "$FALLBACK"; return; }
+
+  d='.properties.timeseries[0].data'
+  temp=$(    echo "$data" | jq -r "${d}.instant.details.air_temperature | round")
+  humidity=$(echo "$data" | jq -r "${d}.instant.details.relative_humidity | round")
+  wind_ms=$( echo "$data" | jq -r "${d}.instant.details.wind_speed")
+  wind=$(    echo "$wind_ms" | awk '{printf "%d", $1 * 3.6}')
+  code=$(    echo "$data" | jq -r \
+    "(${d}.next_1_hours.summary.symbol_code) // (${d}.next_6_hours.summary.symbol_code) // \"cloudy\"")
+
+  # Simplified apparent temperature: wind chill below 10°C, else = temp
+  feelslike=$(echo "$temp $wind" | awk '{
+    t=$1; v=$2
+    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
+  }')
+
+  icon=$(icon_for "$code")
+  desc=$(desc_for "$code")
+
+  printf '{"temp":%s,"feelslike":%s,"humidity":%s,"wind":%s,"desc":"%s","icon":"%s","city":"%s"}\n' \
+    "$temp" "$feelslike" "$humidity" "$wind" "$desc" "$icon" "$city"
+}
+
+fetch
+while true; do sleep 600; fetch; done

modules/home/wayland/apps/eww/bar/scripts/workspaces

@@ -1,86 +1,174 @@
 #!/usr/bin/env bash
 
-colors=("blue" "blue" "green" "red")
-empty="grey"
+declare -A ws_windows=()
+declare -A ws_name=()
+declare -A ws_urgent=()
+declare -A mon_active=()
+focused_ws=""
+focused_monitor=""
+_state=""
+_color=""
 
-# get initial focused workspace
-focusedws=$(hyprctl -j monitors | jaq -r '.[] | select(.focused == true) | .activeWorkspace.id')
+load_workspaces() {
+  local raw
+  raw=$(hyprctl -j workspaces 2>/dev/null) || return
+  ws_windows=()
+  ws_name=()
+  while read -r id windows name; do
+    ws_windows[$id]=$windows
+    ws_name[$id]=$name
+  done < <(printf '%s' "$raw" | jaq -jr '.[] | (.id | tostring), " ", (.windows | tostring), " ", .name, "\n"' 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_monitors() {
+  local raw
+  raw=$(hyprctl -j monitors 2>/dev/null) || return
+  mon_active=()
+  focused_ws=""
+  focused_monitor=""
+  while read -r name active_id is_focused; do
+    mon_active[$name]=$active_id
+    if [ "$is_focused" = "true" ]; then
+      focused_ws=$active_id
+      focused_monitor=$name
+    fi
+  done < <(printf '%s' "$raw" | jaq -jr '.[] | .name, " ", (.activeWorkspace.id | tostring), " ", (.focused | tostring), "\n"' 2>/dev/null)
+}
 
-# set color for each workspace
-status() {
-  if [ "${o[$1]}" -eq 1 ]; then
-    mon=${monitormap[${workspaces[$1]}]}
-    echo -n "${colors[$mon]}"
+load_urgent() {
+  local raw
+  raw=$(hyprctl -j clients 2>/dev/null) || return
+  ws_urgent=()
+  while read -r wsid; do
+    ws_urgent[$wsid]=1
+  done < <(printf '%s' "$raw" | jaq -r '.[] | select(.urgent == true) | (.workspace.id | tostring)' 2>/dev/null)
+}
+
+ws_state_color() {
+  local id=$1
+  _state="empty"
+  _color="grey"
+
+  if [ "$id" = "$focused_ws" ]; then
+    _state="focused"
   else
-    echo -n "$empty"
+    local mon
+    for mon in "${!mon_active[@]}"; do
+      if [ "${mon_active[$mon]}" = "$id" ]; then
+        _state="active"
+        break
+      fi
+    done
+    if [ "$_state" = "empty" ] && [ "${ws_windows[$id]:-0}" -gt 0 ]; then
+      _state="running"
+    fi
+  fi
+
+  if [ "$_state" != "empty" ]; then
+    if [ "${ws_urgent[$id]:-0}" -eq 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"')
+ws_entry() {
+  local id=$1 name=$2 target=$3 sep=${4:-false}
+  ws_state_color "$id"
+  printf '{"id":%s,"name":"%s","target":"%s","state":"%s","color":"%s","sep":%s}' \
+    "$id" "$name" "$target" "$_state" "$_color" "$sep"
 }
 
-# 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 '['
+  printf '['
+  local first=true
 
-  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 neg_ids=() id
+  for id in "${!ws_name[@]}"; do
+    if [[ "$id" == -* ]] && [ "${ws_name[$id]}" != "special:magic" ]; then
+      neg_ids+=("$id")
+    fi
   done
 
-  echo ']'
+  local has_neg=false
+  if [ ${#neg_ids[@]} -gt 0 ]; then
+    has_neg=true
+    IFS=$'\n' sorted_neg=($(printf '%s\n' "${neg_ids[@]}" | sort -n)); unset IFS
+    for id in "${sorted_neg[@]}"; do
+      $first || printf ','
+      first=false
+      ws_entry "$id" "${ws_name[$id]}" "name:${ws_name[$id]}"
+    done
+  fi
+
+  local first_pos=true
+  for i in {1..9}; do
+    $first || printf ','
+    first=false
+    if $first_pos && $has_neg; then
+      ws_entry "$i" "$i" "$i" true
+    else
+      ws_entry "$i" "$i" "$i"
+    fi
+    first_pos=false
+  done
+
+  printf ']\n'
 }
 
-# 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
+while read -r line; do
+  event="${line%>>*}"
+  data="${line#*>>}"
+  case "$event" in
   "workspace")
-    focusedws=${line#*>>}
+    # data is the workspace name, not id — resolve to id for named workspaces
+    focused_ws="$data"
+    for _k in "${!ws_name[@]}"; do
+      [ "${ws_name[$_k]}" = "$data" ] && { focused_ws="$_k"; break; }
+    done
+    unset "ws_urgent[$focused_ws]"
+    [ -n "$focused_monitor" ] && mon_active[$focused_monitor]="$focused_ws"
+    ;;
+  "workspacev2")
+    focused_ws="${data%%,*}"
+    unset "ws_urgent[$focused_ws]"
+    [ -n "$focused_monitor" ] && mon_active[$focused_monitor]="$focused_ws"
     ;;
   "focusedmon")
-    focusedws=${line#*,}
+    focused_monitor="${data%%,*}"
+    _wsname="${data#*,}"
+    focused_ws="$_wsname"
+    for _k in "${!ws_name[@]}"; do
+      [ "${ws_name[$_k]}" = "$_wsname" ] && { focused_ws="$_k"; break; }
+    done
+    unset "ws_urgent[$focused_ws]"
+    mon_active[$focused_monitor]="$focused_ws"
     ;;
-  "createworkspace")
-    o[${line#*>>}]=1
+  "urgent")
+    wsid=$(hyprctl -j clients 2>/dev/null | jaq -r --arg addr "$data" '.[] | select(.address == $addr) | (.workspace.id | tostring)' 2>/dev/null)
+    [ -n "$wsid" ] && ws_urgent[$wsid]=1
     ;;
-  "destroyworkspace")
-    o[${line#*>>}]=0
+  "createworkspace"*|"destroyworkspace"*|"moveworkspace"*)
+    load_workspaces
+    load_monitors
+    ;;
+  "openwindow"|"movewindow"*)
+    load_workspaces
+    ;;
+  "closewindow")
+    load_workspaces
+    load_urgent
     ;;
   "monitor"*)
-    monitor_event
+    load_monitors
     ;;
   esac
   generate
-done
+done < <(socat -u UNIX-CONNECT:"$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock" - | \
+  rg --line-buffered "^(workspace|focusedmon|createworkspace|destroyworkspace|openwindow|closewindow|movewindow|moveworkspace|monitor|urgent)")

modules/home/wayland/apps/eww/bar/windows/calendar.yuck

@@ -1,9 +0,0 @@
-(defwindow calendar
-  :monitor 1
-  :geometry (geometry
-    :x "0%"
-    :y "0%"
-  	:anchor "bottom right"
-    :width "0px"
-    :height "0px")
-  (window (calendar)))

modules/home/wayland/apps/eww/bar/windows/clock.yuck

@@ -0,0 +1,126 @@
+
+(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")
+
+(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 "Wallpaper" :onclick "scripts/wallpaper" :active false)
+        (quick-btn :icon "󱐋" :label "Power Save" :onclick "scripts/power-save" :active {power-save})
+        (quick-btn :icon "󰌵" :label "Night Light" :onclick "scripts/nightlight" :active {night-light}))
+      (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))
+    ))
+
+

modules/home/wayland/apps/eww/bar/windows/net.yuck

@@ -0,0 +1,105 @@
+
+(deflisten netinfo
+  :initial '{"wifi":{"ssid":"","ip":"","freq":0,"band":"","gen":"","signal":0},"ethernet":{"state":"down","ip":"","speed":"","interface":""},"usb":{"interface":"","ip":""}}'
+  "scripts/net/netinfo")
+
+(deflisten bt-devices
+  :initial "[]"
+  "scripts/net/bt-devices")
+
+; --- 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 {netinfo.wifi.ssid})
+      (netinfo-row :label "IP"     :value {netinfo.wifi.ip})
+      (netinfo-row :label "Signal" :value "${net.wifi.icon}  ${netinfo.wifi.signal} dBm")
+      (netinfo-row :label "Freq"   :value "${netinfo.wifi.freq} MHz · ${netinfo.wifi.band} · ${netinfo.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 {netinfo.usb.interface})
+    (netinfo-row :label "IP"        :value {netinfo.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 {netinfo.ethernet.interface})
+      (netinfo-row :label "IP"        :value {netinfo.ethernet.ip})
+      (netinfo-row :label "Speed"     :value {netinfo.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 {bluetooth.powered}
+      :onclick {bluetooth.powered ? "bluetoothctl power off" : "bluetoothctl power on"}
+      :icon-on "󰂯" :icon-off "󰂲")
+    (scroll :vscroll true :hscroll false :height 90
+      :visible {bluetooth.powered}
+      (box :orientation "v" :space-evenly false
+        (for device in {bt-devices}
+          (bt-device-row :device {device}))))
+    (label :class "netinfo-dim" :halign "start"
+      :visible {!bluetooth.powered}
+      :text "Disabled")))
+
+; --- 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")
+    (bluetooth-net-section)))

modules/home/wayland/apps/eww/bar/windows/popup.yuck

@@ -0,0 +1,20 @@
+
+(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)))

modules/home/wayland/apps/eww/bar/windows/powermenu.yuck

@@ -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 "󰐥" 
-                            :onclick "systemctl poweroff")
-        (powermenu_entry    :label "Reboot" 
-                            :icon "󰜉" 
-                            :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")
-    )
-)
+  (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")
+            (pm-btn :icon "󰜉" :label "Reboot"
+                    :onclick "systemctl reboot")
+            (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 close powermenu")))))))
 
 (defwindow powermenu
-    :monitor 1
-    :stacking "overlay"
-    :geometry (geometry 
-                    :anchor "center"
-                    :width "120%"
-                    :height "120%")
-    :namespace "eww-blur"
-    (powermenu)
-)
+  :monitor 0
+  :stacking "overlay"
+  :geometry (geometry
+    :anchor "center"
+    :width "120%"
+    :height "120%")
+  :namespace "eww-blur"
+  (powermenu))

modules/home/wayland/apps/eww/bar/windows/radio.yuck

@@ -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 ? "󰐌" : "󰏥"}")
+    (box :class "section-sep")
 
-                (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"
-
-        (for station in {radio.stations}
+    ; --- 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':''}"
-                :timeout "2s"
-                :onclick "scripts/radio start ${station.id}"
-                :tooltip "${station.title}"
-                :style "background-size:cover; background-image: url('${station.icon_fill_white}');"
-            )
-        )
-    )
-  )
-)
+              :class "station-row ${radio.radio == station.id ? 'station-row-active' : ''}"
+              :timeout "2s"
+              :onclick "scripts/radio start ${station.id}"
+              :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 "(sleep 0.1 && scripts/panel-toggle radio)"
+      (box :orientation "v"
+        (label :show-truncated false :class "icon-text" :text "󰝚")))))

modules/home/wayland/apps/eww/bar/windows/sys.yuck

@@ -1,140 +1,211 @@
 
+(defpoll swap :interval "30s" "scripts/sys/swap")
+
+(defpoll cpu-freq-min :interval "60s"
+  "awk '{print $1/1000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq")
+(defpoll cpu-freq-max :interval "60s"
+  "awk '{print $1/1000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq")
+(defpoll cpu-temp :interval "4s"
+  "scripts/sys/cputemp")
+(defpoll cpu-freq-avg :interval "2s"
+  "awk '{sum+=$1; count++} END {printf \"%.1f\", sum/count/1000000}' /sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq")
+
+(deflisten cpu-grid :initial '[[{"core":0,"usage":0,"freq":0}]]'
+  "bash scripts/sys/cpugrid")
+
+; --- 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 {cpu-grid}
+        (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")
-    (progress
-      :value {gpu.devices[0].GRBM2?.CommandProcessor-Compute?.value?:0.0}
-      :orientation "h"
-      :flipped true
-      :class "gpu-core-usage"
-      :tooltip "Compute"
-    )    
-    (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"
+  (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 {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")))
+  )
+)
+
+; --- 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 {100*swap.used/swap.total}
+            :start-at 0 :clockwise true :thickness 7
+            :class "swap-ring"
+            :tooltip "Swap\n${swap.human.used} / ${swap.human.total}")
+          (box :orientation "v" :valign "center" :halign "center" :space-evenly false
+            (label :class "ram-used-label" :text "${swap.human.used}")
+            (label :class "ram-total-label" :text "${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-sys-win [] 
+  (box :orientation "v" :space-evenly false :class "sys-section" :visible {battery.visible}
+    (section-header :title "Battery" :accent "bat-accent")
+    (overlay
+      (circular-progress
+        :width 60 :height 60
+        :value {battery.percentage}
+        :start-at 0
+        :clockwise true
+        :thickness 6
+        :class "bat-ring"
+        :style "color: ${battery.color};"
+        :tooltip "Battery  ${round(battery.percentage, 0)}%\n${battery.status} @ ${battery.wattage}")
+      (label :class "bat-ring-label"
+        :text "${round(battery.percentage, 0)}%"))
   )
 )
 
+; --- 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")
-      (gpu-sys-win)
-      (box :class "spacer")
-      (box :class "spacer")
-      (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
-      )
-    )
+    :orientation "v"
+    (cpu-sys-win)
+    (box :class "section-sep")
+    (gpu-sys-win)
+    (box :class "section-sep")
+    (ram-sys-win)
+    (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)))

modules/home/wayland/apps/eww/default.nix

@@ -1,50 +1,103 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }:
+let
+  openOnCurrentScreen = pkgs.writeShellScriptBin "eww-open-on-current-screen" ''
+    window="$1"
+    shift
+
+    screen="$(hyprctl monitors -j | ${lib.getExe pkgs.jq} -r '.[] | select(.focused == true) | .name' | head -n1)"
+
+    if [ -n "$screen" ]; then
+      exec ${lib.getExe pkgs.eww} open "$window" --screen "$screen" "$@"
+    fi
+
+    exec ${lib.getExe pkgs.eww} open "$window" "$@"
+  '';
+
+  # Wraps a static script file with a bash launcher that prepends Nix store
+  # bin dirs to PATH — keeps the source files unchanged.
+  mkScript = name: src: inputs: pkgs.writeShellScriptBin name ''
+    export PATH="${lib.makeBinPath inputs}:$PATH"
+    ${builtins.readFile src}
+  '';
+
+  scripts = {
+    "scripts/brightness"   = mkScript "brightness"   ./bar/scripts/brightness   [ pkgs.brightnessctl ];
+    "scripts/nightlight"   = mkScript "nightlight"   ./bar/scripts/nightlight   [ pkgs.wlsunset ];
+    "scripts/panel-toggle"      = mkScript "panel-toggle"      ./bar/scripts/panel-toggle      [ pkgs.eww pkgs.util-linux openOnCurrentScreen ];
+    "scripts/powermenu-toggle"  = mkScript "powermenu-toggle"  ./bar/scripts/powermenu-toggle  [ pkgs.eww openOnCurrentScreen ];
+    "scripts/power-save"   = mkScript "power-save"   ./bar/scripts/power-save   [ pkgs.eww ];
+    "scripts/radio"        = mkScript "radio"        ./bar/scripts/radio        [ pkgs.eww pkgs.jq pkgs.curl pkgs.mpv pkgs.playerctl ];
+    "scripts/color-pick"   = mkScript "color-pick"   ./bar/scripts/color-pick   [ pkgs.eww pkgs.hyprpicker ];
+    "scripts/media"        = mkScript "media"        ./bar/scripts/media        [ pkgs.playerctl ];
+    "scripts/lock"         = mkScript "lock"         ./bar/scripts/lock         [ pkgs.eww pkgs.hyprlock ];
+    "scripts/screenshot"   = mkScript "screenshot"   ./bar/scripts/screenshot   [ pkgs.eww pkgs.hyprshot pkgs.satty pkgs.wl-clipboard ];
+    "scripts/sys/gpu"      = mkScript "gpu"          ./bar/scripts/sys/gpu      [ pkgs.custom.amdgpu_top pkgs.jq ];
+    "scripts/sys/memory"   = mkScript "memory"       ./bar/scripts/sys/memory   [ pkgs.ripgrep ];
+    "scripts/volume"       = mkScript "volume"       ./bar/scripts/volume       [ pkgs.ripgrep ];
+    "scripts/weather"      = mkScript "weather"      ./bar/scripts/weather      [ pkgs.jq pkgs.curl ];
+    "scripts/workspaces"   = mkScript "workspaces"   ./bar/scripts/workspaces   [ pkgs.jaq pkgs.socat pkgs.ripgrep ];
+  };
+in {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
-    home.packages = with pkgs; [ eww jq jaq custom.amdgpu_top ];
+    home.packages = [ pkgs.eww openOnCurrentScreen ];
 
-    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/.;
-      };
+    xdg.configFile = lib.mkMerge [
+      {
+        "eww" = {
+          source = lib.cleanSourceWith {
+            filter = name: _type:
+              let
+                baseName = baseNameOf (toString name);
+                relPath = lib.removePrefix (toString ./bar + "/") (toString name);
+              in !(lib.hasSuffix ".nix" baseName)
+              && (baseName != "_colors.scss")
+              && !(builtins.elem relPath (builtins.attrNames scripts));
+            src = lib.cleanSource ./bar/.;
+          };
+          recursive = true;
+        };
 
-      recursive = true;
-    };
-
-    # colors file
-    xdg.configFile."eww/css/_colors.scss".text = ''
-      $base00: #${config.colorScheme.palette.base00};
-      $base01: #${config.colorScheme.palette.base01};
-      $base02: #${config.colorScheme.palette.base02};
-      $base03: #${config.colorScheme.palette.base03};
-      $base04: #${config.colorScheme.palette.base04};
-      $base05: #${config.colorScheme.palette.base05};
-      $base06: #${config.colorScheme.palette.base06};
-      $base07: #${config.colorScheme.palette.base07};
-      $base08: #${config.colorScheme.palette.base08};
-      $base09: #${config.colorScheme.palette.base09};
-      $base0A: #${config.colorScheme.palette.base0A};
-      $base0B: #${config.colorScheme.palette.base0B};
-      $base0C: #${config.colorScheme.palette.base0C};
-      $base0D: #${config.colorScheme.palette.base0D};
-      $base0E: #${config.colorScheme.palette.base0E};
-      $base0F: #${config.colorScheme.palette.base0F};
+        "eww/css/_colors.scss".text = ''
+          $base00: #${config.colorScheme.palette.base00};
+          $base01: #${config.colorScheme.palette.base01};
+          $base02: #${config.colorScheme.palette.base02};
+          $base03: #${config.colorScheme.palette.base03};
+          $base04: #${config.colorScheme.palette.base04};
+          $base05: #${config.colorScheme.palette.base05};
+          $base06: #${config.colorScheme.palette.base06};
+          $base07: #${config.colorScheme.palette.base07};
+          $base08: #${config.colorScheme.palette.base08};
+          $base09: #${config.colorScheme.palette.base09};
+          $base0A: #${config.colorScheme.palette.base0A};
+          $base0B: #${config.colorScheme.palette.base0B};
+          $base0C: #${config.colorScheme.palette.base0C};
+          $base0D: #${config.colorScheme.palette.base0D};
+          $base0E: #${config.colorScheme.palette.base0E};
+          $base0F: #${config.colorScheme.palette.base0F};
 
 
-      $fg: $base07;
-      $bg0: $base00;
-      $bg1: $base01;
+          $fg: $base07;
+          $bg0: $base00;
+          $bg1: $base01;
 
-      $border-color: $base03;
-      $border-color-focus: $base04;
-      $border-radius: ${config.colorScheme.palette.border-radius}px;
-      $border-width: ${config.colorScheme.palette.border-width}px;
+          $border-color: $base03;
+          $border-color-focus: $base04;
+          $border-radius: ${config.colorScheme.palette.border-radius}px;
+          $border-width: ${config.colorScheme.palette.border-width}px;
 
-      $gaps-screen: ${config.colorScheme.palette.gaps-screen}px;
-      $gaps-window: ${config.colorScheme.palette.gaps-window}px;
-    '';
+          $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)
+    ];
   };
 }

modules/home/wayland/apps/kanshi/default.nix

@@ -1,109 +1,176 @@
-{ config, lib, ... }: {
+{ config, lib, pkgs, ... }: 
+let 
+  baseOutput = {
+    position = "0,0";
+    scale = 1.0;
+    adaptiveSync = true;
+    status = "enable";
+      transform = "normal"; 
+  };
+
+in {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
     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";
+        };}
+        {output = baseOutput//{
+          criteria = "AOC 24E1W1 GNSKCHA086899";
+          mode = "1920x1080@60.000";
+          transform = "180"; 
+        };}
+        {output = baseOutput//{
+          criteria = "AOC 24E1W1 GNSKBHA080346";
+          mode = "1920x1080@60.000";
+        };}
+        {output = baseOutput//{
+          criteria = "LG UNKNOWN_TBD";
+          mode = "1920x1080@144.000";
+        };}
+        {output = baseOutput//{
+          criteria = "LG Display 0x060A Unknown";
+          mode = "1920x1080@60.020";
+        };}
+        {output = baseOutput//{
+          criteria = "CEX CX133 0x00000001";
+          mode = "2560x1600@59.972";
+        };}
+        {output = baseOutput//{
+          criteria = "AOC 16G3 1DDP7HA000348";
+          mode = "1920x1080@144.000";
+        };}
+        {profile = {
+          name = "tower_00";
+          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 = "1920,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
+              position = "0,1080";
+            }
+            {
+              criteria = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
+              position = "1920,720";
             }
           ];
-        }
-        {
-          profile.name = "tower_1";
-          profile.outputs = [
+          exec = [ 
+            "${pkgs.eww}/bin/eww open bar --screen 0" 
+            "${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 })
+                hl.workspace_rule({ workspace = "name:X", monitor = "DP-3", default = true })
+              '
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "DP-2" })); hl.dispatch(hl.dsp.focus({ workspace = "2" }));'
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "DP-3" })); hl.dispatch(hl.dsp.focus({ workspace = "name:X" }));'
+              #${pkgs.hyprland}/bin/hyprctl eval 'hl.monitor({ output = "DP-3", cm = "hdr" });'
+
+            ''}"
+            "${pkgs.awww}/bin/awww restore"
+          ];
+        };}
+        {profile = {
+          name = "tower_0";
+          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"
+            "${pkgs.eww}/bin/eww open bar --screen 0" 
+           ];
+        };}
+        {profile = {
+          name = "tower_1";
+          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 = [{
+        };}
+        {profile = {
+          name = "laptop_0";
+          outputs = [{
             criteria = "LG Display 0x060A Unknown";
-            mode = "1920x1080@60.020";
             position = "0,0";
-            scale = 1.0;
-            status = "enable";
           }];
-        }
-        {
-          profile.name = "laptop_1";
-          profile.outputs = [
+        };}
+        {profile = {
+          name = "laptop_1";
+          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 = [
+        };}
+        {profile = {
+          name = "laptop_2";
+          outputs = [
             {
               criteria = "AOC 16G3 1DDP7HA000348";
-              mode = "1920x1080@144.000";
               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";
             }
           ];
-        }
+        };}
       ];
     };
   };

modules/home/wayland/apps/lockscreen/default.nix

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

modules/home/wayland/apps/waybar/default.nix

@@ -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" = {

modules/home/wayland/apps/waylock/default.nix

@@ -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
-    '';
-  };
-}

modules/home/wayland/apps/wofi/default.nix

@@ -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

modules/home/wayland/base/default.nix

@@ -1,40 +1,17 @@
-{ 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
-    '';
-  };
-in {
+{ lib, config, pkgs, ... }: {
   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.mimeApps = {

modules/home/wayland/hyprland/config.nix

@@ -1,231 +1,317 @@
-{ lib, config, pkgs, ... }: {
-  config = lib.mkIf (config.usercfg.wm == "Wayland") {
+{ 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" ''
+    ${pkgs.awww}/bin/awww-daemon &
+    ${pkgs.awww}/bin/awww restore &
+
+    sleep 2
+    keepassxc &
+    firefox &
+    jellyfin-mpv-shim &
+    easyeffects --gapplication-service &
+
+    sleep 2
+    nextcloud &
+    # telegram-desktop &
+    # discord &
+  '';
+in {
+  config = lib.mkIf (config.usercfg.wm == "Wayland") {
     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
+      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'')
+          ];
+        };
 
-            follow_mouse = 1
+        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;
+        }];
 
-            sensitivity = 0
+        config = {
+          input = {
+            kb_layout = "us";
+            kb_variant = "intl";#, phonetic";
+            kb_options = "grp:alt_shift_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
+            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;
+            vrr = 0; #vrr=2;
+          };
+          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} }";
             }
-        }
+          ];
+        }];
 
-        misc {
-            disable_hyprland_logo=true
-            animate_mouse_windowdragging=false
-            animate_manual_resizes=false
+        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"; }
+        ];
 
-            vrr=1
-        }
 
-        general {
-            gaps_in = ${config.colorScheme.palette.gaps-window}
-            gaps_out = ${config.colorScheme.palette.gaps-screen}
-            border_size = ${config.colorScheme.palette.border-width}
+        gesture = {
+          fingers = 3;
+          direction = "vertical";
+          action = "workspace";
+        };
 
-            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
+        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"; 
             }
-            #multisample_edges = true
+              # --- 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; }
 
-            #opactity
-            inactive_opacity = 1.0
-            active_opacity = 1.0
-            fullscreen_opacity = 1.0
+            # --- 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";
+            }
 
-            # shadow
-            # drop_shadow = no
-            # shadow_range = 60
-            # shadow_offset = 0 5
-            # shadow_render_power = 4
-            #col.shadow = rgba(00000099)
-        }
+            # --- Telegram Media Viewer ---
+            {
+              match.class = "^(org.telegram.desktop)$";
+              match.title = "^(Media viewer)$";
+              float = true;
+              center = true;
+            }
 
-        animations {
-            enabled = true
-            bezier = customcurve, 0.0, 0.9, 0.1, 1.0
+            # --- Idle Inhibition ---
+            { match.class = "^(.*)$"; idle_inhibit = "fullscreen"; }
+            { match.class = "^(steam_app_.*)$"; idle_inhibit = "focus"; }
+            { match.class = "^(mpv)$"; idle_inhibit = "focus"; }
 
-            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 
-        }
+        layer_rule = [ {
+          match.namespace = "^eww%-blur$";
+          blur = true;
+          ignore_alpha = 0.0;
+        }];
 
-        master {
-            new_status = master
-        }
+        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"))
 
-        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
-      '';
+          (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 "amixer -q sset 'Master' 5%+") { locked = true; repeating = true; })
+          (bindOpts "XF86AudioLowerVolume" (dsp.exec "amixer -q sset 'Master' 5%-") { locked = true; repeating = true; })
+          (bindOpts "XF86AudioMute" (dsp.exec "amixer -q sset 'Master' 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; })
+        ];
+      };
     };
-
-    xdg.configFile."startup.sh".text = ''
-      #!/bin/sh
-      sleep 2
-      keepassxc & 
-      firefox & 
-      jellyfin-mpv-shim & 
-      easyeffects --gapplication-service &
-
-      sleep 2
-      nextcloud & 
-      #telegram-desktop&
-      #discord&
-    '';
   };
 }

modules/home/xdg/default.nix

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

modules/nixos/gui/greet/default.nix

@@ -5,7 +5,7 @@
       enable = true;
       settings = rec {
         initial_session = {
-          command = "zsh";
+          command = "start-hyprland";
           user = "${config.syscfg.defaultUser}";
         };
         default_session = initial_session;

modules/nixos/gui/xserver/default.nix

@@ -3,7 +3,7 @@
     programs.xwayland.enable = true;
     services.xserver = {
       enable = true;
-      videoDrivers = [ "amd" ];
+      videoDrivers = [ "amdgpu" ];
       xkb = {
         layout = "us";
         variant = "intl";

modules/nixos/system/default.nix

@@ -1,3 +1,23 @@
-{ ... }: {
+{ config, lib, ... }: {
   imports = [ ./dbus ./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);
+  };
 }

modules/nixos/system/hw/base/default.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ lib, ... }: {
   services.fwupd.enable = true;
-  hardware.enableAllFirmware = true;
+  hardware.enableAllFirmware = false;
+  services.power-profiles-daemon.enable = lib.mkDefault true;
 }

modules/nixos/system/hw/boot/default.nix

@@ -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;

modules/nixos/system/hw/default.nix

@@ -1 +1 @@
-{ ... }: { imports = [ ./base ./boot ./fs ./graphics ./power ./udev ./virt ]; }
+{ ... }: { imports = [ ./base ./boot ./fs ./graphics ./power ./udev ./virt ./wsl ]; }

modules/nixos/system/hw/power/default.nix

@@ -1,5 +1,6 @@
 { lib, config, pkgs, ... }: {
   config = lib.mkIf (config.syscfg.make.power) {
+    services.power-profiles-daemon.enable = false; # conflicts with TLP
     services.tlp = {
       enable = true;
       settings = {
@@ -15,10 +16,10 @@
     # suspend to RAM (deep) rather than `s2idle`
     boot.kernelParams = [ "mem_sleep_default=deep" ];
     # suspend-then-hibernate
-    systemd.sleep.extraConfig = ''
-      HibernateDelaySec=30m
-      SuspendState=mem
-    '';
+    systemd.sleep.settings.Sleep = {
+      HibernateDelaySec = "30m";
+      SuspendState = "mem";
+    };
 
     services.logind.settings.Login.HandleLidSwitch = "suspend-then-hibernate";
     # Hibernate on power button pressed

modules/nixos/system/hw/udev/default.nix

@@ -1,8 +1,8 @@
-{ ... }: {
+{ pkgs, ... }: {
   systemd.services.systemd-udevd.restartIfChanged = false;
 
   services.udev = {
-    packages = [ ];
+    packages = with pkgs; [ ];
     extraRules = ''
       SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess"
       SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess"

modules/nixos/system/hw/virt/default.nix

@@ -18,5 +18,6 @@
         };
       };
     };
+    virtualisation.containers.registries.search = [ "quay.io" "docker.io" "ghcr.io" ];
   };
 }

modules/nixos/system/hw/wsl/default.nix

@@ -0,0 +1,13 @@
+{ lib, config, pkgs, ... }: {
+    config = lib.mkIf (config.syscfg.extra.wsl) {
+    wsl.enable = true;
+    wsl.defaultUser = config.syscfg.defaultUser;
+    wsl.extraBin = with pkgs; [
+        { src = "${coreutils}/bin/uname"; }
+        { src = "${coreutils}/bin/dirname"; }
+        { src = "${coreutils}/bin/readlink"; }
+    ];
+    
+    wsl.wslConf.network.generateHosts = false;
+    };
+}

modules/nixos/system/network/base/default.nix

@@ -1,17 +1,33 @@
-{ config, ... }: {
+{ lib, config, ... }: {
   networking = {
     hostName = config.syscfg.hostname;
     useDHCP = true;
     nameservers = [ "1.1.1.1" "9.9.9.9" ];
+    dhcpcd = {
+      enable = true;
+      wait = "background";
+    };
+
+    extraHosts = ''
+      ${lib.concatStringsSep "\n" config.syscfg.extra.hosts}
+    '';
+
+    proxy = lib.mkIf (config.syscfg.extra.proxy.domain != "") {
+      default = "http://${config.syscfg.extra.proxy.domain}:${config.syscfg.extra.proxy.port or "8080"}";
+      noProxy = "${config.syscfg.extra.proxy.noProxy}";
+    };
+
 
     firewall = { 
       enable = true;
       allowedUDPPorts = 
-        (if config.syscfg.server ? wireguard then [ 1515 ] else [ ]) ++ 
+        (if (config.syscfg.server != false && config.syscfg.server.wireguard) then [ 1515 ] else [ ]) ++ 
+        (if (config.syscfg.server != false && config.syscfg.server.web) then [ 80 443 22 ] else [ ]) ++ 
         [ ];
 
       allowedTCPPorts = 
-        (if config.syscfg.server ? web       then [ 80 443 22 ] else [ ]) ++ 
+        (if (config.syscfg.server != false && config.syscfg.server.web) then [ 80 443 22 ] else [ ]) ++ 
+        (if (config.syscfg.server != false) then [ 5432 6379 8181 ] else [ ]) ++ 
         [ ];
     };
   };

modules/nixos/system/network/wifi/default.nix

@@ -3,6 +3,7 @@
     networking.supplicant = {
       "${config.syscfg.net.wlp.nif}" = {
         configFile.path = config.sops.secrets.wifi.path;
+        userControlled.enable = true;
         extraConf = ''
           network={
               ssid="test"

modules/nixos/system/network/wireguard/default.nix

@@ -27,6 +27,7 @@ in
             else
               [{
                 allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ];
+                name = "vpn-helcel";
                 endpoint = "vpn.helcel.net:1515";
                 publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q=";
                 persistentKeepalive = 30;
@@ -34,9 +35,17 @@ in
         };
       };
     };
-    systemd.services."wireguard-wg0" = {
+
+    systemd.services."wireguard-wg0-peer-vpn-helcel" = {
       after = [ "network-online.target" "nss-lookup.target" ];
-      wants = [ "network-online.target" "nss-lookup.target" ];
+      bindsTo = [ "network-online.target" ];
+      wantedBy = lib.mkForce [ "network-online.target" ];
+      before =  lib.mkForce [ ];
+      serviceConfig = {
+        Restart = "on-failure";
+        RestartSec = "10s";          # Wait 2 seconds before retrying the domain query
+      };
+      startLimitIntervalSec = 0;  
     };
   };
 }

modules/nixos/system/nix/default.nix

@@ -37,5 +37,12 @@
       ];
     };
   };
+  programs.nix-ld = {
+    enable = true;
+    libraries = with pkgs; [
+      libx11 libxcb libxi libxext libxkbfile xcbutilcursor
+      libpng libdrm libpulseaudio nss nspr expat libbsd
+    ];
+  };
   system.stateVersion = "24.11";
 }

modules/nixos/system/security/polkit/default.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }: {
   security.polkit.enable = true;
-  security.pam.services.swaylock = {
+  security.pam.services.hyprlock = { #swaylock
     text = ''
       auth include login
     '';

modules/nixos/tools/debug/default.nix

@@ -1,12 +1,9 @@
 { pkgs, config, lib, ... }: {
 
   config = lib.mkIf (config.syscfg.make.develop) {
-    programs.adb.enable = true;
-    # services.udev.packages = [
-    #   pkgs.android-udev-rules
-    # ];
+
     programs.wireshark.enable = true;
 
-    environment.systemPackages = with pkgs; [ wget dconf wireshark ];
+    environment.systemPackages = with pkgs; [ wget dconf wireshark mtr android-tools ];
   };
 }

modules/nixos/tools/default.nix

@@ -1,64 +1,4 @@
 { pkgs, ... }: {
-  imports = [ ./debug ./develop ];
+  imports = [ ./debug ./develop ./telegraf ];
 
-  # services.telegraf = {
-  #     enable = true;
-  #     extraConfig = {
-  #         agent = {
-  #             interval = "10s";
-  #             round_interval = true;
-  #             metric_batch_size = 1000;
-  #             metric_buffer_limit = 10000;
-  #             collection_jitter = "0s";
-  #             flush_interval = "10s";
-  #             flush_jitter = "0s";
-  #             precision = "";
-  #             hostname = "valinor";
-  #             omit_hostname = false;
-  #         };
-
-  #         inputs.cpu = {
-  #             percpu = true;
-  #             totalcpu = true;
-  #             collect_cpu_time = false;
-  #             report_active = false;
-  #         };
-
-  #         inputs.mem = {};
-  #         inputs.swap = {};
-  #         inputs.system = {};
-  #         inputs.disk = {
-  #             ignore_fs = ["tmpfs" "devtmpfs" "devfs"];
-  #         };
-
-  #         inputs.net = {};
-  #         inputs.netstat = {};
-
-  #         inputs.ping = {
-  #             urls = ["8.8.8.8" "8.8.4.4"];
-  #             count = 4;
-  #             interval = "60s";
-  #             binary = "${pkgs.iputils.out}/bin/ping";
-  #         };
-
-  #         inputs.internet_speed = {
-  #             interval = "2m";
-  #         };
-
-  #         inputs.net_response = {
-  #             protocol = "tcp";
-  #             address = "google.com:80";
-  #             timeout = "5s";
-  #             read_timeout = "5s";
-  #             interval = "30s";
-  #         };
-
-  #         outputs.influxdb_v2 = {
-  #             urls = [""];
-  #             token = "";
-  #             organization = "";
-  #             bucket = "";
-  #         };
-  #     };
-  # };
 }

modules/nixos/tools/develop/default.nix

@@ -9,6 +9,12 @@ in {
 
   imports = [ ./ollama ];
   config = lib.mkIf (config.syscfg.make.develop) {
+
+    services.vscode-server = lib.mkIf (config.syscfg.extra.wsl) {
+      enable = true;
+      enableFHS = true;
+    };
+
     environment.systemPackages = with pkgs;
       [
         # android-tools

modules/nixos/tools/develop/ollama/default.nix

@@ -1,14 +1,13 @@
 { lib, config, pkgs, ... }: 
 let 
- ollamaPkg = pkgs.ollama-rocm;
+ ollamaPkg = pkgs.ollama-vulkan;
 in{
 
   config = lib.mkIf (config.syscfg.make.develop) {
     services.ollama = {
         enable = true;
         package = ollamaPkg;
-        acceleration = "rocm"; 
-        loadModels = [ "deepseek-v2:lite" "qwen2.5-coder:7b" "qwen2.5-coder:1.5b" ];
+        loadModels = [ ];
         syncModels = true;
     };
     environment.systemPackages = with pkgs; [ ollamaPkg ];