Update Valinor and vscodium

flake.nix

@@ -39,25 +39,35 @@
   outputs = inputs:
     let
       lib = inputs.nixpkgs.lib;
-      gen = import ./generator.nix { inherit inputs; };
+      linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
+      supportedSystems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];
+      overlays = import ./overlays { inherit inputs; };
+      mkPkgs = system:
+        import inputs.nixpkgs {
+          inherit system;
+          inherit overlays;
+          config.allowUnfree = true;
+        };
+      gen = import ./generator.nix { inherit inputs mkPkgs supportedSystems; };
       systemsDir = ./systems;
       isIgnoredSystemDir = name: lib.hasPrefix "_" name || lib.hasPrefix "." name;
-      systemNames = lib.attrNames (lib.filterAttrs
-        (name: type:
+      systemNames = lib.attrNames (
+        lib.filterAttrs (
+          name: type:
           type == "directory"
           && !isIgnoredSystemDir name
-          && builtins.pathExists (systemsDir + "/${name}/cfg.nix"))
-        (builtins.readDir systemsDir));
+          && builtins.pathExists (systemsDir + "/${name}/cfg.nix")
+        ) (builtins.readDir systemsDir)
+      );
       hostsByType = systemType:
-        lib.filter
-          (host: (import (systemsDir + "/${host}/cfg.nix")).syscfg.type == systemType)
-          systemNames;
+        lib.filter (host: ((import (systemsDir + "/${host}/cfg.nix")).syscfg.type or "nixos") == systemType) systemNames;
       generateHosts = systemType:
-        lib.genAttrs
-          (hostsByType systemType)
-          (host: gen.generate { inherit host; });
+        lib.genAttrs (hostsByType systemType) (host: gen.generate { inherit host; });
     in {
-      devShells = import ./shells { inherit inputs; };
+      devShells = import ./shells {
+        inherit inputs mkPkgs;
+        systems = linuxSystems;
+      };
 
       nixosConfigurations = generateHosts "nixos";
       darwinConfigurations = generateHosts "macos";
@@ -76,8 +86,8 @@
   # diyu - ?
   # tirnanog - ?
   # valhalla - ?
-  # arcadia - ? 
-  # elysium - ? 
+  # arcadia - ?
+  # elysium - ?
   # empyrean - ?
   # duat - ?
   # sheol - ?

generator.nix

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

modules/home/base/default.nix

@@ -1,12 +1,16 @@
-{ lib, config, ... }: {
+{ lib, config, pkgs, ... }: {
 
   #environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
-  systemd.user.startServices = "sd-switch";
+  systemd.user.startServices = lib.mkIf pkgs.stdenv.isLinux "sd-switch";
   programs.home-manager.enable = true;
 
   home = {
     username = "${config.usercfg.username}";
-    homeDirectory = "/home/${config.usercfg.username}";
+    homeDirectory =
+      if pkgs.stdenv.isDarwin then
+        "/Users/${config.usercfg.username}"
+      else
+        "/home/${config.usercfg.username}";
 
     stateVersion = "26.05";
   };

modules/home/cli/default.nix

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

modules/home/cli/fastfetch/config.jsonc

@@ -0,0 +1,115 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small",
+        "padding": {
+            "top": 2,
+            "right": 4
+        },
+        "color": {
+            "1": "blue",
+            "2": "white"
+        }
+    },
+    "display": {
+        "separator": "  ",
+        "key": { "width": 16 },
+        "color": {
+            "separator": "90"
+        }
+    },
+    "modules": [
+        {
+            "type": "title",
+            "colorUser": "blue",
+            "colorAt": "90",
+            "colorHost": "cyan"
+        },
+        "separator",
+        {
+            "type": "os",
+            "key": "󱄅  os",
+            "keyColor": "blue",
+            "format": "{2} {8}"
+        },
+        {
+            "type": "kernel",
+            "key": "󰌽  kernel",
+            "keyColor": "blue",
+            "format": "{2}"
+        },
+        {
+            "type": "packages",
+            "key": "󰏗  pkgs",
+            "keyColor": "blue"
+        },
+        {
+            "type": "uptime",
+            "key": "󰅐  uptime",
+            "keyColor": "blue"
+        },
+        "break",
+        {
+            "type": "cpu",
+            "key": "󱛠  cpu",
+            "keyColor": "green",
+            "format": "{1} ({4}t @ {6})"
+        },
+        {
+            "type": "gpu",
+            "key": "󰍹  gpu",
+            "keyColor": "green",
+            "format": "{2} [{6}]"
+        },
+        {
+            "type": "memory",
+            "key": "󰑭  ram",
+            "keyColor": "green"
+        },
+        {
+            "type": "disk",
+            "key": "󰋊  disk",
+            "keyColor": "green",
+            "folders": "/"
+        },
+        "break",
+        {
+            "type": "wm",
+            "key": "󱂬  wm",
+            "keyColor": "yellow",
+            "format": "{2}"
+        },
+        {
+            "type": "terminal",
+            "key": "󰆍  terminal",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "shell",
+            "key": "󱆃  shell",
+            "keyColor": "yellow"
+        },
+        "break",
+        {
+            "type": "command",
+            "key": "󰃑  installed",
+            "keyColor": "magenta",
+            "text": "birth=$(stat -c %W /); echo \"$(( ($(date +%s) - birth) / 86400 )) days\""
+        },
+        {
+            "type": "command",
+            "key": "󰜅  generation",
+            "keyColor": "magenta",
+            "text": "nixos-rebuild list-generations | awk '$NF == \"True\" {print $2, $3}' | xargs -I {} date -d \"{}\" +\"%s\" | awk '{diff=systime()-$1; if(diff<3600) printf \"%d mins\\n\", diff/60; else if(diff<86400) printf \"%.0f hours\\n\", diff/3600; else printf \"%.0f days\\n\", diff/86400}'"
+        },
+        "break",
+        {
+            "type": "colors",
+            "paddingLeft": 1,
+            "block": {
+                "width": 3,
+                "range": [0, 7]
+            }
+        }
+    ]
+}

modules/home/cli/fastfetch/default.nix

@@ -0,0 +1,149 @@
+{ pkgs, config, lib, ... }:
+let
+  p = config.colorScheme.palette;
+
+  hexDigits = {
+    "0"=0; "1"=1; "2"=2; "3"=3; "4"=4; "5"=5; "6"=6; "7"=7;
+    "8"=8; "9"=9; "a"=10; "b"=11; "c"=12; "d"=13; "e"=14; "f"=15;
+  };
+  hexByte = h:
+    hexDigits.${lib.toLower (builtins.substring 0 1 h)} * 16 +
+    hexDigits.${lib.toLower (builtins.substring 1 1 h)};
+  rgb = hex:
+    let r = toString (hexByte (builtins.substring 0 2 hex));
+        g = toString (hexByte (builtins.substring 2 2 hex));
+        b = toString (hexByte (builtins.substring 4 2 hex));
+    in "${r};${g};${b}";
+
+  #  in a JSON string → ESC; JSON custom module format uses this directly
+  blk  = c: "\\u001b[38;2;${rgb c}m\\ue0b7●\\ue0b5 \\u001b[0m";
+  row  = cs: " " + builtins.concatStringsSep "" (map blk cs);
+
+  base = row [ p.base00 p.base01 p.base02 p.base03 p.base04 p.base05 p.base06 p.base07 ];
+  alt  = row [ p.alt00  p.alt01  p.alt02  p.alt03  p.alt04  p.alt05  p.alt06  p.alt07  ];
+  high = row [ p.high08 p.high09 p.high0A p.high0B p.high0C p.high0D p.high0E p.high0F ];
+  low  = row [ p.low08  p.low09  p.low0A  p.low0B  p.low0C  p.low0D  p.low0E  p.low0F  ];
+
+  # ── logo colors ── change $1 / $2 to any palette entry ───────────────────
+  logoColor1 = p.base07;
+  logoColor2 = p.base07;
+  # ─────────────────────────────────────────────────────────────────────────
+in lib.mkIf config.syscfg.make.gui {
+  home.packages = with pkgs; [ fastfetch ];
+  xdg.configFile."neofetch/config.conf".source = ./config.conf;
+  xdg.configFile."fastfetch/logo.txt".source = ./logo.txt;
+  xdg.configFile."fastfetch/config.jsonc".text = ''
+    {
+        "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+        "logo": {
+            "type": "file",
+            "source": "~/.config/fastfetch/logo.txt",
+            "color": {
+                "1": "38;2;${rgb logoColor1}",
+                "2": "38;2;${rgb logoColor2}"
+            },
+            "padding": {
+                "top": 1,
+                "right": 4
+            }
+        },
+        "display": {
+            "separator": "  ",
+            "key": { "width": 16 },
+            "color": {
+                "separator": "90"
+            }
+        },
+        "modules": [
+            {
+                "type": "title",
+                "colorUser": "blue",
+                "colorAt": "90",
+                "colorHost": "cyan"
+            },
+            "separator",
+            {
+                "type": "os",
+                "key": "󱄅  os",
+                "keyColor": "blue",
+                "format": "{2} {8}"
+            },
+            {
+                "type": "kernel",
+                "key": "󰌽  kernel",
+                "keyColor": "blue",
+                "format": "{2}"
+            },
+            {
+                "type": "packages",
+                "key": "󰏗  pkgs",
+                "keyColor": "blue"
+            },
+            {
+                "type": "uptime",
+                "key": "󰅐  uptime",
+                "keyColor": "blue"
+            },
+            "break",
+            {
+                "type": "cpu",
+                "key": "󱛠  cpu",
+                "keyColor": "green",
+                "format": "{1} ({4}t @ {6})"
+            },
+            {
+                "type": "gpu",
+                "key": "󰍹  gpu",
+                "keyColor": "green",
+                "format": "{2} [{6}]"
+            },
+            {
+                "type": "memory",
+                "key": "󰑭  ram",
+                "keyColor": "green"
+            },
+            {
+                "type": "disk",
+                "key": "󰋊  disk",
+                "keyColor": "green",
+                "folders": "/"
+            },
+            "break",
+            {
+                "type": "wm",
+                "key": "󱂬  wm",
+                "keyColor": "yellow",
+                "format": "{2}"
+            },
+            {
+                "type": "terminal",
+                "key": "󰆍  terminal",
+                "keyColor": "yellow"
+            },
+            {
+                "type": "shell",
+                "key": "󱆃  shell",
+                "keyColor": "yellow"
+            },
+            "break",
+            {
+                "type": "command",
+                "key": "󰃑  installed",
+                "keyColor": "magenta",
+                "text": "birth=$(stat -c %W /); echo \"$(( ($(date +%s) - birth) / 86400 )) days\""
+            },
+            {
+                "type": "command",
+                "key": "󰜅  generation",
+                "keyColor": "magenta",
+                "text": "nixos-rebuild list-generations | awk '$NF == \"True\" {print $2, $3}' | xargs -I {} date -d \"{}\" +\"%s\" | awk '{diff=systime()-$1; if(diff<3600) printf \"%d mins\\n\", diff/60; else if(diff<86400) printf \"%.0f hours\\n\", diff/3600; else printf \"%.0f days\\n\", diff/86400}'"
+            },
+            "break",
+            { "type": "custom", "format": "${base}" },
+            { "type": "custom", "format": "${alt}"  },
+            { "type": "custom", "format": "${high}" },
+            { "type": "custom", "format": "${low}"  }
+        ]
+    }
+  '';
+}

modules/home/cli/fastfetch/logo.txt

@@ -0,0 +1,14 @@
+                            
+$2                       $1⢀⣴⣦⡀ 
+$2⢀⣴⣶⣿⣿⣿⣿⣷⣶⣦⣤⣀⡀        $1⢀⣴⣿⡿⠋  
+$2⢸⣿⣿⡿⠋⠉⠁⠉⠉⠉⠙⠛⠿⢷⣦⣄   $1⢀⣴⣿⡿⠋    
+$2⠘⣿⣿⣇   ⢀⣤⣤⣤⣤⣄⣀⠈⠙⠛$1⢀⣴⣿⡿⠋      
+$2 ⠘⣿⣿⣆  ⢸⣿⣿⠛⠛⠛⠛⠿⢃$1⣴⣿⡿⠋        
+$2  ⠈⢻⣿⣧⡀ ⠹⣿⣦⡀ $1⢀⣴⣿⡿⠛$2⠻⣷⣦⡀      
+$2    ⠙⠿⣿⣦⣄⠈⠙⢿⣷$2⣿⣿⣿$2⣿⣶⣄ ⠙⢿⣷⣄    
+$2      ⠈⠻⢿⣷⣦⣄⡈⠙⠛⠛⠋⠙⢿⣷⡀ ⠙⢿⣷⣄  
+$2       $1⢀⣴⣿⡿$2⠿⣿⣷⣶⣤⣤⣤⣼⣿⣷  ⠈⢻⣿⣦ 
+$2     $1⢀⣴⣿⡿⠋   $2⠈⠉⠛⠛⠛⠛⠛⠁    ⣿⣿⡇
+$2   $1⢀⣴⣿⡿⠋       $2⠠⢤⣀⣀⣀⣀⣀⣀⣤⣾⣿⣿⠇
+$2   $1⠻⡿⠋           $2⠈⠉⠙⠛⠛⠛⠛⠛⠛⠁ 
+                            

