little changes

machines/embrace/home/hyprland.nix

@@ -1,9 +1,3 @@
-{
-  pkgs,
-  lib,
-  ...
-}:
-with lib;
 {
   module.wm.hyprland = {
     autostart = [
@@ -12,18 +6,13 @@ with lib;
     ]; # autostart
     binds =
       let
-        inherit (pkgs) grimblast;
-        pic = "$(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')";
-        c = "--class";
         # regex
         mk =
           mod: sub: key: cmd:
           "${toString mod}  ${toString sub}, ${key}, exec, ${cmd}";
         # mod & nomod
-        mod = (mk "$m");
-        m = (mod null);
-        s = (mod "$s");
-        a = (mod "$a");
+        m = (mk "$m" null);
+        s = (mk "$m" "$s");
       in
       [
         # menus
@@ -32,7 +21,7 @@ with lib;
 
         # programs
         (m "$rt" "kitty")
-        (s "$rt" "kitty ${c}=termfloat")
+        (s "$rt" "kitty --class=termfloat")
 
         (m "V" "telegram-desktop")
 
@@ -42,11 +31,7 @@ with lib;
         (s "N" "nemo")
 
         (m "M" "spotify")
-        (s "M" "kitty ${c}=ani anicli-ru -q 1080")
-
-        # screenshot
-        (mk null null "$PR" "${getExe grimblast} copysave area   ${pic}")
-        (mk null "$s" "$PR" "${getExe grimblast} copysave output ${pic}")
+        (s "M" "kitty --class=ani anicli-ru -q 1080")
       ];
   };
 }

machines/jetpure/default.nix

