Replace AGS with waybar

flake.lock

@@ -7,11 +7,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1771029844,
+        "lastModified": 1772290697,
-        "narHash": "sha256-fY6UGNKCQcYkflnkdzNRbuGNJiavQzokZjMCMVfUgCg=",
+        "narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "c3b9c0ab9e24d1648ed29040164704a1cd8fa3c9",
+        "rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771037579,
+        "lastModified": 1773179137,
-        "narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=",
+        "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150",
+        "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
         "type": "github"
       },
       "original": {
@@ -473,11 +473,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770899531,
+        "lastModified": 1771865848,
-        "narHash": "sha256-UBrWjh0DR8db60aLNkTnZTJ9F4kWK0Y7rUDNJC88W7A=",
+        "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "e03c34ccd51280a44ea6d1f5c040cd81ecca25ed",
+        "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960",
         "type": "github"
       },
       "original": {
@@ -701,11 +701,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1770770419,
+        "lastModified": 1773068389,
-        "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
+        "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
+        "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
         "type": "github"
       },
       "original": {
@@ -765,11 +765,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1771008912,
+        "lastModified": 1772963539,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
         "type": "github"
       },
       "original": {
@@ -781,11 +781,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1770380644,
+        "lastModified": 1772736753,
-        "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
+        "narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe",
+        "rev": "917fec990948658ef1ccd07cef2a1ef060786846",
         "type": "github"
       },
       "original": {
@@ -813,11 +813,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1768875095,
+        "lastModified": 1772419343,
-        "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
+        "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
+        "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
         "type": "github"
       },
       "original": {
@@ -894,11 +894,11 @@
     "russia-blocked-geoip": {
       "flake": false,
       "locked": {
-        "lastModified": 1773222740,
+        "lastModified": 1773244551,
-        "narHash": "sha256-x2We3wwRUjfatG5je8P9ip1snK3NvtTHv9tKlPsqOwI=",
+        "narHash": "sha256-Dqpi3RFoy98K2wpzqMsnM1cCQdYbbFCC9xv3oTRl8IA=",
         "owner": "runetfreedom",
         "repo": "russia-blocked-geoip",
-        "rev": "6138773989321235eac52193a889197c38efd942",
+        "rev": "22168e3f173281db701a606095a621ffadf52b42",
         "type": "github"
       },
       "original": {
@@ -934,11 +934,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769091129,
+        "lastModified": 1772420823,
-        "narHash": "sha256-Jj/vIHjiu4OdDIrDXZ3xOPCJrMZZKzhE2UIVXV/NYzY=",
+        "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "131e22d6a6d54ab72aeef6a5a661ab7005b4c596",
+        "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
         "type": "github"
       },
       "original": {
@@ -952,11 +952,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1770683991,
+        "lastModified": 1773096132,
-        "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
+        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
+        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
         "type": "github"
       },
       "original": {
@@ -984,11 +984,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1770914701,
+        "lastModified": 1772296853,
-        "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=",
+        "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "db03fed72e5ca02be34e1d24789345a943329738",
+        "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
         "type": "github"
       },
       "original": {
@@ -1171,11 +1171,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1770959024,
+        "lastModified": 1773207251,
-        "narHash": "sha256-r2fZFW+xZxEdyORsAipCrnuxQblGGldtZcx0iSQI1ZQ=",
+        "narHash": "sha256-HxkX00IX1wUt7QHcpbml5FbtI/A4eSTgmCDjw1JdGf0=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "13bdb164a473091b46e857d37599e7e1ae22665e",
+        "rev": "e4829372db533c6201ace0d627663adc12dd2868",
         "type": "github"
       },
       "original": {

modules/user.nix

@@ -11,6 +11,7 @@
     ./user/neofetch.nix
     ./user/qt.nix
     ./user/sops.nix
+    ./user/waybar.nix
     ./user/yazi.nix
     ./user/zsh.nix
 

modules/user/hyprland.nix

@@ -54,6 +54,13 @@ in {
         enable_stdout_logs = true;
       };
 
+      general = {
+        "col.inactive_border" = lib.mkForce "rgba(00000000)";
+      };
+
+      decoration.inactive_opacity = lib.mkDefault .95;
+      decoration.border_part_of_window = false;
+
       misc = {
         focus_on_activate = true;
       };
@@ -82,16 +89,23 @@ in {
         "3, horizontal, workspace"
       ];
 
+      workspace = [
+        "w[t1], gapsout:10 0 0, gapsin:0"
+      ];
+
       windowrule = [
         "float, class:^(imv)$"
         "float, class:^(feh)$"
         "float, class:^(mpv)$"
         "float, title:^(Список друзей)"
-        "move onscreen cursor -50% -50%, class:^(xdragon)$"
+        "move onscreen cursor -50% -50%, class:^(dragon-drop)$"
         "float, title:(nmtui)"
         "float, title:(pulsemixer)"
         "float, title:(clipse)"
         "size 622 652, title:(clipse)"
+
+        "rounding 0, focus:1"
+        "bordersize 0, floating:0, onworkspace:w[t1]"
       ];
 
       exec-once = lib.mkBefore [

modules/user/waybar.nix

@@ -0,0 +1,234 @@
+{ osConfig, config, pkgs, ... }: {
+  home.packages = with pkgs; [
+    font-awesome
+    playerctl
+  ];
+  
+  programs.waybar = {
+    enable = true;
+
+    settings.mainBar = {
+      margin = "8";
+      spacing = 8;
+
+      modules-left = [
+        "hyprland/workspaces"
+        "hyprland/language"
+        "keyboard-state"
+      ];
+
+      modules-center = [
+        "mpris"
+      ];
+
+      modules-right = [
+        "tray"
+        "group/system"
+        "pulseaudio"
+        "battery"
+        "clock"
+      ];
+
+      clock = {
+        tooltip = false;
+        interval = 5;
+        format = "{:L%d %b - %H:%M %a}";
+      };
+
+      pulseaudio = {
+        format = "{icon} {volume}%";
+        format-icons = {
+          headphone =  "";
+          hands-free =  "";
+          headset =  "";
+          phone =  "";
+          phone-muted =  "";
+          portable =  "";
+          car =  "";
+          default =  ["" ""];
+        };
+        on-click = "ghostty --title=pulsemixer -e pulsemixer";
+      };
+
+      mpris = {
+        format = "{dynamic}";
+        dynamic-len = if osConfig.host.laptop then 32 else 64;
+      };
+
+      battery = {
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{capacity}%";
+        format-charging = "{capacity}% {time}";
+        format-plugged = "{capacity}%";
+        format-alt = "{time}";
+        format-time = "{H}:{m}";
+      };
+
+      "keyboard-state" = {
+        capslock = true;
+        format = "{icon}";
+        format-icons = {
+          locked = "CUPS";
+          unlocked = "";
+        };
+      };
+
+      "hyprland/language" = {
+        format-en = "EN";
+        format-ru = "RU";
+      };
+
+
+      "group/system" = {
+        orientation = "inherit";
+          drawer = {
+            transition-duration = 500;
+            transition-left-to-right = false;
+          };
+          modules = [
+            "network"
+            "custom/mem"
+            "cpu"
+            "temperature"
+          ];
+      };
+
+	    network = {
+        format = "{ifname}";
+        format-wifi = "{essid} ({signalStrength}%) ";
+        format-ethernet = "{ifname} ";
+        format-disconnected = "";
+        tooltip-format = "{ifname}";
+        tooltip-format-wifi = "{essid} ({signalStrength}%) ";
+        tooltip-format-ethernet = "{ifname} ";
+        tooltip-format-disconnected = "Disconnected";
+        max-length = 50;
+        on-click = "ghostty --title=nmtui -e nmtui";
+      };
+
+      "custom/weather" = {
+        format = "{}";
+        tooltip = true;
+        interval = 1800;
+        exec = "python3 $HOME/.config/waybar/scripts/wttr.py";
+        return-type = "json";
+      };
+
+      "custom/mem" = {
+        format = "{} ";
+        interval = 3;
+        exec = "free -h | awk '/Mem:/{printf $3}'";
+        tooltip = false;
+      };
+
+      cpu = {
+        interval = 2;
+        format = "{usage}% ";
+        min-length = 6;
+      };
+
+      temperature = {
+        # thermal-zone = 2;
+        # hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
+        critical-threshold = 80;
+        # format-critical = "{temperatureC}°C {icon}";
+        format = "{temperatureC}°C {icon}";
+        format-icons = ["" "" "" "" ""];
+        tooltip = false;
+      };
+    };
+
+    style = let
+      colors = config.lib.stylix.colors.withHashtag;
+      radius = "12px";
+    in /* css */ ''
+      window#waybar {
+        background: transparent;
+        color: ${colors.base05};
+        border-radius: ${radius};
+        font-weight: bold;
+        font-size: 1.1em;
+      }
+
+      window#waybar > * {
+        padding: 4px;
+      }
+
+      #language,
+      #mpris,
+      #pulseaudio,
+      #network,
+      #battery,
+      #cpu,
+      #temperature,
+      #custom-mem,
+      #clock {
+        background: ${colors.base00};
+        border-radius: ${radius};
+        padding: 8px;
+      }
+
+      #workspaces,
+      #tray {
+        background: ${colors.base00};
+        border-radius: ${radius};
+      }
+
+      #workspaces button {
+        padding: 4px;
+        border-radius: ${radius};
+        border: 1pt solid transparent;
+      }
+      #workspaces button:hover {
+        background: ${colors.base01};
+      }
+      #workspaces button.active {
+        background: ${colors.base0B};
+        color: ${colors.base00};
+      }
+      #workspaces button.active:hover {
+        border-color: ${colors.base0B};
+        background: ${colors.base01};
+        color: ${colors.base0B};
+      }
+
+      #mpris:hover {
+        background: ${colors.base01};
+      }
+      #mpris.paused {
+        opacity: .5;
+      }
+
+      #tray widget {
+        border: 1pt solid transparent;
+        border-radius: ${radius};
+      }
+      #tray widget:hover {
+        background: ${colors.base01};
+      }
+      #tray widget>image {
+        padding: 8px;
+      }
+      #tray > .passive {
+        border-color: ${colors.base02};
+      }
+      #tray > .needs-attention {
+        border-color: ${colors.base09};
+      }
+
+      #pulseaudio:hover {
+        background: ${colors.base01};
+      }
+      #pulseaudio.muted {
+        color: ${colors.base08};
+      }
+
+      #network:hover {
+        background: ${colors.base01};
+      }
+    '';
+  };
+}

user/sweetbread/modules/hyprland.nix

@@ -51,11 +51,10 @@
   in {
     settings = {
       general = {
-        gaps_in = 5;
+        gaps_in = 2;
         gaps_out = 10;
         border_size = 3;
-        "col.active_border" = lib.mkForce "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
+        "col.active_border" = lib.mkForce "rgba(${colors.base0C}aa) rgba(${colors.base0B}aa) 45deg";
-        "col.inactive_border" = lib.mkForce "rgba(${colors.base05}aa)";
 
         layout = "dwindle";
       };
@@ -70,11 +69,7 @@
           new_optimizations = true;
         };
 
-        shadow = {
+        shadow.enabled = false;
-          enabled = true;
-          range = 4;
-          render_power = 3;
-        };
       };
 
       animations = {