waybar conf done

home-manager/autumn/home.nix

@@ -42,12 +42,6 @@
 
   programs.htop.enable = true;
   programs.starship.enable = true;
-  programs.bash.initExtra = "
-    fish
-  ";
-
-# wayland.windowManager.river.enable = true;
-
 
   home.sessionVariables = {
     EDITOR = "helix";
@@ -56,11 +50,9 @@
 
   imports = [
     ../packages/fish/fish.nix
-#   ../packages/river/river.nix
     ../packages/alacritty/alacritty.nix
     ../packages/helix/helix.nix
     ../packages/fuzzel/fuzzel.nix
-#   ../packages/waybar/waybar.nix
     ../packages/git/git.nix
     ../packages/starship/starship.nix
   ];

home-manager/packages/river/river.nix

@@ -14,21 +14,72 @@
     systemd.enable = true;
     settings = {
       spawn = [
-#      "waybar"
+        # set gaps on wideriver
         "~/login-wm-setup-2.sh"
-#        "wideriver"
       ];
       output-layout = "wideriver";
       rule-add = "ssd";
       map = {
         normal = {
+          # spawn binds
           "Super Return" = "spawn alacritty";
+          "Super R" = "spawn fuzzel";
+          
+          # globals
           "Alt Q" = "close";
+          "Super+Shift E" = "exit";
+          "Super+Shift Return" = "zoom";
+          "Super F" = "toggle-fullscreen";
+
+          #movement
           "Super J" = "focus-view next";
           "Super K" = "focus-view previous";
+          "Super H" = "send-layout-cmd wideriver \"--count +1\"";
+          "Super L" = "send-layout-cmd wideriver \"--count -1\"";
+          "Super+Shift H" = "send-layout-cmd wideriver \"--ratio +0.05\"";
           "Super+Shift J" = "swap next";
           "Super+Shift K" = "swap previous";
-          "Super R" = "spawn fuzzel";
+          "Super+Shift L" = "send-layout-cmd wideriver \"--ratio -0.05\"";
+          # "Super+Alt H" = "move left 100";
+          # "Super+Alt J" = "move down 100";
+          # "Super+Alt K" = "move up 100";
+          # "Super+Alt L" = "move right 100";
+          "Super Period" = "focus-output next";
+          "Super Comma" = "focus-output previous";
+          "Super+Shift Period" = "send-to-output next";
+          "Super+Shift Comma" = "send-to-output previous";
+
+          # tag commands
+          "Super 1" = "set-focused-tags 2147483649";
+          "Super+Shift 1" = "toggle-focused-tags 1";
+          "Super+Alt 1" = "toggle-view-tags 1";
+          "Super 2" = "set-focused-tags 2147483650";
+          "Super+Shift 2" = "toggle-focused-tags 2";
+          "Super+Alt 2" = "toggle-view-tags 2";
+          "Super 3" = "set-focused-tags 2147483652";
+          "Super+Shift 3" = "toggle-focused-tags 4";
+          "Super+Alt 3" = "toggle-view-tags 4";
+          "Super 4" = "set-focused-tags 2147483656";
+          "Super+Shift 4" = "toggle-focused-tags 8";
+          "Super+Alt 4" = "toggle-view-tags 8";
+          "Super 5" = "set-focused-tags 2147483664";
+          "Super+Shift 5" = "toggle-focused-tags 16";
+          "Super+Alt 5" = "toggle-view-tags 16";
+          "Super 6" = "set-focused-tags 2147483680";
+          "Super+Shift 6" = "toggle-focused-tags 32";
+          "Super+Alt 6" = "toggle-view-tags 32";
+          "Super 7" = "set-focused-tags 2147483712";
+          "Super+Shift 7" = "toggle-focused-tags 64";
+          "Super+Alt 7" = "toggle-view-tags 64";
+          "Super 8" = "set-focused-tags 2147483776";
+          "Super+Shift 8" = "toggle-focused-tags 128";
+          "Super+Alt 8" = "toggle-view-tags 128";
+          "Super 9" = "set-focused-tags 2147483904";
+          "Super+Shift 9" = "toggle-focused-tags 256";
+          "Super+Alt 9" = "toggle-view-tags 256";
+          "Super 0" = "set-focused-tags 2147483648";
+          "Super+Shift 0" = "toggle-focused-tags 2147483648";
+          "Super+Alt 0" = "toggle-view-tags 2147483648";
         };
       };
     };

home-manager/packages/waybar/waybar.nix

@@ -18,8 +18,12 @@
 
         # Module layout
         #
+        modules-left = [
+          "river/tags"
+        ];
         modules-center = [
           "river/mode"
+          # "river/layout"
           "river/window"
         ];
         modules-right = [
@@ -36,7 +40,45 @@
          
           # Module configurations
 
-          
+        "river/tags" = {
+          num-tags = 10;
+          tag-labels = [
+            "1"
+            "2"
+            "3"
+            "4"
+            "5"
+            "6"
+            "7"
+            "8"
+            "9"
+            "0"
+          ];
+          set-tags = [
+            2147483649
+            2147483650
+            2147483652
+            2147483656
+            2147483664
+            2147483680
+            2147483712
+            2147483776
+            2147483904
+            2147483648
+          ];
+          toggle-tags = [
+            1
+            2
+            4
+            8
+            16
+            32
+            64
+            128
+            256
+          ];
+          hide-vacant = true;
+        };
         
         "tray" = {
           icon-size = 21;
@@ -44,8 +86,8 @@
         };
           
         "clock" = {
-          # timezone = "America/Denver";
+          timezone = "America/Denver";
-          tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          tooltip-format = "<big>{calendar}</big>";
           format-alt = "{:%Y-%m-%d}";
         };
           
@@ -119,13 +161,13 @@
       # Waybar styling inspired by the referenced swayhome configuration
     style = ''
       * {
-        font-family: "JetBrains Mono", "Font Awesome 6 Free";
+        font-family: "Hack Nerd Font Mono";
         font-size: 13px;
       }
       window#waybar {
-        color: #ffffff;
+        color: #545454;
-        background-color: #1e3b28;
+        background-color: #e391e2;
-        border-bottom: 3px solid #8f2fef;
+        border-bottom: 3px solid #6e3a6d;
         transition-property: background-color;
         transition-duration: .5s;
       }
@@ -136,33 +178,39 @@
 
       button {
         box-shadow: inset 0 -3px transparent;
-        border: none;
+        border: 1px #000000 solid;
         border-radius: 0;
+        color:#545454;
+        
       }
       button:hover {
         background: inherit;
         box-shadow: inset 0 -3px #ffffff;
       }
 
-      #workspaces button {
+      #tags button {
         padding: 0 15px;
         background-color: transparent;
-        border: 2px solid #8f2fef
+        border: 2px solid #6e3a6d;
       }
 