@@ -3,7 +3,7 @@
   flake = import ../../libx {
     inherit inputs lib;
     flakeDir = "/persist/flake";
-    pass = "/persist/vault/pass.kdbx";
+    pass = "/persist/vault/passwords.kdbx";
     # variables
     hostName = "jetpure";
     userName = "nixzoid";

machines/jetpure/home/hyprland.nix

@@ -1,25 +1,15 @@
-{
-  pkgs,
-  lib,
-  ...
-}:
-with lib;
 {
   module.wm.hyprland = {
     autostart = [ "mako" ]; # autostart
     binds =
       let
-        inherit (pkgs) grimblast;
-        pic = "$(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')";
-        c = "--class";
         # regex
         mk =
           mod: sub: key: cmd:
           "${toString mod}  ${toString sub}, ${key}, exec, ${cmd}";
         # mod & nomod
-        mod = (mk "$m");
-        m = (mod null);
-        s = (mod "$s");
+        m = (mk "$m" null);
+        s = (mk "$m" "$s");
       in
       [
         # menus
@@ -28,26 +18,19 @@ with lib;
 
         # programs
         (m "$rt" "kitty")
-        (s "$rt" "kitty ${c}=termfloat")
+        (s "$rt" "kitty --class=termfloat")
 
         (m "V" "telegram-desktop")
         (s "V" "vesktop")
 
         (m "B" "qutebrowser")
-        (s "B" "secrets")
+        (s "B" "keepassxc")
 
         (m "N" "yazi")
-        (s "N" "kitty ${c}=termfloat yazi")
+        (s "N" "kitty --class=termfloat yazi")
 
         (m "M" "spotify")
-        (s "M" "kitty ${c}=ani anicli-ru -q 1080")
-
-        (m "Z" "bottles")
-        (s "Z" "prismlauncher")
-
-        # screenshot
-        (mk null null "$PR" "${getExe grimblast} copysave area   ${pic}")
-        (mk null "$s" "$PR" "${getExe grimblast} copysave output ${pic}")
+        (s "M" "kitty --class=ani anicli-ru -q 1080")
       ];
   };
 }

modules/home/misc/minimal/default.nix

@@ -1,4 +1,7 @@
-{ x, ... }:
+{
+  x,
+  ...
+}:
 with x;
 {
   news.display = "silent";

modules/home/programs/gui/qutebrowser/rules.nix

@@ -18,6 +18,7 @@
       youtube = "youtube.com";
       redlib = "l.opnxng.com";
       twitch = "twitch.tv";
+      gmail = "mail.google.com";
       protonMail = "mail.proton.me";
       mastodonMl = "mastodon.ml";
       vk = "vk.com";
@@ -46,6 +47,7 @@
         "*://*.youtube.com/*"
         "https://www.youtube.com/*"
         "https://*.google.com/*"
+        "https://mail.google.com/*"
         "https://vk.mail.ru/*"
         "https://mail.proton.me/*"
         "https://account.proton.me/*"

modules/home/shells/variables/default.nix

@@ -1,4 +1,3 @@
-{ ... }:
 {
   home.sessionVariables = {
     TERM = "kitty";

modules/home/shells/zsh/default.nix

@@ -35,7 +35,7 @@ in
         dotDir = ".config/zsh";
         completionInit = "autoload -U compinit && compinit";
         # CONFIGURATION
-        oh-my-zsh = plug.zsh;
+        oh-my-zsh = plug.ohMyZsh;
         zsh-abbr = on // {
           abbreviations = abbrs;
         };

modules/home/shells/zsh/plugins.nix

@@ -6,7 +6,7 @@
 with x;
 with pkgs;
 {
-  zsh = on // {
+  ohMyZsh = on // {
     plugins = [
       "git"
       "eza"

modules/home/wm/hyprland/binds.nix

@@ -9,6 +9,7 @@ with lib;
 let
   cfg = config.module.wm.hyprland;
   tee = "${pkgs.uutils-coreutils-noprefix}/bin/tee";
+  pic = "$(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')";
   mic = ''fixf4=$(cat /sys/class/leds/platform\:\:micmute/brightness); echo $((1-fixf4)) | sudo ${tee} /sys/class/leds/platform\:\:micmute/brightness; wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle'';
 in
 {
@@ -33,6 +34,7 @@ in
   # binds
   bind =
     let
+      inherit (pkgs) grimblast;
       mk =
         mod: args: cmd:
         "${toString mod} ${toString args}, ${toString cmd}";
@@ -69,6 +71,10 @@ in
       (mk "$m," "$mu" "workspace, e-1")
       (mk "$m," "$nx" "workspace, e+1")
       (mk "$m," "$pr" "workspace, e-1")
+
+      # screenshot
+      (mk null null "$PR, exec, ${getExe grimblast} copysave area   ${pic}")
+      (mk null "$s" "$PR, exec, ${getExe grimblast} copysave output ${pic}")
     ] # modules
     ++ cfg.binds
     ++ x.workspaces;

modules/home/wm/misc/waybar/default.nix

@@ -23,8 +23,8 @@ in
       settings = {
         mainBar =
           let
-            ico = import ./icons;
             Tool.tooltip = false;
+            ico = import ./icons;
             wm_icons = ico.wm;
             bat_icons = ico.bat;
             light_icons = ico.light;
@@ -102,7 +102,7 @@ in
               ];
               format-wifi = "{icon} CON";
               format-ethernet = "󰈀 ETH";
-              format-disconnected = "⚠️ ERR";
+              format-disconnected = " ERR";
               on-click = "kitty nmtui";
               interval = 5;
             };

pkgs/anicli/api.nix

@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LwHfxxwXxcUy1HKJfYXusz4wZCTZjQACMWQpYr9t8Vk=";
+    hash = "sha256-QHuUED1htlfdLXih0Bf5HzeHn+eZBkRCKDHwAp+XILA=";
   };
 
   build-system = with python3Packages; [

pkgs/anicli/default.nix

@@ -1,6 +1,6 @@
 {
   verCli ? "5.0.12",
-  verApi ? "0.7.0",
+  verApi ? "0.7.1",
   #
   pkgs,
   fetchPypi,