things

home-manager/progs/niri.nix

@@ -21,7 +21,7 @@
       };
 
       spawn-at-startup = [
-        # waybar
+        # waybar (status bar)
         { command = [ "${pkgs.waybar}/bin/waybar" ]; }
 
         # swaybg works on more than just sway (sets a wallpaper)
@@ -47,18 +47,27 @@
       window-rules = [
         { draw-border-with-background = false; }
         {
-          geometry-corner-radius = {
-            top-left = 10.0;
-            top-right = 10.0;
-            bottom-right = 10.0;
-            bottom-left = 10.0;
-          };
+          geometry-corner-radius =
+            let
+              radius = 10.0;
+            in
+            {
+              top-left = radius;
+              top-right = radius;
+              bottom-right = radius;
+              bottom-left = radius;
+            };
         }
         { clip-to-geometry = true; }
       ];
 
+      # https://github.com/sodiboo/niri-flake/issues/591
+      # switch-events = with config.lib.niri.actions; {
+      #   "lid-close" = spawn [ "${pkgs.swaylock}/bin/swaylock"];
+      # };
+
       binds = with config.lib.niri.actions; {
-        # application launcher
+        # Application launcher
         "Mod+Space".action = spawn [
           "${pkgs.rofi-wayland}/bin/rofi"
           "-show"
@@ -82,37 +91,38 @@
           "-u"
           "up"
         ];
+
         "XF86AudioLowerVolume".action = spawn [
           "${pkgs.avizo}/bin/volumectl"
           "-u"
           "down"
         ];
+
         "XF86AudioMute".action = spawn [
           "${pkgs.avizo}/bin/volumectl"
           "toggle-mute"
         ];
-        "XF86AudioMicMute".action = spawn [
-          "${pkgs.avizo}/bin/volumectl"
-          "-m"
-          "toggle-mute"
-        ];
 
         #Display Brightness control
         "XF86MonBrightnessUp".action = spawn [
           "${pkgs.avizo}/bin/lightctl"
           "up"
         ];
+
         "XF86MonBrightnessDown".action = spawn [
           "${pkgs.avizo}/bin/lightctl"
           "down"
         ];
 
+        # "Framework" key (F12)
+        # "XF86AudioMedia".action = spawn [];
+
         # Force close a window
         "Mod+Q".action = close-window;
 
         "Mod+Shift+Q".action = quit;
 
-        # bindings for like window management ig
+        # bindings for window management
 
         "Mod+Left".action = focus-column-left;
         "Mod+Down".action = focus-window-down;
@@ -177,7 +187,7 @@
         "Mod+Ctrl+U".action = move-column-to-workspace-down;
         "Mod+Ctrl+I".action = move-column-to-workspace-up;
 
-        #does little squeeze thing into the left or right position with another window
+        # does little squeeze thing into the left or right position with another window
         "Mod+BracketLeft".action = consume-or-expel-window-left;
         "Mod+BracketRight".action = consume-or-expel-window-right;
 

home-manager/progs/waybar.nix

@@ -11,9 +11,10 @@
       margin-bottom = -1;
       # passthrough = false;
       height = 32;
-      modules-left =
-        [
-        ];
+      modules-left = [
+        "niri/workspaces"
+        "niri/window"
+      ];
       modules-center = [ "clock" ];
       modules-right = [
         "cpu"
@@ -24,11 +25,27 @@
         "network"
         "battery"
       ];
+
+      "niri/workspaces" = {
+        format = "{icon}";
+        format-icons = {
+
+          # Icons by state
+          active = "";
+          default = "";
+        };
+      };
+
+      "niri/window" = {
+        format = "{}";
+      };
+
       cpu = {
         interval = 5;
         format = "  {usage}%";
         max-length = 10;
       };
+
       memory = {
         interval = 10;
         format = "  {percentage}%";
@@ -36,10 +53,12 @@
         tooltip = true;
         tooltip-format = "RAM - {used:0.1f}GiB used";
       };
+
       tray = {
         icon-size = 18;
         spacing = 3;
       };
+
       clock = {
         format = "      {:%R\n %d.%m.%Y}";
         tooltip-format = "<tt><small>{calendar}</small></tt>";
@@ -57,6 +76,7 @@
             today = "<span color='#ff6699'><b><u>{}</u></b></span>";
           };
         };
+
         actions = {
           on-click-right = "mode";
           on-click-forward = "tz_up";