Flake update

flake.lock

@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720045378,
+        "lastModified": 1720188602,
-        "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=",
+        "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0a30138c694ab3b048ac300794c2eb599dc40266",
+        "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7",
         "type": "github"
       },
       "original": {
@@ -156,16 +156,16 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1719663039,
+        "lastModified": 1719720450,
-        "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
+        "narHash": "sha256-57+R2Uj3wPeDeq8p8un19tzFFlgWiXJ8PbzgKtBgBX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
+        "rev": "78f8641796edff3bfabbf1ef5029deadfe4a21d0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -227,11 +227,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1719873517,
+        "lastModified": 1720187017,
-        "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
+        "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a11224af8d824935f363928074b4717ca2e280db",
+        "rev": "1b11e208cee97c47677439625dc22e5289dcdead",
         "type": "github"
       },
       "original": {

home/hyprland/waybar/default.nix

@@ -156,91 +156,98 @@ in
       }
     '';
     settings = [
-      ({
+      (
-        "layer" = "top";
+        let
-        "position" = "top";
+          volInterval = if (osConfig.system.name == "gunter") then "5" else "1";
-        modules-left = [ "custom/flakestat" ];
+        in
-        modules-center = [ "hyprland/workspaces" ];
+        {
-        modules-right =
+          "layer" = "top";
-          [
+          "position" = "top";
-            (lib.mkIf (withArrhist) "custom/arrhist")
+          modules-left = [ "custom/flakestat" ];
-            "pulseaudio"
+          modules-center = [ "hyprland/workspaces" ];
-            "pulseaudio#microphone"
+          modules-right =
-            "memory"
+            [
-            "cpu"
+              (lib.mkIf (withArrhist) "custom/arrhist")
-            (lib.mkIf (withBattery) "battery")
+              "pulseaudio"
-            "clock"
+              "pulseaudio#microphone"
-            "tray"
+              "memory"
-          ];
+              "cpu"
-        "hyprland/workspaces" = {
+              (lib.mkIf (withBattery) "battery")
-          "format" = "{name}";
+              "clock"
-          "on-click" = "activate";
+              "tray"
-          "on-scroll-up" = "hyprctl dispatch workspace e+1";
+            ];
-          "on-scroll-down" = "hyprctl dispatch workspace e-1";
+          "hyprland/workspaces" = {
-        };
+            "format" = "{name}";
-        "pulseaudio" = {
+            "on-click" = "activate";
-          "scroll-step" = 5;
+            "on-scroll-up" = "hyprctl dispatch workspace e+1";
-          "format" = "{icon} {volume}%";
+            "on-scroll-down" = "hyprctl dispatch workspace e-1";
-          "format-muted" = "";
-          "format-icons" = { "default" = [ "" "" "" ]; };
-          "on-click" = "pamixer -t";
-        };
-        "pulseaudio#microphone" = {
-          "format" = "{format_source}";
-          "format-source" = " {volume}%";
-          "format-source-muted" = "";
-          "on-click" = "pamixer --default-source -t";
-          "on-scroll-up" = "pamixer --default-source -i 5";
-          "on-scroll-down" = "pamixer --default-source -d 5";
-          "scroll-step" = 5;
-          "on-click-right" = "pavucontrol";
-        };
-        "clock" = {
-          "interval" = 1;
-          "format" = "{:%H:%M %A %b %d}";
-          "tooltip" = true;
-        };
-        "memory" = {
-          "interval" = 3;
-          "format" = " {percentage}%";
-          "states" = { "warning" = 85; };
-        };
-        "cpu" = {
-          "interval" = 3;
-          "format" = " {usage}%";
-        };
-        "tray" = {
-          "icon-size" = 15;
-          "spacing" = 6;
-        };
-        "battery" = {
-          "interval" = 60;
-          "states" = {
-            "warning" = 20;
-            "critical" = 5;
           };
-          "format" = "{icon} {capacity}%";
+          "pulseaudio" = {
-          "format-icons" = [
+            "scroll-step" = 5;
-            ""
+            "format" = "{icon} {volume}%";
-            ""
+            "format-muted" = "";
-            ""
+            "format-icons" = { "default" = [ "" "" "" ]; };
-            ""
+            "on-scroll-up" = "pamixer -i ${volInterval}";
-            ""
+            "on-scroll-down" = "pamixer -d ${volInterval}";
-          ];
+            "on-click" = "pamixer -t";
-        };
+          };
-        "custom/flakestat" = {
+          "pulseaudio#microphone" = {
-          "exec" = "${flakestat}/bin/flakestat";
+            "format" = "{format_source}";
-          "format" = "  {}";
+            "format-source" = " {volume}%";
-          "return-type" = "json";
+            "format-source-muted" = "";
-          "interval" = 600;
+            "on-click" = "pamixer --default-source -t";
-        };
+            "on-scroll-up" = "pamixer --default-source -i ${volInterval}";
-      } // lib.optionalAttrs (withArrhist) {
+            "on-scroll-down" = "pamixer --default-source -d ${volInterval}";
-        "custom/arrhist" = {
+            "scroll-step" = 5;
-          "exec" = "${arrhist}/bin/arrhist";
+            "on-click-right" = "pavucontrol";
-          "return-type" = "json";
+          };
-          "interval" = 600;
+          "clock" = {
-        };
+            "interval" = 1;
-      })
+            "format" = "{:%H:%M %A %b %d}";
+            "tooltip" = true;
+          };
+          "memory" = {
+            "interval" = 3;
+            "format" = " {percentage}%";
+            "states" = { "warning" = 85; };
+          };
+          "cpu" = {
+            "interval" = 3;
+            "format" = " {usage}%";
+          };
+          "tray" = {
+            "icon-size" = 15;
+            "spacing" = 6;
+          };
+          "battery" = {
+            "interval" = 60;
+            "states" = {
+              "warning" = 20;
+              "critical" = 5;
+            };
+            "format" = "{icon} {capacity}%";
+            "format-icons" = [
+              ""
+              ""
+              ""
+              ""
+              ""
+            ];
+          };
+          "custom/flakestat" = {
+            "exec" = "${flakestat}/bin/flakestat";
+            "format" = "  {}";
+            "return-type" = "json";
+            "interval" = 600;
+          };
+        } // lib.optionalAttrs (withArrhist) {
+          "custom/arrhist" = {
+            "exec" = "${arrhist}/bin/arrhist";
+            "return-type" = "json";
+            "interval" = 600;
+          };
+        }
+      )
     ];
   };
 }

home/magicman.nix

@@ -17,6 +17,7 @@
         ./programs/obs-studio
         ./programs/vscode
         ./programs/pywal
+        ./programs/zellij
         ./scripts
         ./scripts/batlvl.nix
         ./zsh

home/programs/zellij/default.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+  programs.zellij = {
+    enable = true;
+    # enableZshIntegration = true;
+    settings = { };
+  };
+}