waybar: wlogout, weather

homeConfigurations/vinzenz/default.nix

@@ -14,6 +14,7 @@
     ./swaync.nix
     ./vscode.nix
     ./waybar.nix
+    ./wlogout.nix
     ./zsh.nix
     # keep-sorted end
   ];

homeConfigurations/vinzenz/niri.nix

@@ -16,6 +16,8 @@
       name = "adwaita-dark";
     };
 
+    services.wpaperd.enable = true;
+
     programs.niri.settings = {
       outputs = {
         "BOE 0x0A3B Unknown" = {
@@ -53,10 +55,10 @@
             from = pink_dark;
             to = pink_light;
           };
-          gap-size = 10;
+          gap-size = 8;
         in
         {
-          background-color = "#000000";
+          background-color = "transparent";
           gaps = gap-size;
           border = {
             enable = true;

homeConfigurations/vinzenz/swaylock.nix

@@ -2,12 +2,16 @@
 { pkgs, config, ... }:
 {
   config = {
+    stylix.targets.swaylock = {
+      enable = true;
+      useWallpaper = true;
+    };
     programs.swaylock = {
       enable = true;
       package = pkgs.swaylock-effects;
       # https://github.com/jirutka/swaylock-effects/blob/master/swaylock.1.scd
       settings = {
-        screenshot = true;
+        screenshot = false;
         effect-blur = "9x9";
         effect-vignette = "0.2:0.2";
         fade-in = 0.5;
@@ -19,37 +23,6 @@
         ignore-empty-password = true;
         grace = 3.5;
         indicator-thickness = 20;
-
-        # https://github.com/catppuccin/swaylock/blob/main/themes/mocha.conf
-        color = "1e1e2e";
-        bs-hl-color = "f5e0dc";
-        caps-lock-bs-hl-color = "f5e0dc";
-        caps-lock-key-hl-color = "a6e3a1";
-        inside-color = "00000000";
-        inside-clear-color = "00000000";
-        inside-caps-lock-color = "00000000";
-        inside-ver-color = "00000000";
-        inside-wrong-color = "00000000";
-        key-hl-color = "a6e3a1";
-        layout-bg-color = "00000000";
-        layout-border-color = "00000000";
-        layout-text-color = "cdd6f4";
-        line-color = "00000000";
-        line-clear-color = "00000000";
-        line-caps-lock-color = "00000000";
-        line-ver-color = "00000000";
-        line-wrong-color = "00000000";
-        ring-color = "b4befe";
-        ring-clear-color = "f5e0dc";
-        ring-caps-lock-color = "fab387";
-        ring-ver-color = "89b4fa";
-        ring-wrong-color = "eba0ac";
-        separator-color = "00000000";
-        text-color = "cdd6f4";
-        text-clear-color = "f5e0dc";
-        text-caps-lock-color = "fab387";
-        text-ver-color = "89b4fa";
-        text-wrong-color = "eba0ac";
       };
     };
 

homeConfigurations/vinzenz/waybar.nix

@@ -38,7 +38,7 @@
           #"image"
           "group/status-infos"
           "group/system-tray"
-          "group/group-power"
+          "custom/wlogout"
         ];
 
         "group/system-tray" = {
@@ -57,6 +57,7 @@
           orientation = "inherit";
           modules = [
             "battery"
+            "custom/weather"
             "temperature"
             "cpu"
             "memory"
@@ -163,7 +164,7 @@
         };
         backlight = {
           device = "intel_backlight";
-          format = "{percent}% ";
+          format = "{percent}%  ";
           on-scroll-down = "light -U 1";
           on-scroll-up = "light -A 1";
         };
@@ -174,46 +175,14 @@
         disk = {
           format = "{free}/{total}";
         };
-        "group/group-power" = {
+        "custom/wlogout" = {
-          "orientation" = "inherit";
+          format = " ";
-          "drawer" = {
+          tooltip = false;
-            "transition-duration" = 500;
+          on-click = "wlogout";
-            "children-class" = "not-power";
-            "transition-left-to-right" = false;
-          };
-          "modules" = [
-            "custom/power" # First element is the "group leader" and won't ever be hidden
-            "custom/quit"
-            "custom/lock"
-            "custom/reboot"
-          ];
-        };
-        "custom/quit" = {
-          "format" = "󰗼 ";
-          "tooltip" = false;
-          "on-click" = "niri msg action quit";
-          min-width = 20;
-        };
-        "custom/lock" = {
-          "format" = "󰍁 ";
-          "tooltip" = false;
-          "on-click" = "${lib.getBin config.programs.swaylock.package}/bin/swaylock";
-          min-width = 20;
-        };
-        "custom/reboot" = {
-          "format" = "󰜉 ";
-          "tooltip" = false;
-          "on-click" = "systemctl reboot";
-          min-width = 20;
-        };
-        "custom/power" = {
-          "format" = " ";
-          "tooltip" = false;
-          "on-click" = "systemctl shutdown";
           min-width = 20;
         };
         idle_inhibitor = {
-          format = "{icon}";
+          format = "{icon} ";
           format-icons = {
             activated = "";
             deactivated = "";
@@ -247,7 +216,7 @@
           };
         };
         memory = {
-          format = "{}% ";
+          format = "{}%  ";
         };
         power-profiles-daemon = {
           format = "{icon}";
@@ -308,6 +277,13 @@
             on-click-right = "${swaync-client} --toggle-dnd --skip-wait";
             escape = true;
           };
+        "custom/weather" = {
+          format = "{}°";
+          tooltip = true;
+          interval = 3600;
+          exec = "${lib.getBin pkgs.wttrbar}/bin/wttrbar --nerd";
+          return-type = "json";
+        };
       };
     };
   };

homeConfigurations/vinzenz/wlogout.nix

@@ -0,0 +1,34 @@
+{
+  config.programs.wlogout = {
+    enable = true;
+    style = ''
+      * {
+        /*background-image: none;*/
+        box-shadow: none;
+      }
+
+      window {
+        background-color: rgba(30, 30, 46, 0.90);
+      }
+
+      button {
+        border-radius: 0;
+        border-color: #cba6f7;
+        text-decoration-color: #cdd6f4;
+        color: #cdd6f4;
+        background-color: #181825;
+        border-style: solid;
+        border-width: 1px;
+        background-repeat: no-repeat;
+        background-position: center;
+        background-size: 25%;
+      }
+
+      button:focus, button:active, button:hover {
+        /* 20% Overlay 2, 80% mantle */
+        background-color: rgb(48, 50, 66);
+        outline-style: none;
+      }
+    '';
+  };
+}

nixosModules/stylix.nix

@@ -1,8 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+    image = config.lib.stylix.pixel "base00";
     polarity = "dark";
     targets = {
       gnome.enable = false;