modules/home/cli/kitty/default.nix

@@ -1,5 +1,5 @@
-{ config, ... }: {
-  programs.kitty = {
+{ config, lib, ... }: {
+  programs.kitty = lib.mkIf config.syscfg.make.gui {
     enable = true;
     settings = {
       foreground = "#${config.colorScheme.palette.base07}";

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 +0,0 @@
-{ pkgs, config, ... }: {
-  home.packages = with pkgs; [ fastfetch ];
-  xdg.configFile."neofetch/config.conf".source = ./config.conf;
-  xdg.configFile."fastfetch/config.jsonc".source = ./config.jsonc;
-}

modules/home/cli/other/default.nix

@@ -1,18 +1,16 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   home.packages = with pkgs; [
-    sudo
     ripgrep
     unzip
 
     socat
-    ripgrep
-
-    appimage-run
 
     cbonsai
     pipes-rs
     cmatrix
     #cava
     sl
+  ] ++ lib.optionals (config.syscfg.make.gui || config.syscfg.make.develop) [
+    pkgs.appimage-run
   ];
 }

modules/home/cli/starship/default.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }: {
 
   home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
-  home.packages = with pkgs; [ starship ];
   programs.starship = {
     enable = true;
     enableFishIntegration = false;

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

@@ -1,18 +1,22 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }: 
+let
+  exts = with pkgs.vscode-extensions; [
+    bbenoist.nix
+    esbenp.prettier-vscode
+
+    anthropic.claude-code
+    # openai.codex
+  ];
+in {
 
   config = lib.mkIf (config.syscfg.make.develop) {
     programs.vscodium = {
       enable = true;
-      #profiles.default = {
-        profiles.default.extensions = with pkgs.vscode-extensions; [
-          bbenoist.nix
-          esbenp.prettier-vscode
-          golang.go
-          ms-python.vscode-pylance
-          ms-vscode.cpptools
-          dbaeumer.vscode-eslint
-        ];
-      #};
+      profiles.default.extensions = exts;
+    };
+    programs.antigravity = {
+      enable = true;
+      profiles.default.extensions = exts;
     };
   };
 }

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

@@ -4,8 +4,9 @@
     programs.imv.enable = true;
 
     programs.obs-studio.enable = true;
+    services.jellyfin-mpv-shim.enable = true;
 
-    home.packages = with pkgs; [ jellyfin-mpv-shim krita gimp darktable ];
+    home.packages = with pkgs; [ krita gimp darktable ];
   };
 
 }

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

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

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

@@ -1,26 +1,26 @@
-{ lib, config, pkgs, ... }: {
-
-  config = lib.mkIf (config.syscfg.make.gui) {
-    home.packages = with pkgs; [
-      custom.vosk.base
-      jq
-      (python3.withPackages (ps: with ps; [ translatepy ]))
-    ];
-
-    xdg.configFile."script/transcript-translate.py".text = ''
-      #!/bin/python
-
-      import sys; 
-      from translatepy.translators.google import GoogleTranslate; 
-
+{ lib, config, pkgs, ... }:
+let
+  translateScript = pkgs.writeTextFile {
+    name = "transcript-translate";
+    executable = true;
+    destination = "/bin/transcript-translate";
+    text = ''
+      #!${pkgs.python3.withPackages (ps: [ ps.translatepy ])}/bin/python3
+      import sys
+      from translatepy.translators.google import GoogleTranslate
       if len(sys.argv) != 2:
           print("No language provided.")
-          exit
+          exit(1)
       translator = GoogleTranslate()
       while True:
           for line in sys.stdin:
               sys.stdout.write(translator.translate(line,sys.argv[1]).result+"\n") 
     '';
+  };
+in {
+
+  config = lib.mkIf (config.syscfg.make.gui) {
+    home.packages = [ pkgs.custom.vosk.base ];
 
     xdg.configFile."script/transcript.sh".text = ''
       #!/bin/sh
@@ -37,22 +37,22 @@
         MODEL_OPTS+="$pair\n"
       done
 
-      MODEL_OPT=$(echo -e "$MODEL_OPTS" | wofi --dmenu -p "Choose model:")
+      MODEL_OPT=$(echo -e "$MODEL_OPTS" | ${pkgs.wofi}/bin/wofi --dmenu -p "Choose model:")
       MODEL=$(echo "$MODEL_OPT" | awk -F ':' '{print $2}')
 
       TRANSS="None\nNone-prog\nEnglish\nGerman\nRussian\nJapanese"
-      TRANS=$(echo -e "$TRANSS" | wofi --dmenu -p "Choose translation:")
+      TRANS=$(echo -e "$TRANSS" | ${pkgs.wofi}/bin/wofi --dmenu -p "Choose translation:")
 
       export VOSK_MODEL=$MODEL
       case $TRANS in
           "None")
-              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' 2>/dev/null
+              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | ${pkgs.jq}/bin/jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' 2>/dev/null
               ;;
           "None-prog")
-              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty, .partial // empty | select(length > 0)' 2>/dev/null
+              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | ${pkgs.jq}/bin/jq --unbuffered -r '.alternatives[0].text // empty, .partial // empty | select(length > 0)' 2>/dev/null
               ;;
           *)
-              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' | python ~/.config/script/transcript-translate.py $TRANS
+              ${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | ${pkgs.jq}/bin/jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' | ${translateScript}/bin/transcript-translate "$TRANS"
               ;;
       esac
     '';

modules/home/gui/theme/default.nix

@@ -31,8 +31,6 @@ in {
       platformTheme.name = "gtk";
     };
 
-    home.packages = [ wallpaperGen pkgs.awww ];
-
     xdg.configFile."script/wallpaper.sh".text = ''
       #!/bin/sh
 
@@ -48,9 +46,9 @@ in {
           print "img:" $0 ":text:" image_file;
       }')
 
-      IMG=$WPDIR/$(echo "$RES" | wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
+      IMG=$WPDIR/$(echo "$RES" | ${pkgs.wofi}/bin/wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
       IMG=$(echo "$IMG" | awk -F ':' '{print $2}')
-      awww img $IMG
+      ${pkgs.awww}/bin/awww img $IMG
     '';
   };
 }

modules/home/wayland/apps/default.nix

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

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

@@ -8,14 +8,11 @@
       settings = {
         global = {
           follow = "mouse";
-          height = "200";
+          height = "(0, 200)";
           width = "350";
           scale = "0";
-          origin = "top-right";
-          offset = "${
-              toString ((lib.strings.toInt config.colorScheme.palette.gaps-bar)
-                + (lib.strings.toInt config.colorScheme.palette.gaps-screen))
-            }x${config.colorScheme.palette.gaps-screen}";
+          origin = "bottom-right";
+          offset = "(${config.colorScheme.palette.gaps-screen},${config.colorScheme.palette.gaps-screen})";
           notification_limit = "0";
           progress_bar = "true";
           progress_bar_height = "10";
@@ -54,7 +51,7 @@
           sticky_history = "yes";
           history_length = "20";
 
-          dmenu = "wofi --show dmenu -p dunst:";
+          dmenu = "${pkgs.wofi}/bin/wofi --show dmenu -p dunst:";
           browser = "/usr/bin/xdg-open";
           always_run_script = "true";
           title = "Dunst";
@@ -62,8 +59,8 @@
           corner_radius = "${config.colorScheme.palette.border-radius}";
           ignore_dbusclose = "false";
           layer = "top";
-          force_xwayland = "true";
-          force_xinerama = "false";
+          # force_xwayland = "true";
+          # force_xinerama = "false";
 
           mouse_left_click = "close_current";
           mouse_middle_click = "context";
@@ -91,6 +88,9 @@
           timeout = "10";
           highlight = "#${config.colorScheme.palette.base0E}";
         };
+        experimental = {
+          per_monitor_dpi = true;
+        };
       };
     };
   };

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

@@ -61,8 +61,8 @@ calendar {
 }
 
 .quick-btn-active {
-  .quick-icon  { @include color-accent; }
-  .quick-label { @include color-accent; }
+  .quick-icon  { color: $base0E; }
+  .quick-label { color: $base0E; }
 }
 
 .quick-icon  { font-size: 1.5em; @include color-body; }

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

@@ -1,21 +1,23 @@
-.powermenu-box {
-  padding: 3rem 2.5rem;
-  margin: 0;
+.pm-overlay {
+  background-color: rgba(0, 0, 0, 0.55);
+}
 
-  .powermenu-entry {
-    margin: 0 0.5rem;
+.pm-win {
+  padding: $popup-scale * 10pt;
+  font-size: $popup-scale * $panel-font-size;
+}
 
-    .powermenu-button {
-      @include background-active;
-      border-radius: 1rem;
-      transition: 0.3s;
-      padding: 3.25rem 4rem;
+.pm-btn {
+  @include background-base2;
+  @include border-radius;
+  padding: $popup-scale * 20pt $popup-scale * 16pt;
+  margin: $popup-scale * 6px;
 
-      &:hover { background-color: $base03; }
-    }
-  }
-
-  .powermenu-icon {
-    font-size: 4rem;
+  &:hover {
+    @include background-active;
+    .pm-icon, .pm-label { color: $base01; }
   }
 }
+
+.pm-icon  { font-size: 2.4em; @include color-body; }
+.pm-label { font-size: 0.70em; margin-top: $popup-scale * 5pt; @include color-body; }

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

@@ -93,6 +93,10 @@ tooltip {
 .green  { color: $base0B; }
 .blue   { color: $base0C; }
 
+.workspace-sep {
+  border-top: 2px solid $base03;
+}
+
 /* WINDOW WRAPPER CSS */
 
 .winevent {

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

@@ -6,7 +6,7 @@
       :onhover "${EWW_CMD} update date_rev=true"
       :onhoverlost "${EWW_CMD} update date_rev=false"
       :onclick "(sleep 0.1 && scripts/panel-toggle clock)"
-      :onrightclick "(sleep 0.1 && eww-open-on-current-screen powermenu --toggle)"
+      :onrightclick "(sleep 0.1 && scripts/powermenu-toggle)"
       (box
         :class "datetime"
         (overlay
@@ -14,21 +14,21 @@
             :orientation "v"
             (label :show-truncated false 
               :class "hour" 
-              :text {hour})
+              :text {time.hour})
             (label :show-truncated false
             :class "minute"
-              :text {minute}))
+              :text {time.minute}))
           (revealer
             :reveal date_rev
             (box
               :class "date"
               :orientation "v"
-              (label :show-truncated "false" 
-                :class "day"
-                :text {day})
               (label :show-truncated "false"
-                :class "month" 
-                :text {month}))
+                :class "day"
+                :text {time.day})
+              (label :show-truncated "false"
+                :class "month"
+                :text {time.month}))
           )
         )
       )
@@ -36,7 +36,5 @@
   )
 )
 
-(defpoll hour	:interval "15s"	"date '+%H'")
-(defpoll minute	:interval "15s"	"date '+%M'")
-(defpoll day	:interval "15s"	"date '+%d'")
-(defpoll month	:interval "15s"	"date '+%m'")
+(defpoll time :interval "15s" "date '+{\"hour\":\"%H\",\"minute\":\"%M\",\"day\":\"%d\",\"month\":\"%m\"}'")
+

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

@@ -1,24 +1,24 @@
 (deflisten workspace :initial '[]' "scripts/workspaces")
 
 (defwidget workspace-mod []
-  	(module
-  	  	(eventbox
+	(module
+		(eventbox
 			:onscroll "echo {} | sed -e 's/up/-1/' -e 's/down/+1/' | xargs -I % hyprctl eval \"hl.dispatch(hl.dsp.focus({ workspace = '%' }))\""
-
 			(box
 				:class "module workspaces"
 				:orientation "v"
 				(for ws in workspace
 					(button
-						:onclick "hyprctl  eval \"hl.dispatch(hl.dsp.focus({ workspace = '${ws.number}' }))\""
-						(label 
+						:class `${ws.sep ? "workspace-sep" : ""}`
+						:onclick "hyprctl  eval \"hl.dispatch(hl.dsp.focus({ workspace = '${ws.target}' }))\""
+						(label
 							:show-truncated false
-							:class "icon-text  ${ws.color}"
-							:text `${ws.focused ? "󰜗" : "󰝥"}`
+							:class `icon-text ${ws.color}`
+							:text `${ws.state == "focused" ? "󰜗" : ws.state == "active" ? "󰝥" : "○"}`
 						)
 					)
 				)
 			)
-	  	)
+		)
 	)
 )

modules/home/wayland/apps/eww/bar/scripts/airplane-mode

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+is_active() {
+  rfkill list wifi 2>/dev/null | grep -q "Soft blocked: yes"
+}
+
+case "$1" in
+  status)
+    is_active && echo true || echo false
+    ;;
+  *)
+    if is_active; then
+      rfkill unblock all
+      echo false
+    else
+      rfkill block all
+      echo true
+    fi
+    ;;
+esac

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

@@ -22,7 +22,8 @@ case "$1" in
   *)
     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
