wip

.gitignore

@@ -42,10 +42,7 @@ tmux/*
 git/*
 !git/config
 !git/ignore
-!git/config.d
+!git/aflabs
-git/config.d/*
-!git/config.d/aflabs.conf
-!git/config.d/flare.conf
 
 # ghostty
 !ghostty

git/config

@@ -1,3 +1,12 @@
+[includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
+	path = ~/.config/git/config.d/aflabs.conf
+
+[includeIf "gitdir:~/Desktop/git/gitlab.com/flarenetwork"]
+	path = ~/.config/git/config.d/flare.conf
+
+[includeIf "gitdir:~/Desktop/git/gitlab.com/flare-foundation"]
+	path = ~/.config/git/config.d/flare.conf
+
 [user]
 	name = Matej Janežič
 	email = janezic.mj@gmail.com
@@ -45,12 +54,3 @@
 
 [mergetool "nvimdiff"]
 	layout = "LOCAL,BASE,REMOTE / MERGED"
-
-[includeIf "gitdir:~/git/git.aflabs.org/**"]
-	path = ~/.config/git/config.d/aflabs.conf
-
-[includeIf "gitdir:~/git/gitlab.com/flarenetwork/**"]
-	path = ~/.config/git/config.d/flare.conf
-
-[includeIf "gitdir:~/git/gitlab.com/flare-foundation/**"]
-	path = ~/.config/git/config.d/flare.conf

git/config.d/aflabs.conf

@@ -1,2 +0,0 @@
-[user]
-	email = matej.janezic@aflabs.com

git/config.d/flare.conf

@@ -1,2 +0,0 @@
-[user]
-	email = matej@flare.network

sway/config.d/30-input.conf

@@ -1,5 +1,4 @@
 input "type:keyboard" {
-        xkb_options "fkeys:basic_13-24"
         repeat_delay 150
         repeat_rate 35
 }

sway/config.d/50-keybind.conf

@@ -83,8 +83,7 @@ bindsym $mod+minus scratchpad show
 bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
 bindsym --locked XF86AudioLowerVolume exec pamixer -d 5 && pamixer --get-volume > $wobs
 bindsym --locked XF86AudioRaiseVolume exec pamixer -i 5 && pamixer --get-volume > $wobs
-bindsym --locked F16 exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
-
 # xf86-brightnes
 bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
 bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+

sway/config.d/60-window-rule.conf

@@ -6,7 +6,7 @@ for_window [tiling] border normal $border
 assign [app_id="google-chrome"] workspace 2
 assign [app_id="thunderbird"] workspace 3
 assign [app_id="Cider"] workspace 4
-assign [app_id=".*BoltLauncher.*"] workspace 5
+assign [class=".*BoltLauncher.*"] workspace 5
 assign [class="net-runelite.*"] workspace 5
 assign [app_id="vesktop"] workspace 8
 assign [app_id="Slack"] workspace 8

waybar/config.jsonc

@@ -1,20 +1,21 @@
-[
 {
         "layer": "top",
         "position": "top",
-    "height": 30,
+        "height": 45,
         "spacing": 1,
         "margin": 0,
         "modules-left": [
-      "sway/workspaces", "sway/mode"
+                "clock",
         ],
         "modules-center": [
-      "privacy",
+                "sway/workspaces",
-      "custom/ssh-login"
+                "sway/mode",
+                "sway/scratchpad",
         ],
         "modules-right": [
                 "custom/cider",
                 "pulseaudio",
+                "network",
                 "power-profiles-daemon",
                 "cpu",
                 "memory",
@@ -22,10 +23,12 @@
                 "backlight",
                 "battery",
                 "tray",
+                "custom/notification"
         ],
-  //
+    // Modules configuration
     "sway/workspaces": {
             "disable-scroll": true,
+        // "all-outputs": true,
         "format": "{icon}",
         "format-icons": {
                 "1": "I",
@@ -38,10 +41,18 @@
                 "8": "VIII",
                 "9": "IX",
                 "10": "X",
-    },
+        }
+
     },
     "sway/mode": {
-    "format": "{}",
+            "format": "<span style=\"italic\">{}</span>"
+    },
+    "sway/scratchpad": {
+            "format": "{icon} {count}",
+            "show-empty": false,
+            "format-icons": ["", ""],
+            "tooltip": true,
+            "tooltip-format": "{app}: {title}"
     },
     "custom/cider": {
             "format": "{}",
@@ -53,53 +64,25 @@
             "on-click": "curl -s -X POST http://localhost:10767/api/v1/playback/playpause",
             "on-click-right": "curl -s -X POST http://localhost:10767/api/v1/playback/next",
     },
-  "privacy": {
-    "icon-spacing": 4,
-    "icon-size": 18,
-    "transition-duration": 250,
-    "modules": [
-      {
-        "type": "screenshare",
-        "tooltip": true,
-        "tooltip-icon-size": 24
-      },
-      {
-        "type": "audio-out",
-        "tooltip": true,
-        "tooltip-icon-size": 24
-      },
-      {
-        "type": "audio-in",
-        "tooltip": true,
-        "tooltip-icon-size": 24
-      }
-    ],
-    "ignore-monitor": true,
-    "ignore": [
-      {
-        "type": "audio-in",
-        "name": "cava"
-      },
-      {
-        "type": "screenshare",
-        "name": "obs"
-      }
-    ]
-  },
     "tray": {
             "icon-size": 18,
-    "spacing": 10,
+            "spacing": 10
+    },
+    "clock": {
+            "interval": 1,
+            "format": "{:%Y/%m/%d %H:%M:%S}",
+            "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
     },
     "cpu": {
             "format": "cpu:{usage}%",
             "tooltip": false,
-    "on-click": "ghostty -e htop",
+            "on-click": "ghostty -e htop"
     },
     "memory": {
             "interval": 10,
             "format": "ram:{}%",
             "tooltip-format": "total: {total:0.2f}GiB\nused: {used:0.2f}GiB\navailable: {avail:0.2f}GiB\nswap: {swapUsed:0.2f}/{swapTotal:0.2f}GiB",
-    "on-click": "ghostty -e htop",
+            "on-click": "ghostty -e htop"
     },
     "temperature": {
         // "thermal-zone": 2,
@@ -109,19 +92,19 @@
         "format": "{temperatureC}°C {icon}",
         "format-icons": ["", "", ""],
         "on-click": "ghostty -e s-tui",
-    "tooltip": false,
+        "tooltip": false
     },
     "backlight": {
         // "device": "acpi_video1",
         "format": "{percent}% {icon}",
         "format-icons": ["", "", "", "", "", "", "", "", ""],
-    "tooltip": false,
+        "tooltip": false
     },
     "battery": {
             "states": {
             // "good": 95,
             "warning": 30,
-      "critical": 15,
+            "critical": 15
             },
             "format": "{capacity}% {icon}",
             "format-full": "{capacity}% {icon}",
@@ -130,7 +113,7 @@
             "format-alt": "{time} {icon}",
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
-    "format-icons": ["", "", "", "", ""],
+        "format-icons": ["", "", "", "", ""]
     },
     "power-profiles-daemon": {
             "format": "{icon}",
@@ -140,8 +123,8 @@
                     "default": "",
                     "performance": "",
                     "balanced": "",
-      "power-saver": "",
+                    "power-saver": ""
-    },
+            }
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
@@ -150,7 +133,7 @@
         "tooltip-format": "{ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
         "format-disconnected": "Disconnected ⚠",
-    "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
@@ -167,9 +150,21 @@
                 "phone": "",
                 "portable": "",
                 "car": "",
-      "default": ["", "", ""],
+                "default": ["", "", ""]
         },
-    "on-click": "pavucontrol",
+        "on-click": "pavucontrol"
+    },
+    "custom/media": {
+            "format": "{icon} {text}",
+            "return-type": "json",
+            "max-length": 40,
+            "format-icons": {
+                    "spotify": "",
+                    "default": "🎜"
+            },
+            "escape": true,
+            "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
     },
     "custom/power": {
             "format" : "⏻ ",
@@ -180,35 +175,27 @@
                     "shutdown": "shutdown",
                     "reboot": "reboot",
                     "suspend": "systemctl suspend",
-      "hibernate": "systemctl hibernate",
+                    "hibernate": "systemctl hibernate"
-    },
+            }
-  },
+    },
-  "custom/ssh-login": {
+    "custom/notification": {
-    "format": "{}",
+            "tooltip": true,
-    "interval": 1,
+            "format": "<span size='16pt'>{0} {icon} </span>",
-    // "exec-if": "who",
+            "format-icons": {
-    "exec": "who | awk '{ print $2 }'",
+                    "notification": "󱅫",
-    "on-click": "pkill -9 -t $(who | awk '{ print $2 }')",
+                    "none": "󰂜",
-  },
+                    "dnd-notification": "󰂠",
-  },
+                    "dnd-none": "󰪓",
-  {
+                    "inhibited-notification": "󰂛",
-    "layer": "top",
+                    "inhibited-none": "󰪑",
-    "position": "bottom",
+                    "dnd-inhibited-notification": "󰂛",
-    "height": 30,
+                    "dnd-inhibited-none": "󰪑"
-    "spacing": 1,
+            },
-    "margin": 0,
+            "return-type": "json",
-    "modules-right": [
+            "exec-if": "which swaync-client",
-      "network",
+            "exec": "swaync-client -swb",
-      "clock",
+            "on-click": "swaync-client -t -sw",
-    ],
+            "on-click-right": "swaync-client -d -sw",
-    "network": {
+            "escape": true
-      "format-ethernet": "{ipaddr}/{cidr}",
+    }
-      "format-disconnected": "disconnected"
-    },
-    "clock": {
-      "interval": 1,
-      "format": "{:%Y/%m/%d %H:%M:%S}",
-      "tooltip-format": "<big><tt>{calendar}</tt></big>",
-    },
 }
-]

waybar/style.css

@@ -1,3 +1,23 @@
+/* -----------------------------------------------------------------------------
+ * Gruvbox Material Dark Palette
+ * ----------------------------------------------------------------------------- */
+@define-color background #282828;
+@define-color background-light #3c3836;
+@define-color foreground #d4be98;
+@define-color black #1d2021;
+@define-color gray #928374;
+@define-color red #ea6962;
+@define-color green #a9b665;
+@define-color yellow #d8a657;
+@define-color blue #7daea3;
+@define-color magenta #d3869b;
+@define-color cyan #89b482;
+@define-color white #ddc7a1;
+@define-color orange #e78a4e;
+
+/* -----------------------------------------------------------------------------
+ * Module Colors (Neovim/Muted Style)
+ * ----------------------------------------------------------------------------- */
 @define-color workspaces-color @gray;
 @define-color workspaces-focused-bg @background-light;
 @define-color workspaces-focused-fg @foreground;
