fixup! vpn: change engine

modules/user.nix

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

modules/user/waybar.nix

@@ -1,177 +0,0 @@
-{ osConfig, config, pkgs, ... }: {
-  home.packages = with pkgs; [
-    font-awesome
-    nerd-fonts.symbols-only
-    playerctl
-    cava
-  ];
-  
-  programs.waybar = {
-    enable = true;
-    systemd.enable = true;
-
-    settings.mainBar = {
-      modules-center = [
-         "group/left"
-         "group/center"
-         "group/right"
-      ];
-
-
-
-      "group/left" = {
-        orientation = "inherit";
-        modules = [
-        "hyprland/workspaces"
-        "custom/sep-left"
-        "hyprland/language"
-        "keyboard-state"
-        ];
-      };
-
-      "group/center" = {
-        orientation = "inherit";
-        modules = [
-        "cava"
-        "mpris"
-        ];
-      };
-
-      
-      "group/right" = {
-        orientation = "inherit";
-        modules = [
-        "tray"
-        "custom/sep-left"
-        "group/system"
-        "custom/sep-left"
-        "pulseaudio"
-        "custom/sep-left"
-        "battery"
-        "clock"
-        ];
-      };
-
-      cava = {
-        bars = 9;
-        bar_delimiter = 0;
-        stereo = false;
-        input_delay = 0;
-        format-icons = [" " "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
-      };
-
-      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 16 else 32;
-        dynamic-order = [ "title" "artist" "album" ];
-      };
-
-      battery = {
-        interval = 5;
-        states = {
-          warning = 30;
-          critical = 15;
-        };
-        format = "{icon} {capacity}% | ";
-        format-icons = {
-          default = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
-          charging = ["󰢟" "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅"];
-        };
-      };
-
-      "custom/sep-left" = {
-      format = " | ";
-      tooltip = false;
-      };
-      
-      "keyboard-state" = {
-        capslock = true;
-        format = "{icon}";
-        format-icons = {
-          locked = "CAPS";
-          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 = "{ipaddr}";
-        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 = {
-        hwmon-path = "/sys/class/hwmon/hwmon5/temp1_input";
-        critical-threshold = 80;
-        format = "{temperatureC}°C {icon}";
-        format-icons = ["" "" "" "" ""];
-        tooltip = false;
-      };
-    };
-  };
-}

user/chest/modules/waybar.nix

@@ -1,6 +1,179 @@
-{ config, pkgs, ... }: {
-  programs.waybar.settings.mainBar.spacing = 4;
-  programs.waybar.style = let
+{ osConfig, config, pkgs, lib, ... }: {
+  home.packages = with pkgs; [
+    font-awesome
+    nerd-fonts.symbols-only
+    playerctl
+    cava
+    pulsemixer
+  ];
+
+  programs.waybar = {
+    enable = true;
+    systemd.enable = true;
+
+    settings.mainBar = {
+      modules-center = [
+        "group/left"
+        "group/center"
+        "group/right"
+      ];
+
+
+      "group/left" = {
+        orientation = "inherit";
+        modules = [
+          "hyprland/workspaces"
+          "custom/sep-left"
+          "hyprland/language"
+          "keyboard-state"
+        ];
+      };
+
+      "group/center" = {
+        orientation = "inherit";
+        modules = [
+          "cava"
+          "mpris"
+        ];
+      };
+
+      "group/right" = {
+        orientation = "inherit";
+        modules = [
+          "tray"
+          "custom/sep-left"
+          "group/system"
+          "custom/sep-left"
+          "pulseaudio"
+          "custom/sep-left"
+          "battery"
+          "clock"
+        ];
+      };
+
+
+      cava = {
+        bars = 9;
+        bar_delimiter = 0;
+        stereo = false;
+        input_delay = 0;
+        format-icons = [" " "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
+      };
+
+      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 16 else 32;
+        dynamic-order = [ "title" "artist" "album" ];
+      };
+
+      battery = {
+        interval = 5;
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{icon} {capacity}% | ";
+        format-icons = {
+          default = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+          charging = ["󰢟" "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅"];
+        };
+      };
+
+      "custom/sep-left" = {
+        format = " | ";
+        tooltip = false;
+      };
+
+      "keyboard-state" = {
+        capslock = true;
+        format = "{icon}";
+        format-icons = {
+          locked = "CAPS";
+          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 = "{ipaddr}";
+        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 = {
+        hwmon-path = "/sys/class/hwmon/hwmon5/temp1_input";
+        critical-threshold = 80;
+        format = "{temperatureC}°C {icon}";
+        format-icons = ["" "" "" "" ""];
+        tooltip = false;
+      };
+    };
+
+    style = let
       colors = config.lib.stylix.colors.withHashtag;
       accent = colors.base0E;
       scssFile = pkgs.writeText "waybar.scss" /*scss*/ ''
@@ -9,9 +182,10 @@
           color: ${colors.base05};
           font-weight: bold;
           font-size: .85em;
-        & > * {padding: 0 0 6px 0;}
+          & > * { padding: 0 0 6px 0; }
         }
-      .modules-center{
+
+        .modules-center {
           background: ${colors.base01}CC;
           border-radius: 12px;
           padding: 10px;
@@ -26,25 +200,15 @@
           margin: 0 8px;
           border-radius: 8px;
         }
-      #left{
-        margin-left: 0;}
+        #left { margin-left: 0; }
+        #right { margin-right: 0; }
 
-      #right{
-        margin-right: 0;}
+        #clock { padding-right: 10px; }
 
-      #clock{
-        padding-right: 10px;}
-
-      #cava {
-        padding: 0 10px;}
+        #cava { padding: 0 10px; }
 
         #language { padding: 8px; }
 
-      /*#workspaces,
-      #tray {
-        background: ${colors.base01};
-      }*/
-
         #workspaces button {
           color: ${colors.base05};
           padding: 0 2px;
@@ -153,4 +317,5 @@
         nativeBuildInputs = [ pkgs.dart-sass ];
       } "sass ${scssFile} $out";
     in builtins.readFile cssFile;
+  };
 }