+    udevadm monitor --udev --subsystem-match=backlight 2>/dev/null | while read -r _; do
+      gen_output
+    done
     ;;
 esac

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

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

modules/home/wayland/apps/eww/bar/scripts/do-not-disturb

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+case "$1" in
+  status)
+    dunstctl is-paused
+    ;;
+  *)
+    if dunstctl is-paused | grep -q true; then
+      dunstctl set-paused false
+      echo false
+    else
+      dunstctl set-paused true
+      echo true
+    fi
+    ;;
+esac

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

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

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

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

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

@@ -27,8 +27,8 @@ 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" &
+# Poll every 10s as reliable fallback for missed events
+(while true; do sleep 10; echo poll; done) > "$pipe" &
 
 # bluetoothctl monitor for reactive device connect/disconnect events
 (bluetoothctl monitor 2>/dev/null | grep --line-buffered -E "Powered|Connected|Device") > "$pipe" &

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

@@ -22,8 +22,8 @@ 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" &
+# Poll every 10s as fallback for missed events
+(while true; do sleep 10; echo poll; done) > "$pipe" &
 
 # Reactive updates from D-Bus
 (bluetoothctl monitor 2>/dev/null | grep --line-buffered -E "Connected|Device|Powered") > "$pipe" &

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

@@ -1,30 +1,18 @@
 #!/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
+# Atomic lock: flock acquires exclusively or exits immediately.
+# Released automatically when the process exits (no trap needed).
+exec 9>"/tmp/eww_panel_toggle.lock"
+flock -n 9 || exit 0
 
 CURRENT=$(eww get active-panel 2>/dev/null | tr -d '"')
 
-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
+  eww close popup 2>/dev/null
+  eww-open-on-current-screen popup
 fi

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

@@ -1,9 +1,15 @@
 #!/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
+case "$1" in
+  status)
+    powerprofilesctl get | grep -q power-saver && echo true || echo false
+    ;;
+  *)
+    if powerprofilesctl get | grep -q power-saver; then
+      powerprofilesctl set balanced 2>/dev/null || true
+      echo false
+    else
+      powerprofilesctl set power-saver 2>/dev/null || true
+      echo true
+    fi
+    ;;
+esac

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

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

modules/home/wayland/apps/eww/bar/scripts/read-mode

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+SHADER="$HOME/.config/eww/shaders/read-mode.glsl"
+
+is_active() {
+  hyprctl getoption decoration:screen_shader | grep -qF "$SHADER"
+}
+
+case "$1" in
+  status)
+    is_active && echo true || echo false
+    ;;
+  *)
+    if is_active; then
+      hyprctl eval 'hl.config({ decoration = { screen_shader = "" } })'
+      hyprctl eval 'hl.config({ render = { use_fp16 = 2 } })'
+      echo false
+    else
+      hyprctl eval 'hl.config({ render = { use_fp16 = 0 } })'
+      hyprctl eval "hl.config({ decoration = { screen_shader = \"$SHADER\" } })"
+      echo true
+    fi
+    ;;
+esac

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-DIR="$HOME/Pictures/Screenshots"
-mkdir -p "$DIR"
-FILE="$DIR/$(date +%Y-%m-%d_%H-%M-%S).png"
-grim -g "$(slurp)" "$FILE" && wl-copy < "$FILE"
+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/unused/brightness

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-function get_time_ms {
-  date -u +%s%3N
-}
-
-icons=("󰛩" "󱩒" "󰛨")
-
-gen_output() {
-  icon="${icons[$(awk -v n="$(brillo)" 'BEGIN{print int(n/34)}')]}"
-  prcnt=$(brillo | xargs printf "%.*f\n" "0")
-  echo '{"percent": '$prcnt', "icon": "'$icon'"}'
-}
-
-if [[ $(brillo 2>/dev/stdout 1>/dev/null | head -n1 | awk '{print $1}') == "No" ]]; then
-  echo  '{"percent":  100, "icon": "󰛨"}'
-elif [ "$1" = "" ]; then
-  # initial
-  last_time=$(get_time_ms)
-  gen_output
-
-  udevadm monitor | rg --line-buffered "backlight" | while read -r _; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    if [[ $delta -gt 50 ]]; then
-      gen_output
-      last_time=$(get_time_ms)
-    fi
-  done
-fi

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

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-icon() {
-  [ "$STATUS" = "no" ] && echo "󰀞" || echo "󰀝"
-}
-
-toggle() {
-  if [ "$STATUS" = "no" ]; then
-    rfkill block all
-  else
-    rfkill unblock all
-  fi
-}
-
-if [ "$1" = "toggle" ]; then
-  toggle
-else
-  icon
-  rfkill event | while read -r _; do
-    STATUS="$(rfkill list | sed -n 2p | awk '{print $3}')"
-    icon
-  done
-fi

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

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-icon() {
-  [ "$STATUS" = "no" ] && echo "󰌪" || echo "󱐋"
-}
-
-toggle() {
-  if [ "$STATUS" = "no" ]; then
-    echo ""
-  else
-    echo ""
-  fi
-}
-
-if [ "$1" = "toggle" ]; then
-  toggle
-  icon
-else
-  icon
-fi

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

@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-function get_time_ms {
-  date -u +%s%3N
-}
-
-volicons=("󰕿" "󰖀" "󰕾")
-
-vol() {
-  wpctl get-volume @DEFAULT_AUDIO_"$1"@ | awk '{print int($2*100)}'
-}
-ismuted() {
-  wpctl get-volume @DEFAULT_AUDIO_"$1"@ | rg -qi muted
-  echo -n $?
-}
-setvol() {
-  wpctl set-volume @DEFAULT_AUDIO_"$1"@ "$(awk -v n="$2" 'BEGIN{print (n / 100)}')"
-}
-setmute() {
-  wpctl set-mute @DEFAULT_AUDIO_"$1"@ toggle
-}
-
-gen_output() {
-  percent="$(vol "SINK")"
-  lvl=$(awk -v n="$percent" 'BEGIN{print int(n/34)}')
-  ismuted=$(ismuted "SINK")
-
-  if [ "$ismuted" = 1 ]; then
-    icon="${volicons[$lvl]}"
-  else
-    icon="󰝟"
-  fi
-
-  echo '{"icon": "'$icon'", "percent": '$(vol "SINK")', "microphone": '$(vol "SOURCE")'}'
-}
-
-if [ "$1" = "mute" ]; then
-  if [ "$2" != "SOURCE" ] && [ "$2" != "SINK" ]; then
-    echo "Can only mute SINK or SOURCE"
-    exit 1
-  fi
-  setmute "$2"
-elif [ "$1" = "setvol" ]; then
-  if [ "$2" != "SOURCE" ] && [ "$2" != "SINK" ]; then
-    echo "Can only set volume for SINK or SOURCE"
-    exit 1
-  elif [ "$3" -lt 0 ] || [ "$3" -gt 100 ]; then
-    echo "Volume must be between 0 and 100"
-    exit 1
-  fi
-  setvol "$2" "$3"
-else
-  last_time=$(get_time_ms)
-  gen_output
-
-  pw-cli -m 2>/dev/null | rg --line-buffered "PipeWire:Interface:Client" | while read -r event; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    if [[ $delta -gt 50 ]]; then
-      gen_output
-      last_time=$(get_time_ms)
-    fi
-  done
-fi

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

@@ -33,8 +33,8 @@ case "$1" in
     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" &
+    # 2s polling fallback
+    (while true; do sleep 2; echo poll; done) > "$pipe" &
     # PipeWire property-change events (fires on mute/volume change)
     (pw-cli -m 2>/dev/null | grep --line-buffered "changed") > "$pipe" &
 

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

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

modules/home/wayland/apps/eww/bar/shaders/read-mode.glsl

@@ -0,0 +1,133 @@
+#version 320 es
+
+/*
+   I love e-ink displays!
+   The mathematical philosophy here is using deterministic logic (Bayer matrices, arithmetic hashing) 
+   to simulate physical chaos (paper grain, ink bleed). I picked up these concepts in a course 
+   and this is easily the best real-world application of them I've found. 
+   It works brilliantly-looks like real paper, killed my eye strain, and even reduced the insane 
+   reflections from my glossy surface display.
+
+   by @snes19xx, https://github.com/snes19xx
+*/
+
+
+precision highp float;
+in vec2 v_texcoord;
+uniform sampler2D tex;
+out vec4 fragColor;
+
+// 4x4 Bayer Matrix
+// this grid helps break up smooth gradients into texture so it looks less "digital"
+float getBayer(vec2 pos) {
+    int x = int(mod(pos.x, 4.0));
+    int y = int(mod(pos.y, 4.0));
+    const mat4 bayer = mat4(
+        0.0, 12.0,  3.0, 15.0,
+        8.0,  4.0, 11.0,  7.0,
+        2.0, 14.0,  1.0, 13.0,
+        10.0,  6.0,  9.0,  5.0
+    );
+    return bayer[x][y] / 16.0;
+}
+
+// High-performance "Hash12" - No trigonometry
+// old hash used sin() which is slow on gpu. this one just mashes bits together.
+// (https://www.shadertoy.com/view/4djSRW)
+float hash(vec2 p) {
+    // fract() keeps only the decimal part for the wave-like dusty pattern
+    // .1031 is a special prime number to avoid perfect alignments with pixel grid
+    vec3 p3  = fract(vec3(p.xyx) * .1031);
+    
+    // dot product mixes the x, y, z values so they depend on each other
+    p3 += dot(p3, p3.yzx + 33.33);
+    
+    // return the final entangled decimal. deterministically random (afaik).
+    return fract((p3.x + p3.y) * p3.z);
+}
+
+// Multi-octave noise for realistic paper fiber texture
+float paperTexture(vec2 uv) {
+    float n = 0.0;
+    n += hash(uv * 0.3) * 0.6;       // Very large fibers
+    n += hash(uv * 0.8) * 0.4;       // Large fibers
+    n += hash(uv * 2.5) * 0.3;       // Medium detail
+    n += hash(uv * 6.0) * 0.2;       // Fine grain
+    n += hash(uv * 15.0) * 0.1;      // Very fine grain
+    return n / 1.6; // Normalize
+}
+
+// Directional paper grain (simulates paper fibers running in one direction)
+float directionalGrain(vec2 uv) {
+    vec2 direction = vec2(0.7, 0.3); // Fiber direction
+    float grain = 0.0;
+    grain += hash(uv * 3.0 + direction * 2.0) * 0.5;
+    grain += hash(uv * 8.0 + direction * 5.0) * 0.3;
+    return grain / 0.8;
+}
+
+// Subtle vignette for paper edge darkening
+float vignette(vec2 uv) {
+    vec2 center = uv - 0.5;
+    float dist = length(center);
+    // smoothstep creates a signmoid (S-curve) so the shadow falls off naturally
+    return 1.0 - smoothstep(0.4, 1.2, dist) * 0.15;
+}
+
+void main() {
+    vec4 pixColor = texture(tex, v_texcoord);
+    
+    // Luma Conversion
+    // not using average (r+g+b)/3 because eyes see green brighter than blue.
+    float gray = dot(pixColor.rgb, vec3(0.299, 0.587, 0.114));
+    
+    // E-ink characteristic response curve
+    // real e-ink isn't linear. this exponent simulates ink clumping.
+    gray = pow(gray, 1.2);
+    
+    // Better contrast with slight S-curve
+    // clips pure blacks/whites but keeps the middle smooth.
+    gray = smoothstep(0.08, 0.92, gray);
+    
+    // Mid-tone boost
+    float midBoost = smoothstep(0.3, 0.5, gray) * (1.0 - smoothstep(0.5, 0.7, gray));
+    gray += midBoost * 0.1;
+    
+    vec2 screenPos = gl_FragCoord.xy;
+    
+    // PAPER GRAIN 
+    float paperGrain = (paperTexture(screenPos * 0.3) - 0.5) * 0.035; 
+    float dirGrain = (directionalGrain(screenPos * 0.4) - 0.5) * 0.025; // directional grain
+    
+    float bayerValue = getBayer(screenPos);
+    
+    // Apply to bright areas (paper), but also slightly to mid-tones for more visible grain
+    float textureMask = smoothstep(0.5, 0.95, gray); // Lower threshold for more coverage
+    
+    // Apply both grain types
+    gray += paperGrain * textureMask;
+    gray += dirGrain * textureMask * 0.7; // Directional grain is slightly weaker
+    
+    // Increased dithering for more texture
+    float ditherStrength = 0.025; // Increased from 0.018
+    gray += (bayerValue - 0.5) * ditherStrength * textureMask;
+    
+    // Vignette for paper edges
+    float vig = vignette(v_texcoord);
+    gray *= vig;
+    
+    gray = clamp(gray, 0.0, 1.0);
+    
+    // E-ink colors with slight warmth variation
+    vec3 paperColor = vec3(0.94, 0.92, 0.86);
+    vec3 inkColor   = vec3(0.10, 0.10, 0.12);
+    
+    // More noticeable color variation for paper texture
+    float colorVariation = hash(screenPos * 0.08) * 0.02; // Increased from 0.01
+    paperColor += vec3(colorVariation, colorVariation * 0.5, -colorVariation * 0.2);
+    
+    // linear interpolation. paints the gray value onto our specific color palette.
+    vec3 finalColor = mix(inkColor, paperColor, gray);
+    
+    fragColor = vec4(finalColor, pixColor.a);
+}

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