@@ -20,13 +40,17 @@
 @define-color battery-warning-color @yellow;
 @define-color battery-critical-color @red;
 
+/* -----------------------------------------------------------------------------
+ * Global Setup
+ * ----------------------------------------------------------------------------- */
 * {
     font-family: "JetBrainsMono Nerd Font";
     font-size: 14px;
-    font-weight: bold;
 }
 
 window#waybar {
+    background-color: transparent;
+    font-weight: bold;
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
@@ -39,10 +63,15 @@ window#waybar.hidden {
 /* This targets every module */
 #waybar .module {
     background-color: #1e1e2e; /* Your desired module color */
+    border-radius: 7px;
+    border: 2px solid #d4be98;
 }
 
 /* Specific grouping (Optional: if you want modules to stick together in islands) */
-.modules-left, .modules-center, .modules-right {}
+.modules-left, .modules-center, .modules-right {
+    background: transparent;
+    margin: 12px 10px 5px 10px;
+}
 
 button {
     box-shadow: none;
@@ -295,3 +324,7 @@ button:hover {
 #privacy-item.audio-out {
     color: @blue;
 }
+
+/* #custom-cider { */
+/*     color: @cider-color; */
+/* } */

zsh/aliases.zsh

@@ -24,7 +24,6 @@ alias accenton="defaults write -g ApplePressAndHoldEnabled -bool true"
 alias accentoff="defaults write -g ApplePressAndHoldEnabled -bool false"
 
 # git
-alias gpo="git push origin"
 alias gros="git reset origin/$(git_current_branch) --soft"
 alias gcan="git commit -v --amend --no-edit"
 alias glogaa="git log --oneline --graph --all --pretty=format:\"%C(auto)%h %C(blue)(%aL/%cL)%C(auto)%(decorate) %s%Creset\""