flake.lock: Update

Flake lock file updates:

• Updated input 'wallpapers':
    'git+https://code.youwen.dev/youwen5/wallpapers?ref=refs/heads/main&rev=abfd5f3522fcac0ace21075b498c9e053165c53f' (2024-08-26)
  → 'git+https://code.youwen.dev/youwen5/wallpapers?ref=refs/heads/main&rev=89d778e59408fb0bcae728d4f3e272a4ab0cee6c' (2024-08-26)

flake.lock

@@ -1073,11 +1073,11 @@
     "wallpapers": {
       "flake": false,
       "locked": {
-        "lastModified": 1724660030,
-        "narHash": "sha256-l0Z4e7oeYJsvXIaRrlygxyVC7bQcJ5bd5dgH11TvKFg=",
+        "lastModified": 1724670714,
+        "narHash": "sha256-AmHrw0m2rpzXxieWEBRK0utg83i4B1XpUboo7gZJ84I=",
         "ref": "refs/heads/main",
-        "rev": "abfd5f3522fcac0ace21075b498c9e053165c53f",
-        "revCount": 5,
+        "rev": "89d778e59408fb0bcae728d4f3e272a4ab0cee6c",
+        "revCount": 6,
         "type": "git",
         "url": "https://code.youwen.dev/youwen5/wallpapers"
       },

flake.nix

@@ -85,7 +85,6 @@
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
-          system = "x86_64-linux";
         };
         modules = [
           ./hosts/demeter
@@ -95,7 +94,6 @@
       callisto = nixpkgs.lib.nixosSystem {
         specialArgs = {
           inherit inputs;
-          system = "aarch64-linux";
         };
         modules = [
           ./hosts/callisto
@@ -104,7 +102,6 @@
       adrastea = nixpkgs.lib.nixosSystem {
         specialArgs = {
           inherit inputs;
-          system = "x86_64-linux";
         };
         modules = [
           ./hosts/adrastea

hosts/callisto/configuration.nix

@@ -43,6 +43,7 @@
     inputs.vesktop-bin.overlays.default
 
     (final: prev: {
+      librewolf = stablepkgs.librewolf;
       hyprland = prev.hyprland.overrideAttrs (oldAttrs: {
         src = oldAttrs.src;
         patches =

hosts/demeter/home-manager-extras/default.nix

@@ -1,8 +1,8 @@
 {
   inputs,
-  system,
+  pkgs,
   ...
 }: {
   wayland.windowManager.hyprland.settings.monitor = ["DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1"];
-  wayland.windowManager.hyprland.package = inputs.stablepkgs.legacyPackages.${system}.hyprland;
+  wayland.windowManager.hyprland.package = inputs.stablepkgs.legacyPackages.${pkgs.system}.hyprland;
 }

modules/linux/core/default.nix

@@ -1,10 +1,10 @@
 {
   inputs,
-  system,
+  pkgs,
   ...
 }: {
   environment.systemPackages = [
-    inputs.personal-neovim.packages.${system}.default
+    inputs.personal-neovim.packages.${pkgs.system}.default
   ];
 
   security.sudo.enable = false;

users/youwen/linux/hyprland/common.nix

@@ -234,8 +234,8 @@
           "windowsIn, 1, 6, winIn, slide"
           "windowsOut, 1, 5, winOut, slide"
           "windowsMove, 1, 5, wind, slide"
-          "border, 1, 1, liner"
-          "borderangle, 1, 30, liner, loop"
+          # "border, 1, 1, liner"
+          # "borderangle, 1, 30, liner, loop"
           "fade, 1, 10, default"
           "workspaces, 1, 5, wind"
         ];

users/youwen/linux/waybar/desktop/default.nix

@@ -1,91 +1,141 @@
 {
+  # home.file.".config/waybar/config".source = ./config.jsonc;
   programs.waybar = {
     enable = true;
+    style = ./style.css;
+    systemd.enable = true;
     settings = {
       mainBar = {
+        name = "bar0";
+
         layer = "top";
         position = "top";
-        height = 24;
-        width = 1600;
-        reload-style-on-change = true;
-        margin = "10px 0px 0px 0px";
-        modules-left = ["hyprland/window" "hyprland/workspaces"];
-        modules-right = ["backlight" "group/adjustable" "custom/weather"];
-        modules-center = ["network" "group/hardware" "clock"];
-        "hyprland/workspaces" = {
-          active-only = false;
-          all-outputs = false;
+
+        height = 28;
+        # "width" = 1920;
+
+        "margin" = "5px 10px 0px 10px";
+        "spacing" = 10;
+
+        "mode" = "top";
+        # "exclusive" = true;
+
+        # "output" = "eDP-1";
+
+        reload_style_on_change = true;
+
+        modules-left = ["hyprland/workspaces"];
+        modules-center = ["hyprland/window"];
+        modules-right = [
+          "tray"
+          "idle_inhibitor"
+          "backlight"
+          "wireplumber"
+          "network"
+          "battery"
+          "disk"
+          "memory"
+          "cpu"
+          "temperature"
+          "clock"
+        ];
+
+        idle_inhibitor = {
           format = "{icon}";
-          persistent-workspaces = {
-            eDP-1 = [1];
-            DP-1 = [2 3 4 5];
+          format-icons = {
+            activated = "󰛊 ";
+            deactivated = "󰾫 ";
           };
         };
-        "group/hardware" = {
-          orientation = "inherit";
-          modules = ["cpu" "memory" "battery"];
+
+        network = {
+          format = "{ifname}";
+          format-wifi = "{icon}{essid}";
+          format-ethernet = " {essid}";
+          format-disconnected = "󰤯 Disconnected";
+          format-icons = [
+            "󰤟 "
+            "󰤢 "
+            "󰤨 "
+          ];
+          tooltip-format = "  {bandwidthUpBits} |   {bandwidthDownBits}";
+          tooltip-format-wifi = "   {bandwidthUpBits} |    {bandwidthDownBits} | 󱄙   {signalStrength}";
         };
-        "group/adjustable" = {
-          orientation = "inherit";
-          drawer = {
-            transition-duration = 500;
-            transition-left-to-right = true;
+
+        backlight = {
+          interval = 2;
+          format = "󰖨 {percent}%";
+          on-scroll-up = "brightnessctl set +4";
+          on-scroll-down = "brightnessctl set 4-";
         };
-          modules = ["pulseaudio" "mpris"];
+
+        wireplumber = {
+          format = "{icon} {volume}%";
+          format-muted = "󰝟 ";
+          on-click = "pamixer -t";
+          on-scroll-up = "pamixer set 5%+";
+          on-scroll-down = "pamixer set 5%-";
+          format-icons = ["" "" "" "" ""];
         };
-        "custom/weather" = {
-          orientation = "horizontal";
-          exec = ''curl wttr.in/?format="%l:%20%t"'';
+
+        battery = {
           interval = 10;
+          format = "{icon}{capacity}%";
+          format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+          tooltip = true;
+          tooltip-format = "{timeTo}";
         };
-        cpu = {
-          interval = 10;
-          format = "{usage}%  ";
+
+        disk = {
+          intervel = 30;
+          format = "󰋊 {percentage_used}%";
+          tooltip-format = "{used} used out of {total} on \"{path}\" ({percentage_used}%)";
         };
+
         memory = {
           interval = 10;
-          format = "{percentage}%  ";
+          format = " {used}";
+          tooltip-format = "{used}GiB used of {total}GiB ({percentage}%)";
         };
-        # mpris = {
-        #   format-playing = "    {title}  ";
-        #   format-paused = " 󰏤 {title}  ";
-        #   format-stopped = "Nothing Playing";
-        # };
-        tray = {spacing = 10;};
-        clock = {format = "{:%a %b %d, %I:%M %p} ";};
-        backlight = {
-          device = "intel_backlight";
-          format = "{percent}% {icon}";
-          format-icons = ["󰃞" "󰃠"];
+
+        cpu = {
+          interval = 10;
+          format = " {usage}%";
         };
-        battery = {
-          states = {
-            good = 95;
-            warning = 20;
-            critical = 10;
+
+        temperature = {
+          interval = 10;
         };
-          format = "{capacity}% {icon}";
-          format-icons = ["󰁻" "󰁽" "󰁿" "󰂀" "󰁹"];
+
+        clock = {
+          interval = 1;
+          format = "{:%H:%M:%S}";
         };
-        "hyprland/window" = {format = "{class}";};
-        network = {
-          format-wifi = "{essid} ";
-          format-linked = "{ifname} (No IP) ";
-          format-disconnected = "Disconnected ⚠";
-          format-alt = "{ifname}: {ipaddr}/{cidr}";
+
+        "hyprland/workspaces" = {
+          show-special = true;
+          persistent-workspaces = {
+            "*" = [1 2 3 4 5 6 7 8 9 10];
+          };
+          format = "{icon}";
+          format-icons = {
+            active = "";
+            empty = "";
+            default = "";
+            urgent = "";
+            special = "󰠱";
+          };
+        };
+        "hyprland/window" = {
+          icon = true;
+          icon-size = 20;
+          max-length = 50;
+          rewrite = {
+            "(.*) — LibreWolf" = "$1";
+            "^$" = "👾";
           };
-        pulseaudio = {
-          format = "{volume}% {icon}  {format_source}";
-          format-bluetooth = "{volume}% {icon}  {format_source}";
-          format-bluetooth-muted = " {icon} {format_source}";
-          format-muted = " {format_source}";
-          format-source = "{volume}% ";
-          format-source-muted = "";
-          format-icons = {default = ["" "" ""];};
         };
       };
     };
-    style = ./waybar.css;
-    systemd.enable = true;
   };
 }

users/youwen/linux/waybar/desktop/style.css

@@ -0,0 +1,71 @@
+window#waybar {
+    font-family: "CaskaydiaCove Nerd Font";
+    background-color: rgba(0,0,0,0);
+    font-size: 0.8rem;
+    border-radius: 0.5rem;
+}
+
+.modules-left, .modules-center {
+    opacity: 1;
+    background: linear-gradient(45deg, rgb(214, 39, 200), rgb(5, 83, 252));
+    border-radius: 0.5rem;
+    padding: 2px;
+}
+
+.modules-right {
+    opacity: 1;
+    background-color: rgba(0,0,0,0.5);
+    border-radius: 0.5rem;
+    padding: 2px 2px 2px 10px
+}
+
+/* label.module {
+    margin-left: -1px;
+} */
+
+#workspaces {
+    background-color: rgba(0,0,0,0.5);
+    border-radius: 0.5rem;
+    padding: 0 2px;
+}
+
+#workspaces button {
+    font-size: 0.6rem;
+    padding: 0 0.3rem 0 0;
+}
+
+#window {
+    background-color: rgba(0,0,0,0.5);
+    border-radius: 0.5rem;
+    padding: 2px 5px;
+}
+
+#clock {
+    font-weight: bolder;
+    border-radius: 0.5rem;
+    padding: 0 3px 0 0;
+}
+
+#battery {
+    color: lightgreen;
+}
+
+#memory {
+    color: lightpink;
+}
+
+#disk {
+    color: lightskyblue;
+}
+
+#cpu {
+    color: lightgoldenrodyellow;
+}
+
+#temperature {
+    color: lightslategray;
+}
+
+#network {
+    color: lightsteelblue;
+}

users/youwen/linux/waybar/desktop/waybar.css

@@ -1,102 +0,0 @@
-* {
-  font-size: 10px;
-  font-family: CaskaydiaCove Nerd Font;
-}
-
-window#waybar {
-  border-bottom: 0px solid #ffffff;
-  background: transparent;
-  transition-property: none;
-  transition-duration: 0s;
-}
-
-#workspaces {
-  background: #24273a;
-  padding: 0px 2px 0px 2px;
-  margin: 0px 0px 0px 5px;
-  border-radius: 5px;
-}
-
-#workspaces {
-  background: #24273a;
-  padding: 0px 5px 0px 5px;
-  margin: 0px 0px 0px 5px;
-  border-radius: 5px;
-}
-
-#workspaces button,
-#workspaces button:hover {
-  padding: 0;
-  background-color: #24273a;
-  /* color: @color4; */
-}
-#workspaces button.active,
-#workspaces button:hover {
-  /* color: @color8; */
-}
-
-#clock,
-#pulseaudio,
-#network,
-#battery,
-#tray,
-#mpris,
-#cpu,
-#memory,
-#temperature,
-#custom-weather,
-#window,
-#backlight {
-  background-color: #24273a;
-  /* color: @color4; */
-  opacity: 1;
-  border-radius: 5px;
-  padding: 1px 10px 1px 10px;
-  margin: 0px 5px 0px 0px;
-}
-#backlight {
-  margin-right: 0px;
-  padding-right: 3px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-#mpris {
-  padding-left: 0px;
-  margin-left: 0px;
-  margin-right: 5px;
-  padding-right: 0px;
-}
-#pulseaudio {
-  padding-left: 5px;
-  padding-right: 5px;
-  margin-left: 0px;
-  margin-right: 5px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-#memory,
-#cpu {
-  padding-right: 2px;
-  /* border-top-right-radius: 0px; */
-  /* border-bottom-right-radius: 0px; */
-  /* border-right-width: 0px; */
-}
-#memory,
-#battery {
-  margin-left: 0px;
-  padding-left: 2px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-  border-left-width: 0px;
-}
-#battery {
-  padding-right: 13px;
-}
-#custom-weather {
-  margin-right: 0px;
-}
-
-#window {
-  margin-right: 0px;
-  margin-left: 0px;
-}

