flake.lock

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

home/hyprland/waybar/default.nix

@@ -156,98 +156,91 @@ in
       }
     '';
     settings = [
-      (
+      ({
-        let
+        "layer" = "top";
-          volInterval = if (osConfig.system.name == "gunter") then "5" else "1";
+        "position" = "top";
-        in
+        modules-left = [ "custom/flakestat" ];
-        {
+        modules-center = [ "hyprland/workspaces" ];
-          "layer" = "top";
+        modules-right =
-          "position" = "top";
+          [
-          modules-left = [ "custom/flakestat" ];
+            (lib.mkIf (withArrhist) "custom/arrhist")
-          modules-center = [ "hyprland/workspaces" ];
+            "pulseaudio"
-          modules-right =
+            "pulseaudio#microphone"
-            [
+            "memory"
-              (lib.mkIf (withArrhist) "custom/arrhist")
+            "cpu"
-              "pulseaudio"
+            (lib.mkIf (withBattery) "battery")
-              "pulseaudio#microphone"
+            "clock"
-              "memory"
+            "tray"
-              "cpu"
+          ];
-              (lib.mkIf (withBattery) "battery")
+        "hyprland/workspaces" = {
-              "clock"
+          "format" = "{name}";
-              "tray"
+          "on-click" = "activate";
-            ];
+          "on-scroll-up" = "hyprctl dispatch workspace e+1";
-          "hyprland/workspaces" = {
+          "on-scroll-down" = "hyprctl dispatch workspace e-1";
-            "format" = "{name}";
+        };
-            "on-click" = "activate";
+        "pulseaudio" = {
-            "on-scroll-up" = "hyprctl dispatch workspace e+1";
+          "scroll-step" = 5;
-            "on-scroll-down" = "hyprctl dispatch workspace e-1";
+          "format" = "{icon} {volume}%";
+          "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;
           };
-          "pulseaudio" = {
+          "format" = "{icon} {capacity}%";
-            "scroll-step" = 5;
+          "format-icons" = [
-            "format" = "{icon} {volume}%";
+            ""
-            "format-muted" = "";
+            ""
-            "format-icons" = { "default" = [ "" "" "" ]; };
+            ""
-            "on-scroll-up" = "pamixer -i ${volInterval}";
+            ""
-            "on-scroll-down" = "pamixer -d ${volInterval}";
+            ""
-            "on-click" = "pamixer -t";
+          ];
-          };
+        };
-          "pulseaudio#microphone" = {
+        "custom/flakestat" = {
-            "format" = "{format_source}";
+          "exec" = "${flakestat}/bin/flakestat";
-            "format-source" = " {volume}%";
+          "format" = "  {}";
-            "format-source-muted" = "";
+          "return-type" = "json";
-            "on-click" = "pamixer --default-source -t";
+          "interval" = 600;
-            "on-scroll-up" = "pamixer --default-source -i ${volInterval}";
+        };
-            "on-scroll-down" = "pamixer --default-source -d ${volInterval}";
+      } // lib.optionalAttrs (withArrhist) {
-            "scroll-step" = 5;
+        "custom/arrhist" = {
-            "on-click-right" = "pavucontrol";
+          "exec" = "${arrhist}/bin/arrhist";
-          };
+          "return-type" = "json";
-          "clock" = {
+          "interval" = 600;
-            "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,7 +17,6 @@
         ./programs/obs-studio
         ./programs/vscode
         ./programs/pywal
-        ./programs/zellij
         ./scripts
         ./scripts/batlvl.nix
         ./zsh

home/programs/zellij/default.nix

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