@@ -69,8 +69,11 @@
 
 ; --- Quick Actions ---
 
-(defvar power-save  false)
-(defvar night-light false)
+(defpoll power-save     :interval "5s" :initial "false" "scripts/power-save status")
+(defpoll night-light   :interval "5s" :initial "false" "scripts/nightlight status")
+(defpoll read-mode     :interval "5s" :initial "false" "scripts/read-mode status")
+(defpoll airplane-mode :interval "5s" :initial "false" "scripts/airplane-mode status")
+(defpoll do-not-disturb :interval "5s" :initial "false" "scripts/do-not-disturb status")
 
 (defwidget quick-btn [icon label onclick active]
   (button :class "quick-btn ${active ? 'quick-btn-active' : ''}"
@@ -84,13 +87,17 @@
     (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}))
+        (quick-btn :icon "󰌵" :label "Night Light" :onclick "scripts/nightlight"    :active {night-light})
+        (quick-btn :icon "󰂺" :label "Read Mode"   :onclick "scripts/read-mode"     :active {read-mode})
+        (quick-btn :icon "󰸉" :label "Wallpaper"   :onclick "scripts/wallpaper"     :active false))
       (box :orientation "h" :space-evenly true
-        (quick-btn :icon "󰹑" :label "Screenshot" :onclick "scripts/screenshot" :active false)
-        (quick-btn :icon "󰌾" :label "Lock" :onclick "swaylock" :active false)
-        (quick-btn :icon "󱉨" :label "Color Pick" :onclick "hyprpicker -a" :active false)))))
+        (quick-btn :icon "󱐋" :label "Power Save"  :onclick "scripts/power-save"    :active {power-save})
+        (quick-btn :icon "󰀞" :label "Airplane"    :onclick "scripts/airplane-mode" :active {airplane-mode})
+        (quick-btn :icon "󰂛" :label "Do Not Dist" :onclick "scripts/do-not-disturb" :active {do-not-disturb}))
+      (box :orientation "h" :space-evenly true
+        (quick-btn :icon "󰹑" :label "Screenshot"  :onclick "scripts/screenshot"    :active false)
+        (quick-btn :icon "󰌾" :label "Lock"         :onclick "scripts/lock"          :active false)
+        (quick-btn :icon "󱉨" :label "Color Pick"   :onclick "scripts/color-pick"    :active false)))))
 
 ; --- Brightness ---
 

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

@@ -1,45 +1,35 @@
-(defwidget powermenu_entry [label icon onclick]
-    (box :orientation "v" :space-evenly false :class "powermenu-entry"
-        (button :class "powermenu-button" :onclick {onclick}
-            :tooltip "${label}"
-            (label :class "powermenu-icon" :text {icon})
-        )
-    )
-)
+
+(defwidget pm-btn [icon label onclick]
+  (button :class "pm-btn" :onclick onclick
+    (box :orientation "v" :space-evenly false :halign "center" :valign "center"
+      (label :class "pm-icon" :text icon)
+      (label :class "pm-label" :text label))))
 
 (defwidget powermenu []
-    (box :orientation "h" :space-evenly true :valign "center" :halign "center" :class "powermenu-box"
-        (powermenu_entry    :label "Power off" 
-                            :icon "󰐥" 
-                            :onclick "systemctl poweroff")
-        (powermenu_entry    :label "Reboot" 
-                            :icon "󰜉" 
-                            :onclick "systemctl reboot")
-        (powermenu_entry    :label "Lock" 
-                            :icon "󰍁" 
-                            :onclick "sleep 0.1 && gtklock & eww close powermenu &")
-
-        (powermenu_entry    :label "Suspend" 
-                            :icon "󰤄" 
-                            :onclick "sleep 0.1 && gtklock & systemctl suspend & eww close powermenu &")
-                                
-        (powermenu_entry    :label "Sign out" 
-                            :icon "󰗼" 
-                            :onclick "hyprctl eval \"hl.dispatch(hl.dsp.exit())\"")
-
-        (powermenu_entry    :label "Cancel" 
-                            :icon "󰅖" 
-                            :onclick "eww close powermenu")
-    )
-)
+  (box :hexpand true :vexpand true :class "pm-overlay"
+    (box :halign "center" :valign "center"
+      (eventbox :class "winevent"
+        (box :class "wininner pm-win"
+          (box :orientation "h" :space-evenly true
+            (pm-btn :icon "󰐥" :label "Power off"
+                    :onclick "systemctl poweroff")
+            (pm-btn :icon "󰜉" :label "Reboot"
+                    :onclick "systemctl reboot")
+            (pm-btn :icon "󰍁" :label "Lock"
+                    :onclick "scripts/lock")
+            (pm-btn :icon "󰤄" :label "Suspend"
+                    :onclick "scripts/lock & systemctl suspend")
+            (pm-btn :icon "󰗼" :label "Sign out"
+                    :onclick "hyprctl eval \"hl.dispatch(hl.dsp.exit())\"")
+            (pm-btn :icon "󰅖" :label "Cancel"
+                    :onclick "eww close powermenu")))))))
 
 (defwindow powermenu
-    :monitor 0
-    :stacking "overlay"
-    :geometry (geometry 
-                    :anchor "center"
-                    :width "120%"
-                    :height "120%")
-    :namespace "eww-blur"
-    (powermenu)
-)
+  :monitor 0
+  :stacking "overlay"
+  :geometry (geometry
+    :anchor "center"
+    :width "120%"
+    :height "120%")
+  :namespace "eww-blur"
+  (powermenu))

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

@@ -40,13 +40,13 @@
         :orientation "v" :space-evenly false :class "radio-controls"
         (box :orientation "h" :space-evenly true :halign "center"
           (button :visible {radio.is_paused == 1 && radio.media.status != "Stopped"}
-            :class "radio-ctrl-btn" :timeout "2s" :onclick "playerctl previous"
+            :class "radio-ctrl-btn" :timeout "2s" :onclick "scripts/media previous"
             (label :text "󰒮"))
           (button :class "radio-ctrl-btn" :timeout "2s"
-            :onclick {radio.is_paused == 1 && radio.media.status != "Stopped" ? "playerctl play-pause" : "scripts/radio toggle"}
+            :onclick {radio.is_paused == 1 && radio.media.status != "Stopped" ? "scripts/media play-pause" : "scripts/radio toggle"}
             (label :text {radio.is_paused == 0 ? "󰏥" : (radio.media.status == "Playing" ? "󰏥" : "󰐌")}))
           (button :visible {radio.is_paused == 1 && radio.media.status != "Stopped"}
-            :class "radio-ctrl-btn" :timeout "2s" :onclick "playerctl next"
+            :class "radio-ctrl-btn" :timeout "2s" :onclick "scripts/media next"
             (label :text "󰒭")))
         (vol-row
           :icon "󰕾"

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

@@ -1,11 +1,11 @@
 
-(defpoll swap :interval "5s" "scripts/sys/swap")
+(defpoll swap :interval "30s" "scripts/sys/swap")
 
 (defpoll cpu-freq-min :interval "60s"
   "awk '{print $1/1000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq")
 (defpoll cpu-freq-max :interval "60s"
   "awk '{print $1/1000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq")
-(defpoll cpu-temp :interval "2s"
+(defpoll cpu-temp :interval "4s"
   "scripts/sys/cputemp")
 (defpoll cpu-freq-avg :interval "2s"
   "awk '{sum+=$1; count++} END {printf \"%.1f\", sum/count/1000000}' /sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq")

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

@@ -12,56 +12,95 @@ let
 
     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/read-mode"    = mkScript "read-mode"    ./bar/scripts/read-mode    [ pkgs.hyprland ];
+    "scripts/airplane-mode"  = mkScript "airplane-mode"  ./bar/scripts/airplane-mode  [ pkgs.util-linux ];
+    "scripts/do-not-disturb" = mkScript "do-not-disturb" ./bar/scripts/do-not-disturb [ pkgs.dunst ];
+    "scripts/panel-toggle"      = mkScript "panel-toggle"      ./bar/scripts/panel-toggle      [ pkgs.eww pkgs.util-linux openOnCurrentScreen ];
+    "scripts/powermenu-toggle"  = mkScript "powermenu-toggle"  ./bar/scripts/powermenu-toggle  [ pkgs.eww openOnCurrentScreen ];
+    "scripts/power-save"   = mkScript "power-save"   ./bar/scripts/power-save   [ pkgs.eww ];
+    "scripts/radio"        = mkScript "radio"        ./bar/scripts/radio        [ pkgs.eww pkgs.jq pkgs.curl pkgs.mpv pkgs.playerctl ];
+    "scripts/color-pick"   = mkScript "color-pick"   ./bar/scripts/color-pick   [ pkgs.eww pkgs.hyprpicker ];
+    "scripts/media"        = mkScript "media"        ./bar/scripts/media        [ pkgs.playerctl ];
+    "scripts/lock"         = mkScript "lock"         ./bar/scripts/lock         [ pkgs.eww pkgs.hyprlock ];
+    "scripts/screenshot"   = mkScript "screenshot"   ./bar/scripts/screenshot   [ pkgs.eww pkgs.hyprshot pkgs.satty pkgs.wl-clipboard ];
+    "scripts/sys/gpu"      = mkScript "gpu"          ./bar/scripts/sys/gpu      [ pkgs.custom.amdgpu_top pkgs.jq ];
+    "scripts/sys/memory"   = mkScript "memory"       ./bar/scripts/sys/memory   [ pkgs.ripgrep ];
+    "scripts/volume"       = mkScript "volume"       ./bar/scripts/volume       [ pkgs.ripgrep ];
+    "scripts/weather"      = mkScript "weather"      ./bar/scripts/weather      [ pkgs.jq pkgs.curl ];
+    "scripts/workspaces"   = mkScript "workspaces"   ./bar/scripts/workspaces   [ pkgs.jaq pkgs.socat pkgs.ripgrep ];
+  };
 in {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
-    home.packages = with pkgs; [ eww jq jaq custom.amdgpu_top openOnCurrentScreen ];
+    home.packages = [ pkgs.eww openOnCurrentScreen ];
 
-    xdg.configFile."eww" = {
-      source = lib.cleanSourceWith {
-        filter = name: _type:
-          let baseName = baseNameOf (toString name);
-          in !(lib.hasSuffix ".nix" baseName) && (baseName != "_colors.scss");
-        src = lib.cleanSource ./bar/.;
-      };
+    xdg.configFile = lib.mkMerge [
+      {
+        "eww" = {
+          source = lib.cleanSourceWith {
+            filter = name: _type:
+              let
+                baseName = baseNameOf (toString name);
+                relPath = lib.removePrefix (toString ./bar + "/") (toString name);
+              in !(lib.hasSuffix ".nix" baseName)
+              && (baseName != "_colors.scss")
+              && !(builtins.elem relPath (builtins.attrNames scripts));
+            src = lib.cleanSource ./bar/.;
+          };
+          recursive = true;
+        };
 
-      recursive = true;
-    };
-
-    # colors file
-    xdg.configFile."eww/css/_colors.scss".text = ''
-      $base00: #${config.colorScheme.palette.base00};
-      $base01: #${config.colorScheme.palette.base01};
-      $base02: #${config.colorScheme.palette.base02};
-      $base03: #${config.colorScheme.palette.base03};
-      $base04: #${config.colorScheme.palette.base04};
-      $base05: #${config.colorScheme.palette.base05};
-      $base06: #${config.colorScheme.palette.base06};
-      $base07: #${config.colorScheme.palette.base07};
-      $base08: #${config.colorScheme.palette.base08};
-      $base09: #${config.colorScheme.palette.base09};
-      $base0A: #${config.colorScheme.palette.base0A};
-      $base0B: #${config.colorScheme.palette.base0B};
-      $base0C: #${config.colorScheme.palette.base0C};
-      $base0D: #${config.colorScheme.palette.base0D};
-      $base0E: #${config.colorScheme.palette.base0E};
-      $base0F: #${config.colorScheme.palette.base0F};
+        "eww/css/_colors.scss".text = ''
+          $base00: #${config.colorScheme.palette.base00};
+          $base01: #${config.colorScheme.palette.base01};
+          $base02: #${config.colorScheme.palette.base02};
+          $base03: #${config.colorScheme.palette.base03};
+          $base04: #${config.colorScheme.palette.base04};
+          $base05: #${config.colorScheme.palette.base05};
+          $base06: #${config.colorScheme.palette.base06};
+          $base07: #${config.colorScheme.palette.base07};
+          $base08: #${config.colorScheme.palette.base08};
+          $base09: #${config.colorScheme.palette.base09};
+          $base0A: #${config.colorScheme.palette.base0A};
+          $base0B: #${config.colorScheme.palette.base0B};
+          $base0C: #${config.colorScheme.palette.base0C};
+          $base0D: #${config.colorScheme.palette.base0D};
+          $base0E: #${config.colorScheme.palette.base0E};
+          $base0F: #${config.colorScheme.palette.base0F};
 
 
-      $fg: $base07;
-      $bg0: $base00;
-      $bg1: $base01;
+          $fg: $base07;
+          $bg0: $base00;
+          $bg1: $base01;
 
-      $border-color: $base03;
-      $border-color-focus: $base04;
-      $border-radius: ${config.colorScheme.palette.border-radius}px;
-      $border-width: ${config.colorScheme.palette.border-width}px;
+          $border-color: $base03;
+          $border-color-focus: $base04;
+          $border-radius: ${config.colorScheme.palette.border-radius}px;
+          $border-width: ${config.colorScheme.palette.border-width}px;
 
-      $gaps-screen: ${config.colorScheme.palette.gaps-screen}px;
-      $gaps-window: ${config.colorScheme.palette.gaps-window}px;
+          $gaps-screen: ${config.colorScheme.palette.gaps-screen}px;
+          $gaps-window: ${config.colorScheme.palette.gaps-window}px;
 
-      $panel-font-size: 10pt;
-      $popup-scale: 1.25;
-    '';
+          $panel-font-size: 10pt;
+          $popup-scale: 1.25;
+        '';
+      }
+
+      (lib.mapAttrs' (rel: drv: {
+        name = "eww/${rel}";
+        value.source = "${drv}/bin/${drv.name}";
+      }) scripts)
+    ];
   };
 }

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