users/youwen/linux/waybar/laptop/default.nix

@@ -1,91 +1,140 @@
 {
+  # home.file.".config/waybar/config".source = ./config.jsonc;
   programs.waybar = {
     enable = true;
+    style = ./style.css;
+    systemd.enable = true;
     settings = {
       mainBar = {
+        name = "bar0";
+
         layer = "top";
         position = "top";
-        height = 24;
-        # width = 1000;
-        reload-style-on-change = true;
-        margin = "5px 0px 0px 0px";
-        modules-left = ["hyprland/window" "hyprland/workspaces" "network" "clock"];
-        modules-right = ["group/hardware" "backlight" "group/adjustable" "custom/weather"];
-        # modules-center = [ "network" "group/hardware" "clock" ];
-        "hyprland/workspaces" = {
-          active-only = false;
-          all-outputs = false;
+
+        height = 28;
+        # "width" = 1920;
+
+        "margin" = "5px 10px 0px 10px";
+        "spacing" = 10;
+
+        "mode" = "top";
+        # "exclusive" = true;
+
+        # "output" = "eDP-1";
+
+        reload_style_on_change = true;
+
+        modules-left = ["hyprland/workspaces" "hyprland/window"];
+        modules-right = [
+          "tray"
+          "idle_inhibitor"
+          "backlight"
+          "wireplumber"
+          "network"
+          "battery"
+          "disk"
+          "memory"
+          "cpu"
+          "temperature"
+          "clock"
+        ];
+
+        idle_inhibitor = {
           format = "{icon}";
-          persistent-workspaces = {
-            eDP-1 = [1];
-            DP-1 = [2 3 4 5];
+          format-icons = {
+            activated = "󰛊 ";
+            deactivated = "󰾫 ";
           };
         };
-        "group/hardware" = {
-          orientation = "inherit";
-          modules = ["cpu" "battery"];
+
+        network = {
+          format = "{ifname}";
+          format-wifi = "{icon}{essid}";
+          format-ethernet = " {essid}";
+          format-disconnected = "󰤯 Disconnected";
+          format-icons = [
+            "󰤟 "
+            "󰤢 "
+            "󰤨 "
+          ];
+          tooltip-format = "  {bandwidthUpBits} |   {bandwidthDownBits}";
+          tooltip-format-wifi = "   {bandwidthUpBits} |    {bandwidthDownBits} | 󱄙   {signalStrength}";
         };
-        "group/adjustable" = {
-          orientation = "inherit";
-          drawer = {
-            transition-duration = 500;
-            transition-left-to-right = true;
+
+        backlight = {
+          interval = 2;
+          format = "󰖨 {percent}%";
+          on-scroll-up = "brightnessctl set +4";
+          on-scroll-down = "brightnessctl set 4-";
         };
-          modules = ["pulseaudio" "mpris"];
+
+        wireplumber = {
+          format = "{icon} {volume}%";
+          format-muted = "󰝟 ";
+          on-click = "pamixer -t";
+          on-scroll-up = "pamixer set 5%+";
+          on-scroll-down = "pamixer set 5%-";
+          format-icons = ["" "" "" "" ""];
         };
-        "custom/weather" = {
-          orientation = "horizontal";
-          exec = ''curl wttr.in/?format="%l:%20%t"'';
+
+        battery = {
           interval = 10;
+          format = "{icon} {capacity}%";
+          format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+          tooltip = true;
+          tooltip-format = "{timeTo}";
         };
-        cpu = {
-          interval = 10;
-          format = "{usage}%  ";
+
+        disk = {
+          intervel = 30;
+          format = "󰋊 {percentage_used}%";
+          tooltip-format = "{used} used out of {total} on \"{path}\" ({percentage_used}%)";
         };
+
         memory = {
           interval = 10;
-          format = "{percentage}%  ";
+          format = " {used}";
+          tooltip-format = "{used}GiB used of {total}GiB ({percentage}%)";
         };
-        # mpris = {
-        #   format-playing = "    {title}  ";
-        #   format-paused = " 󰏤 {title}  ";
-        #   format-stopped = "Nothing Playing";
-        # };
-        tray = {spacing = 10;};
-        clock = {format = "{:%a %b %d, %I:%M %p} ";};
-        backlight = {
-          device = "intel_backlight";
-          format = "{percent}% {icon}";
-          format-icons = ["󰃞" "󰃠"];
+
+        cpu = {
+          interval = 10;
+          format = " {usage}%";
         };
-        battery = {
-          states = {
-            good = 95;
-            warning = 20;
-            critical = 10;
+
+        temperature = {
+          interval = 10;
         };
-          format = "{capacity}% {icon}";
-          format-icons = ["󰁻" "󰁽" "󰁿" "󰂀" "󰁹"];
+
+        clock = {
+          interval = 1;
+          format = "{:%H:%M:%S}";
         };
-        "hyprland/window" = {format = "{class}";};
-        network = {
-          format-wifi = "{essid} ";
-          format-linked = "{ifname} (No IP) ";
-          format-disconnected = "Disconnected ⚠";
-          format-alt = "{ifname}: {ipaddr}/{cidr}";
+
+        "hyprland/workspaces" = {
+          show-special = true;
+          persistent-workspaces = {
+            "*" = [1 2 3 4 5 6 7 8 9 10];
+          };
+          format = "{icon}";
+          format-icons = {
+            active = "";
+            empty = "";
+            default = "";
+            urgent = "";
+            special = "󰠱";
+          };
+        };
+        "hyprland/window" = {
+          icon = true;
+          icon-size = 20;
+          max-length = 50;
+          rewrite = {
+            "(.*) — LibreWolf" = "$1";
+            "^$" = "👾";
           };
-        pulseaudio = {
-          format = "{volume}% {icon}  {format_source}";
-          format-bluetooth = "{volume}% {icon}  {format_source}";
-          format-bluetooth-muted = " {icon} {format_source}";
-          format-muted = " {format_source}";
-          format-source = "{volume}% ";
-          format-source-muted = "";
-          format-icons = {default = ["" "" ""];};
         };
       };
     };
-    style = ./waybar.css;
-    systemd.enable = true;
   };
 }

users/youwen/linux/waybar/laptop/style.css

@@ -0,0 +1,71 @@
+window#waybar {
+    font-family: "CaskaydiaCove Nerd Font";
+    background-color: rgba(0,0,0,0);
+    font-size: 0.8rem;
+    border-radius: 0.5rem;
+}
+
+.modules-left, .modules-center {
+    opacity: 1;
+    background: linear-gradient(45deg, rgb(214, 39, 200), rgb(5, 83, 252));
+    border-radius: 0.5rem;
+    padding: 2px;
+}
+
+.modules-right {
+    opacity: 1;
+    background-color: rgba(0,0,0,0.5);
+    border-radius: 0.5rem;
+    padding: 2px 2px 2px 10px
+}
+
+/* label.module {
+    margin-left: -1px;
+} */
+
+#workspaces {
+    background-color: rgba(0,0,0,0.5);
+    border-radius: 0.5rem;
+    padding: 0 2px;
+}
+
+#workspaces button {
+    font-size: 0.6rem;
+    padding: 0 0.3rem 0 0;
+}
+
+#window {
+    background-color: rgba(0,0,0,0.5);
+    border-radius: 0.5rem;
+    padding: 2px 5px;
+}
+
+#clock {
+    font-weight: bolder;
+    border-radius: 0.5rem;
+    padding: 0 3px 0 0;
+}
+
+#battery {
+    color: lightgreen;
+}
+
+#memory {
+    color: lightpink;
+}
+
+#disk {
+    color: lightskyblue;
+}
+
+#cpu {
+    color: lightgoldenrodyellow;
+}
+
+#temperature {
+    color: lightslategray;
+}
+
+#network {
+    color: lightsteelblue;
+}

users/youwen/linux/waybar/laptop/waybar.css

@@ -1,109 +0,0 @@
-* {
-  font-size: 12px;
-  font-family: CaskaydiaCove Nerd Font;
-}
-
-window#waybar {
-  border-bottom: 0px solid #ffffff;
-  background: transparent;
-  transition-property: none;
-  transition-duration: 0s;
-}
-
-#workspaces {
-  background: #24273a;
-  padding: 0px 5px 0px 5px;
-  margin: 0px 0px 0px 2px;
-  border-radius: 5px;
-}
-
-#workspaces {
-  background: #24273a;
-  padding: 0px 5px 0px 5px;
-  margin: 0px 0px 0px 2px;
-  border-radius: 5px;
-}
-
-#workspaces button,
-#workspaces button:hover {
-  padding: 0;
-  background-color: #24273a;
-  /* color: @color4; */
-}
-#workspaces button.active,
-#workspaces button:hover {
-  /* color: @color8; */
-}
-
-#clock,
-#pulseaudio,
-#network,
-#battery,
-#tray,
-#mpris,
-#cpu,
-#memory,
-#temperature,
-#custom-weather,
-#window,
-#backlight {
-  background-color: #24273a;
-  /* color: @color4; */
-  opacity: 1;
-  border-radius: 5px;
-  padding: 1px 10px 1px 10px;
-  margin: 0px 5px 0px 0px;
-}
-#backlight {
-  margin-right: 0px;
-  padding-right: 3px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-#network {
-  margin-left: 15px;
-  padding-right: 15px;
-}
-#mpris {
-  padding-left: 0px;
-  margin-left: 0px;
-  margin-right: 5px;
-  padding-right: 0px;
-}
-#pulseaudio {
-  padding-left: 5px;
-  padding-right: 5px;
-  margin-left: 0px;
-  margin-right: 5px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-#memory,
-#cpu {
-  padding-right: 2px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-  border-right-width: 0px;
-}
-#memory,
-#battery {
-  margin-left: 0px;
-  padding-left: 2px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-  border-left-width: 0px;
-}
-#cpu {
-  margin-right: 0px;
-}
-#battery {
-  padding-right: 13px;
-}
-#custom-weather {
-  margin-right: 10px;
-}
-
-#window {
-  margin-right: 10px;
-  margin-left: 10px;
-}