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

.gitea/workflows/build.yml

@@ -12,13 +12,13 @@ jobs:
   build-nixos:
     runs-on: ubuntu-latest
     steps: 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       
       - name: "Install Nix ❄️"
         uses: cachix/install-nix-action@v31
 
     #  - uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v13
+      - uses: DeterminateSystems/magic-nix-cache-action@v14
       - uses: DeterminateSystems/flake-checker-action@v12
 
       - name: "Install Cachix ❄️"

.gitea/workflows/update.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Install nix
         uses: DeterminateSystems/nix-installer-action@v22
         with:

.gitignore

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

.sops.yaml

@@ -13,6 +13,31 @@ 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:
@@ -29,8 +54,6 @@ creation_rules:
       - age:
           - *ci
           - *sandbox
-        pgp:
-          - *sora
 
   - path_regex: modules/server/sops/server.[a-z]+
     key_groups:

flake.lock

@@ -1,5 +1,27 @@
 {
   "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": {
@@ -23,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779036909,
+        "lastModified": 1783395956,
-        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
+        "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "56c666e108467d87d13508936aade6d567f2a501",
+        "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15",
         "type": "github"
       },
       "original": {
@@ -37,23 +59,28 @@
         "type": "github"
       }
     },
-    "flake-compat": {
+    "flake-parts": {
-      "flake": false,
+      "inputs": {
+        "nixpkgs-lib": [
+          "arion",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1767039857,
+        "lastModified": 1769996383,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "edolstra",
+        "owner": "hercules-ci",
-        "repo": "flake-compat",
+        "repo": "flake-parts",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "hercules-ci",
-        "repo": "flake-compat",
+        "repo": "flake-parts",
         "type": "github"
       }
     },
-    "flake-parts": {
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "nur",
@@ -74,34 +101,16 @@
         "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": 1780065812,
+        "lastModified": 1783792734,
-        "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=",
+        "narHash": "sha256-50rvY9GdFvpYDcMLcD/4cWSi0hVxArT5wsGlVsHy8eY=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144",
+        "rev": "8efb4337e857949f4cfac86d12ef1066f417f31f",
         "type": "github"
       },
       "original": {
@@ -110,6 +119,22 @@
         "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": [
@@ -117,16 +142,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1779726825,
+        "lastModified": 1779506708,
-        "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
+        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
+        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-26.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -152,11 +177,11 @@
     },
     "nixUnstable": {
       "locked": {
-        "lastModified": 1780030872,
+        "lastModified": 1783791668,
-        "narHash": "sha256-u6WU/yd/o8iYQrHX3RAwO1hYa3LkoSL+WNQD0rJfJZQ=",
+        "narHash": "sha256-zbcZ1dmBTPfJ7Mlqh/yLEPGpgJnwuv4Xr1xucy2WqMA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e9a7635a57597d9754eccebdfc7045e6c8600e6b",
+        "rev": "716c7a2664ca8325617b8a7fbb609273f2c4cae7",
         "type": "github"
       },
       "original": {
@@ -166,27 +191,6 @@
         "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,
@@ -217,33 +221,47 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1780203844,
+        "lastModified": 1782847189,
-        "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
+        "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
+        "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1783522502,
+        "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1780265777,
+        "lastModified": 1783812717,
-        "narHash": "sha256-t/KORFHEv8Jn2vFmVfv4Zffekv+MUogI2KgtxuCcEmQ=",
+        "narHash": "sha256-/ShoG1aG4RN+002Y69CQk0HJ8U/DRw5PHGJcgqB/rLQ=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "39917b7f68263188707925ffe26c9df6ef4e7d64",
+        "rev": "f677cb4b829c9df339277c6e80200b1c98320463",
         "type": "github"
       },
       "original": {
@@ -254,16 +272,15 @@
     },
     "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": {
@@ -273,11 +290,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777944972,
+        "lastModified": 1783174389,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
         "type": "github"
       },
       "original": {
@@ -285,42 +302,6 @@
         "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,15 +3,12 @@
   inputs = {
     # Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
     nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
     hardware.url = "github:nixos/nixos-hardware";
-    nur = {
+    nur.url = "github:nix-community/nur";
-      url = "github:nix-community/nur";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-26.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -20,48 +17,40 @@
       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";
-    };
 
-    vscode-server = {
+    arion.url = "github:hercules-ci/arion";
-      url = "github:nix-community/nixos-vscode-server";
+    arion.inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs";
+
-    };
   };
 
   outputs = inputs:
-    let
+    let gen = import ./generator.nix { inherit inputs; };
-      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 = generateHosts "nixos";
+      nixosConfigurations = {
-      darwinConfigurations = generateHosts "macos";
+        valinor = gen.generate { host = "valinor"; };
-      homeConfigurations = generateHosts "home";
+        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"; };
+      };
     };
 
   # ===== Unsupported/NotImplemented ======

generator.nix

@@ -5,7 +5,7 @@
       nameValuePair = name: value: { inherit name value; };
     in ({
       "nixos" = inputs.nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+        system = syscfg.syscfg.system;
         specialArgs = { inherit inputs; };
         modules = [
           ./modules/shared/syscfg
@@ -13,12 +13,9 @@
           ./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;
@@ -32,6 +29,7 @@
                   syscfg
                   { usercfg = userConfig; }
                   inputs.nix-colors.homeManagerModule
+                  # inputs.hyprland.homeManagerModules.default
                   inputs.sops-nix.homeManagerModules.sops
                 ];
               }) syscfg.syscfg.users);
@@ -40,7 +38,7 @@
       };
 
       "macos" = inputs.darwin.lib.darwinSystem {
-        system = "x86_64-darwin";
+        system = syscfg.system;
         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 = "26.05";
+    stateVersion = "24.11";
   };
 
 

modules/home/cli/neofetch/config.jsonc

@@ -1,147 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
-        "type": "builtin", // Logo type: auto, builtin, small, file, etc.
-        // "source": "arch",
-        "width": 10,
-        "height": 10,
-        "padding": {
-            "top": 3,
-            "left": 2,
-            "right": 2
-        },
-        "color": {
-            "1": "blue",
-            "2": "white",
-            "3": "cyan"
-        }
-    },
-    "display": { /* Display settings */},
-    "modules": [
-        "break",
-        {
-            "type": "custom",
-            "format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
-        },
-        {
-            "type": "host",
-            "key": "󰌢  PC",
-            "keyColor": "green",
-            "format": "{2}"
-        },
-        {
-            "type": "cpu",
-            "key": "│ ├󱛠 ",
-            "keyColor": "green",
-            "format": "{1} | {4} @{6}"
-        },
-        {
-            "type": "gpu",
-            "key": "│ ├󰍹 ",
-            "keyColor": "green",
-            "format": "{2} | {7}"
-        },
-        {
-            "type": "memory",
-            "key": "│ ├󰑭 ",
-            "keyColor": "green",
-            "format": "{2}"
-        },
-        // {
-        //     "type": "disk",
-        //     "key": "└ └󰋊 ",
-        //     "keyColor": "green"
-        // },
-        {
-            "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
-        "break",
-        {
-            "type": "custom",
-            "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
-        },
-        {
-            "type": "os",
-            "key": "  OS",
-            "keyColor": "yellow",
-            "format": " {2} {8}"
-        },
-        {
-            "type": "kernel",
-            "key": "│ ├󰌽 ",
-            "keyColor": "yellow",
-            "format": "{1} {2}"
-        },
-        {
-            "type": "bios",
-            "key": "│ ├󰖡 ",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "packages",
-            "key": "│ ├󰏗 ",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "de",
-            "key": "󰧨  DE",
-            "keyColor": "blue",
-            "format": "{2} | {3}"
-        },
-        {
-            "type": "lm",
-            "key": "│ ├󰍁 ",
-            "keyColor": "blue",
-            "format": "{1} {2} {3}"
-        },
-        {
-            "type": "wm",
-            "key": "│ ├󱂬 ",
-            "keyColor": "blue",
-            "format": "{2} {5}"
-        },
-        {
-            "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
-        "break",
-        {
-            "type": "custom",
-            "format": "\u001b[90m┌──────────────────────Age───────────────────────────┐"
-        },
-        {
-            "type": "command",
-            "key": "  ›  OS Age  ",
-            "keyColor": "magenta",
-            "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
-        },
-        {
-            "type": "command",
-            "key": "  ›  Update  ",
-            "keyColor": "magenta",
-            "text": "nixos-rebuild list-generations | awk '$NF == \"True\" {print $2, $3}' | xargs -I {} date -d \"{}\" +\"%s\" | awk '{diff=systime()-$1; printf \"%d days, %d hours, %d mins\\n\", diff/86400, (diff%86400)/3600, (diff%3600)/60}'"
-        },
-        {
-            "type": "uptime",
-            "key": "  ›  Uptime  ",
-            "keyColor": "magenta"
-        },
-        {
-            "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
-        {
-            "type": "colors",
-            "paddingLeft": 2,
-            "block": {
-                "width": 3,
-                "range": [
-                    0,
-                    15
-                ]
-            } //,
-            //"symbol": "circle"
-        },
-    ]
-}

modules/home/cli/neofetch/default.nix

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

modules/home/cli/other/default.nix

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

modules/home/cli/starship/default.nix

@@ -1,6 +1,7 @@
 { 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,8 +1,9 @@
 { lib, config, pkgs, ... }: {
 
   config = lib.mkIf (config.syscfg.make.develop) {
-    programs.vscodium = {
+    programs.vscode = {
       enable = true;
+      package = pkgs.vscodium;
       #profiles.default = {
         profiles.default.extensions = with pkgs.vscode-extensions; [
           bbenoist.nix
@@ -11,6 +12,7 @@
           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, ... }:
+{ lib, config, pkgs, ... }: {
-let
+
-  translateScript = pkgs.writeTextFile {
+  config = lib.mkIf (config.syscfg.make.gui) {
-    name = "transcript-translate";
+    home.packages = with pkgs; [
-    executable = true;
+      custom.vosk.base
-    destination = "/bin/transcript-translate";
+      jq
-    text = ''
+      (python3.withPackages (ps: with ps; [ translatepy ]))
-      #!${pkgs.python3.withPackages (ps: [ ps.translatepy ])}/bin/python3
+    ];
-      import sys
+
-      from translatepy.translators.google import GoogleTranslate
+    xdg.configFile."script/transcript-translate.py".text = ''
+      #!/bin/python
+
+      import sys; 
+      from translatepy.translators.google import GoogleTranslate; 
+
       if len(sys.argv) != 2:
           print("No language provided.")
-          exit(1)
+          exit
       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 @@ in {
         MODEL_OPTS+="$pair\n"
       done
 
-      MODEL_OPT=$(echo -e "$MODEL_OPTS" | ${pkgs.wofi}/bin/wofi --dmenu -p "Choose model:")
+      MODEL_OPT=$(echo -e "$MODEL_OPTS" | 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" | ${pkgs.wofi}/bin/wofi --dmenu -p "Choose translation:")
+      TRANS=$(echo -e "$TRANSS" | wofi --dmenu -p "Choose translation:")
 
       export VOSK_MODEL=$MODEL
       case $TRANS in
           "None")
-              ${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
+              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' 2>/dev/null
               ;;
           "None-prog")
-              ${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, .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 | select(length > 0)' | ${translateScript}/bin/transcript-translate "$TRANS"
+              ${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
               ;;
       esac
     '';

modules/home/gui/base/default.nix

@@ -4,10 +4,10 @@
     services.nextcloud-client.enable = true;
 
     home.packages = with pkgs; [
-      thunar
+      xfce.thunar
-      thunar-volman
+      xfce.thunar-volman
-      thunar-archive-plugin
+      xfce.thunar-archive-plugin
-      tumbler
+      xfce.tumbler
 
       telegram-desktop
       discord-canary

modules/home/gui/theme/default.nix

@@ -1,5 +1,6 @@
 { lib, config, pkgs, ... }:
 let
+  colorVariant = " black";
   gtkThemeFromScheme = import ./gtk-theme-gen.nix { inherit pkgs config; };
   wallpaperGen = import ./wallpaper-gen.nix { inherit pkgs config; };
 in {
@@ -19,7 +20,6 @@ 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,6 +31,8 @@ in {
       platformTheme.name = "gtk";
     };
 
+    home.packages = [ wallpaperGen pkgs.swww ];
+
     xdg.configFile."script/wallpaper.sh".text = ''
       #!/bin/sh
 
@@ -48,7 +50,7 @@ in {
 
       IMG=$WPDIR/$(echo "$RES" | wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
       IMG=$(echo "$IMG" | awk -F ':' '{print $2}')
-      ${pkgs.awww}/bin/awww img $IMG
+      swww img $IMG
     '';
   };
 }

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

@@ -1,150 +1,40 @@
-{ pkgs, config, lib ? pkgs.lib }:
+{ pkgs, config }:
 
 let
-  colors = config.colorScheme.palette;
+  scheme = config.colorScheme;
-  mediaImages = config.syscfg.media.main;
+  colors = scheme.palette;
-  mediaNames = map (image: builtins.baseNameOf (toString image)) mediaImages;
+  dither =
-  mediaSourceDir = pkgs.linkFarm "wallpaper-media" (
+    "atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
-    map (image: {
+in pkgs.stdenv.mkDerivation rec {
-      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;
-  };
-
-  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
-  ];
-
-  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";
+  version = "a1676fc2a0e3dfb7bf95d8a89e592830";
-  dontUnpack = true;
+  src = pkgs.fetchFromGitea {
+    domain = "git.helcel.net";
+    owner = "sora";
+    repo = "nixconfig-wallpaper";
+    rev = version;
+    sha256 = "sha256-ZhBjTaKzoiEq1ptMmNWWRPCjLJsvy9My/HuzRaDjX1c=";
+  };
 
-  nativeBuildInputs = with pkgs; [
+  buildInputs = with pkgs; [ custom.repalette nodejs imagemagick gifsicle ];
-    custom.repalette
+
-    gifsicle
+  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
+  '';
 
   buildPhase = ''
-    runHook preBuild
+    make DITHER=${dither} PALETTE_SIZE=0 all
-
-    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/dunst/default.nix

@@ -46,7 +46,7 @@
           min_icon_size = 32;
           max_icon_size = 64;
 
-          icon_path = lib.mkForce 
+          icon_path =
             "${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 = "${pkgs.wofi}/bin/wofi --show dmenu -p dunst:";
+          dmenu = "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,19 +1,31 @@
+.calendar-win {
+}
 
 calendar {
-  padding: $popup-scale * 1.75pt $popup-scale * 1pt;
+  padding: 5pt;
-  font-size: $popup-scale * 8pt;
 
-  header {
+  :selected {
-    padding: $popup-scale * 2pt 0;
+    color: $base0C;
-    @include color-body;
   }
 
-  :selected      { @include color-accent; }
+  .header {
-  .highlight     { @include color-accent; font-weight: bold; }
+    color: $base05;
-  :indeterminate { color: $base03; }
   }
 
-.cal-box .sys-section-header { margin-bottom: $popup-scale * 4pt; }
+  .highlight {
+    color: $base0C;
+    font-weight: bold;
+  }
+
+  label {
+    font-size: 20pt;
+    color: $base0C;
+  }
+
+  :indeterminate {
+    color: $base03;
+  }
+}
 
 
 .hour, .month {
@@ -21,88 +33,16 @@ calendar {
 }
 
 .minute, .month {
-  margin-top: $popup-scale * -4pt;
+  margin-top: -4pt;
 }
 
 
 .date {
-  @include color-accent;
+  color: $base0C;
-  @include background-base;
+  background-color: $base01;
-  @include border-radius;
+  border-radius: $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

@@ -1,32 +0,0 @@
-$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,36 +1,8 @@
-// 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; }
 
-// Popup window section accents
+.net {
-.wifi-accent { background-color: $base0C; }
+    color: $base07;
-.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;
 }
 
-// Bluetooth device list
+.blt {
-.bt-device-row  { margin-bottom: $popup-scale * 4pt; }
+    color: $base0C;
-.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,21 +1,26 @@
 .powermenu-box {
-  padding: 3rem 2.5rem;
+    padding-left: 2.5rem;
-  margin: 0;
+    padding-right: 2.5rem;
+    padding-top: 3rem;
+    padding-bottom: 3rem;
+    margin:0 0 0 0;
+}
 
 .powermenu-entry {
     margin: 0 0.5rem;
+}
 
 .powermenu-button {
-      @include background-active;
+    background-color: $base02;
     border-radius: 1rem;
     transition: 0.3s;
     padding: 3.25rem 4rem;
-
-      &:hover { background-color: $base03; }
 }
+
+.powermenu-button:hover {
+    background-color:$base03;
 }
 
 .powermenu-icon {
     font-size: 4rem;
 }
-}

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

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

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

@@ -1,93 +1,69 @@
 
-// Bar module rings
+.cpubar {
-.cpubar { color: $base0C; }
+color: $base0C;
-.gpubar { color: $base0E; }
+}
-.membar { color: $base08; }
-.batbar { color: $base0B; }
-.cpubar, .gpubar, .membar, .batbar { @include background-base2; margin: $gaps-window 0; }
 
-// Window chrome
+.gpubar {
-.sys-win            { padding: $popup-scale * 10pt; font-size: $popup-scale * $panel-font-size; }
+color: $base0E;
-.sys-section        { margin-bottom: 0; }
+}
-.sys-section-header { margin-bottom: $popup-scale * 10pt; }
+
+.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;
+}
 
 .sys-label {
-  font-size: 0.72em;
+    font-weight: bolder;
-  font-weight: bold;
+    color: $base04;
-  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,28 +1,35 @@
 .tray * {
-  padding: $border-width 0;
+    padding: $border-width 0px;
 }
-
 .tray menu {
+    background-color: $base01;
+    color: $base07;
     @include border-radius;
     @include border-active;
-  @include background-base;
-  @include color-base;
 
-  padding: 10px 0;
+
+	padding: 10px 0px;
 
 	>menuitem {
         margin: 2px $border-width;
-    padding: 0 10px;
+		padding: 0px 10px;
 
-    &:disabled label { @include color-active; }
+		&:disabled label {
-    &:hover          { @include background-accent; }
+			color: $base04;
+		}
+
+		&:hover {
+			background-color: $base0C;
+		}
 	}
 
 	separator {
-    @include background-base2;
+		background-color: $base03;
 		padding-top: 1px;
-    margin: 10px 0;
+        margin:10px 0px;
 
-    &:last-child { padding: unset; }
+		&:last-child {
+			padding: unset;
+		}
 	}
 }

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

@@ -18,45 +18,8 @@
   border-color: $base04;
 }
 
-@mixin background-base {
+@mixin test {
-  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 */
@@ -68,9 +31,9 @@
 }
 
 tooltip {
-  @include border-active;
+  background: $base01;
-  @include border-radius;
+  border: $border-width solid $base04;
-  @include background-base;
+  border-radius: $border-radius;
 
   label {
     font-size: 1rem;
@@ -86,17 +49,33 @@ tooltip {
   font-weight: 900;
 }
 
-/* WORKSPACE COLORS - emitted dynamically by scripts/workspaces as class names */
+.grey {
-.grey   { color: $base02; }
+  color: $base02;
-.red    { color: $base0F; }
+}
-.orange { color: $base08; }
+
-.green  { color: $base0B; }
+.red {
-.blue   { color: $base0C; }
+  color: $base0F;
+}
+
+.orange {
+  color: $base08;
+}
+
+.green {
+  color: $base0B;
+}
+
+.blue {
+  color: $base0C;
+}
 
 /* WINDOW WRAPPER CSS */
 
 .winevent {
-  @include panel-base;
+  background-color: $base01;
+  color: $base07;
+  @include border-radius;
+  @include border-inactive;
 }
 .winevent:hover {
   @include border-active;
@@ -112,12 +91,19 @@ tooltip {
 /* MODULE WRAPPER CSS */
 
 .modevent {
-  @include panel-base;
+  background-color: $base01;
-  @include mod-edge;
+  color: $base07;
+  @include border-radius;
+  @include border-inactive;
+  border-right-style: none;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
 }
 .modevent:hover {
   @include border-active;
-  @include mod-edge;
+  border-right-style: none;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
 }
 
 .modinner {

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

@@ -5,12 +5,8 @@
 (include "modules/systray.yuck")
 (include "modules/clock.yuck")
 
-(defvar active-panel "")
+(include "windows/calendar.yuck")
-
 (include "windows/sys.yuck")
-(include "windows/net.yuck")
-(include "windows/clock.yuck")
-(include "windows/popup.yuck")
 (include "windows/radio.yuck")
 (include "windows/powermenu.yuck")
 
@@ -52,7 +48,7 @@
 
 
 (defwindow bar
-    :monitor 0
+    :monitor 1
     :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 && scripts/panel-toggle clock)"
+      :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle calendar)"
-      :onrightclick "(sleep 0.1 && eww-open-on-current-screen powermenu --toggle)"
+      :onrightclick "(sleep 0.1 && ${EWW_CMD} open --toggle powermenu)"
       (box
         :class "datetime"
         (overlay

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

@@ -1,30 +1,17 @@
-(deflisten net
+(deflisten net :initial '{"name":"","icon":""}'"scripts/net/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
-    (eventbox
+    (box
-      :onclick "(sleep 0.1 && scripts/panel-toggle net)"
+      :orientation "v"
-    (box :orientation "v"
+      (button
-      (label
+        :class "net"
-        :class "net-icon ${net.ethernet.connected ? 'net-active' : 'net-dim'}"
+        :tooltip {net.name}
-        :tooltip {net.ethernet.connected ? "Ethernet: Connected" : "Ethernet: Disconnected"}
+        {net.icon})
-        :text "󰈀")
+
-      (label
+      (button
-        :visible {net.usb.connected}
+        :class "blt"
-        :class "net-icon net-active"
+        (label :class "icon-text" :text "B"))
-        :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,32 +1,42 @@
-(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 cpu :initial '{}' "scripts/sys/cpu")
-(deflisten memory :initial '{"human":{"used":"0G","total":"0G","cached":"0G"},"used":0.0,"total":1.0,"cached":0.0}' "scripts/sys/memory")
+(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 battery :initial '{"visible":false,"percentage":0.0,"color":"#FFFFFF"}' "scripts/sys/battery")
 
 (defwidget sys-mod []
   (module
     (eventbox
-      :onclick "(sleep 0.1 && scripts/panel-toggle sys)"
+      :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle sys)"
-      (box :orientation "v"
+      (box
+        :orientation "v"
           (circular-progress
             :value {EWW_CPU.avg}
             :class "cpubar"
-          :width 28 :height 28 :thickness 6
+            :thickness 6
-          :tooltip "CPU ${round(EWW_CPU.avg, 0)}%")
+            (label :class "icon-text" :text "C"))
+
           (circular-progress
-          :value {gpu.gfx_pct}
+            :value {gpu.devices[0].GRBM2?.CommandProcessor-Graphics?.value?:0}
             :class "gpubar"
-          :width 28 :height 28 :thickness 6
+            :thickness 6
-          :tooltip "GPU ${round(gpu.gfx_pct, 0)}%")
+            (label :class "icon-text" :text "G"))
         (circular-progress
           :value {100*memory.used/memory.total}
           :class "membar"
-          :width 28 :height 28 :thickness 6
+          :thickness 6
-          :tooltip "RAM ${memory.human.used} / ${memory.human.total}")
+          :tooltip "${memory.human.used} / ${memory.human.total}"
+          (label :class "icon-text" :text "M"))
+
         (circular-progress
           :value {battery.percentage}
           :class "batbar"
           :visible {battery.visible}
           :style "color: ${battery.color};"
-          :width 28 :height 28 :thickness 6
+          :thickness 6
-          :tooltip "Bat ${round(battery.percentage, 0)}% · ${battery.status} @ ${battery.wattage}")))))
+          :tooltip "${battery.status} @ ${battery.wattage}"
+          (label :class "icon-text" :text "B"))
+      )
+    )
+  )
+)

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

@@ -3,14 +3,13 @@
 (defwidget workspace-mod []
   	(module
   	  	(eventbox
-			:onscroll "echo {} | sed -e 's/up/-1/' -e 's/down/+1/' | xargs -I % hyprctl eval \"hl.dispatch(hl.dsp.focus({ workspace = '%' }))\""
+		:onscroll "echo {} | sed -e \"s/up/-1/g\" -e \"s/down/+1/g\" | xargs hyprctl dispatch workspace"
-
 			(box
 				:class "module workspaces"
 				:orientation "v"
 				(for ws in workspace
 					(button
-						:onclick "hyprctl  eval \"hl.dispatch(hl.dsp.focus({ workspace = '${ws.number}' }))\""
+						:onclick "hyprctl dispatch workspace ${ws.number}"
 						(label 
 							:show-truncated false
 							:class "icon-text  ${ws.color}"

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

@@ -1,28 +0,0 @@
-#!/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
-    # Poll for changes every 2s (sysfs files don't support inotify reliably)
-    while true; do sleep 2; gen_output; done
-    ;;
-esac

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

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

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

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

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

@@ -1,38 +0,0 @@
-#!/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 2s as reliable fallback for missed events
-(while true; do sleep 2; 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

@@ -1,33 +0,0 @@
-#!/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 3s as fallback for missed events
-(while true; do sleep 3; 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

@@ -1,7 +0,0 @@
-#!/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,64 +1,73 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 
-get_wifi_iface() {
+function get_time_ms {
-  awk 'NR > 2 { gsub(":", "", $1); print $1; exit }' /proc/net/wireless
+  date -u +%s%3N
 }
 
-get_usb_iface() {
+icons=("󰤯" "󰤟" "󰤢" "󰤥" "󰤨")
-  ip link 2>/dev/null | awk '
+
-    /^[0-9]+: usb[0-9]/ { gsub(":", "", $2); print $2; exit }
+function toggle() {
-    /^[0-9]+: enx/      { gsub(":", "", $2); print $2; exit }
+  status=$(rfkill | grep wlan | awk '{print $4}')
-  '
+
+  if [ "$status" = "unblocked" ]; then
+    rfkill block wlan
+  else
+    rfkill unblock wlan
+  fi
 }
 
-signal_icon() {
+function gen_wifi() {
-  local dbm="$1"
+  signal=$(cat /proc/net/wireless | head -n3 | tail -n1 | awk '{print $3}')
-  if [ -z "$dbm" ]; then echo "󰤮"; return; fi
+  level=$(awk -v n="$signal" 'BEGIN{print int((n-1)/20)}')
-  if   [ "$dbm" -ge -50 ]; then echo "󰤨"
+  if [ "$level" -gt 4 ]; then
-  elif [ "$dbm" -ge -60 ]; then echo "󰤥"
+    level=4
-  elif [ "$dbm" -ge -70 ]; then echo "󰤢"
+  fi
-  elif [ "$dbm" -ge -80 ]; then echo "󰤟"
+
-  else echo "󰤯"; fi
+  icon=${icons[$level]}
+  ip="-"
+  class="net-connected"
+  name_raw=$(wpa_cli status | grep \^ssid= | sed 's/ssid=//g')
+  name=$(printf "%s" $name_raw)
 }
 
-make_content() {
+function gen_ethernet() {
-  local wifi_iface eth_iface
+  icon="󰈀"
-
+  class="net-connected"
-  wifi_iface=$(get_wifi_iface)
+  ip=""
-  eth_iface=$(ip link | awk '/^[0-9]+: en[po]/ { gsub(":",""); print $2; exit }')
+  name=Wired
-
-  # 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
-
-  # 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
-
-  # 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"
 }
 
+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"
+  fi
+
+  echo '{"icon": "'$icon'", "name": "'$name'", "ip": "'$ip'", "class": "'$class'"}'
+}
+
+if [ "$1" = "toggle" ]; then
+  toggle
+else
+  last_time=$(get_time_ms)
   make_content
   ip monitor | while read -r _; do
+    current_time=$(get_time_ms)
+    delta=$((current_time - last_time))
+    if [[ $delta -gt 50 ]]; then
       make_content
+      last_time=$(get_time_ms)
+    fi
   done
+fi

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

@@ -1,79 +0,0 @@
-#!/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

@@ -1,13 +0,0 @@
-#!/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

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-PANEL="$1"
-
-# Drop concurrent invocations, but recover from stale locks (dead processes)
-LOCK="/tmp/eww_panel_toggle.lock"
-if [ -f "$LOCK" ] && kill -0 "$(cat "$LOCK" 2>/dev/null)" 2>/dev/null; then
-  exit 0
-fi
-echo $$ > "$LOCK"
-trap 'rm -f "$LOCK"' EXIT
-
-CURRENT=$(eww get active-panel 2>/dev/null | tr -d '"')
-
-open_popup() {
-  local screen
-  screen=$(hyprctl monitors -j 2>/dev/null | jq -r '.[] | select(.focused == true) | .name' | head -n1)
-  if [ -n "$screen" ]; then
-    eww open popup --screen "$screen"
-  else
-    eww open popup
-  fi
-}
-
-if [ "$CURRENT" = "$PANEL" ]; then
-  eww update active-panel=""
-  eww close popup 2>/dev/null
-else
-  eww update active-panel="$PANEL"
-  open_popup
-fi

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

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-current=$(eww state 2>/dev/null | grep '^power-save:' | awk '{print $2}')
-if [ "$current" = "true" ]; then
-  powerprofilesctl set balanced 2>/dev/null || true
-  echo false
-else
-  powerprofilesctl set power-saver 2>/dev/null || true
-  echo true
-fi

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

@@ -1,227 +1,106 @@
 #!/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"
 
-STATION_IDS='[507,522,523,536,537,42532,42602]'
-
-# 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 ))
+RADIO_URL=""
-INFO="$DEFAULT_INFO"
+INFO='{"id":null,"artist":null,"song":null,"image600":null}'
-MEDIA="$DEFAULT_MEDIA"
+PAUSED=$(( $PID == 0 || $RADIO_ID == 0 ? 1 : 0 ))
 STATUS="{}"
 
-get_stations() {
+get_radio() {
-  local rr
+  echo "$STATIONS" | jq -r --argjson sel_id "$RADIO_ID" 'map(select(.id == $sel_id)).[0]'
-  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() {
-  curl -s --compressed "$URL_BASE/station/history/?id=$RADIO_ID" \
+  echo $(curl -s "$URL_BASE/station/history/?id=$RADIO_ID" | jq '.result.history[0] | ({id, artist, song, image600})')
-    | jq '.result.history[0] | {artist, song, image600}'
 }
 
-get_stream_url() {
-  echo "$STATIONS" | jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].stream_hls // empty'
-}
 
-get_player_info() {
+update() {
-  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
-  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
+  PAUSED=$(( $PID == 0 && $RADIO_ID > 0 ? 1 : 0 ))
-    PID=0
+}
-    rm -f "$MPV_PID_FILE"
+
+start() {
+  STATIONS=$(curl -s "$URL_BASE/stations/" | jq --argjson ids '[507,522,523,536,537,42532,42602]' '.result.stations | map(select(.id | IN($ids[]))) | map({id, title, stream_hls, icon_fill_white})')
+  RADIO_URL=$(get_radio | jq -r '.stream_hls')
+  if [ "$PAUSED" = 0 ]; then
+    kill -9 $PID
   fi
-  PAUSED=$(( PID == 0 ? 1 : 0 ))
+  mpv "$RADIO_URL" & echo $! > "$MPV_PID_FILE"
+  echo $RADIO_ID > "$RADIO_ID_FILE"
 }
 
-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() {
+toggle() {
-  local name="$1"
+  if [ "$PAUSED" = 1 ]; then
-  wpctl status 2>/dev/null | awk -v pat="$name" '
+    echo $RADIO_ID $PID
-    /Streams:/ { in_s = 1 }
+    start
-    /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
-    local player; player=$(playerctl -l 2>/dev/null | grep -Ev '^mpv' | head -1)
+    kill -9 "$PID"
-    [ -n "$player" ] && playerctl -p "$player" volume 2>/dev/null \
+    rm -f $MPV_PID_FILE
-      | awk '{printf "%d", $1 * 100}'
   fi
 }
 
-do_vol() {
+status() {
-  local vol="${1%.*}"
+  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}')
-  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() {
-  STATIONS=$(get_stations)
+  STATUS=$(status)
-  echo "$(emit_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_pid_check=0
+  last_time_info=0
-  last_song_fetch=0
+  last_time=0
-  last_media_fetch=0
-
   while true; do
-    now=$(date -u +%s%3N)
+    current_time=$(get_time_ms)
-
+    delta=$((current_time - last_time))
-    if (( now - last_pid_check > 1000 )); then
+    delta_i=$((current_time - last_time_info))
-      update_state
+    if [[ $delta -gt 1000 ]]; then
-      NEW_STATUS=$(emit_status)
+      PID=$( [ -e "$MPV_PID_FILE" ] && cat "$MPV_PID_FILE" || echo 0 )
-      if [ "$NEW_STATUS" != "$STATUS" ]; then STATUS=$NEW_STATUS; echo "$STATUS"; fi
+      RADIO_ID=$( [ -e "$RADIO_ID_FILE" ] && cat "$RADIO_ID_FILE" || echo 0 )
-      last_pid_check=$now
+      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
-    if (( now - last_song_fetch > 15000 )); then
+    fi
-      if [ "$PAUSED" = 0 ]; then
+    if [[ $delta_i -gt 15000 ]]; then
-        IS_RR=$(echo "$STATIONS" | jq --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].radiorecord // true')
+      if [ "$PAUSED" = 1 ]; then
-        if [ "$IS_RR" = "true" ]; then
+        INFO="{\"id\":null,\"artist\":null,\"song\":null,\"image600\": \"$(get_radio | jq -r '.icon_fill_white')\"}"
-          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=$(echo "$INFO" "$(get_song)" | jq -s ' reduce .[] as $item ( {}; . + (
-          INFO=$(jq -cnr --arg title "$STATION_TITLE" '{artist:"",song:$title,image600:""}')
+            reduce ($item | to_entries[]) as $entry ( {}; if $entry.value != null then .[$entry.key] = $entry.value else . end
+          )) )')
       fi
-      else
+      last_time_info=$current_time
-        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
-      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)
+  "start")
-    RADIO_ID="$2"
+    RADIO_ID=$2
-    echo "$RADIO_ID" > "$RADIO_ID_FILE"
+    start
-    do_start
     ;;
-  vol)
+  "toggle")
-    do_vol "$2"
+    toggle
-    ;;
-  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

@@ -1,4 +0,0 @@
-#!/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

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

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

@@ -1,49 +0,0 @@
-#!/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

@@ -1,3 +0,0 @@
-#!/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,22 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
-amdgpu_top -J -s 5000 | jq -c --unbuffered '.devices[0] | {
+
-  gfx_pct:   (.gpu_activity.GFX.value // 0),
+amdgpu_top -J -s 5000 | sed 's/ //g' 
-  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,6 +8,5 @@ human() {
 
 free --si -s 3 | rg --line-buffered Mem | while read -r line; do
   used=$(echo "$line" | awk '{print $3}')
-  cached=$(echo "$line" | awk '{print $6}')
+  echo '{"human": { "total": "'$(human "$total")'", "used": "'$(human "$used")'"}, "total": "'$total'" , "used": "'$used'"}'
-  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

@@ -1,7 +0,0 @@
-#!/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/volume

@@ -1,45 +0,0 @@
-#!/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
-
-    # 1s polling fallback
-    (while true; do sleep 1; 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

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

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

@@ -1,100 +0,0 @@
-#!/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/windows/calendar.yuck

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

@@ -1,126 +0,0 @@
-
-(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 ---
-
-(defvar power-save  false)
-(defvar night-light false)
-
-(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 "eww update power-save=$(scripts/power-save)" :active {power-save})
-        (quick-btn :icon "󰌵" :label "Night Light" :onclick "eww update night-light=$(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

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

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

@@ -25,7 +25,7 @@
                                 
         (powermenu_entry    :label "Sign out" 
                             :icon "󰗼" 
-                            :onclick "hyprctl eval \"hl.dispatch(hl.dsp.exit())\"")
+                            :onclick "hyprctl dispatch exit 0")
 
         (powermenu_entry    :label "Cancel" 
                             :icon "󰅖" 
@@ -34,7 +34,7 @@
 )
 
 (defwindow powermenu
-    :monitor 0
+    :monitor 1
     :stacking "overlay"
     :geometry (geometry 
                     :anchor "center"

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

@@ -1,82 +1,111 @@
+(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 :class "sys-win" :orientation "v" :space-evenly false
+	(box 
+      :space-evenly false
+      :orientation "h" 
+      (revealer
+        :visible radio_rev
+        :reveal radio_rev
+        :transition "slideleft"
+          (radio-selector))
+      (box
+      :space-evenly false
+      :orientation "v" 
 
-    ; --- Now Playing ---
+		(box 
-    (box :orientation "v" :space-evenly false :class "sys-section"
+          :class "album_art" 
-      (section-header :title "Media" :accent "radio-accent")
+          :style "background-size:cover; background-image: url('${radio.song.image600?:'https://www.radiorecord.ru/upload/stations_images/record_image600_white_fill.png'}');")
-      (box :orientation "h" :space-evenly false :valign "center" :spacing 10 :class "radio-now-playing"
+		(box 
-        (box :class "radio-art"
+          :space-evenly false
-          :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;"
+          :orientation "v"
-          (label :class "radio-art-icon" :halign "center" :valign "center"
+			(label 
-            :visible {radio.is_paused == 0
+              :halign "center" 
-              ? radio.song.image600 == ""
+              :class "song" 
-              : (radio.media.status != "Stopped"
+              :wrap "true" 
-                  ? radio.media.art == ""
+              :limit-width 18
-                  : radio.song.image600 == "")}
+              :text "${radio.song.song?:'...'}")
-            :text "󰝚"))
+			(label 
-        (box :orientation "v" :space-evenly false :hexpand true :valign "center"
+              :halign "center" 
-          (label :class "radio-song" :halign "start" :wrap true :limit-width 20
+              :class "artist" 
-            :text {radio.is_paused == 0
+              :wrap "true" 
-              ? (radio.song.song != "" ? radio.song.song : "Tuning in...")
+              :limit-width 22
-              : (radio.media.status != "Stopped"
+              :text "${radio.song.artist?:'...'}")
-                ? (radio.media.title != "" ? radio.media.title : "Playing")
+			(box 
-                : (radio.song.song != "" ? radio.song.song : "Nothing playing"))})
+              :space-evenly true
-          (label :class "radio-artist" :halign "start" :wrap true :limit-width 22
+              :orientation "h" 
-            :text {radio.is_paused == 0
+              :halign "center" 
-              ? radio.song.artist
+              :class "btn_bar"
-              : (radio.media.status != "Stopped"
-                ? (radio.media.artist != "" ? radio.media.artist : radio.media.player)
-                : "")})))
 
-      ; Controls - hidden only in placeholder state
+                (button
-      (box :visible {radio.is_paused == 0 || radio.radio > 0 || radio.media.status != "Stopped"}
+                :class "btn_left" 
-        :orientation "v" :space-evenly false :class "radio-controls"
+                :onclick "${EWW_CMD} update radio_rev=${!radio_rev}"
-        (box :orientation "h" :space-evenly true :halign "center"
+                (box "󰷐"))
-          (button :visible {radio.is_paused == 1 && radio.media.status != "Stopped"}
-            :class "radio-ctrl-btn" :timeout "2s" :onclick "playerctl previous"
-            (label :text "󰒮"))
-          (button :class "radio-ctrl-btn" :timeout "2s"
-            :onclick {radio.is_paused == 1 && radio.media.status != "Stopped" ? "playerctl 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 "playerctl next"
-            (label :text "󰒭")))
-        (vol-row
-          :icon "󰕾"
-          :value {radio-vol}
-          :onchange "scripts/radio vol {}"
-          :onclick "scripts/radio mute"
-          :muted {radio-muted})))
 
-    (box :class "section-sep")
+				        (button 
+                :class "btn_play" 
+                :timeout "2s"
+                :onclick "scripts/radio toggle" 
+                "${radio.is_paused==1 ? "󰐌" : "󰏥"}")
+
+                (button
+                :class "btn_right" 
+                :onclick ""
+                (box :visible false "󰔶"))
+            )
+		)
+      )
+    )
+)
+
+
+(defwidget radio-selector []
+  (scroll
+    :active true
+    :vscroll true
+    :hscroll false
+
+    (box
+        :class "station_list"
+        :space-evenly false
+        :orientation "v"
 
-    ; --- 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-row ${radio.radio == station.id ? 'station-row-active' : ''}"
+                :class "station_art ${(radio.radio == station.id)?'station_sel':''}"
                 :timeout "2s"
                 :onclick "scripts/radio start ${station.id}"
-              :tooltip {station.title}
+                :tooltip "${station.title}"
-              (box :orientation "h" :space-evenly false :valign "center"
+                :style "background-size:cover; background-image: url('${station.icon_fill_white}');"
-                (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
-    (eventbox
+    (box
-      :onclick "(sleep 0.1 && scripts/panel-toggle radio)"
+      :orientation "v"
-      (box :orientation "v"
+      (button
-        (label :show-truncated false :class "icon-text" :text "󰝚")))))
+        :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle --no-daemonize radio)"
+        (label 
+          :show-truncated false
+          :class "icon-text" 
+          :text "󰝚")
+      )
+    )
+  )
+)

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

@@ -1,211 +1,140 @@
 
-(defpoll swap :interval "5s" "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 "2s"
-  "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 :class "sys-section"
+  (box
-    (section-header :title "CPU" :accent "cpu-accent")
+    :orientation "v"
-    (box :orientation "v" :space-evenly false :halign "center"
+    :space-evenly false
-      (for row in {cpu-grid}
+    (box :class "sys-label" "CPU")
-        (box :orientation "h" :space-evenly false
+    (box
-          (for core in {row}
+      :orientation "v"
-            (cpu-core-cell :core {core})))))
+      (for core in {EWW_CPU.cores}
-    (box :orientation "h" :space-evenly true :class "gpu-stats-row"
+        (box
-      (box :orientation "v" :halign "center" :space-evenly false
+          :space-evenly false
-        (label :class "gpu-stat-value" :text "${cpu-temp}°C")
+          :class "cpu-core ${core.core}"
-        (label :class "gpu-stat-label" :text "temp"))
+          (progress
-      (box :orientation "v" :halign "center" :space-evenly false
+            :value {core.usage}
-        (label :class "gpu-stat-value" :text "${cpu-freq-avg}GHz")
+            :orientation "h"
-        (label :class "gpu-stat-label" :text "avg clk"))
+            :flipped true
-      (box :orientation "v" :halign "center" :space-evenly false
+            :class "cpu-core-usage"
-        (label :class "gpu-stat-value" :text "${round(EWW_CPU.avg, 0)}%")
+            :tooltip "${core.core} @ ${core.freq}Mhz"
-        (label :class "gpu-stat-label" :text "usage")))
+          )
+        )
+      )
+    )
   )
 )
-
-; --- GPU ---
 
 (defwidget gpu-sys-win []
-  (box :orientation "v" :space-evenly false :class "sys-section"
+  (box
-    (section-header :title "GPU" :accent "gpu-accent")
+    :orientation "v"
-    (box :orientation "h" :space-evenly true
+    :space-evenly false
-      ; GFX - outer: activity%, inner: clock% of range
+    (box :class "sys-label" "GPU")
-      (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}
+      :value {gpu.devices[0].GRBM2?.CommandProcessor-Compute?.value?:0.0}
-        :orientation "h" :flipped true :hexpand true
+      :orientation "h"
-        :class "vram-bar"
+      :flipped true
-        :tooltip "VRAM  ${round(100 * gpu.vram_used / gpu.vram_total, 1)}%")
+      :class "gpu-core-usage"
-      (box :orientation "h" :space-evenly false
+      :tooltip "Compute"
-        (label :class "vram-usage-label" :halign "start" :hexpand true :text "VRAM")
+    )    
-        (label :class "vram-usage-label" :halign "end"
+    (progress
-          :text "${round(gpu.vram_used / 1024, 1)} / ${round(gpu.vram_total / 1024, 1)} GiB")))
+      :value {gpu.devices[0].GRBM2?.CommandProcessor-Fetcher?.value?:0.0}
-    (box :orientation "h" :space-evenly true :class "gpu-stats-row"
+      :orientation "h"
-      (box :orientation "v" :halign "center" :space-evenly false
+      :flipped true
-        (label :class "gpu-stat-value" :text "${gpu.temp}°C")
+      :class "gpu-core-usage"
-        (label :class "gpu-stat-label" :text "temp"))
+      :tooltip "Fetcher"
-      (box :orientation "v" :halign "center" :space-evenly false
+    )
-        (label :class "gpu-stat-value" :text "${gpu.power}W")
+    (progress
-        (label :class "gpu-stat-label" :text "power")))
+      :value {gpu.devices[0].GRBM2?.CommandProcessor-Graphics?.value?:0.0}
+      :orientation "h"
+      :flipped true
+      :class "gpu-core-usage"
+      :tooltip "Graphics"
+    )
+    (box :class "spacer")
+    (progress
+      :value {gpu.devices[0]?.gpu_activity?.GFX?.value?:0.0}
+      :orientation "h"
+      :flipped true
+      :class "gpu-core-usage"
+      :tooltip "GFX"
+    )    
+    (progress
+      :value {gpu.devices[0]?.gpu_activity?.Memory?.value?:0.0}
+      :orientation "h"
+      :flipped true
+      :class "gpu-core-usage"
+      :tooltip "Memory"
+    )
+    (progress
+      :value {gpu.devices[0]?.gpu_activity?.MediaEngine?.value?:0.0}
+      :orientation "h"
+      :flipped true
+      :class "gpu-core-usage"
+      :tooltip "Media"
+    )
+    (box :class "spacer")
+    (progress
+      :value {100*(gpu.devices[0]?.VRAM?.TotalVRAMUsage?.value?:0.0)/(gpu.devices[0]?.VRAM?.TotalVRAM?.value?:1.0)}
+      :orientation "h"
+      :flipped true
+      :class "gpu-core-usage"
+      :tooltip "VRAM"
+    )
   )
 )
-
-; --- RAM ---
 
 (defwidget ram-sys-win []
-  (box :orientation "v" :space-evenly false :class "sys-section"
+  (box
-    (section-header :title "RAM" :accent "ram-accent")
+    :orientation "v"
-    (box :orientation "h" :space-evenly false :halign "center" :spacing 16 :valign "center"
+    :space-evenly false
-      (overlay
+    (box :class "sys-label" "RAM")
-        (circular-progress
+    (progress
-          :width 88 :height 88
       :value {100*memory.used/memory.total}
-          :start-at 0
+      :orientation "h"
-          :clockwise true
+      :flipped true
-          :thickness 9
+      :class "memory-usage"
-          :class "ram-ring"
+      :tooltip "RAM"
-          :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}"))))
     )
   )
 )
 
-; --- 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 "section-sep")
+      (box :class "spacer")
+      (box :class "spacer")
       (gpu-sys-win)
-    (box :class "section-sep")
+      (box :class "spacer")
+      (box :class "spacer")
       (ram-sys-win)
-    (box :class "section-sep" :visible {battery.visible})
+    )
-    (bat-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
       )
     )
+  )
+)
+
+(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,62 +1,21 @@
-{ 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.jq ];
-    "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/lock"         = mkScript "lock"         ./bar/scripts/lock         [ pkgs.eww pkgs.swaylock-effects ];
-    "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 = [ pkgs.eww openOnCurrentScreen ];
+    home.packages = with pkgs; [ eww jq jaq custom.amdgpu_top ];
 
-    xdg.configFile = lib.mkMerge [
+    xdg.configFile."eww" = {
-      {
-        "eww" = {
       source = lib.cleanSourceWith {
         filter = name: _type:
-              let
+          let baseName = baseNameOf (toString name);
-                baseName = baseNameOf (toString name);
+          in !(lib.hasSuffix ".nix" baseName) && (baseName != "_colors.scss");
-                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;
     };
 
-        "eww/css/_colors.scss".text = ''
+    # colors file
+    xdg.configFile."eww/css/_colors.scss".text = ''
       $base00: #${config.colorScheme.palette.base00};
       $base01: #${config.colorScheme.palette.base01};
       $base02: #${config.colorScheme.palette.base02};
@@ -86,16 +45,6 @@ in {
 
       $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,108 +1,109 @@
-{ config, lib, pkgs, ... }: 
+{ config, lib, ... }: {
-let 
-  baseOutput = {
-    position = "0,0";
-    scale = 1.0;
-    adaptiveSync = true;
-    status = "enable";
-  };
-
-in {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
     services.kanshi = {
       enable = true;
       systemdTarget = "graphical-session.target";
       settings = [
-        {output = baseOutput//{
+        {
+          profile.name = "tower_0";
+          profile.outputs = [
+            {
               criteria = "AOC 24E1W1 GNSKCHA086899";
               mode = "1920x1080@60.000";
-        };}
+              position = "0,0";
-        {output = baseOutput//{
+              status = "enable";
+              scale = 1.0;
+              adaptiveSync = true;
+            }
+            {
               criteria = "AOC 24E1W1 GNSKBHA080346";
               mode = "1920x1080@60.000";
-        };}
+              position = "1920,0";
-        {output = baseOutput//{
+              status = "enable";
+              scale = 1.0;
+              adaptiveSync = true;
+            }
+          ];
+        }
+        {
+          profile.name = "tower_1";
+          profile.outputs = [
+            {
+              criteria = "AOC 24E1W1 GNSKCHA086899";
+              mode = "1920x1080@60.000";
+              position = "0,0";
+              status = "enable";
+              scale = 1.0;
+              adaptiveSync = true;
+            }
+            {
+              criteria = "AOC 24E1W1 GNSKBHA080346";
+              mode = "1920x1080@60.000";
+              position = "0,0";
+              status = "enable";
+              scale = 1.0;
+              adaptiveSync = true;
+            }
+            {
               criteria = "LG UNKNOWN_TBD";
               mode = "1920x1080@144.000";
-        };}
+              position = "0,0";
-        {output = baseOutput//{
+              status = "enable";
+              scale = 1.0;
+              adaptiveSync = true;
+            }
+          ];
+        }
+        {
+          profile.name = "laptop_0";
+          profile.outputs = [{
             criteria = "LG Display 0x060A Unknown";
             mode = "1920x1080@60.020";
-        };}
+            position = "0,0";
-        {output = baseOutput//{
+            scale = 1.0;
+            status = "enable";
+          }];
+        }
+        {
+          profile.name = "laptop_1";
+          profile.outputs = [
+            {
               criteria = "CEX CX133 0x00000001";
               mode = "2560x1600@59.972";
-        };}
+              position = "0,0";
-        {output = baseOutput//{
+              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 = [
+            {
               criteria = "AOC 16G3 1DDP7HA000348";
               mode = "1920x1080@144.000";
-        };}
-
-        {profile = {
-          name = "tower_0";
-          outputs = [
-            {
-              criteria = "AOC 24E1W1 GNSKCHA086899";
               position = "0,0";
+              status = "enable";
+              scale = 1.0;
+              adaptiveSync = true;
             }
             {
-              criteria = "AOC 24E1W1 GNSKBHA080346";
+              criteria = "LG Display 0x060A Unknown";
+              mode = "1920x1080@60.020";
               position = "1920,0";
+              scale = 1.0;
+              status = "enable";
             }
           ];
-          exec = [ "${pkgs.eww}/bin/eww open bar --screen 1" ];
-        };}
-        {profile = {
-          name = "tower_1";
-          outputs = [
-            {
-              criteria = "AOC 24E1W1 GNSKCHA086899";
-              position = "0,0";
         }
-            {
-              criteria = "AOC 24E1W1 GNSKBHA080346";
-              position = "0,0";
-            }
-            {
-              criteria = "LG UNKNOWN_TBD";
-              position = "0,0";
-            }
-          ];
-        };}
-        {profile = {
-          name = "laptop_0";
-          outputs = [{
-            criteria = "LG Display 0x060A Unknown";
-            position = "0,0";
-          }];
-        };}
-        {profile = {
-          name = "laptop_1";
-          outputs = [
-            {
-              criteria = "CEX CX133 0x00000001";
-              position = "0,0";
-            }
-            {
-              criteria = "LG Display 0x060A Unknown";
-              position = "2560,0";
-            }
-          ];
-        };}
-        {profile = {
-          name = "laptop_2";
-          outputs = [
-            {
-              criteria = "AOC 16G3 1DDP7HA000348";
-              position = "0,0";
-            }
-            {
-              criteria = "LG Display 0x060A Unknown";
-              position = "1920,0";
-            }
-          ];
-        };}
       ];
     };
   };

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

@@ -19,6 +19,8 @@ let
 in {
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
 
+    home.packages = [ pkgs.custom.amdgpu_top pkgs.jq ];
+
     programs.waybar = {
       enable = true;
       package = pkgs.waybar;
@@ -144,8 +146,8 @@ in {
             "9" = [ ];
             "10" = [ ];
           };
-          "on-scroll-up" = "hyprctl eval \"hl.dispatch(hl.dsp.focus({ workspace = '-1' }))\"";
+          "on-scroll-up" = "hyprctl dispatch workspace r-1";
-          "on-scroll-down" = "hyprctl eval \"hl.dispatch(hl.dsp.focus({ workspace = '+1' }))\"";
+          "on-scroll-down" = "hyprctl dispatch workspace r+1";
         };
 
         "backlight" = {
@@ -201,7 +203,8 @@ in {
         "custom/gpu" = {
           "exec" = jsonOutput "gpu" {
             tooltip = "...";
-            percentage = ''$(${lib.getExe pkgs.custom.amdgpu_top} -J -n 1 | ${pkgs.jq}/bin/jq -r '.devices[0].GRBM2."Command Processor -  Graphics".value')'';
+            percentage = ''
+              $(amdgpu_top -J -n 1 | jq -r '.devices[0].GRBM2."Command Processor -  Graphics".value')'';
           };
           "return-type" = "json";
           "interval" = 5;
@@ -229,7 +232,7 @@ in {
         "custom/powermenu" = {
           "format" = "{icon}";
           "format-icons" = [ "󰐥" ];
-          "on-click" = "eww-open-on-current-screen powermenu";
+          "on-click" = "eww open powermenu";
           "tooltip" = false;
         };
         "tray" = {

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

@@ -1,6 +1,8 @@
 { 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

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

@@ -1,6 +1,7 @@
 { 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,17 +1,40 @@
-{ lib, config, pkgs, ... }: {
+{ 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 {
   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,32 +1,221 @@
-{ lib, config, pkgs, ... }: let
+{ lib, config, pkgs, ... }: {
-  lua = lib.generators.mkLuaInline;
+  config = lib.mkIf (config.usercfg.wm == "Wayland") {
 
-  bind = keys: dispatcher: { _args = [ keys dispatcher ]; };
+    wayland.windowManager.hyprland = {
-  bindOpts = keys: dispatcher: opts: { _args = [ keys dispatcher opts ]; };
+      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
 
-  dsp = {
+            follow_mouse = 1
-    exec = cmd: lua ''hl.dsp.exec_cmd("${cmd}")'';
+
-    close = lua "hl.dsp.window.close()";
+            sensitivity = 0
-    exit = lua "hl.dsp.exit()";
+                        
-    float = lua ''hl.dsp.window.float({ action = "toggle" })'';
+            touchpad {
-    fullscreen = lua "hl.dsp.window.fullscreen()";
+                natural_scroll=no
-    pseudo = lua "hl.dsp.window.pseudo()";
+                disable_while_typing=true
-    layout = msg: lua ''hl.dsp.layout("${msg}")'';
+                scroll_factor=1
-    focus = dir: lua ''hl.dsp.focus({ direction = "${dir}" })'';
+                disable_while_typing=0
-    swap = dir: lua ''hl.dsp.window.swap({ direction = "${dir}" })'';
+                tap-to-click=0
-    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})'';
+        misc {
-    drag = lua "hl.dsp.window.drag()";
+            disable_hyprland_logo=true
-    resize = lua "hl.dsp.window.resize()";
+            animate_mouse_windowdragging=false
+            animate_manual_resizes=false
+                          
+            vrr=1
+        }
+                        
+        general {
+            gaps_in = ${config.colorScheme.palette.gaps-window}
+            gaps_out = ${config.colorScheme.palette.gaps-screen}
+            border_size = ${config.colorScheme.palette.border-width}
+                                      
+            col.active_border = rgb(${config.colorScheme.palette.base04})
+            col.inactive_border = rgb(${config.colorScheme.palette.base03})
+                          
+            layout = dwindle
+        }
+                        
+        decoration {
+            rounding = ${config.colorScheme.palette.border-radius}
+                          
+            blur {
+                enabled = true
+                size = 2
+                passes = 1
+                new_optimizations = true
+            }
+            #multisample_edges = true
+
+            #opactity
+            inactive_opacity = 1.0
+            active_opacity = 1.0
+            fullscreen_opacity = 1.0
+                                      
+            # shadow
+            # drop_shadow = no
+            # shadow_range = 60
+            # shadow_offset = 0 5
+            # shadow_render_power = 4
+            #col.shadow = rgba(00000099)
+        }
+                        
+        animations {
+            enabled = true
+            bezier = customcurve, 0.0, 0.9, 0.1, 1.0
+
+            animation = windows, 1, 4, customcurve
+            animation = windowsOut, 1, 4, customcurve, popin 50%
+            animation = border, 1, 10, customcurve
+            animation = borderangle, 0, 1, customcurve
+            animation = fade, 1, 4, customcurve
+            animation = workspaces, 1, 4, customcurve
+        }
+                        
+        dwindle {
+            pseudotile = yes
+            preserve_split = yes 
+        }
+
+        master {
+            new_status = master
+        }
+
+        gesture = 3, vertical, workspace
+                        
+        exec-once = eww open bar
+        #exec-once = waybar
+        exec-once = dunst
+
+        exec-once = swww init
+
+        exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+        exec-once = /nix/store/$(ls -la /nix/store | grep 'polkit-gnome' | grep '4096' | awk '{print $9}' | sed -n '$p')/libexec/polkit-gnome-authentication-agent-1 & 
+
+        exec-once = wl-paste --type text --watch cliphist store #Stores only text data
+        exec-once = wl-paste --type image --watch cliphist store #Stores only image data
+
+        exec-once = swayidle -w timeout 600 'swaylock' before-sleep 'swaylock'
+
+
+        #windowrules
+        windowrule = noshadow, floating:0
+
+        windowrule = float, title:^(flying_kitty)$
+        windowrule = size 1100 600, title:^(flying_kitty)$
+        windowrule = move center, title:^(flying_kitty)$
+        windowrule = animation slide, title:^(flying_kitty)$
+        windowrule = float, title:^(Volume Control)$
+        windowrule = float, title:^(Picture-in-Picture)$
+        windowrule = float, title:^(Steam)$
+
+        windowrulev2 = workspace 2 silent, class:^(org.telegram.desktop)$
+        windowrulev2 = workspace 2 silent, class:^(discord)$
+
+        windowrulev2 = workspace 8 silent, class:^(org.keepassxc.KeePassXC)$
+        windowrulev2 = workspace 8 silent, title:^(Nextcloud)$
+        windowrulev2 = workspace 8 silent, class:^(Tk)$,title:^(Server Configuration)$
+
+        #SPECIAL FLOATERS
+        windowrulev2 = float,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC -  Access Request)$
+        windowrulev2 = pin,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC -  Access Request)$
+        windowrulev2 = float,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$
+        windowrulev2 = pin,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$
+        windowrulev2 = float,title:^(Open)$
+        windowrulev2 = float,title:^(Choose Files)$
+        windowrulev2 = float,title:^(Save As)$
+        windowrulev2 = float,title:^(Confirm to replace files)$
+        windowrulev2 = float,title:^(File Operation Progress)$
+        windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$
+        windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Picture-in-Picture)$
+        windowrulev2 = float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
+        windowrulev2 = float,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
+        windowrulev2 = float,class:^(org.telegram.desktop)$,title:^(Media viewer)$
+        windowrulev2 = center,class:^(org.telegram.desktop)$,title:^(Media viewer)$
+
+        #SPECIAL NO SLEEP
+        windowrulev2 = idleinhibit fullscreen, class:^(.*)
+        windowrulev2 = idleinhibit focus, class:^(steam_app_.*)$
+        windowrulev2 = idleinhibit focus, class:^(mpv)$
+
+        layerrule = blur,^(eww-blur)
+
+        #binds
+        bind = SUPER, RETURN, exec, kitty
+
+        bind = SUPER_SHIFT, RETURN,togglespecialworkspace,
+        # bind = SUPER_SHIFT, RETURN, exec, kitty --title flying_kitty --single-instance
+        bind = SUPER, Q, killactive, 
+        bind = SUPER, T, togglefloating, 
+        bind = SUPER, F, fullscreen, 
+
+        bind = SUPER, D, exec, wofi -modi --show drun
+        bind = SUPER SHIFT,D,exec, ~/.config/hypr/themes/apatheia/eww/launch_bar 
+
+        bind = SUPER, V, exec, cliphist list | wofi -dmenu | cliphist decode | wl-copy
+        bind = , PRINT, exec, hyprshot -m region --raw | satty --filename - --early-exit --action-on-enter save-to-clipboard --copy-command 'wl-copy'
+
+        bind = SUPER, L, exec, swaylock 
+
+        bind = SUPER, left, movefocus, l
+        bind = SUPER, right, movefocus, r
+        bind = SUPER, up, movefocus, u
+        bind = SUPER, down, movefocus, d
+
+        bind = SUPER, 1, workspace, 1
+        bind = SUPER, 2, workspace, 2
+        bind = SUPER, 3, workspace, 3
+        bind = SUPER, 4, workspace, 4
+        bind = SUPER, 5, workspace, 5
+        bind = SUPER, 6, workspace, 6
+        bind = SUPER, 7, workspace, 7
+        bind = SUPER, 8, workspace, 8
+        bind = SUPER, 9, workspace, 9
+        bind = SUPER, 0, workspace, 10
+
+        bind = SUPER SHIFT, 1, movetoworkspacesilent, 1
+        bind = SUPER SHIFT, 2, movetoworkspacesilent, 2
+        bind = SUPER SHIFT, 3, movetoworkspacesilent, 3
+        bind = SUPER SHIFT, 4, movetoworkspacesilent, 4
+        bind = SUPER SHIFT, 5, movetoworkspacesilent, 5
+        bind = SUPER SHIFT, 6, movetoworkspacesilent, 6
+        bind = SUPER SHIFT, 7, movetoworkspacesilent, 7
+        bind = SUPER SHIFT, 8, movetoworkspacesilent, 8
+        bind = SUPER SHIFT, 9, movetoworkspacesilent, 9
+        bind = SUPER SHIFT, 0, movetoworkspacesilent, 10
+
+        bind = SUPER, mouse_down, workspace, e+1
+        bind = SUPER, mouse_up, workspace, e-1
+
+        bindm = SUPER, mouse:272, movewindow
+        bindm = SUPER, mouse:273, resizewindow
+        bind = , XF86AudioPlay, exec, playerctl play-pause
+        bind = , XF86AudioPrev, exec, playerctl previous
+        bind = , XF86AudioNext, exec, playerctl next
+        bind = , XF86AudioRaiseVolume, exec, amixer -q sset 'Master' 5%+
+        bind = , XF86AudioLowerVolume, exec, amixer -q sset 'Master' 5%-
+        bind = , XF86AudioMute, exec, amixer -q sset 'Master' toggle
+        bind = , XF86MonBrightnessUp, exec, brightnessctl s 5%+
+        bind = , XF86MonBrightnessDown, exec, brightnessctl s 5%-
+
+        exec-once = [workspace special silent] kitty --title flying_kitty
+        exec-once = sh ~/.config/startup.sh
+      '';
     };
 
-
+    xdg.configFile."startup.sh".text = ''
-  startupScript = pkgs.writeShellScriptBin "hyprland-start" ''
+      #!/bin/sh
-    ${pkgs.eww}/bin/eww open bar &
-    ${pkgs.awww}/bin/awww-daemon &
-
       sleep 2
       keepassxc & 
       firefox & 
@@ -38,305 +227,5 @@
       #telegram-desktop&
       #discord&
     '';
-in {
-  config = lib.mkIf (config.usercfg.wm == "Wayland") {
-    wayland.windowManager.hyprland = {
-      enable = true;
-      xwayland.enable = true;
-      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.swaylock-effects}/bin/swaylock' before-sleep '${pkgs.swaylock-effects}/bin/swaylock'")
-                hl.exec_cmd("${lib.getExe startupScript}")
-                hl.exec_cmd("[workspace special:magic silent] kitty --title flying_kitty")
-              end'')
-          ];
-        };
-
-        monitor = [{
-          output = "";
-          mode = "preferred";
-          position = "auto";
-          scale = "auto";
-          bitdepth = 10;
-        }];
-        #Fullscreen HDR is possible without the hdr cm setting if "render:cm_auto_hdr" is enabled.
-
-        config = {
-          input = {
-            kb_layout = "us";
-            kb_variant = "intl";#, phonetic";
-            kb_options = "grp:alt_shift_toggle";
-            follow_mouse = 1;
-            sensitivity = 0;
-
-            touchpad = {
-              natural_scroll = false;
-              scroll_factor = 1;
-              disable_while_typing = false;
-              tap_to_click = false;
-            };
-          };
-          render = {
-            cm_enabled = true;
-            cm_auto_hdr = 1;
-          };
-          quirks = {
-            # prefer_hdr = 1;
-          };
-          misc = {
-            force_default_wallpaper = -1;
-            disable_hyprland_logo = true;
-            animate_mouse_windowdragging = false;
-            animate_manual_resizes = false;
-            vrr = 1;
-          };
-          ecosystem = {
-            no_update_news = true;
-            no_donation_nag = true;
-          };
-          general = {
-            gaps_in = config.colorScheme.palette.gaps-window;
-            gaps_out = config.colorScheme.palette.gaps-screen;
-            border_size = lib.toInt config.colorScheme.palette.border-width;
-            col = {
-              active_border = "rgb(${config.colorScheme.palette.base04})";
-              inactive_border = "rgb(${config.colorScheme.palette.base03})";
-            };
-            layout = "dwindle";
-          };
-
-          decoration = {
-            rounding = lib.toInt config.colorScheme.palette.border-radius;
-            inactive_opacity = 1.0;
-            active_opacity = 1.0;
-            fullscreen_opacity = 1.0;
-
-            blur = {
-              enabled = true;
-              size = 2;
-              passes = 1;
-              new_optimizations = true;
-            };
-          };
-
-          dwindle = {
-            #pseudotile = true;
-            preserve_split = true;
-          };
-          animations = {
-            enabled = true;
-          };
-
-          master = {
-            new_status = "master";
-          };
-        };
-
-        curve = [{
-          _args = [
-            "customcurve"
-            {
-              type = "bezier";
-              points = lua "{ {0.0, 0.9}, {0.1, 1.0} }";
-            }
-          ];
-        }];
-
-        animation = [
-          { leaf = "windows"; enabled = true; speed = 4; bezier = "customcurve"; }
-          { leaf = "windowsOut"; enabled = true; speed = 4; bezier = "customcurve"; style = "popin 80%"; }
-          { leaf = "border"; enabled = true; speed = 10; bezier = "customcurve"; }
-          { leaf = "borderangle"; enabled = true; speed = 1; bezier = "customcurve"; }
-          { leaf = "fade"; enabled = true; speed = 4; bezier = "customcurve"; }
-          { leaf = "workspaces"; enabled = true; speed = 4; bezier = "customcurve"; }
-        ];
-
-
-        gesture = {
-          fingers = 3;
-          direction = "vertical";
-          action = "workspace";
-        };
-
-        window_rule = [
-          { match.title = "noshadow"; float= false;}
-          {
-            match.title = "^(flying_kitty)$";
-            float = true;
-            center = true;
-            size = "1100 600";
-            move = "{0 600}";
-            animation = "slide";
-          }
-          { match.title = "^(Volume Control)$"; float = true; }
-          { match.title = "^(Picture-in-Picture)$"; float = true; }
-          { match.title = "^(Steam)$"; float = true; }
-          # --- Chat & Workspace Assignments ---
-            { match.class = "^(org.telegram.desktop)$"; workspace = "2 silent"; }
-            { match.class = "^(discord)$"; workspace = "2 silent"; }
-            { match.class = "^(org.keepassxc.KeePassXC)$"; workspace = "8 silent"; }
-            { match.title = "^(Nextcloud)$"; workspace = "8 silent"; }
-            { match.class = "^(org.telegram.desktop)$"; match.title = "^(Media viewer)$"; float = true; center = true; }
-            { 
-              match.class = "^(Tk)$"; 
-              match.title = "^(Server Configuration)$"; 
-              workspace = "8 silent"; 
-            }
-              # --- KeePassXC Dialogs ---
-            {
-              match.class = "^(org.keepassxc.KeePassXC)$";
-              match.title = "^(KeePassXC -  Access Request)$";
-              float = true;
-              pin = true;
-            }
-            {
-              match.class = "^(org.keepassxc.KeePassXC)$";
-              match.title = "^(Unlock Database - KeePassXC)$";
-              float = true;
-              pin = true;
-            }
-            # --- Generic System / File Dialogs ---
-            { match.title = "^(Open)$"; float = true; }
-            { match.title = "^(Choose Files)$"; float = true; }
-            { match.title = "^(Save As)$"; float = true; }
-            { match.title = "^(Confirm to replace files)$"; float = true; }
-            { match.title = "^(File Operation Progress)$"; float = true; }
-
-            # --- Firefox Window Rules ---
-            {
-              match.class = "^(firefox)$";
-              match.title = "^(Picture-in-Picture)$";
-              float = true;
-              pin = true;
-              suppress_event = "fullscreen";
-            }
-            {
-              match.class = "^(firefox)$";
-              match.title = "^(Firefox — Sharing Indicator)$";
-              float = true;
-              suppress_event = "fullscreen";
-            }
-            {
-              match.class = "^(firefox)$";
-              match.title = "^(Extension:.* Mozilla Firefox)$";
-              float = true;
-              suppress_event = "fullscreen";
-            }
-
-            # --- Telegram Media Viewer ---
-            {
-              match.class = "^(org.telegram.desktop)$";
-              match.title = "^(Media viewer)$";
-              float = true;
-              center = true;
-            }
-
-            # --- Idle Inhibition ---
-            { match.class = "^(.*)$"; idle_inhibit = "fullscreen"; }
-            { match.class = "^(steam_app_.*)$"; idle_inhibit = "focus"; }
-            { match.class = "^(mpv)$"; idle_inhibit = "focus"; }
-
-        ];
-
-        # windowrule = [ "noshadow, floating:0" ];
-
-        # windowrulev2 = [
-        #   "workspace 2 silent, class:^(org.telegram.desktop)$"
-        #   "workspace 2 silent, class:^(discord)$"
-        #   "workspace 8 silent, class:^(org.keepassxc.KeePassXC)$"
-        #   "workspace 8 silent, title:^(Nextcloud)$"
-        #   "workspace 8 silent, class:^(Tk)$,title:^(Server Configuration)$"
-        #   "float,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC -  Access Request)$"
-        #   "pin,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC -  Access Request)$"
-        #   "float,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$"
-        #   "pin,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$"
-        #   "float,title:^(Open)$"
-        #   "float,title:^(Choose Files)$"
-        #   "float,title:^(Save As)$"
-        #   "float,title:^(Confirm to replace files)$"
-        #   "float,title:^(File Operation Progress)$"
-        #   "float,class:^(firefox)$,title:^(Picture-in-Picture)$"
-        #   "pin,class:^(firefox)$,title:^(Picture-in-Picture)$"
-        #   "suppressevent fullscreen,class:^(firefox)$,title:^(Picture-in-Picture)$"
-        #   "float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$"
-        #   "suppressevent fullscreen,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$"
-        #   "float,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$"
-        #   "suppressevent fullscreen,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$"
-        #   "float,class:^(org.telegram.desktop)$,title:^(Media viewer)$"
-        #   "center,class:^(org.telegram.desktop)$,title:^(Media viewer)$"
-        #   "idleinhibit fullscreen, class:^(.*)"
-        #   "idleinhibit focus, class:^(steam_app_.*)$"
-        #   "idleinhibit focus, class:^(mpv)$"
-        # ];
-
-        layer_rule = [ {
-          match.namespace = "^eww%-blur$";
-          blur = true;
-          ignore_alpha = 0.5;
-        }];
-
-        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.swaylock-effects}/bin/swaylock"))
-          (bind "SUPER + left" (dsp.focus "left"))
-          (bind "SUPER + right" (dsp.focus "right"))
-          (bind "SUPER + up" (dsp.focus "up"))
-          (bind "SUPER + down" (dsp.focus "down"))
-          (bind "SUPER + mouse_down" (dsp.focusWorkspace "e+1"))
-          (bind "SUPER + mouse_up" (dsp.focusWorkspace "e-1"))
-
-          (bind "SUPER + 1" (dsp.focusWorkspace 1))
-          (bind "SUPER + SHIFT + 1" (dsp.moveToWorkspace 1))
-          (bind "SUPER + 2" (dsp.focusWorkspace 2))
-          (bind "SUPER + SHIFT + 2" (dsp.moveToWorkspace 2))
-          (bind "SUPER + 3" (dsp.focusWorkspace 3))
-          (bind "SUPER + SHIFT + 3" (dsp.moveToWorkspace 3))
-          (bind "SUPER + 4" (dsp.focusWorkspace 4))
-          (bind "SUPER + SHIFT + 4" (dsp.moveToWorkspace 4))
-          (bind "SUPER + 5" (dsp.focusWorkspace 5))
-          (bind "SUPER + SHIFT + 5" (dsp.moveToWorkspace 5))
-          (bind "SUPER + 6" (dsp.focusWorkspace 6))
-          (bind "SUPER + SHIFT + 6" (dsp.moveToWorkspace 6))
-          (bind "SUPER + 7" (dsp.focusWorkspace 7))
-          (bind "SUPER + SHIFT + 7" (dsp.moveToWorkspace 7))
-          (bind "SUPER + 8" (dsp.focusWorkspace 8))
-          (bind "SUPER + SHIFT + 8" (dsp.moveToWorkspace 8))
-          (bind "SUPER + 9" (dsp.focusWorkspace 9))
-          (bind "SUPER + SHIFT + 9" (dsp.moveToWorkspace 9))
-          (bind "SUPER + 0" (dsp.focusWorkspace 0))
-          (bind "SUPER + SHIFT + 0" (dsp.moveToWorkspace 0))
-          (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; })
-        ];
-      };
-    };
   };
 }

modules/home/xdg/default.nix

@@ -1,12 +1,13 @@
 { config, pkgs, ... }: {
 
-  xdg.enable = true;
+  home.packages = with pkgs; [ xdg-user-dirs ];
+
   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 = {
-    MISC = "${config.home.homeDirectory}/misc";
+    XDG_MISC_DIR = "${config.home.homeDirectory}/misc";
   };
   xdg.userDirs.music = "${config.home.homeDirectory}/media/music";
   xdg.userDirs.pictures = "${config.home.homeDirectory}/media/photo";
@@ -14,5 +15,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 = "start-hyprland";
+          command = "zsh";
           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 = [ "amdgpu" ];
+      videoDrivers = [ "amd" ];
       xkb = {
         layout = "us";
         variant = "intl";

modules/nixos/system/default.nix

@@ -1,23 +1,3 @@
-{ 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,5 +1,4 @@
-{ lib, ... }: {
+{ ... }: {
   services.fwupd.enable = true;
-  hardware.enableAllFirmware = false;
+  hardware.enableAllFirmware = true;
-  services.power-profiles-daemon.enable = lib.mkDefault true;
 }

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

@@ -2,16 +2,7 @@
 let isSANDBOX = builtins.elem config.syscfg.hostname [ "sandbox" ];
 in {
   config = lib.mkIf (!isSANDBOX) {
-    boot.kernelParams = [ 
-      "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 ./wsl ]; }
+{ ... }: { imports = [ ./base ./boot ./fs ./graphics ./power ./udev ./virt ]; }

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

@@ -1,6 +1,5 @@
 { lib, config, pkgs, ... }: {
   config = lib.mkIf (config.syscfg.make.power) {
-    services.power-profiles-daemon.enable = false; # conflicts with TLP
     services.tlp = {
       enable = true;
       settings = {
@@ -16,10 +15,10 @@
     # suspend to RAM (deep) rather than `s2idle`
     boot.kernelParams = [ "mem_sleep_default=deep" ];
     # suspend-then-hibernate
-    systemd.sleep.settings.Sleep = {
+    systemd.sleep.extraConfig = ''
-      HibernateDelaySec = "30m";
+      HibernateDelaySec=30m
-      SuspendState = "mem";
+      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 = with pkgs; [ ];
+    packages = [ ];
     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,6 +18,5 @@
         };
       };
     };
-    virtualisation.containers.registries.search = [ "quay.io" "docker.io" "ghcr.io" ];
   };
 }

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

@@ -1,13 +0,0 @@
-{ 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,33 +1,17 @@
-{ lib, config, ... }: {
+{ 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 != false && config.syscfg.server.wireguard) then [ 1515 ] else [ ]) ++ 
+        (if 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 != false && config.syscfg.server.web) then [ 80 443 22 ] else [ ]) ++ 
+        (if 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,7 +3,6 @@
     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,7 +27,6 @@ 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;
@@ -35,17 +34,9 @@ in
         };
       };
     };
-
+    systemd.services."wireguard-wg0" = {
-    systemd.services."wireguard-wg0-peer-vpn-helcel" = {
       after = [ "network-online.target" "nss-lookup.target" ];
-      bindsTo = [ "network-online.target" ];
+      wants = [ "network-online.target" "nss-lookup.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,12 +37,5 @@
       ];
     };
   };
-  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/tools/debug/default.nix

@@ -1,9 +1,12 @@
 { 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 mtr android-tools ];
+    environment.systemPackages = with pkgs; [ wget dconf wireshark ];
   };
 }

modules/nixos/tools/default.nix

@@ -1,4 +1,64 @@
 { pkgs, ... }: {
-  imports = [ ./debug ./develop ./telegraf ];
+  imports = [ ./debug ./develop ];
 
+  # 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,12 +9,6 @@ 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,13 +1,14 @@
 { lib, config, pkgs, ... }: 
 let 
- ollamaPkg = pkgs.ollama-vulkan;
+ ollamaPkg = pkgs.ollama-rocm;
 in{
 
   config = lib.mkIf (config.syscfg.make.develop) {
     services.ollama = {
         enable = true;
         package = ollamaPkg;
-        loadModels = [ ];
+        acceleration = "rocm"; 
+        loadModels = [ "deepseek-v2:lite" "qwen2.5-coder:7b" "qwen2.5-coder:1.5b" ];
         syncModels = true;
     };
     environment.systemPackages = with pkgs; [ ollamaPkg ];

modules/nixos/tools/telegraf/default.nix

@@ -1,365 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.syscfg.monitoring.telegraf;
-  hasCollector = name: builtins.elem name cfg.collectors;
-  dockerGroups =
-    lib.optionals (cfg.enable && hasCollector "docker" && config.virtualisation.podman.enable) [ "podman" ]
-    ++ lib.optionals (cfg.enable && hasCollector "docker" && config.virtualisation.docker.enable) [ "docker" ];
-  amdgpuMetricsScript = pkgs.writeShellScript "telegraf-amdgpu-metrics" ''
-    set -euo pipefail
-    ${lib.getExe pkgs.custom.amdgpu_top} -J -n 1 | ${lib.getExe pkgs.jq} -r '
-      def maybe_int($name; $value):
-        if $value == null then empty else "\($name)=\(($value | floor))i" end;
-      def maybe_float($name; $value):
-        if $value == null then empty else "\($name)=\($value)" end;
-      .devices
-      | to_entries[]
-      | [
-          maybe_int("utilization_gpu"; (.value.gpu_activity.GFX.value // .value.GRBM2["Command Processor -  Graphics"].value // 0)),
-          maybe_int("utilization_media"; .value.gpu_activity.MediaEngine.value),
-          maybe_int("utilization_memory"; .value.gpu_activity.Memory.value),
-          maybe_float("temperature_edge"; .value.Sensors["Edge Temperature"].value),
-          maybe_float("power_draw"; .value.gpu_metrics.average_socket_power.value)
-        ] as $fields
-      | map(select(length > 0)) as $nonempty
-      | select(($nonempty | length) > 0)
-      | "amdgpu,card=\(.key) " + ($nonempty | join(","))
-    '
-  '';
-  baseConfig = {
-    agent = {
-      interval = cfg.interval;
-      round_interval = true;
-      metric_batch_size = 1000;
-      metric_buffer_limit = 10000;
-      flush_interval = cfg.interval;
-      hostname = config.syscfg.hostname;
-      omit_hostname = false;
-    };
-    global_tags = {
-      host = config.syscfg.hostname;
-    };
-  };
-  inputsConfig = lib.mkMerge [
-    (lib.mkIf (hasCollector "cpu") {
-      inputs.cpu = {
-        percpu = true;
-        totalcpu = true;
-        collect_cpu_time = false;
-        report_active = false;
-        fielddrop = [
-          "usage_guest"
-          "usage_guest_nice"
-          "usage_irq"
-          "usage_nice"
-          "usage_softirq"
-          "usage_steal"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "mem") {
-      inputs.mem = {
-        fielddrop = [
-          "available_percent"
-          "commit_limit"
-          "committed_as"
-          "high_free"
-          "high_total"
-          "huge_page_size"
-          "huge_pages_free"
-          "huge_pages_total"
-          "low_free"
-          "low_total"
-          "mapped"
-          "page_tables"
-          "slab"
-          "sreclaimable"
-          "sunreclaim"
-          "swap_cached"
-          "swap_free"
-          "swap_total"
-          "vmalloc_chunk"
-          "vmalloc_total"
-          "vmalloc_used"
-          "write_back"
-          "write_back_tmp"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "swap") {
-      inputs.swap = {
-        fielddrop = [
-          "free"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "system") {
-      inputs.system = {
-        fielddrop = [
-          "n_physical_cpus"
-          "n_unique_users"
-          "uptime_format"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "disk") {
-      inputs.disk = {
-        ignore_fs = [ "tmpfs" "devtmpfs" "devfs" "overlay" "squashfs" ];
-        fielddrop = [
-          "free"
-          "inodes_free"
-          "inodes_total"
-          "inodes_used"
-          "inodes_used_percent"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "diskio") {
-      inputs.diskio = {
-        skip_serial_number = true;
-        fielddrop = [
-          "io_svctm"
-          "iops_in_progress"
-          "merged_reads"
-          "merged_writes"
-          "weighted_io_time"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "kernel") {
-      inputs.kernel = {
-        fielddrop = [
-          "boot_time"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "net") {
-      inputs.net = {
-        fielddrop = [
-          "bytes_recv"
-          "bytes_sent"
-          "speed"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "netstat") {
-      inputs.netstat = {
-        fielddrop = [
-          "tcp_close"
-          "tcp_close_wait"
-          "tcp_closing"
-          "tcp_fin_wait1"
-          "tcp_fin_wait2"
-          "tcp_last_ack"
-          "tcp_none"
-          "tcp_syn_recv"
-          "tcp_syn_sent"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "processes") {
-      inputs.processes = {
-        fielddrop = [
-          "dead"
-          "idle"
-          "paging"
-          "stopped"
-          "unknown"
-          "zombies"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "temp") {
-      inputs.temp = { };
-    })
-    (lib.mkIf (hasCollector "mdstat") {
-      inputs.mdstat = { };
-    })
-    (lib.mkIf (hasCollector "smart") {
-      inputs.smart = {
-        use_sudo = true;
-        attributes = true;
-      };
-    })
-    (lib.mkIf (hasCollector "docker") {
-      inputs.docker = [
-        {
-          endpoint = "unix:///var/run/docker.sock";
-          timeout = "5s";
-          perdevice_include = [ ];
-          total_include = [ ];
-          docker_label_exclude = [ "*" ];
-          tagexclude = [
-            "container_image"
-            "container_status"
-            "container_version"
-            "engine_host"
-            "server_version"
-          ];
-          namedrop = [
-            "docker_container_health"
-            "docker_container_mem"
-            "docker_container_status"
-          ];
-          fielddrop = [
-            "memory_total"
-            "n_cpus"
-            "n_goroutines"
-            "n_listener_events"
-            "n_used_file_descriptors"
-            "server_version"
-          ];
-        }
-        {
-          endpoint = "unix:///var/run/docker.sock";
-          timeout = "5s";
-          perdevice_include = [ ];
-          total_include = [ ];
-          docker_label_exclude = [ "*" ];
-          tagexclude = [
-            "container_image"
-            "container_status"
-            "container_version"
-            "engine_host"
-            "server_version"
-          ];
-          namepass = [ "docker_container_mem" ];
-          fielddrop = [
-            "active_anon"
-            "active_file"
-            "container_id"
-            "hierarchical_memory_limit"
-            "inactive_anon"
-            "inactive_file"
-            "mapped_file"
-            "max_usage"
-            "pgfault"
-            "pgmajfault"
-            "pgpgin"
-            "pgpgout"
-            "rss_huge"
-            "total_active_anon"
-            "total_active_file"
-            "total_cache"
-            "total_inactive_anon"
-            "total_inactive_file"
-            "total_mapped_file"
-            "total_pgfault"
-            "total_pgmajfault"
-            "total_pgpgin"
-            "total_pgpgout"
-            "total_rss"
-            "total_rss_huge"
-            "total_unevictable"
-            "total_writeback"
-            "unevictable"
-            "writeback"
-          ];
-        }
-      ];
-    })
-    (lib.mkIf (hasCollector "systemd_units") {
-      inputs.systemd_units = {
-        pattern = "*";
-        unittype = "service";
-        details = true;
-        timeout = "5s";
-      };
-    })
-    (lib.mkIf (hasCollector "ping") {
-      inputs.ping = {
-        urls = [ "1.1.1.1" ];
-        count = 4;
-        interval = "60s";
-        timeout = 5.0;
-        binary = "${pkgs.iputils}/bin/ping";
-        fielddrop = [
-          "packets_received"
-          "packets_transmitted"
-        ];
-      };
-    })
-    (lib.mkIf (hasCollector "internet_speed") {
-      inputs.internet_speed = {
-        interval = "30m";
-        cache = true;
-        memory_saving_mode = true;
-      };
-    })
-    (lib.mkIf (hasCollector "gpu" || hasCollector "nix") {
-      inputs.exec =
-        lib.optionals (hasCollector "gpu") [{
-          commands = [ amdgpuMetricsScript ];
-          timeout = "5s";
-          data_format = "influx";
-        }]
-        ++ lib.optionals (hasCollector "nix") [{
-          commands = [
-            (pkgs.writeShellScript "telegraf-nix-metrics" ''
-              set -euo pipefail
-
-              current="$(${lib.getExe pkgs.nixos-rebuild} list-generations | ${lib.getExe pkgs.gawk} '$NF == "True" {print $1 "|" $2 " " $3; exit}')"
-              [ -n "$current" ]
-
-              generation="''${current%%|*}"
-              build_datetime="''${current#*|}"
-              build_timestamp="$(${lib.getExe' pkgs.coreutils "date"} -d "$build_datetime" +%s)"
-              now="$(${lib.getExe' pkgs.coreutils "date"} +%s)"
-              store_bytes="$(${lib.getExe pkgs.nix} path-info --json --json-format 1 --all --offline --no-pretty | ${lib.getExe pkgs.jq} -r 'map(.narSize // 0) | add // 0')"
-              current_system_bytes="$(${lib.getExe pkgs.nix} path-info --json --json-format 1 --closure-size /run/current-system --offline --no-pretty | ${lib.getExe pkgs.jq} -r 'to_entries[0].value.closureSize // 0')"
-
-              printf 'nix generation=%si,configured_packages=%si,store_bytes=%si,current_system_bytes=%si,build_timestamp=%si,seconds_since_build=%si,build_datetime="%s"\n' \
-                "$generation" \
-                ${toString (builtins.length config.environment.systemPackages)} \
-                "$store_bytes" \
-                "$current_system_bytes" \
-                "$build_timestamp" \
-                "$((now - build_timestamp))" \
-                "$build_datetime"
-            '')
-          ];
-          interval = "1h";
-          timeout = "30s";
-          data_format = "influx";
-        }];
-    })
-  ];
-  outputsConfig = lib.mkMerge [{
-      outputs.influxdb_v3 = {
-        urls = cfg.outputs;
-        token = "$INFLUX_TOKEN";#config.sops.secrets.telegraf.path;
-        database = "telegraf";
-      };
-    }
-  ];
-in {
-  config = lib.mkIf cfg.enable {
-    services.telegraf = {
-      enable = true;
-      environmentFiles = [ config.sops.secrets.telegraf.path ];
-      extraConfig = lib.mkMerge [
-        baseConfig
-        inputsConfig
-        outputsConfig
-        cfg.extraConfig
-      ];
-    };
-
-    users.users.telegraf.extraGroups = dockerGroups;
-
-    systemd.services.telegraf = {
-      path =
-        lib.optionals (hasCollector "smart") [ pkgs.smartmontools pkgs.nvme-cli ]
-        ++ lib.optionals (hasCollector "gpu") [ pkgs.custom.amdgpu_top pkgs.jq ];
-      serviceConfig.SupplementaryGroups = dockerGroups;
-    };
-
-    security.sudo.extraRules = lib.optionals (hasCollector "smart") [{
-      users = [ "telegraf" ];
-      commands = [{
-        command = "${pkgs.smartmontools}/bin/smartctl";
-        options = [ "NOPASSWD" ];
-      }];
-    }];
-  };
-}

modules/server/containers/apps/.template.nix

@@ -1,54 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name,... }:
-let
-  version = "latest";
-  serverCfg = config.syscfg.server;
-  image = pkgs.dockerTools.streamLayeredImage {
-    name = "EXAMPLE";
-    tag = "0.0.0";
-    contents = [ pkgs.bashInteractive ];
-    config = {
-      Entrypoint = [ "echo 1" ];
-      ExposedPorts = {  };
-    };
-  }; 
-  settings = pkgs.writeText "settings.yaml" ...;
-  templateData = builder.mkData { name = "template"; dir = "template"; vars = {
-      _ARGUMENT = "template";
-    };
-  };
-in {
-  requires = {
-    secrets = [ ];
-    databases = [ ];
-  };
-
-  runtime = {
-    paths = [{
-      path="${serverCfg.path.config.path}/example/";
-      mode = "0444";
-    }];
-
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        # imageStream = image;
-        image = "....:${version}";
-        port = 8080;
-        secret = name;
-        extraEnv = { };
-        overrides = {
-          cmd = [ ];
-          volumes = [ ];
-         };
-      };
-    };
-
-    setup = {
-      trigger = "server";
-      envFile = config.sops.secrets."EXAMPLE".path;
-      script = pkgs.writeShellScript "setup" ''
-        ...
-      '';
-    };
-  };
-}

modules/server/containers/apps/.todo.md

@@ -1,8 +0,0 @@
-# Missing
-
-RSS: TTRSS / FreshRSS
-Monitoring: Telegraf + InfluxDB
-https://github.com/tarampampam/error-pages ?
-kavita + mylar ? kapowarr ?
-
-- Transmission Cfg and API/Token handling

modules/server/containers/apps/authentik.nix

@@ -1,149 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name, ... }:
-let 
-  version = "2026.2.2";
-  serverCfg = config.syscfg.server;
-  mediaCfg = config.syscfg.media;
-  authentikBackground = if mediaCfg.banner.png != null then mediaCfg.banner.png else mediaCfg.bg;
-  logoSvgFileName = builtins.baseNameOf (toString mediaCfg.logo.svg);
-  logoIcoFileName = builtins.baseNameOf (toString mediaCfg.logo.ico);
-  backgroundFileName = builtins.baseNameOf (toString authentikBackground);
-  logoSvgMount = "/data/media/public/branding/${logoSvgFileName}";
-  logoIcoMount = "/data/media/public/branding/${logoIcoFileName}";
-  backgroundMount = "/data/media/public/branding/${backgroundFileName}";
-  authentikData = builder.mkData { 
-    name = "authentik"; dir = "authentik"; vars = {
-      AUTHENTIK_DOMAIN = "${containerCfg.subdomain}.${serverCfg.domain}";
-      COOKIE_DOMAIN = "${serverCfg.domain}";
-      AUTHENTIK_LDAP_DC_DOMAIN = "dc=ldap," + (lib.concatMapStringsSep "," (x: "dc=${x}") (lib.splitString "." serverCfg.domain));
-      AUTHENTIK_BRANDING_TITLE = if containerCfg.extra ? name then containerCfg.extra.name else "authentik";
-      AUTHENTIK_BRANDING_LOGO = "branding/${logoSvgFileName}";
-      AUTHENTIK_BRANDING_FAVICON = "branding/${logoIcoFileName}";
-      AUTHENTIK_BRANDING_BACKGROUND = "branding/${backgroundFileName}";
-    } 
-    // (if serverCfg.containers?jellyfin then { JELLYFIN_DOMAIN = "${serverCfg.containers.jellyfin.subdomain}.${serverCfg.domain}";} else {})
-    // (if serverCfg.containers?gitea then { GITEA_DOMAIN = "${serverCfg.containers.gitea.subdomain}.${serverCfg.domain}";} else {})
-    // (if serverCfg.containers?immich then { IMMICH_DOMAIN = "${serverCfg.containers.immich.subdomain}.${serverCfg.domain}";} else {})
-    // (if serverCfg.containers?freshrss then { FRESHRSS_DOMAIN = "${serverCfg.containers.freshrss.subdomain}.${serverCfg.domain}";} else {})
-    // (if serverCfg.containers?homepage then { HOMEPAGE_DOMAIN = "${serverCfg.containers.homepage.subdomain}.${serverCfg.domain}";} else {})
-    // (if serverCfg.containers?nextcloud then { NEXTCLOUD_DOMAIN = "${serverCfg.containers.nextcloud.subdomain}.${serverCfg.domain}";} else {});
-  };
-in {
-  requires = {
-    secrets = [ name ];
-    databases = [ name ];
-  };
-
-  runtime = {
-    paths = [{
-      path="${serverCfg.path.config.path}/authentik";
-      owner = "1000:1000";
-      dirs = ["media" "templates"];
-      mode = "0755";
-    }];
-
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        image = "ghcr.io/goauthentik/server:${version}";
-        port = 9000;
-        secret = name;
-        extraEnv = {
-          AUTHENTIK_DISABLE_STARTUP_ANALYTICS="true";
-          AUTHENTIK_ERROR_REPORTING__ENABLED="false";
-          AUTHENTIK_WEB__WORKERS="1";
-          AUTHENTIK_WORKER__PROCESSES="1";
-          AUTHENTIK_WORKER__THREADS="2";
-          AUTHENTIK_REDIS__HOST = builder.host;
-          AUTHENTIK_POSTGRESQL__HOST = builder.host;
-          AUTHENTIK_POSTGRESQL__USER = "authentik_user";
-          AUTHENTIK_POSTGRESQL__NAME = "authentik_db";
-          AUTHENTIK_POSAUTHENTIK_POSTGRESQL__SSLMODE = "false";
-          AUTHENTIK_DISABLE_UPDATE_CHECK = "true";
-          AUTHENTIK_POSTGRESQL__SSLMODE = "disable";
-        } // lib.optionalAttrs (serverCfg.mail.server != null) {
-          AUTHENTIK_EMAIL__HOST = serverCfg.mail.server;
-          AUTHENTIK_EMAIL__PORT = "587";
-          AUTHENTIK_EMAIL__USERNAME = "noreply@${serverCfg.domain}";
-          AUTHENTIK_EMAIL__USE_TLS = "true";
-          AUTHENTIK_EMAIL__USE_SSL = "false";
-          AUTHENTIK_EMAIL__TIMEOUT = "10";
-          AUTHENTIK_EMAIL__FROM = "sso@noreply.${serverCfg.domain}";
-        };
-        overrides = {
-          environmentFiles =  [ config.sops.secrets."AUTHENTIK".path config.sops.secrets."CUSTOM".path ] ;
-        
-          cmd = [ "server" ];
-          volumes = [
-            "${serverCfg.path.config.path}/authentik/media:/media"
-            "${serverCfg.path.config.path}/authentik/templates:/templates"
-            "${authentikData}:/blueprints/custom:ro"
-            "${mediaCfg.logo.svg}:${logoSvgMount}:ro"
-            "${mediaCfg.logo.ico}:${logoIcoMount}:ro"
-            "${authentikBackground}:${backgroundMount}:ro"
-          ];
-        };
-      };
-
-      worker = builder.mkContainer {
-        image = "ghcr.io/goauthentik/server:${version}";
-        secret = name;
-        extraEnv = {
-          AUTHENTIK_DISABLE_STARTUP_ANALYTICS="true";
-          AUTHENTIK_ERROR_REPORTING__ENABLED="false";
-          AUTHENTIK_WEB__WORKERS="1";
-          AUTHENTIK_WORKER__PROCESSES="1";
-          AUTHENTIK_WORKER__THREADS="2";
-          AUTHENTIK_REDIS__HOST = builder.host;
-          AUTHENTIK_POSTGRESQL__HOST = builder.host;
-          AUTHENTIK_POSTGRESQL__USER = "authentik_user";
-          AUTHENTIK_POSTGRESQL__NAME = "authentik_db";
-          AUTHENTIK_POSAUTHENTIK_POSTGRESQL__SSLMODE = "false";
-          AUTHENTIK_DISABLE_UPDATE_CHECK = "true";
-          AUTHENTIK_POSTGRESQL__SSLMODE = "disable";
-        };
-        overrides = {
-          cmd = [ "worker" ];
-          volumes = [
-            "${serverCfg.path.config.path}/authentik/media:/media"
-            "${serverCfg.path.config.path}/authentik/templates:/templates"
-            "${authentikData}:/blueprints/custom:ro"
-            "${mediaCfg.logo.svg}:${logoSvgMount}:ro"
-            "${mediaCfg.logo.ico}:${logoIcoMount}:ro"
-            "${authentikBackground}:${backgroundMount}:ro"
-          ];
-        };
-      };
-
-      ldap = builder.mkContainer {
-        image = "ghcr.io/goauthentik/ldap:${version}";
-        secret = name;
-        extraEnv = {
-          AUTHENTIK_HOST = "https://${containerCfg.subdomain}.${serverCfg.domain}"; 
-          AUTHENTIK_INSECURE = "false"; 
-        };
-      };
-    };
-
-    setup = {
-      trigger = "worker";
-      script = pkgs.writeShellScript "setup" ''
-        # Define the command wrapper
-        AK="${pkgs.podman}/bin/podman --events-backend=none exec --env-file ${config.sops.secrets."CUSTOM".path} -e DOMAIN=${serverCfg.domain} -u root authentik-worker ak"
-
-        $AK apply_blueprint /blueprints/custom/authentik.yaml
-        $AK apply_blueprint /blueprints/custom/branding.yaml
-        $AK apply_blueprint /blueprints/custom/traefik.yaml
-        $AK apply_blueprint /blueprints/custom/ldap.yaml
-
-        ${lib.optionalString (serverCfg.containers ? gitea) ''$AK apply_blueprint /blueprints/custom/gitea.yaml''}
-        ${lib.optionalString (serverCfg.containers ? jellyfin) ''$AK apply_blueprint /blueprints/custom/jellyfin.yaml''}
-        ${lib.optionalString (serverCfg.containers ? nextcloud) ''$AK apply_blueprint /blueprints/custom/nextcloud.yaml''}
-        ${lib.optionalString (serverCfg.containers ? immich) ''$AK apply_blueprint /blueprints/custom/immich.yaml''}
-        ${lib.optionalString (serverCfg.containers ? freshrss) ''$AK apply_blueprint /blueprints/custom/freshrss.yaml''}
-        ${lib.optionalString (serverCfg.containers ? homepage) ''$AK apply_blueprint /blueprints/custom/homepage.yaml''}
-
-        echo "Completed Authentik Setup"
-      '';
-    };
-  };
-}

modules/server/containers/apps/calibre.nix

@@ -1,42 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name,... }:
-let
-  version = "latest";
-  serverCfg = config.syscfg.server;
-in {
-  runtime = {
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        image = "crocodilestick/calibre-web-automated:${version}";
-        port = 8083;
-      #   secret = name;
-        extraEnv = {
-          CWA_PORT_OVERRIDE = "8083";
-
-          PUID = "1000";
-          PGID = "1000";
-          #HARDCOVER_TOKEN= ....
-          TRUSTED_PROXY_COUNT= "1";
-        };
-          extraLabels = {
-          "traefik.http.routers.${containerCfg.subdomain}-login.rule" = "Host(`${containerCfg.subdomain}.${serverCfg.domain}`)";
-          "traefik.http.routers.${containerCfg.subdomain}-login.middlewares" = if (serverCfg.containers?authentik) then "authentik" else "";
-          "traefik.http.routers.${containerCfg.subdomain}-login.priority" = "100";
-          "traefik.http.routers.${containerCfg.subdomain}-login.entrypoints" = "web-secure";
-          "traefik.http.routers.${containerCfg.subdomain}-login.tls" = "true";
-        };
-        overrides = {
-          volumes = [
-            "${serverCfg.path.book.path}:/calibre-library"
-            "${serverCfg.path.dlComplete.path}:/cwa-book-ingest"
-          ];
-        };
-      };
-    };
-  };
-
-  # curl 'https://books.test.helcel.net/admin/ajaxconfig' \
-  # -X POST 
-  # -H 'Content-Type: application/x-www-form-urlencoded; charset=UTF-8'
-  # --data-raw 'csrf_token=${CSRF_TOKEN}&config_certfile=&config_keyfile=&config_updatechannel=0&config_trustedhosts=&config_log_level=20&config_logfile=%2Fdev%2Fstdout&config_access_logfile=%2Fconfig%2Faccess.log&config_embed_metadata=on&config_uploading=on&config_upload_formats=m4b%2Cacsm%2Cdoc%2Cpdf%2Cmp3%2Codt%2Ccbr%2Crtf%2Clit%2Cprc%2Cm4a%2Cdjv%2Cfb2%2Copus%2Cdocx%2Cazw3%2Cepub%2Cdjvu%2Cwav%2Ccb7%2Ccbz%2Cmp4%2Ckfx-zip%2Cmobi%2Ccbt%2Cogg%2Ckfx%2Ckepub%2Ctxt%2Cazw%2Chtml%2Cflac&config_external_port=8083&config_goodreads_api_key=&config_hardcover_token=&config_use_https=on&config_reverse_proxy_login_header_name=&config_login_type=1&config_ldap_provider_url=sso.test.helcel.net&config_ldap_port=389&config_ldap_encryption=0&config_ldap_cacert_path=&config_ldap_cert_path=&config_ldap_key_path=&config_ldap_authentication=2&config_ldap_serv_username=cn%3Dldap-service%2Cou%3Dusers%2C%24%7BLDAP_DC_DOMAIN%7D&config_ldap_serv_password_e=%24DEFAULT_LDAP_PASSWORD&config_ldap_dn=%24%7BLDAP_DC_DOMAIN%7D&config_ldap_user_object=(memberOf%3Dcn%3Dcloud%2Cou%3Dgroups%2C%24%7BLDAP_DC_DOMAIN%7D)&config_ldap_openldap=on&config_ldap_auto_create_users=on&config_ldap_group_object_filter=(memberOf%3Dcn%3Dcloud%2Cou%3Dgroups%2C%24%7BLDAP_DC_DOMAIN%7D)&config_ldap_group_name=cloud&config_ldap_group_members_field=memberUid&ldap_import_user_filter=0&config_ldap_member_user_object=&config_generic_oauth_metadata_url=&config_generic_oauth_server_url=&config_generic_oauth_auth_url=&config_generic_oauth_token_url=&config_generic_oauth_userinfo_url=&config_generic_oauth_scope=email+openid+profile&config_oauth_redirect_host=&config_generic_oauth_client_id=&config_generic_oauth_client_secret=&config_generic_oauth_username_mapper=preferred_username&config_generic_oauth_email_mapper=email&config_generic_oauth_admin_group=admin&config_generic_oauth_login_button=OpenID+Connect&config_1_oauth_client_id=&config_1_oauth_client_secret=&config_2_oauth_client_id=&config_2_oauth_client_secret=&config_binariesdir=%2Fusr%2Fbin&config_calibre=&config_kepubifypath=%2Fusr%2Fbin%2Fkepubify&config_rarfile_location=%2Fusr%2Fbin%2Funrar&config_enable_oauth_group_admin_management=on&config_ratelimiter=on&config_limiter_uri=&config_limiter_options=&config_check_extensions=on&config_session=1&config_password_policy=on&config_password_min_length=8&config_password_number=on&config_password_lower=on&config_password_upper=on&config_password_character=on&config_password_special=on'
-}

modules/server/containers/apps/collabora.nix

@@ -1,37 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name, ... }:
-let 
-version = "latest";
-serverCfg = config.syscfg.server;
-in {
-  requires.secrets = [ name ];
-
-  runtime = {
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        image = "collabora/code:${version}";
-        port = 9980;
-        secret = name;
-        extraEnv = {
-          "aliasgroup1" = "https://${serverCfg.containers.nextcloud.subdomain}.${serverCfg.domain}";
-          "server_name" = "${containerCfg.subdomain}.${serverCfg.domain}";
-          "username" = "collabora_user";
-          "VIRTUAL_HOST" = "${containerCfg.subdomain}.${serverCfg.domain}";
-          "VIRTUAL_PORT" = "9980";
-          "VIRTUAL_PROTO" = "http";
-          "DONT_GEN_SSL_CERT" = "true";
-          "RESOLVE_TO_PROXY_IP" = "true";
-          "extra_params" = "--o:ssl.enable=false --o:ssl.termination=true";
-          "dictionaries" = "en fr de jp no";
-        };
-        
-        overrides = {
-          volumes = [
-            "${pkgs.noto-fonts}/share/fonts/noto:/opt/collaboraoffice/share/fonts/truetype/noto:ro"
-            "${pkgs.ibm-plex}/share/fonts/opentype:/opt/collaboraoffice/share/fonts/opentype/plex:ro"
-          ];
-        };
-      };
-    };
-  };
-}

modules/server/containers/apps/ethercalc.nix

@@ -1,42 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name,... }:
-let 
-  serverCfg = config.syscfg.server;
-  ethercalc_exe = pkgs.ethercalc;
-
-  image = pkgs.dockerTools.streamLayeredImage {
-    name = "ethercalc";
-    tag = ethercalc_exe.version;
-    contents = [ pkgs.bashInteractive ];
-    config = {
-      Entrypoint = [ "${ethercalc_exe}/bin/ethercalc" ];
-      ExposedPorts = { "8080/tcp" = {}; };
-    };
-  };
-in {
-  requires.secrets = [ name ];
-
-  runtime = {
-    paths = [{
-      path="${serverCfg.path.data.path}/ethercalc/";
-      mode = "0666";
-    }];
-
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        imageStream = image;
-        port = 8080;
-        secret = name;
-        extraEnv = {
-          ETHERCALC_PORT = "8080";
-          #CONNECT TO REDIS
-        };
-        overrides = {
-          volumes = [
-            "${serverCfg.path.data.path}/ethercalc:/data"
-          ];
-         };
-      };
-    };
-  };
-}

modules/server/containers/apps/etherpad.nix

@@ -1,129 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name,... }:
-let 
-  serverCfg = config.syscfg.server;
-  etherpad_exe = pkgs.etherpad-lite;
-  settings = pkgs.writeText"settings.json" (builtins.toJSON {
-    title= "\${TITLE:Etherpad}";
-    showRecentPads = "\${SHOW_RECENT_PADS:true}";
-    favicon = "\${FAVICON:null}";
-    publicURL = "\${PUBLIC_URL:null}";
-    skinName = "\${SKIN_NAME:colibris}";
-    skinVariants = "\${SKIN_VARIANTS:super-light-toolbar super-light-editor light-background}";
-    ip = "\${IP:0.0.0.0}";
-    port = "\${PORT:9001}";
-    showSettingsInAdminPage = "\${SHOW_SETTINGS_IN_ADMIN_PAGE:true}";
-    enableMetrics = "\${ENABLE_METRICS:true}";
-    updates.tier = "off";
-    cleanup.enabled = false;
-    gdprAuthorErasure.enabled = "\${GDPR_AUTHOR_ERASURE_ENABLED:false}";
-    authenticationMethod = "\${AUTHENTICATION_METHOD:apikey}";
-    enableDarkMode = "\${ENABLE_DARK_MODE:true}";
-    enablePadWideSettings = "\${ENABLE_PAD_WIDE_SETTINGS:true}";
-    dbType = "\${DB_TYPE:dirty}";
-    dbSettings = {
-      host =       "\${DB_HOST:undefined}";
-      port =       "\${DB_PORT:undefined}";
-      database =   "\${DB_NAME:undefined}";
-      user =       "\${DB_USER:undefined}";
-      password =   "\${DB_PASS:undefined}";
-      charset =    "\${DB_CHARSET:undefined}";
-      filename =   "\${DB_FILENAME:var/dirty.db}";
-      collection = "\${DB_COLLECTION:undefined}";
-      url =        "\${DB_URL:undefined}";
-    };
-    defaultPadText = "\${DEFAULT_PAD_TEXT:P A D}";
-    padOptions = {
-      noColors =         "\${PAD_OPTIONS_NO_COLORS:false}";
-      showControls =     "\${PAD_OPTIONS_SHOW_CONTROLS:true}";
-      showChat =         "\${PAD_OPTIONS_SHOW_CHAT:true}";
-      showLineNumbers =  "\${PAD_OPTIONS_SHOW_LINE_NUMBERS:true}";
-      useMonospaceFont = "\${PAD_OPTIONS_USE_MONOSPACE_FONT:false}";
-      userName =         "\${PAD_OPTIONS_USER_NAME:null}";
-      userColor =        "\${PAD_OPTIONS_USER_COLOR:null}";
-      rtl =              "\${PAD_OPTIONS_RTL:false}";
-      alwaysShowChat =   "\${PAD_OPTIONS_ALWAYS_SHOW_CHAT:false}";
-      chatAndUsers =     "\${PAD_OPTIONS_CHAT_AND_USERS:false}";
-      lang =             "\${PAD_OPTIONS_LANG:null}";
-      fadeInactiveAuthorColors = "\${PAD_OPTIONS_FADE_INACTIVE_AUTHOR_COLORS:true}";
-      enforceReadableAuthorColors = "\${PAD_OPTIONS_ENFORCE_READABLE_AUTHOR_COLORS:true}";
-    };
-
-    requireSession = "\${REQUIRE_SESSION:false}";
-    editOnly = "\${EDIT_ONLY:false}";
-    minify = "\${MINIFY:true}";
-    requireAuthentication = "\${REQUIRE_AUTHENTICATION:false}";
-    requireAuthorization = "\${REQUIRE_AUTHORIZATION:false}";
-    trustProxy = "\${TRUST_PROXY:true}";
-    ep_headerauth.username_header = "X-authentik-username";
-    users.admin = {
-      password = "\${ADMIN_PASSWORD:null}";
-      is_admin = true;
-    };
-    socketTransportProtocols = ["websocket" "polling"];
-    socketIo.maxHttpBufferSize = "\${SOCKETIO_MAX_HTTP_BUFFER_SIZE:1000000}";
-    indentationOnNewLine = true;
-
-    loglevel = "\${LOGLEVEL:INFO}";
-    lowerCasePadIds = "\${LOWER_CASE_PAD_IDS:true}";
-  });
-  image = pkgs.dockerTools.streamLayeredImage {
-    name = "etherpad";
-    tag = etherpad_exe.version;
-    contents = [ pkgs.bashInteractive ];
-    config = {
-      Entrypoint = [ "${etherpad_exe}/bin/etherpad-lite" ];
-      ExposedPorts = { "8080/tcp" = {}; };
-    };
-  };
-in {
-  requires = {
-    secrets = [ name ];
-    databases = [ name ];
-  };
-
-  runtime = {
-    paths = [{
-      path="${serverCfg.path.config.path}/etherpad/";
-      mode = "0444";
-    }];
-
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        imageStream = image;
-        port = 8080;
-        secret = name;
-        extraEnv = {
-          TITLE = "Pad";
-          PORT ="8080";
-          DB_TYPE = "postgres";
-          DB_HOST = builder.host;
-          DB_NAME = "etherpad_db";
-          DB_USER = "etherpad_user";
-          TRUST_PROXY = "true";
-          DB_CHARSET = "utf8mb4";
-          DEFAULT_PAD_TEXT = "";
-          PAD_OPTIONS_SHOW_LINE_NUMBERS = "true";
-          PAD_OPTIONS_USE_MONOSPACE_FONT = "true";
-          SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background";
-        };
-        overrides = {
-          cmd = [ "--settings" "/etc/etherpad/settings.json" "--apikey" "/etc/etherpad/APIKEY.txt" ];
-          volumes = [
-            "${settings}:/etc/etherpad/settings.json"
-            "${serverCfg.path.config.path}/etherpad/APIKEY.txt:/etc/etherpad/APIKEY.txt:ro"
-          ];
-         };
-      };
-    };
-
-    setup = {
-      trigger = "server";
-      envFile = config.sops.secrets."ETHERPAD".path;
-      script = pkgs.writeShellScript "setup" ''
-        echo "$APIKEY" > ${serverCfg.path.config.path}/etherpad/APIKEY.txt
-        chmod 444 ${serverCfg.path.config.path}/etherpad/APIKEY.txt
-      '';
-    };
-  };
-}

modules/server/containers/apps/favicon.nix

@@ -1,284 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name, ... }:
-let
-  serverCfg = config.syscfg.server;
-  mediaCfg = config.syscfg.media;
-  palette = serverCfg.colorScheme.palette or { };
-  port = 8080;
-  assetSize = 64;
-  cacheMode = containerCfg.extra.cacheMode or "off";
-  cacheControl =
-    if cacheMode == "disk" then
-      containerCfg.extra.cacheControl or "public, max-age=3600"
-    else if cacheMode == "off" then
-      "no-store"
-    else
-      throw "favicon cacheMode must be either `off` or `disk`";
-  priority = toString (containerCfg.extra.priority or 2147482647);
-  logoSvgFileName = builtins.baseNameOf (toString mediaCfg.logo.svg);
-  logoSvgMount = "/assets/${logoSvgFileName}";
-  ensureAttrSet = field: value:
-    if builtins.isAttrs value then
-      value
-    else
-      throw "favicon `${field}` must be an attribute set";
-  resolveColor = value:
-    if value == null then null
-    else if !builtins.isString value then
-      throw "favicon color values must be strings"
-    else if lib.hasPrefix "#" value then
-      value
-    else
-      let
-        paletteValue = lib.attrByPath [ value ] (throw "Unknown favicon color reference `${value}`") palette;
-      in
-      if builtins.isString paletteValue then
-        if lib.hasPrefix "#" paletteValue then
-          paletteValue
-        else
-          "#${paletteValue}"
-      else
-        throw "favicon palette reference `${value}` must resolve to a string";
-  normalizeProfile = profile:
-    let
-      normalizedProfile = ensureAttrSet "profile" profile;
-      bg =
-        if normalizedProfile ? bg then resolveColor normalizedProfile.bg
-        else if normalizedProfile ? background then resolveColor normalizedProfile.background
-        else null;
-      fg =
-        if normalizedProfile ? fg then resolveColor normalizedProfile.fg
-        else if normalizedProfile ? foreground then resolveColor normalizedProfile.foreground
-        else null;
-    in
-    (lib.filterAttrs (name: _: !(builtins.elem name [ "bg" "background" "fg" "foreground" ])) normalizedProfile)
-    // lib.optionalAttrs (bg != null) { bg = bg; }
-    // lib.optionalAttrs (fg != null) { fg = fg; };
-  hostMappings = lib.mapAttrs (_: profile: normalizeProfile profile) (
-    ensureAttrSet "mappings" (containerCfg.extra.mappings or { })
-  );
-  defaultProfile =
-    if containerCfg.extra ? default then
-      normalizeProfile containerCfg.extra.default
-    else
-      null;
-    traefikAssetPathRegexp =
-    "^/(.*/)?"
-    + "(fav(icon)?(-[0-9]+x[0-9]+)?\\.(ico|png|svg)"
-    + "|(favicon|apple-icon)(-[0-9]+)?(\\.(ico|png))?"
-    + "|logo\\.(ico)"
-    + "|fav([0-9]+)?\\.(ico|png)"
-    + "|apple-touch-icon(-precomposed)?\\.png"
-    + "|android-chrome-[0-9]+x[0-9]+\\.png"
-    + "|mstile-[0-9]+x[0-9]+\\.png)$";
-  pythonEnv = pkgs.python3.withPackages (ps: with ps; [
-    cairosvg
-    pillow
-  ]);
-  serverScript = pkgs.writeText "favicon-server.py" ''
-    from io import BytesIO
-    import hashlib
-    import os
-    from pathlib import Path
-    import re
-    import threading
-    from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
-
-    import cairosvg
-    from PIL import Image
-
-    LOGO_PATH = ${builtins.toJSON logoSvgMount}
-    LISTEN_HOST = "0.0.0.0"
-    LISTEN_PORT = ${toString port}
-    ASSET_SIZE = ${toString assetSize}
-    CACHE_MODE = ${builtins.toJSON cacheMode}
-    CACHE_CONTROL = ${builtins.toJSON cacheControl}
-    CACHE_DIR = Path("/cache")
-
-    with open(LOGO_PATH, "rb") as fh:
-        LOGO_BYTES = fh.read()
-    MAPPINGS = ${builtins.toJSON hostMappings}
-    DEFAULT_PROFILE = ${if defaultProfile == null then "None" else builtins.toJSON defaultProfile}
-    APP_DOMAIN = (${builtins.toJSON serverCfg.domain} or "").strip().lower()
-    DEFAULT_COLORS = {"bg": "#111827", "fg": "#f8fafc"}
-    LOGO_HASH = hashlib.sha256(LOGO_BYTES).hexdigest()
-    ICON_CACHE_LOCK = threading.Lock()
-
-    def _request_host(headers):
-        host = (
-            headers.get("X-Forwarded-Host")
-            or headers.get("X-Original-Host")
-            or headers.get("Host", "")
-        )
-        return (host or "").split(",", 1)[0].split(":", 1)[0].strip().lower().rstrip(".")
-
-    def _host_candidates(host):
-        candidates = []
-
-        def add(candidate):
-            if candidate and candidate not in candidates:
-                candidates.append(candidate)
-
-        add(host)
-        if APP_DOMAIN:
-            suffix = f".{APP_DOMAIN}"
-            if host.endswith(suffix):
-                add(host[: -len(suffix)].rstrip("."))
-        if "." in host:
-            add(host.split(".", 1)[0])
-
-        return candidates
-
-    def _profile_for_host(host):
-        for candidate in _host_candidates(host):
-            profile = MAPPINGS.get(candidate)
-            if profile:
-                return candidate, profile
-        return None, DEFAULT_PROFILE
-
-    def _replace_logo_fill(svg, color):
-        svg, _ = re.subn(
-            "fill:#3193f5",
-            f"fill:{color}",
-            svg,
-            flags=re.IGNORECASE,
-        )
-        return svg
-
-    def _colors(profile):
-        profile = profile or {}
-        return {
-            "bg": profile.get("bg") or profile.get("background") or DEFAULT_COLORS["bg"],
-            "fg": profile.get("fg") or profile.get("foreground") or DEFAULT_COLORS["fg"],
-        }
-
-    def _add_background(svg, color):
-        return re.sub(
-            r"(<svg\\b[^>]*>)",
-            rf'\\1<circle cx="64" cy="64" r="64" fill="{color}"/>',
-            svg,
-            count=1,
-            flags=re.IGNORECASE,
-        )
-
-    def _render_icon(colors):
-        svg = LOGO_BYTES.decode("utf-8")
-        svg = _replace_logo_fill(svg, colors["fg"])
-        svg = _add_background(svg, colors["bg"])
-
-        png = cairosvg.svg2png(
-            bytestring=svg.encode("utf-8"),
-            output_width=ASSET_SIZE,
-            output_height=ASSET_SIZE,
-        )
-        output = BytesIO()
-        with Image.open(BytesIO(png)) as image:
-            with image.convert("RGBA") as rgba:
-                rgba.save(output, format="ICO", sizes=[(ASSET_SIZE, ASSET_SIZE)])
-        return output.getvalue()
-
-    def _cache_path(colors):
-        digest = hashlib.sha256(
-            f"{ASSET_SIZE}:{LOGO_HASH}:{colors['bg']}:{colors['fg']}".encode("utf-8")
-        ).hexdigest()
-        return CACHE_DIR / f"{digest}.ico"
-
-    def _payload_for(colors):
-        if CACHE_MODE != "disk":
-            return _render_icon(colors)
-
-        cache_path = _cache_path(colors)
-        with ICON_CACHE_LOCK:
-            if cache_path.exists():
-                return cache_path.read_bytes()
-
-        payload = _render_icon(colors)
-        with ICON_CACHE_LOCK:
-            if cache_path.exists():
-                return cache_path.read_bytes()
-            CACHE_DIR.mkdir(parents=True, exist_ok=True)
-            tmp_path = cache_path.with_suffix(".tmp")
-            tmp_path.write_bytes(payload)
-            os.replace(tmp_path, cache_path)
-            return payload
-
-    class Handler(BaseHTTPRequestHandler):
-        server_version = "favicon-router/1.0"
-
-        def _serve(self, include_body):
-            host = _request_host(self.headers)
-            matched_host, profile = _profile_for_host(host)
-            if not profile:
-                self.send_error(404, "No favicon mapping for host")
-                return
-
-            colors = _colors(profile)
-            payload = _payload_for(colors)
-            self.send_response(200)
-            self.send_header("Content-Type", "image/x-icon")
-            self.send_header("Content-Length", str(len(payload)))
-            self.send_header("Cache-Control", CACHE_CONTROL)
-            self.send_header("X-Favicon-Host", host or "default")
-            self.send_header("X-Favicon-Mapping", matched_host or "default")
-            self.end_headers()
-            if include_body:
-                self.wfile.write(payload)
-
-        def do_GET(self):
-            self._serve(include_body=True)
-
-        def do_HEAD(self):
-            self._serve(include_body=False)
-
-        def log_message(self, fmt, *args):
-            print("%s - - [%s] %s" % (self.address_string(), self.log_date_time_string(), fmt % args))
-
-    if __name__ == "__main__":
-        httpd = ThreadingHTTPServer((LISTEN_HOST, LISTEN_PORT), Handler)
-        httpd.serve_forever()
-  '';
-  image = pkgs.dockerTools.streamLayeredImage {
-    name = "favicon";
-    tag = "1";
-    contents = [
-      pythonEnv
-      pkgs.cacert
-      pkgs.tzdata
-    ];
-    config = {
-      Entrypoint = [ "${pythonEnv}/bin/python3" "-u" serverScript ];
-      ExposedPorts = { "${toString port}/tcp" = { }; };
-      WorkingDir = "/";
-    };
-  };
-in {
-  runtime = {
-    paths = [
-      {
-        path = "${serverCfg.path.config.path}/favicon";
-        mode = "0755";
-        dirs = [ "cache" ];
-      }
-    ];
-
-    containers = {
-      server = builder.mkContainer {
-        imageStream = image;
-        port = port;
-        extraLabels = {
-          "traefik.enable" = "true";
-          "traefik.http.routers.${name}.entrypoints" = "web-secure";
-          "traefik.http.routers.${name}.rule" = "PathRegexp(`${traefikAssetPathRegexp}`)";
-          "traefik.http.routers.${name}.priority" = priority;
-          "traefik.http.routers.${name}.tls" = "true";
-          "traefik.http.services.${name}.loadbalancer.server.port" = toString port;
-        };
-        overrides = {
-          volumes = [
-           "${serverCfg.path.config.path}/favicon/cache:/cache"
-            "${mediaCfg.logo.svg}:${logoSvgMount}:ro"
-          ];
-        };
-      };
-    };
-  };
-}

modules/server/containers/apps/freshrss.nix

@@ -1,61 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name, ... }:
-let
-  version = "latest";
-  serverCfg = config.syscfg.server;
-in {
-  requires = {
-    secrets = [ name ];
-    databases = [ name ];
-  };
-
-  runtime = {
-    paths = [
-      {
-        path = "${serverCfg.path.config.path}/freshrss";
-        owner = "1000:1000";
-        mode = "0755";
-      }
-    ];
-
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        image = "ghcr.io/freshrss/freshrss:${version}";
-        port = 80;
-        
-        extraEnv = {
-          CRON_MIN = "5,35";
-          TRUSTED_PROXY = "10.0.0.0/8 192.168.0.1/16";
-          LISTEN = "80";
-          OIDC_ENABLED = "1";
-          OIDC_PROVIDER_METADATA_URL = "https://${serverCfg.containers.authentik.subdomain}.${serverCfg.domain}/application/o/freshrss/.well-known/openid-configuration";
-          OIDC_REMOTE_USER_CLAIM = "preferred_username";
-          OIDC_CLIENT_ID = "freshrss";
-          OIDC_SCOPES = "openid profile";
-          OIDC_X_FORWARDED_HEADERS = "X-Forwarded-Host X-Forwarded-Port X-Forwarded-Proto";
-        };
-
-        overrides = {
-          environmentFiles =  [ config.sops.secrets."FRESHRSS".path config.sops.secrets."CUSTOM".path ];
-          volumes = ["${serverCfg.path.config.path}/freshrss:/var/www/FreshRSS/data"];
-        };
-      };
-    };
-
-    setup = {
-      trigger = "server"; # Triggers atomic environment verification on main controller
-      envFile = [ config.sops.secrets."FRESHRSS".path config.sops.secrets."CUSTOM".path];
-      script = pkgs.writeShellScript "setup-freshrss" ''
-
-        RSS="${pkgs.podman}/bin/podman --events-backend=none exec -u www-data freshrss-server"
-        $RSS ./cli/prepare.php
-        $RSS ./cli/do-install.php --default-user $DEFAULT_ADMIN_USERNAME --auth-type http_auth --base-url https://${containerCfg.subdomain}.${serverCfg.domain} --language en \
-          --title RSS --api-enabled --db-type pgsql --db-host ${builder.host} --db-user freshrss_user --db-password $DB_PASSWORD --db-base freshrss_db
-        $RSS ./cli/create-user.php --user $DEFAULT_ADMIN_USERNAME --password $DEFAULT_ADMIN_PASSWORD --email $DEFAULT_ADMIN_EMAIL
-        $RSS ./cli/reconfigure.php
-        # $RSS ./cli/access-permissions.sh
-        
-      '';
-    };
-  };
-}

modules/server/containers/apps/frigate.nix

@@ -1,96 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name, ... }:
-let 
-  serverCfg = config.syscfg.server;
-  
-  # Ensure the package is available (Nixpkgs includes frigate)
-  frigatePkg = pkgs.frigate;
-
-  image = pkgs.dockerTools.streamLayeredImage {
-    name = "frigate";
-    tag = frigatePkg.version;
-    contents = [ 
-      pkgs.bashInteractive 
-      frigatePkg
-      pkgs.ffmpeg # Explicitly included for video stream processing
-    ];
-    config = {
-      Entrypoint = [ "${frigatePkg}/bin/frigate" ];
-      Cmd = [ "start" ];
-      ExposedPorts = {
-        "5000/tcp" = {}; # Web UI / API
-        "8554/tcp" = {}; # RTSP Feeds
-        "8555/tcp" = {}; # WebRTC
-      };
-      Env = [
-        "FRIGATE_RTSP_PASSWORD=secret" # Base fallback, overridden by envFile/sops
-      ];
-    };
-  };
-in {
-  requires.secrets = [ name ];
-
-  runtime = {
-    paths = [
-      {
-        path = "${serverCfg.path.config.path}/frigate/";
-        mode = "0755";
-      }
-      {
-        path = "/var/lib/frigate/storage/";
-        mode = "0755"; # Dedicated path for heavy video recordings and media
-      }
-    ];
-
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        imageStream = image;
-        port = 5000;
-        secret = name;
-        extraEnv = {
-          PLUS_API_KEY = ""; # Optional: For Frigate Plus users
-        };
-        overrides = {
-          cmd = [ ];
-          volumes = [
-            "${serverCfg.path.config.path}/frigate:/config"
-            "/var/lib/frigate/storage:/media/frigate"
-            "/dev/bus/usb:/dev/bus/usb" # Passes Google Coral USB TPU to the container
-            "/dev/dri:/dev/dri"         # Passes Intel/AMD GPU for hardware video decoding
-          ];
-        };
-      };
-    };
-
-    setup = {
-      trigger = "server";
-      envFile = config.sops.secrets."FRIGATE_ENV".path;
-      script = pkgs.writeShellScript "setup-frigate" ''
-        mkdir -p "${serverCfg.path.config.path}/frigate"
-        mkdir -p "/var/lib/frigate/storage"
-        
-        # Bootstrap a standard configuration layout if missing
-        if [ ! -f "${serverCfg.path.config.path}/frigate/config.yml" ]; then
-          cat <<EOF > "${serverCfg.path.config.path}/frigate/config.yml"
-mqtt:
-  enabled: False # Set to True and define host if connecting to Home Assistant
-
-database:
-  path: /config/frigate.db
-
-cameras:
-  dummy_camera: # Replace with your actual RTSP stream details
-    enabled: false
-    ffmpeg:
-      inputs:
-        - path: rtsp://127.0.0.1:554/live
-          roles:
-            - detect
-    detect:
-      enabled: false
-EOF
-        fi
-      '';
-    };
-  };
-}

modules/server/containers/apps/gitea.nix

@@ -1,145 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name, ... }:
-let 
-  version = "latest";
-  serverCfg = config.syscfg.server;
-
-  LDAP_DC_DOMAIN = "dc=ldap," + (lib.concatMapStringsSep "," (x: "dc=${x}") (lib.splitString "." serverCfg.domain));
-in {
-  requires = {
-    secrets = [ name ];
-    databases = [ name ];
-  };
-
-  runtime = {
-    paths = [{
-      path="${serverCfg.path.data.path}/gitea";
-      owner = "1000:1000";
-      dirs = ["data" "runner"];
-      mode = "0755";
-    }];
-    containers = {
-      server = builder.mkContainer {
-        subdomain = containerCfg.subdomain;
-        image = "gitea/gitea:${version}";
-        port = 8080;
-        secret = name;
-        
-        extraEnv = { # app.ini -> GITEA__<section>__<KEY> = "<VALUE>";
-          GITEA__DEFAULT__APP_NAME = if(containerCfg.extra ? name) then containerCfg.extra.name else "Gitea";
-          GITEA__repository__DISABLED_REPO_UNITS = "repo.ext_issues,repo.ext_wiki";
-          GITEA__repository__DISABLE_STARS = "true";
-          GITEA__repository__DEFAULT_MERGE_STYLE = "squash";
-          # GITEA__ui__THEMES = "";
-          # GITEA__ui__DEFAULT_THEME = "";
-
-          # GITEA__security__SECRET_KEY = "SECRET_ENV";
-          # GITEA__security__INTERNAL_TOKEN = "SECRET_ENV";
-          # GITEA__database__PASSWD = "SECRET_ENV";
-          # GITEA__mailer__PASSWD="SECRET_ENV";
-
-          GITEA__database__DB_TYPE = "postgres"; 
-          GITEA__database__HOST = builder.host;
-          GITEA__database__NAME = "gitea_db";
-          GITEA__database__USER = "gitea_user";
-
-
-          GITEA__mailer__ENABLED = "true";
-          GITEA__mailer__FROM = "";
-          GITEA__mailer__PROTOCOL = "smtps";
-          GITEA__mailer__SMTP_ADDR = "";
-          GITEA__mailer__SMTP_PORT = "";
-          GITEA__mailer__USER= "";
-
-          GITEA__server__DOMAIN = "${containerCfg.subdomain}.${serverCfg.domain}";
-          GITEA__server__ROOT_URL = "https://${containerCfg.subdomain}.${serverCfg.domain}/";
-          GITEA__server__PROTOCOL = "http";
-          GITEA__server__HTTP_PORT = "8080";
-          GITEA__server__LFS_START_SERVER = "true";
-          GITEA__security__INSTALL_LOCK = "true";
-
-        } // ( if serverCfg.containers?authentik then {
-          GITEA__service__ENABLE_BASIC_AUTHENTICATION = "false";
-          GITEA__service__ENABLE_REVERSE_PROXY_AUTHENTICATION = "true";
-          GITEA__service__ENABLE_REVERSE_PROXY_AUTHENTICATION_API = "true";
-          GITEA__service__ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = "true";
-          GITEA__service__ENABLE_REVERSE_PROXY_EMAIL = "true";
-          GITEA__service__ENABLE_REVERSE_PROXY_FULL_NAME = "true";
-          GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION = "true";
-          GITEA__security__REVERSE_PROXY_LOGOUT_REDIRECT = "https://${serverCfg.containers.authentik.subdomain}.${serverCfg.domain}/outpost.goauthentik.io/sign_out";
-          GITEA__security__REVERSE_PROXY_AUTHENTICATION_USER = "X-authentik-username";
-          GITEA__security__REVERSE_PROXY_AUTHENTICATION_EMAIL = "X-authentik-email";
-          GITEA__security__REVERSE_PROXY_AUTHENTICATION_FULL_NAME = "X-authentik-name";
-          GITEA__security__RREVERSE_PROXY_LIMIT = "1";
-          GITEA__security__REVERSE_PROXY_TRUSTED_PROXIES = "127.0.0.0/8,::1/128,10.0.0.0/8";
-        } else {});
-        extraLabels = {
-          "traefik.http.routers.${containerCfg.subdomain}-login.rule" = "Host(`${containerCfg.subdomain}.${serverCfg.domain}`) && Path(`/user/login`) ";
-          "traefik.http.routers.${containerCfg.subdomain}-login.middlewares" = if (serverCfg.containers?authentik && containerCfg.extra?proxyauth) then "authentik" else "";
-          "traefik.http.routers.${containerCfg.subdomain}-login.priority" = "100";
-          "traefik.http.routers.${containerCfg.subdomain}-login.entrypoints" = "web-secure";
-          "traefik.http.routers.${containerCfg.subdomain}-login.tls" = "true";
-        };
-
-        overrides = {
-          volumes = [
-            "${serverCfg.path.data.path}/gitea/data:/data"
-          ];
-          ports = [ "2222:22" ]; 
-        };
-      };
-
-      runner = builder.mkContainer {
-        image = "gitea/act_runner:${version}";
-        secret = name;
-        extraEnv = { 
-          #CONFIG_FILE="/data/config.yml";
-          GITEA_INSTANCE_URL="https://${containerCfg.subdomain}.${serverCfg.domain}";
-          GITHUB_INSTANCE_URL="https://${containerCfg.subdomain}.${serverCfg.domain}";
-        };
-
-        overrides = {
-          volumes = [
-            "${serverCfg.path.data.path}/gitea/runner:/data"
-            "/var/run/podman/podman.sock:/var/run/docker.sock"
-          ];
-        };
-      };
-    };
-
-
-    setup = {
-      trigger = "server";
-      envFile = config.sops.secrets."CUSTOM".path;
-      script = pkgs.writeShellScript "setup" ''
-        # Define the command wrapper
-        GT="${pkgs.podman}/bin/podman --events-backend=none exec -u git gitea-server gitea"
-        GTR="${pkgs.podman}/bin/podman --events-backend=none exec -u git gitea-runner ./act_runner"
-
-        $GT admin user create --username "$DEFAULT_ADMIN_USERNAME" --password "$DEFAULT_ADMIN_PASSWORD" --email "$DEFAULT_ADMIN_EMAIL" --admin || true
-
-        touch ${serverCfg.path.data.path}/gitea/data-runner/config.yml
-
-        RUNNER_TOKEN=$($GT actions generate-runner-token)
-        $GTR register \
-          --instance "https://${containerCfg.subdomain}.${serverCfg.domain}" \
-          --token "$RUNNER_TOKEN" \
-          --name "Runner" \
-          --labels "ubuntu-latest:docker://catthehacker/ubuntu:act-latest" \
-          --no-interactive
-
-
-        ${lib.optionalString (serverCfg.containers ? authentik) ''
-        $GT admin auth add-ldap --name Authentik --host authentik-ldap --port 6636 --security-protocol ldaps --skip-tls-verify \
-            --bind-dn "cn=ldap-service,ou=users,${LDAP_DC_DOMAIN}" --bind-password $DEFAULT_LDAP_PASSWORD \
-            --user-search-base "ou=users,${LDAP_DC_DOMAIN}" \
-            --user-filter "(&(objectClass=user)(|(uid=%[1]s)(mail=%[1]s)))" \
-            --admin-filter "(memberOf=cn=admin,ou=groups,${LDAP_DC_DOMAIN})" \
-            --username-attribute "username" --firstname-attribute "givenName" --surname-attribute "sn" --email-attribute "mail" \
-            --synchronize-users
-        ''}
-
-        echo "Completed Gitea Setup"
-      '';
-    };
-  };
-}

modules/server/containers/apps/handbrake.nix

@@ -1,48 +0,0 @@
-{ config, containerCfg, pkgs, lib, builder, name,... }:
-let 
-  serverCfg = config.syscfg.server;
-  version = "latest";
-in {
-  runtime = {
-    paths = [{
-      path = "${serverCfg.path.config.path}/handbrake";
-      mode = "0755";
-    }];
-
-    containers = {
-      server = builder.mkContainer {
-        authentik = true;
-        tmpfs = true;
-        subdomain = containerCfg.subdomain;
-        subpath = containerCfg.subpath;
-        image = "ghcr.io/jlesage/handbrake:${version}";
-        port = 5800;
-        
-        extraEnv = {
-          USER_ID = "1000";
-          GROUP_ID = "1000";
-          AUTOMATED_CONVERSION_PRESET = "Custom/AV1 MKV 1080p30";
-          AUTOMATED_CONVERSION_FORMAT = "mkv";
-          AUTOMATED_CONVERSION_OUTPUT_SUBDIR = "SAME_AS_SRC";
-        };
-        
-        overrides = {
-          volumes = [
-            "${serverCfg.path.config.path}/handbrake:/config:rw"
-            "${serverCfg.path.dlComplete.path}:/watch:rw"
-            "${serverCfg.path.dlConverted.path}:/output:rw"
-          ];
-         };
-      };
-    };
-
-    
-    setup = {
-      trigger = "server";
-      script = pkgs.writeShellScript "setup" ''
-          mkdir -p ${serverCfg.path.data.path}/handbrake/{watch,output}
-
-      '';
-    };
-  };
-}