user/sweetbread/modules/style.nix

@@ -142,9 +142,12 @@ in {
   };
 
   gtk = {
-    gtk4.extraConfig = {
+    gtk4 = {
+      theme = null;
+      extraConfig = {
         gtk-application-prefer-dark-theme = true;
       };
+    };
     gtk3.extraConfig = {
       gtk-application-prefer-dark-theme = true;
     };

user/sweetbread/modules/waybar.nix

@@ -1,6 +1,157 @@
-{ config, pkgs, ... }: {
-  programs.waybar.settings.mainBar.spacing = 8;
-  programs.waybar.style = let
+{ osConfig, config, pkgs, lib, ... }: {
+  home.packages = with pkgs; [
+    font-awesome
+    nerd-fonts.symbols-only
+    playerctl
+    cava
+    pulsemixer
+  ];
+
+  programs.waybar = {
+    enable = true;
+    systemd.enable = true;
+
+    settings.mainBar = {
+      spacing = 8;
+
+      modules-left = [
+        "hyprland/workspaces"
+        "hyprland/language"
+        "keyboard-state"
+        "cava"
+      ];
+
+      modules-center = [
+        "mpris"
+      ];
+
+      modules-right = [
+        "tray"
+        "group/system"
+        "pulseaudio"
+        "battery"
+        "clock"
+      ];
+
+      cava = {
+        bars = 14;
+        sleep_timer = 5;
+        hide_on_silence = true;
+        bar_delimiter = 0;
+        input_delay = 0;
+        format-icons = [" " "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
+      };
+
+      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;
+        dynamic-order = [ "title" "artist" "album" ];
+      };
+
+      battery = {
+        interval = 5;
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{icon} {capacity}%";
+        format-icons = {
+          default = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+          charging = ["󰢟" "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅"];
+        };
+      };
+
+      "keyboard-state" = {
+        capslock = true;
+        format = "{icon}";
+        format-icons = {
+          locked = "CAPS";
+          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 = "{ipaddr}";
+        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 = {
+        hwmon-path = "/sys/class/hwmon/hwmon5/temp1_input";
+        critical-threshold = 80;
+        format = "{temperatureC}°C {icon}";
+        format-icons = ["" "" "" "" ""];
+        tooltip = false;
+      };
+    };
+
+    style = let
       colors = config.lib.stylix.colors.withHashtag;
       radius = "6px";
       scssFile = pkgs.writeText "waybar.scss" /*scss*/ ''
@@ -139,6 +290,7 @@
         nativeBuildInputs = [ pkgs.dart-sass ];
       } "sass ${scssFile} $out";
     in builtins.readFile cssFile;
+  };
 
   wayland.windowManager.hyprland.settings.layerrule = [
     "blur on, match:namespace waybar"