-      #workspaces button:hover {
+      #tags button.occupied {
-        background: rgba(255, 255, 255, 0.2);
+        background: #545454;
+        color:#e391e2;
       }
 
-      #workspaces button.focused {
+      #tags button.focused {
-        background-color: #8f2fef;
+        background-color: #6e3a6d;
-        box-shadow: inset 0 -3px #ffffff;
+        color: #e391e2;
+        border: 1px solid #e391e2;
+        border-bottom: 3px solid #e391e2;
       }
 
-      #workspaces button.urgent {
+      #tags button.urgent {
         background-color: #f38ba8;
       }
 
+
       #backlight,
       #battery,
       #clock,
@@ -173,10 +221,9 @@
       #pulseaudio,
       #temperature,
       #tray,
-      #idle_inhibitor,
-      #keyboard-state,
       #power-profiles-daemon {
         padding: 0 8px;
+        color:#545454;
       }
 
       #window,
@@ -184,22 +231,12 @@
         margin: 0 8px;
       }
 
-      .modules-left>widget:first-child>#workspaces {
-        margin-left: 0;
-      }
-
-      .modules-right>widget:last-child>#workspaces {
-        margin-right: 0;
-      }
-
       #backlight {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #cba6f7;
       }
 
       #battery {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #a6e3a1;
       }
@@ -221,55 +258,47 @@
       }
 
       #clock {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #a6e3a1;
       }
 
       #cpu {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #cba6f7;
       }
 
       #memory {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #f9e2af;
       }
 
       #mode {
         color: #ffffff;
-        background-color: #8f2fef;
+        background-color: #6e3a6d;
         border-bottom: 3px solid #ffffff;
       }
 
       #network {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #a6e3a1;
       }
 
       #network.disconnected {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #f38ba8;
       }
 
       #pulseaudio {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #a6e3a1;
       }
 
       #pulseaudio.muted {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #f38ba8;
       }
 
       #temperature {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #a6e3a1;
       }
@@ -281,29 +310,9 @@
 
       #tray {
         background-color: transparent;
-        border-bottom: 3px solid #8f2fef;
+        border-bottom: 3px solid #6e3a6d;
       }
-
-      #idle_inhibitor {
-        color: #ffffff;
-        background-color: transparent;
-        border-bottom: 3px solid #f9e2af;
-      }
-
-      #idle_inhibitor.activated {
-        color: #1e3b28;
-        background-color: #f9e2af;
-        border-bottom: 3px solid #f9e2af;
-      }
-
-      #keyboard-state {
-        color: #ffffff;
-        background-color: transparent;
-        border-bottom: 3px solid #fab387;
-      }
-
       #power-profiles-daemon {
-        color: #ffffff;
         background-color: transparent;
         border-bottom: 3px solid #94e2d5;
       }