@@ -1,109 +1,159 @@
-{ config, lib, ... }: {
+{ config, lib, pkgs, ... }:
+let
+  # Close the bar if it's already open (wrong screen), then open on the target screen.
+  moveOrOpenBar = screen: "${pkgs.writeShellScript "kanshi-eww-bar-${toString screen}" ''
+    if ${pkgs.eww}/bin/eww active-windows 2>/dev/null | grep -qx "bar"; then
+      ${pkgs.eww}/bin/eww close bar
+    fi
+    ${pkgs.eww}/bin/eww open bar --screen ${toString screen}
+  ''}";
+
+  baseOutput = {
+    position = "0,0";
+    scale = 1.0;
+    adaptiveSync = true;
+    status = "enable";
+      transform = "normal"; 
+  };
+  aocT = "AOC 24E1W1 GNSKCHA086899";
+  aocB = "AOC 24E1W1 GNSKBHA080346";
+  lgM = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
+  valinorM = "Lenovo Group Limited *";
+in {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
     services.kanshi = {
       enable = true;
       systemdTarget = "graphical-session.target";
       settings = [
-        {
-          profile.name = "tower_0";
-          profile.outputs = [
+        {output = baseOutput//{
+          criteria = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
+          # mode = "2560x1440@480.168";
+          mode = "2560x1440@240.083";
+          # mode = "1920x1080x240.084";
+        };}
+        {output = baseOutput//{
+          criteria = "AOC 24E1W1 GNSKCHA086899";
+          mode = "1920x1080@60.000";
+          transform = "180"; 
+        };}
+        {output = baseOutput//{
+          criteria = "AOC 24E1W1 GNSKBHA080346";
+          mode = "1920x1080@60.000";
+        };}
+        {output = baseOutput//{
+          criteria = "Lenovo Group Limited *";
+          mode = "1920x1080@60.020";
+        };}
+        {output = baseOutput//{
+          criteria = "AOC 16G3 1DDP7HA000348";
+          mode = "1920x1080@144.000";
+        };}
+        {profile = {
+          name = "tower_00";
+          outputs = [
+            {
+              criteria = aocT;
+              position = "0,0";
+            }
+            {
+              criteria = aocB;
+              position = "0,1080";
+            }
+            {
+              criteria = lgM;
+              position = "1920,720";
+            }
+          ];
+          exec = [
+            (moveOrOpenBar 0)
+            "${pkgs.writeShellScript "kanshi-hyprland-init" ''
+              #!/usr/bin/env bash
+              ${pkgs.hyprland}/bin/hyprctl eval '
+                hl.workspace_rule({ workspace = "1", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "2", monitor = "desc:${aocT}", default = true })
+                hl.workspace_rule({ workspace = "3", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "4", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "5", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "6", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "7", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "8", monitor = "desc:${aocT}", default = true })
+                hl.workspace_rule({ workspace = "9", monitor = "desc:${aocB}", default = true })
+                hl.workspace_rule({ workspace = "name:X", monitor = "desc:${lgM}", default = true })
+              '
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${aocT}" })); hl.dispatch(hl.dsp.focus({ workspace = "2" }));'
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${lgM}" })); hl.dispatch(hl.dsp.focus({ workspace = "name:X" }));'
+              #${pkgs.hyprland}/bin/hyprctl eval 'hl.monitor({ output = "desc:${lgM}", cm = "hdr" });'
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${aocB}" }));'
+
+            ''}"
+            "${pkgs.awww}/bin/awww restore"
+          ];
+        };}
+        {profile = {
+          name = "tower_01";
+          outputs = [
             {
               criteria = "AOC 24E1W1 GNSKCHA086899";
-              mode = "1920x1080@60.000";
+              transform = "180"; 
               position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
             }
             {
               criteria = "AOC 24E1W1 GNSKBHA080346";
-              mode = "1920x1080@60.000";
-              position = "1920,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
+              position = "0,1080";
             }
           ];
-        }
-        {
-          profile.name = "tower_1";
-          profile.outputs = [
+          exec = [ 
+            
+            "${pkgs.writeShellScript "kanshi-hyprland-init" ''
+              #!/usr/bin/env bash
+              ${pkgs.hyprland}/bin/hyprctl eval '
+                hl.workspace_rule({ workspace = "1", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "2", monitor = "DP-2", default = true })
+                hl.workspace_rule({ workspace = "3", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "4", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "5", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "6", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "7", monitor = "DP-1", default = true })
+                hl.workspace_rule({ workspace = "8", monitor = "DP-2", default = true })
+                hl.workspace_rule({ workspace = "9", monitor = "DP-1", default = true })
+              '
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "DP-2" })); hl.dispatch(hl.dsp.focus({ workspace = "2" }));'
+          
+            ''}"
+            "${pkgs.awww}/bin/awww restore"
+            (moveOrOpenBar 0)
+           ];
+        };}
+        {profile = {
+          name = "valinor00";
+          outputs = [
             {
-              criteria = "AOC 24E1W1 GNSKCHA086899";
-              mode = "1920x1080@60.000";
+              criteria = "Lenovo Group Limited *";
               position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
-            }
-            {
-              criteria = "AOC 24E1W1 GNSKBHA080346";
-              mode = "1920x1080@60.000";
-              position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
-            }
-            {
-              criteria = "LG UNKNOWN_TBD";
-              mode = "1920x1080@144.000";
-              position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
             }
           ];
-        }
-        {
-          profile.name = "laptop_0";
-          profile.outputs = [{
-            criteria = "LG Display 0x060A Unknown";
-            mode = "1920x1080@60.020";
-            position = "0,0";
-            scale = 1.0;
-            status = "enable";
-          }];
-        }
-        {
-          profile.name = "laptop_1";
-          profile.outputs = [
-            {
-              criteria = "CEX CX133 0x00000001";
-              mode = "2560x1600@59.972";
-              position = "0,0";
-              scale = 1.0;
-              status = "enable";
-            }
-            {
-              criteria = "LG Display 0x060A Unknown";
-              mode = "1920x1080@60.020";
-              position = "2560,0";
-              scale = 1.0;
-              status = "enable";
-            }
-          ];
-        }
-        {
-          profile.name = "laptop_2";
-          profile.outputs = [
-            {
-              criteria = "AOC 16G3 1DDP7HA000348";
-              mode = "1920x1080@144.000";
-              position = "0,0";
-              status = "enable";
-              scale = 1.0;
-              adaptiveSync = true;
-            }
-            {
-              criteria = "LG Display 0x060A Unknown";
-              mode = "1920x1080@60.020";
-              position = "1920,0";
-              scale = 1.0;
-              status = "enable";
-            }
-          ];
-        }
+          exec = [
+            "${pkgs.writeShellScript "kanshi-hyprland-init" ''
+              #!/usr/bin/env bash
+              ${pkgs.hyprland}/bin/hyprctl eval '
+                hl.workspace_rule({ workspace = "1", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "2", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "3", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "4", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "5", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "6", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "7", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "8", monitor = "eDP-1", default = true })
+                hl.workspace_rule({ workspace = "9", monitor = "eDP-1", default = true })
+              '
+              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "eDP-1" })); hl.dispatch(hl.dsp.focus({ workspace = "1" }));'
+          
+            ''}"
+            "${pkgs.awww}/bin/awww restore"
+            (moveOrOpenBar 0)
+           ];
+        };}
       ];
     };
   };

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

@@ -0,0 +1,113 @@
+{ lib, pkgs, config, ... }: {
+  config = lib.mkIf (config.usercfg.wm == "Wayland") {
+    programs.hyprlock = {
+      enable = true;
+      settings = {
+        general = {
+          grace = 5;                        # grace=5
+          no_fade_in = false;               # fade-in=0.2 (handled dynamically)
+          ignore_empty_input = true;        # ignore-empty-password
+        };
+
+        background = [
+          # 1. OLED MONITOR (Pure Black) 
+          {
+            monitor = "desc:LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
+            color = "rgba(0,0,0,1.0)";      # Pure black OLED protection
+            path = "";                      # Explicitly no screenshot
+            zindex = 0;   
+          }
+          # 2. ALL OTHER MONITORS (Pixelated Screenshot)
+          {
+            monitor = "";
+            path = "screenshot";            # screenshots
+            blur_passes = 2;                # effect-pixelate=5 approximation
+            blur_size = 4;
+            noise = 0.01;
+            zindex = -1;   
+          }
+        ];
+
+        input-field = {
+          monitor = "";
+          placeholder_text = "";
+          fail_text = "";
+
+          size = "200, 200";                # Custom sizing matching indicator-radius
+          outline_thickness = 30;           # indicator-thickness=30
+          
+          dots_size = 0.33;
+          dots_spacing = 0.15;
+          dots_center = true;
+          fade_on_empty = true;
+          hide_input = true;
+          dots_text_format = "*";
+          font_family = "IBM Plex Mono";    # font=IBM Plex Mono
+          
+          # --- Outer Rings / Outline Colors ---
+          # key-hl-color, bs-hl-color, caps-lock-key-hl-color
+          check_color = "rgb(${config.colorScheme.palette.base0C})";       # key-hl
+          fail_color = "rgb(${config.colorScheme.palette.base0F})";        # inside-wrong
+          capslock_color = "rgb(${config.colorScheme.palette.base09})";    # caps-lock-key-hl
+          
+          # --- Inner/Outer Core Colors ---
+          # Replicating your transparent rings with solid action states
+          outer_color = "rgba(${config.colorScheme.palette.base00}00)";    # ring-color (Transparent)
+          inner_color = "rgba(${config.colorScheme.palette.base0C}00)";    # inside-color (Transparent)
+          font_color = "rgba(${config.colorScheme.palette.base00}00)";     # text-color (Transparent)
+
+          fail_transition = 300;
+        };
+      };
+    };
+    xdg.configFile."swaylock/config".text = ''
+      screenshots
+      grace-no-mouse
+      grace-no-touch
+      grace=5
+      effect-pixelate=5
+      fade-in=0.2
+
+      ignore-empty-password
+      font=IBM Plex Mono
+
+      color=${config.colorScheme.palette.base00}00
+
+      indicator-radius=100
+      indicator-thickness=30
+
+      separator-color=${config.colorScheme.palette.base00}00
+
+      inside-color=${config.colorScheme.palette.base0C}00
+      inside-clear-color=${config.colorScheme.palette.base08}FF
+      inside-caps-lock-color=${config.colorScheme.palette.base09}00
+      inside-ver-color=${config.colorScheme.palette.base0C}FF
+      inside-wrong-color=${config.colorScheme.palette.base0F}FF
+
+
+      ring-color=${config.colorScheme.palette.base00}00
+      ring-clear-color=${config.colorScheme.palette.base00}00
+      ring-caps-lock-color=${config.colorScheme.palette.base00}00
+      ring-ver-color=${config.colorScheme.palette.base00}00
+      ring-wrong-color=${config.colorScheme.palette.base00}00
+
+      line-color=${config.colorScheme.palette.base00}00
+      line-clear-color=${config.colorScheme.palette.base00}00
+      line-caps-lock-color=${config.colorScheme.palette.base00}00
+      line-ver-color=${config.colorScheme.palette.base00}00
+      line-wrong-color=${config.colorScheme.palette.base00}00
+
+      text-color=${config.colorScheme.palette.base00}00
+      text-clear-color=${config.colorScheme.palette.base00}00
+      text-caps-lock-color=${config.colorScheme.palette.base00}00
+      text-ver-color=${config.colorScheme.palette.base00}00
+      text-wrong-color=${config.colorScheme.palette.base00}00
+
+
+      key-hl-color=${config.colorScheme.palette.base0C}FF
+      bs-hl-color=${config.colorScheme.palette.base08}FF
+      caps-lock-key-hl-color=${config.colorScheme.palette.base09}FF
+      caps-lock-bs-hl-color=${config.colorScheme.palette.base09}FF
+    '';
+  };
+}

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

@@ -19,8 +19,6 @@ let
 in {
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
 
-    home.packages = [ pkgs.custom.amdgpu_top pkgs.jq ];
-
     programs.waybar = {
       enable = true;
       package = pkgs.waybar;
@@ -203,8 +201,7 @@ in {
         "custom/gpu" = {
           "exec" = jsonOutput "gpu" {
             tooltip = "...";
-            percentage = ''
-              $(amdgpu_top -J -n 1 | jq -r '.devices[0].GRBM2."Command Processor -  Graphics".value')'';
+            percentage = ''$(${lib.getExe pkgs.custom.amdgpu_top} -J -n 1 | ${pkgs.jq}/bin/jq -r '.devices[0].GRBM2."Command Processor -  Graphics".value')'';
           };
           "return-type" = "json";
           "interval" = 5;

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

@@ -1,56 +0,0 @@
-{ lib, pkgs, config, ... }: {
-  config = lib.mkIf (config.usercfg.wm == "Wayland") {
-
-    home.packages = with pkgs; [ swayidle swaylock-effects ];
-
-    xdg.configFile."swaylock/config".text = ''
-      screenshots
-      grace-no-mouse
-      grace-no-touch
-      grace=5
-      effect-pixelate=5
-      fade-in=0.2
-
-      ignore-empty-password
-      font=IBM Plex Mono
-
-      color=${config.colorScheme.palette.base00}00
-
-      indicator-radius=100
-      indicator-thickness=30
-
-      separator-color=${config.colorScheme.palette.base00}00
-
-      inside-color=${config.colorScheme.palette.base0C}00
-      inside-clear-color=${config.colorScheme.palette.base08}FF
-      inside-caps-lock-color=${config.colorScheme.palette.base09}00
-      inside-ver-color=${config.colorScheme.palette.base0C}FF
-      inside-wrong-color=${config.colorScheme.palette.base0F}FF
-
-
-      ring-color=${config.colorScheme.palette.base00}00
-      ring-clear-color=${config.colorScheme.palette.base00}00
-      ring-caps-lock-color=${config.colorScheme.palette.base00}00
-      ring-ver-color=${config.colorScheme.palette.base00}00
-      ring-wrong-color=${config.colorScheme.palette.base00}00
-
-      line-color=${config.colorScheme.palette.base00}00
-      line-clear-color=${config.colorScheme.palette.base00}00
-      line-caps-lock-color=${config.colorScheme.palette.base00}00
-      line-ver-color=${config.colorScheme.palette.base00}00
-      line-wrong-color=${config.colorScheme.palette.base00}00
-
-      text-color=${config.colorScheme.palette.base00}00
-      text-clear-color=${config.colorScheme.palette.base00}00
-      text-caps-lock-color=${config.colorScheme.palette.base00}00
-      text-ver-color=${config.colorScheme.palette.base00}00
-      text-wrong-color=${config.colorScheme.palette.base00}00
-
-
-      key-hl-color=${config.colorScheme.palette.base0C}FF
-      bs-hl-color=${config.colorScheme.palette.base08}FF
-      caps-lock-key-hl-color=${config.colorScheme.palette.base09}FF
-      caps-lock-bs-hl-color=${config.colorScheme.palette.base09}FF
-    '';
-  };
-}

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

@@ -1,7 +1,6 @@
 { lib, config, pkgs, ... }: {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
-    home.packages = with pkgs; [ wofi ];
     xdg.configFile."wofi/config".text = ''
       width=280
       lines=10

modules/home/wayland/base/default.nix

@@ -1,54 +1,49 @@
-{ 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 {
+  #Bookmark: javascript:(function(){window.location.href='mpv://'+encodeURIComponent(window.location.href);})();
+  mpvHandler = pkgs.writeShellScriptBin "mpv-handler" ''
+    #!/bin/bash
+    exec 2>> /tmp/mpv-handler-debug.log
+    set -x
+    RAW_URL="$1"
+    STRIPPED_URL="''${RAW_URL:6}"
+    URL=$(printf '%b' "''${STRIPPED_URL//%/\\x}")
+    exec ${config.programs.mpv.finalPackage}/bin/mpv "$URL"
+  '';
+in
+{
   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
-      awww
-      playerctl
     ];
 
+
+    xdg.desktopEntries."mpv-handler" = {
+      name = "MPV Scheme Handler";
+      exec = "${mpvHandler}/bin/mpv-handler %u";
+      terminal = false;
+      mimeType = [ "x-scheme-handler/mpv" ];
+    };
+
     xdg.mimeApps = {
       enable = true;
       defaultApplications = {
-        "x-scheme-handler/discord-409416265891971072" =
-          [ "discord-409416265891971072.desktop" ];
-        "x-scheme-handler/discord-402572971681644545" =
-          [ "discord-402572971681644545.desktop" ];
-        "x-scheme-handler/discord-696343075731144724" =
-          [ "discord-696343075731144724.desktop" ];
-        "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
-        "x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
+        # --- System & Directories ---
+        "inode/directory" = [ "thunar.desktop" ];
+        "x-scheme-handler/file" = [ "thunar.desktop" ];
+
+        # --- Web & Browsing ---
+        "x-scheme-handler/unknown" = [ "firefox.desktop" ];
         "x-scheme-handler/http" = [ "firefox.desktop" ];
         "x-scheme-handler/https" = [ "firefox.desktop" ];
         "x-scheme-handler/chrome" = [ "firefox.desktop" ];
@@ -60,16 +55,77 @@ in {
         "application/x-extension-xhtml" = [ "firefox.desktop" ];
         "application/x-extension-xht" = [ "firefox.desktop" ];
 
+        # --- Chat & Social Protocol Schemes ---
+        "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
+        "x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
+        "x-scheme-handler/discord-409416265891971072" = [ "discord-409416265891971072.desktop" ];
+        "x-scheme-handler/discord-402572971681644545" = [ "discord-402572971681644545.desktop" ];
+        "x-scheme-handler/discord-696343075731144724" = [ "discord-696343075731144724.desktop" ];
+
+        # --- Documents & Source Code (VSCodium) ---
         "application/pdf" = [ "org.pwmt.zathura-pdf-mupdf.desktop" ];
         "text/plain" = [ "vscodium.desktop" ];
+        "text/markdown" = [ "vscodium.desktop" ];
+        "text/xml" = [ "vscodium.desktop" ];
+        "text/csv" = [ "vscodium.desktop" ];
+        "text/css" = [ "vscodium.desktop" ];
+        "application/xml" = [ "vscodium.desktop" ];
+        "application/json" = [ "vscodium.desktop" ];
+        "application/toml" = [ "vscodium.desktop" ];
+        "application/yaml" = [ "vscodium.desktop" ];
+        "application/javascript" = [ "vscodium.desktop" ];
+        "application/x-shellscript" = [ "vscodium.desktop" ];
 
+        # --- Video & Audio (MPV) ---
+        "x-scheme-handler/mpv" = [ "mpv-handler.desktop" ];
         "video/mp4" = [ "mpv.desktop" ];
+        "video/mkv" = [ "mpv.desktop" ];
+        "video/webm" = [ "mpv.desktop" ];
+        "video/x-matroska" = [ "mpv.desktop" ];
+        "video/quicktime" = [ "mpv.desktop" ];
+        "video/x-msvideo" = [ "mpv.desktop" ];
+        "video/x-flv" = [ "mpv.desktop" ];
+        "video/3gpp" = [ "mpv.desktop" ];
+        "audio/mp3" = [ "mpv.desktop" ];
+        "audio/mpeg" = [ "mpv.desktop" ];
+        "audio/ogg" = [ "mpv.desktop" ];
+        "audio/wav" = [ "mpv.desktop" ];
+        "audio/x-wav" = [ "mpv.desktop" ];
+        "audio/flac" = [ "mpv.desktop" ];
+        "audio/x-flac" = [ "mpv.desktop" ];
+        "audio/mp4" = [ "mpv.desktop" ];
+        "audio/aac" = [ "mpv.desktop" ];
+        "audio/x-matroska-audio" = [ "mpv.desktop" ];
+        "audio/x-mpegurl" = [ "mpv.desktop" ];
+        "audio/mpegurl" = [ "mpv.desktop" ];
 
+        # --- Images (IMV) ---
         "image/png" = [ "imv-dir.desktop" ];
         "image/jpg" = [ "imv-dir.desktop" ];
+        "image/jpeg" = [ "imv-dir.desktop" ];
+        "image/webp" = [ "imv-dir.desktop" ];
+        "image/gif" = [ "imv-dir.desktop" ];
+        "image/svg+xml" = [ "imv-dir.desktop" ];
+        "image/x-canon-cr2" = [ "imv-dir.desktop" ];
+        "image/bmp" = [ "imv-dir.desktop" ];
+        "image/tiff" = [ "imv-dir.desktop" ];
+        "image/heic" = [ "imv-dir.desktop" ];
+        "image/avif" = [ "imv-dir.desktop" ];
+
+        # --- Archives (Engrampa) ---
+        "application/zip" = [ "engrampa.desktop" ];
+        "application/x-tar" = [ "engrampa.desktop" ];
+        "application/x-gzip" = [ "engrampa.desktop" ];
+        "application/x-bzip2" = [ "engrampa.desktop" ];
+        "application/x-7z-compressed" = [ "engrampa.desktop" ];
+        "application/x-rar" = [ "engrampa.desktop" ];
       };
+
       associations = {
-        removed = { "application/pdf" = [ "krita_pdf.desktop" ]; };
+        removed = {
+          "application/pdf" = [ "krita_pdf.desktop" ];
+          "application/zip" = [ "org.prismlauncher.PrismLauncher.desktop" ];
+        };
       };
     };
   };

modules/home/wayland/hyprland/config.nix

@@ -24,13 +24,13 @@
   
 
   startupScript = pkgs.writeShellScriptBin "hyprland-start" ''
-    eww open bar &
-    awww-daemon &
+    ${pkgs.eww}/bin/eww open bar &
+    ${pkgs.awww}/bin/awww-daemon &
+    ${pkgs.awww}/bin/awww restore &
 
     sleep 2
     keepassxc &
     firefox &
-    jellyfin-mpv-shim &
     easyeffects --gapplication-service &
 
     sleep 2
@@ -52,9 +52,9 @@ in {
               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("wl-paste --type text --watch cliphist store")
-                hl.exec_cmd("wl-paste --type image --watch cliphist store")
-                hl.exec_cmd("swayidle -w timeout 600 'swaylock' before-sleep 'swaylock'")
+                hl.exec_cmd("${pkgs.wl-clipboard}/bin/wl-paste --type text --watch ${lib.getExe pkgs.cliphist} store")
+                hl.exec_cmd("${pkgs.wl-clipboard}/bin/wl-paste --type image --watch ${lib.getExe pkgs.cliphist} store")
+                hl.exec_cmd("${lib.getExe pkgs.swayidle} -w timeout 600 '${pkgs.hyprlock}/bin/hyprlock' before-sleep '${pkgs.hyprlock}/bin/hyprlock'")
                 hl.exec_cmd("${lib.getExe startupScript}")
                 hl.exec_cmd("[workspace special:magic silent] kitty --title flying_kitty")
               end'')
@@ -67,8 +67,12 @@ in {
           position = "auto";
           scale = "auto";
           bitdepth = 10;
+          cm = "dcip3"; #auto"; #hdr";#
+          sdrbrightness = 0.85;
+          sdrsaturation = 1.0;
+          sdr_max_luminance = 600;
+          sdr_min_luminance = 0.0005;
         }];
-        #Fullscreen HDR is possible without the hdr cm setting if "render:cm_auto_hdr" is enabled.
 
         config = {
           input = {
@@ -85,13 +89,27 @@ in {
               tap_to_click = false;
             };
           };
-
+          render = {
+            cm_enabled = true;
+            cm_auto_hdr = 1;
+          };
+          quirks = {
+            prefer_hdr = 1;
+          };
           misc = {
-            force_default_wallpaper = -1;
+            force_default_wallpaper = 0;
             disable_hyprland_logo = true;
+            disable_splash_rendering = true;
             animate_mouse_windowdragging = false;
             animate_manual_resizes = false;
-            vrr = 1;
+            vrr = 0; #vrr=2;
+          };
+          debug = {
+            vfr = false;
+          };
+          ecosystem = {
+            no_update_news = true;
+            no_donation_nag = true;
           };
           general = {
             gaps_in = config.colorScheme.palette.gaps-window;
@@ -237,41 +255,10 @@ in {
 
         ];
 
-        # 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;
+          ignore_alpha = 0.0;
         }];
 
         bind = [
@@ -283,11 +270,11 @@ in {
           (bind "SUPER + F" dsp.fullscreen)
           (bind "SUPER + P" dsp.pseudo)
           (bind "SUPER + J" (dsp.layout "togglesplit"))
-          (bind "SUPER + D" (dsp.exec "wofi -modi --show drun"))
+          (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 "cliphist list | wofi -dmenu | cliphist decode | wl-copy"))
-          (bind "PRINT" (dsp.exec "hyprshot -m region --raw | satty --filename - --early-exit --action-on-enter save-to-clipboard --copy-command 'wl-copy'"))
-          (bind "SUPER + L" (dsp.exec "swaylock"))
+          (bind "SUPER + V" (dsp.exec "${lib.getExe pkgs.cliphist} list | ${lib.getExe pkgs.wofi} -dmenu | ${lib.getExe pkgs.cliphist} decode | ${pkgs.wl-clipboard}/bin/wl-copy"))
+          (bind "PRINT" (dsp.exec "${lib.getExe pkgs.hyprshot} -m region --raw | ${lib.getExe pkgs.satty} --filename - --early-exit --action-on-enter save-to-clipboard --copy-command '${pkgs.wl-clipboard}/bin/wl-copy'"))
+          (bind "SUPER + L" (dsp.exec "${pkgs.hyprlock}/bin/hyprlock"))
           (bind "SUPER + left" (dsp.focus "left"))
           (bind "SUPER + right" (dsp.focus "right"))
           (bind "SUPER + up" (dsp.focus "up"))
@@ -313,16 +300,14 @@ in {
           (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 "playerctl play-pause"))
-          (bind "XF86AudioPrev" (dsp.exec "playerctl previous"))
-          (bind "XF86AudioNext" (dsp.exec "playerctl next"))
+          (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 "brightnessctl s 5%+") { locked = true; repeating = true; })
-          (bindOpts "XF86MonBrightnessDown" (dsp.exec "brightnessctl s 5%-") { locked = true; repeating = 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,7 +1,5 @@
 { config, pkgs, ... }: {
 
-  home.packages = with pkgs; [ xdg-user-dirs ];
-
   xdg.enable = true;
   xdg.userDirs.enable = true;
   xdg.userDirs.desktop = "${config.home.homeDirectory}/desktop";

modules/home/xorg/bspwm/config.nix

@@ -109,7 +109,6 @@
 
       telegram-desktop &
       nextcloud &
-      jellyfin-mpv-shim &
       #flameshot &
 
       sleep 2

modules/nixos/system/default.nix

@@ -1,5 +1,5 @@
 { config, lib, ... }: {
-  imports = [ ./dbus ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
+  imports = [ ./dbus ./docs ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
 
   services.journald.extraConfig = ''
     SystemMaxUse=512M

modules/nixos/system/docs/default.nix

@@ -0,0 +1,14 @@
+{ config, lib, ... }:
+let
+  cfg = config.syscfg.make;
+  withDocs = cfg.gui || cfg.develop || cfg.serverExtras;
+in
+{
+  documentation = lib.mkIf (!withDocs) {
+    enable = false;
+    man.enable = false;
+    info.enable = false;
+    doc.enable = false;
+    nixos.enable = false;
+  };
+}

modules/nixos/system/fonts/default.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
 
-  fonts = {
+  fonts = lib.mkIf (config.syscfg.make.gui || config.syscfg.make.serverExtras) {
     enableDefaultPackages = false;
     fontDir.enable = true;
 

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

@@ -1,5 +1,5 @@
-{ lib, ... }: {
-  services.fwupd.enable = true;
+{ config, lib, ... }: {
+  services.fwupd.enable = lib.mkDefault (config.syscfg.make.gui || config.syscfg.make.power);
   hardware.enableAllFirmware = false;
-  services.power-profiles-daemon.enable = lib.mkDefault true;
+  services.power-profiles-daemon.enable = lib.mkDefault config.syscfg.make.gui;
 }

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

@@ -3,6 +3,9 @@ let isSANDBOX = builtins.elem config.syscfg.hostname [ "sandbox" ];
 in {
   config = lib.mkIf (!isSANDBOX) {
     boot.kernelParams = [ 
+      "amdgpu.gpu_recovery=1"
+      "amdgpu.psr=0"
+      "amdgpu.dcfeaturemask=0x2"
       "async_probe=tpm*"     # Load TPM in parallel without blocking udev
       "8250.nr_uarts=0"      # Stop scanning for old motherboard serial lines (ttyS0-S3)
     ];

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

@@ -1,6 +1,9 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }:
+let
+  hasNfsFileSystems = lib.any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") (lib.attrValues config.fileSystems);
+in {
   services.fstrim.enable = true; # Improves SSD life
-  services.gvfs.enable = true; # User Mounted FS
+  services.gvfs.enable = config.syscfg.make.gui; # User Mounted FS
 
-  environment.systemPackages = with pkgs; [ nfs-utils ];
+  environment.systemPackages = lib.optionals hasNfsFileSystems [ pkgs.nfs-utils ];
 }

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

@@ -1,4 +1,4 @@
-{ ... }: {
-  hardware.graphics.enable = true;
-  hardware.graphics.enable32Bit = true;
+{ config, ... }: {
+  hardware.graphics.enable = config.syscfg.make.gui || config.syscfg.make.serverExtras || config.syscfg.make.game;
+  hardware.graphics.enable32Bit = config.syscfg.make.game;
 }

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

@@ -4,7 +4,6 @@
     useDHCP = true;
     nameservers = [ "1.1.1.1" "9.9.9.9" ];
     dhcpcd = {
-      enable = true;
       wait = "background";
     };
 

modules/nixos/system/nix/default.nix

@@ -1,14 +1,10 @@
-{ inputs, pkgs, ... }: {
+{ config, inputs, lib, pkgs, ... }: {
   nixpkgs.config = {
     permittedInsecurePackages = [ ];
     allowUnfree = true;
     android_sdk.accept_license = true;
-    packageOverrides = pkgs: rec {
-      custom = import ../../../../packages { inherit pkgs; };
-    };
-
   };
-  nixpkgs.overlays = import ../../../../overlays { inherit inputs pkgs; };
+  nixpkgs.overlays = import ../../../../overlays { inherit inputs; };
   nix = {
     package = pkgs.nixVersions.stable;
     extraOptions = ''
@@ -37,7 +33,9 @@
       ];
     };
   };
-  programs.nix-ld = {
+  programs.nix-ld = lib.mkIf (
+    config.syscfg.make.gui || config.syscfg.make.develop || config.syscfg.make.serverExtras
+  ) {
     enable = true;
     libraries = with pkgs; [
       libx11 libxcb libxi libxext libxkbfile xcbutilcursor

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

@@ -1,10 +1,12 @@
-{ pkgs, ... }: {
-  security.polkit.enable = true;
-  security.pam.services.swaylock = {
-    text = ''
-      auth include login
-    '';
-  };
+{ config, lib, pkgs, ... }: {
+  config = lib.mkIf config.syscfg.make.gui {
+    security.polkit.enable = true;
+    security.pam.services.hyprlock = { #swaylock
+      text = ''
+        auth include login
+      '';
+    };
 
-  environment.systemPackages = with pkgs; [ polkit_gnome ];
+    environment.systemPackages = [ pkgs.polkit_gnome ];
+  };
 }

modules/nixos/tools/debug/default.nix

@@ -3,6 +3,7 @@
   config = lib.mkIf (config.syscfg.make.develop) {
 
     programs.wireshark.enable = true;
+    programs.dconf.enable = true;
 
     environment.systemPackages = with pkgs; [ wget dconf wireshark mtr android-tools ];
   };

modules/nixos/tools/default.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   imports = [ ./debug ./develop ./telegraf ];
 
+  environment.systemPackages = lib.optionals config.syscfg.make.gui [ pkgs.engrampa ];
 }

modules/server/containers/apps/drawio.nix

@@ -0,0 +1,55 @@
+{ config, containerCfg, pkgs, lib, builder, name, ... }:
+let
+  version = "latest";
+  serverCfg = config.syscfg.server;
+in
+{
+  runtime = {
+    paths = [
+      {
+        path = "${serverCfg.path.data.path}/drawio/";
+        owner = "root:root";
+        mode = "0777";
+      }
+    ];
+
+    containers = {
+      server = builder.mkContainer {
+        subdomain = containerCfg.subdomain;
+        image = "jgraph/drawio:${version}";
+        port = 8080;
+        extraEnv = {
+          VIRTUAL_HOST = "${containerCfg.subdomain}.${serverCfg.domain}";
+          VIRTUAL_PORT = "8080";
+          LETS_ENCRYPT_ENABLED = "false";
+          DRAWIO_SERVER_URL = "https://${containerCfg.subdomain}.${serverCfg.domain}";
+          DRAWIO_SELF_CONTAINED = "1";
+          EXPORT_URL = "http://drawio-exporter:8000/";
+          DRAWIO_CONFIG = ''
+            {
+              "defaultFonts": [
+                "Helvetica", "Arial", "Verdana",
+                "IBM Plex Mono",
+                "IBM Plex Sans",
+                "Noto Sans",
+                "Latin Modern Math"
+              ]
+            }
+          '';
+        };
+        overrides = {
+          ports = ["8080:8080"];
+        };
+      };
+      exporter = builder.mkContainer {
+        image = "jgraph/export-server:${version}";
+        extraEnv = {
+          DRAWIO_SERVER_URL = "https://${containerCfg.subdomain}.${serverCfg.domain}";
+        };
+        overrides = {
+          volumes = ["/run/current-system/sw/share/X11/fonts:/usr/share/fonts/drawio:ro" "/nix/store:/nix/store:ro"];
+        };
+      };
+    };
+  };
+}

modules/server/containers/apps/excalidraw.nix

@@ -0,0 +1,35 @@
+{ config, containerCfg, pkgs, lib, builder, name,... }:
+let
+  version = "latest";
+  serverCfg = config.syscfg.server;
+in {
+  runtime = {
+    paths = [{
+      path="${serverCfg.path.data.path}/excalidraw/";
+      owner = "root:root";
+      mode = "0777";
+    }];
+
+    containers = {
+      server = builder.mkContainer {
+        subdomain = containerCfg.subdomain;
+        image = "excalidraw/excalidraw:${version}";
+        port = 80;
+        tmpfs = true;
+      #   secret = name;
+        extraEnv = {
+          NODE_ENV="production";
+          VITE_APP_WS_SERVER_URL="${containerCfg.subdomain}.${serverCfg.domain}";
+        };
+          extraLabels = {
+        };
+        overrides = {
+          volumes = [
+            "${serverCfg.path.data.path}/excalidraw:/app/data"
+          ];
+        };
+      };
+    };
+  };
+
+}

modules/server/containers/apps/influx.nix

@@ -111,6 +111,11 @@ in {
           GF_LIVE_HA_ENGINE_ADRESS = "${builder.host}:6379";
           DEFAULT_INFLUX_SERVER = "http://${builder.host}:8181";
         };
+        extraLabels = {
+          "traefik.http.routers.grafana-pub.rule" = "Host(`${containerCfg.subdomain}.${serverCfg.domain}`) && PathPrefix(`/public-dashboards`)";
+          "traefik.http.routers.grafana-pub.entrypoints" = "web-secure";
+          "traefik.http.routers.grafana-pub.tls" = "true";
+        };
         overrides = { 
           user = "1500:1500";
           environmentFiles =  [ config.sops.secrets."INFLUX".path config.sops.secrets."CUSTOM".path ] ;

modules/server/containers/apps/miniflux.nix

@@ -0,0 +1,2 @@
+{ name, ... }:
+throw "Container app `${name}` is not implemented yet."

modules/server/containers/apps/robotstxt.nix

@@ -0,0 +1,52 @@
+{ containerCfg, pkgs, builder, name, ... }:
+let
+  port = 8080;
+  priority = toString (containerCfg.extra.priority or 2147482647);
+  defaultRobots = ''
+    User-agent: *
+    Disallow: /
+  '';
+  robots =
+    if containerCfg.extra ? robots then
+      containerCfg.extra.robots
+    else
+      defaultRobots + (containerCfg.extra.extraRobots or "");
+  robotsRoot = pkgs.writeTextDir "robots.txt" robots;
+  image = pkgs.dockerTools.streamLayeredImage {
+    name = "robots";
+    tag = "1";
+    contents = [
+      robotsRoot
+      pkgs.busybox
+    ];
+    config = {
+      Entrypoint = [
+        "${pkgs.busybox}/bin/httpd"
+        "-f"
+        "-p"
+        "0.0.0.0:${toString port}"
+        "-h"
+        "${robotsRoot}"
+      ];
+      ExposedPorts = { "${toString port}/tcp" = { }; };
+      WorkingDir = "/";
+    };
+  };
+in {
+  runtime = {
+    containers = {
+      server = builder.mkContainer {
+        imageStream = image;
+        port = port;
+        extraLabels = {
+          "traefik.enable" = "true";
+          "traefik.http.routers.${name}.entrypoints" = "web-secure";
+          "traefik.http.routers.${name}.rule" = "Path(`/robots.txt`)";
+          "traefik.http.routers.${name}.priority" = priority;
+          "traefik.http.routers.${name}.tls" = "true";
+          "traefik.http.services.${name}.loadbalancer.server.port" = toString port;
+        };
+      };
+    };
+  };
+}

modules/server/containers/apps/trmnl.nix

@@ -1,3 +1,2 @@
-{...}:{
-    
-}
+{ name, ... }:
+throw "Container app `${name}` is not implemented yet."

modules/server/containers/builder.nix

@@ -37,7 +37,9 @@ let
       environment = {
         TZ = config.time.timeZone;
       } // extraEnv;
-
+      autoRemoveOnStop = false;
+      autoStart = true;
+      pull = "newer";
       labels = (if subdomain!=null then ({
         "traefik.enable" = "true";
         "traefik.http.routers.${routerName}.entrypoints" = "web-secure";
@@ -61,7 +63,7 @@ let
     };
     in lib.recursiveUpdate base overrides;
   vmBuilder = { name, vm }: ((import "${pkgs.path}/nixos/lib/eval-config.nix" {
-      system = "x86_64-linux";
+      system = pkgs.stdenv.hostPlatform.system;
       modules = [ vm.cfg
         ({ config, lib, modulesPath, ... }: {
         imports = [

modules/server/containers/default.nix

@@ -16,7 +16,9 @@ let
   basePathConfigs =
     lib.mapAttrsToList (_: cfg: cfg) (lib.filterAttrs (name: _: name != "config" && name != "data") serverCfg.path);
   runtimePathConfigs = concatRuntimeLists "paths";
-  allSetupConfigs = map (app: ({ name = app.name; envFile = ""; } // app.runtime.setup)) appsList;
+  allSetupConfigs = builtins.filter
+    (setup: setup.script != null)
+    (map (app: ({ name = app.name; envFile = [ ]; } // app.runtime.setup)) appsList);
   allCronsConfigs = concatRuntimeLists "cron";
   allVMConfigs = builtins.filter (app: app.runtime.vm != null) appsList;
   mkPathSetup = cfg:
@@ -88,7 +90,7 @@ in {
         value = {
           description = "Run ${e.name} setup";
           after = [ "podman-${e.name}-${e.trigger}.service" ];
-          wants = [ "podman-${e.name}-${e.trigger}.service" ];
+          # wants = [ "podman-${e.name}-${e.trigger}.service" ];
           partOf = [ "podman-${e.name}-${e.trigger}.service" ];
           wantedBy = [ "multi-user.target" ];
           restartTriggers = [ e.script ];
@@ -96,7 +98,8 @@ in {
             Type = "simple";
             Restart = "on-failure";
             RestartSec = "15s";
-            TimeoutStartSec = "360s";
+            # TimeoutStartSec = "360s";
+            TimeoutStartSec = "30s"; 
             EnvironmentFile = e.envFile;
             ExecStart = e.script;
             RemainAfterExit = true;

modules/server/sops/default.nix

@@ -3,7 +3,9 @@ let
   listNames = config.syscfg.server.db;
   containerNames = lib.concatMap (app: app.requires.secrets) (builtins.attrValues config.syscfg.server.loadedContainers);
   allApps = lib.unique (listNames ++ containerNames);
+  needsServerSops = config.syscfg.server.loadedContainers != {} || allApps != [];
 in{
+  config = lib.mkIf needsServerSops {
     sops.secrets = {
       CUSTOM = { 
         mode = "0444";
@@ -13,4 +15,5 @@ in{
       mode = "0444";
       sopsFile = ./server.yaml;
     }));
+  };
 }

modules/shared/media/logo.ascii

@@ -0,0 +1,14 @@
+                            
+                       ⢀⣴⣦⡀ 
+⢀⣴⣶⣿⣿⣿⣿⣷⣶⣦⣤⣀⡀        ⢀⣴⣿⡿⠋  
+⢸⣿⣿⡿⠋⠉⠁⠉⠉⠉⠙⠛⠿⢷⣦⣄   ⢀⣴⣿⡿⠋    
+⠘⣿⣿⣇   ⢀⣤⣤⣤⣤⣄⣀⠈⠙⠛⢀⣴⣿⡿⠋      
+ ⠘⣿⣿⣆  ⢸⣿⣿⠛⠛⠛⠛⠿⢃⣴⣿⡿⠋        
+  ⠈⢻⣿⣧⡀ ⠹⣿⣦⡀ ⢀⣴⣿⡿⠛⠻⣷⣦⡀      
+    ⠙⠿⣿⣦⣄⠈⠙⢿⣷⣿⣿⣿⣿⣶⣄ ⠙⢿⣷⣄    
+      ⠈⠻⢿⣷⣦⣄⡈⠙⠛⠛⠋⠙⢿⣷⡀ ⠙⢿⣷⣄  
+       ⢀⣴⣿⡿⠿⣿⣷⣶⣤⣤⣤⣼⣿⣷  ⠈⢻⣿⣦ 
+     ⢀⣴⣿⡿⠋   ⠈⠉⠛⠛⠛⠛⠛⠁    ⣿⣿⡇
+   ⢀⣴⣿⡿⠋       ⠠⢤⣀⣀⣀⣀⣀⣀⣤⣾⣿⣿⠇
+   ⠻⡿⠋           ⠈⠉⠙⠛⠛⠛⠛⠛⠛⠁ 
+                            

modules/shared/sops/default.nix

@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 let
   isCI = builtins.elem config.syscfg.hostname [ "ci" "sandbox" ];
+  defaultUser = config.users.users.${config.syscfg.defaultUser} or { };
+  defaultGroup = if pkgs.stdenv.isDarwin then "staff" else "users";
   keyFilePath = (if isCI then
     "/var/lib/sops-nix/mock-key.txt"
   else
@@ -8,7 +10,7 @@ let
   sopsFilePath = (if isCI then ./mock.yaml else ./common.yaml);
 in {
   environment.systemPackages = with pkgs; [ sops ];
-  environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
+  environment.variables.SOPS_AGE_KEY_FILE = keyFilePath;
 
   sops.defaultSopsFile = sopsFilePath;
   sops.age.keyFile = keyFilePath;
@@ -19,8 +21,8 @@ in {
   {
     "${config.syscfg.hostname}_ssh_priv" = {
       mode = "0400";
-      owner = config.users.users.${config.syscfg.defaultUser}.name;
-      group = config.users.users.${config.syscfg.defaultUser}.group;
+      owner = defaultUser.name or config.syscfg.defaultUser;
+      group = defaultUser.group or defaultGroup;
     };
   }
   (lib.mkIf config.syscfg.net.wlp.enable {

modules/shared/syscfg/default.nix

@@ -1,11 +1,15 @@
-{ inputs, lib, ... }:
+{ lib, ... }:
 let
   systemsDir = ../../../systems;
-  systemNames = lib.attrNames (lib.filterAttrs 
-    (name: type: type == "directory" && builtins.pathExists (systemsDir + "/${name}/cfg.nix")) 
-    (builtins.readDir systemsDir));
-
-
+  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)
+  );
 in with lib; {
   options.usercfg = import ./user.nix  {inherit lib;};
   options.syscfg = {
@@ -14,6 +18,11 @@ in with lib; {
       type = types.enum [ "nixos" "macos" "home" ];
       default = "nixos";
     };
+    system = mkOption {
+      type = types.enum [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      default = "x86_64-linux";
+      description = "Nix platform used to evaluate this host.";
+    };
     defaultUser = mkOption { type = types.str; };
     make = import ./make.nix {inherit lib;};
     net = import ./net.nix {inherit lib;};

modules/shared/syscfg/extra.nix

@@ -6,6 +6,6 @@ with lib; {
         domain = mkOption { type = types.str; default = ""; };
         port = mkOption { type = types.str; default = ""; };
         noProxy = mkOption { type = types.str; default = ""; };
-        cert = mkOption { type = types.path; default = null; };
+        cert = mkOption { type = types.nullOr types.path; default = null; };
     };
-}
+}

modules/shared/syscfg/make.nix

@@ -2,8 +2,9 @@
 with lib; {
     cli = mkOption { type = types.bool; default = true; };
     gui = mkOption { type = types.bool; default = false; };
+    serverExtras = mkOption { type = types.bool; default = false; };
     virt = mkOption { type = types.bool; default = false; };
     power = mkOption { type = types.bool; default = false; };
     game = mkOption { type = types.bool; default = false; };
     develop = mkOption { type = types.bool; default = false; };
-}
+}

overlays/default.nix

@@ -1,15 +1,14 @@
-{ inputs, pkgs, ... }:
+{ inputs, ... }:
 [
   (final: prev: {
     #openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; };
     #yarn-berry = import ./yarn-berry { inherit final prev; };
     #eww = import ./eww { inherit final prev; };
     # ags =  import ./ags { inherit final prev; };
+    custom = import ../packages { pkgs = final; };
     wine = final.unstable.wineWow64Packages.unstableFull;
     unstable = import inputs.nixUnstable {
-      
       system = final.stdenv.hostPlatform.system;
-      stdenv.hostPlatform.system = final.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
   })

packages/default.nix

@@ -1,15 +1,8 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   amdgpu_top = pkgs.callPackage ./amdgpu_top { };
   simc = pkgs.qt6.callPackage ./simc { };
   repalette = pkgs.callPackage ./repalette { };
 
   vosk = pkgs.callPackage ./vosk { };
-
-  pythonPackages = {
-
-  };
-
-  nodePackages = {
-
-  };
 }

shells/default.nix

@@ -1,13 +1,9 @@
-{ inputs, ... }:
-let
-  forEachSystem =
-    inputs.nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
-in forEachSystem (system:
-  let
-    overlays = import ../overlays { inherit inputs pkgs; };
-    overrides = { custom = import ../packages { inherit pkgs; }; };
-    pkgs = import inputs.nixpkgs { inherit system overlays; } // overrides;
+{ inputs, mkPkgs, systems, ... }:
+inputs.nixpkgs.lib.genAttrs systems (
+  system:
+  let pkgs = mkPkgs system;
   in {
     default = import ./devsh { inherit pkgs; };
     devsh = import ./devsh { inherit pkgs; };
-  })
+  }
+)

systems/asgard/cfg.nix

@@ -3,5 +3,6 @@
     hostname = "asgard";
     defaultUser = "sora";
     type = "macos";
+    system = "x86_64-darwin";
   };
 }

systems/asgard/default.nix

@@ -12,8 +12,7 @@
   };
 
   fonts = {
-    fontDir.enable = true;
-    fonts = with pkgs; [ ibm-plex openmoji-color material-design-icons ];
+    packages = with pkgs; [ ibm-plex openmoji-color material-design-icons ];
   };
 
   environment = {
@@ -33,8 +32,6 @@
 
   programs = { zsh.enable = true; };
 
-  services = { nix-daemon.enable = true; };
-
   homebrew = {
     enable = true;
     onActivation = {
@@ -54,7 +51,11 @@
     '';
     gc = {
       automatic = true;
-      dates = "weekly";
+      interval = {
+        Weekday = 0;
+        Hour = 3;
+        Minute = 0;
+      };
       options = "--delete-older-than 7d";
     };
     settings = {
@@ -67,6 +68,7 @@
   };
 
   system = {
+    primaryUser = "sora";
     defaults = {
       NSGlobalDomain = {
         KeyRepeat = 1;

systems/gateway/default.nix

@@ -17,4 +17,9 @@
     10.10.1.2     avalon.helcel.net
   '';
 
+  swapDevices = [ {
+    device = "/swapfile";
+    size = 2 * 1024; # Size in megabytes (4 GB)
+  } ];
+
 }

systems/gateway/hardware.nix

@@ -5,10 +5,12 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
   boot.loader.systemd-boot.enable = lib.mkForce false;
+  boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
   boot.loader.grub = {
     enable = true;
     device = "/dev/sda";
     efiSupport = true;
+    efiInstallAsRemovable = true;
   };
 
   boot.initrd.availableKernelModules =

systems/sandbox/cfg.nix

@@ -32,6 +32,7 @@
         # ===== BASE =====
         traefik.subdomain = "traefik";
         traefik.extra={provider="infomaniak";};
+        robotstxt.extra = {};
         umami.subdomain = "umami";
         authentik.subdomain = "sso";
         searxng.subdomain = "searx";
@@ -42,14 +43,19 @@
         collabora.subdomain = "office";
         etherpad.subdomain = "pad";
         # ethercalc.subdomain = "calc";
+        drawio.subdomain = "draw";
         immich.subdomain = "pic";
         # ===== FLIX =====
         # invidious.subdomain = "yt";
         # jellyfin.subdomain = "flix";
+        # suwayomi.subdomain = "manga";
+        # calibre.subdomain = "books";
+        # ===== ARR =====
         # servarr.subdomain = "arr";
         # servarr.extra.modules = ["prowlarr" "sonarr" "radarr" "flaresolverr" ];
         # transmission = { subdomain = "arr"; subpath = "transmission"; };
         # handbrake = { subdomain = "arr"; subpath = "hb"; };
+        # selfmark = { subdomain = "arr"; subpath = "selfmark"; };
         # ===== DEV =====
         gitea.subdomain = "git";
         # ===== HOME =====
@@ -58,9 +64,6 @@
         influx.subdomain = "metrum";
 
         freshrss.subdomain = "rss";
-        suwayomi.subdomain = "manga";
-        calibre.subdomain = "books";
-        selfmark = { subdomain = "arr"; subpath = "selfmark"; };
 
         favicon.extra = {
           mappings = {