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/10-variables.conf

@@ -15,9 +15,6 @@ set $lockscreen swaylock
 # other
 set $wobs /tmp/wob.sock
 
-# style
-set $border 3
-
 # colors
 set $bg0        #32302f
 set $bg1        #252423

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/40-theme.conf

@@ -1,8 +1,8 @@
+titlebar_border_thickness 2
 font pango:JetBrainsMono Nerd Font Bold 10
 
-default_floating_border normal $border
+default_floating_border normal 2
-default_border normal $border
+default_border normal 2
-titlebar_border_thickness $border
 
 # class                 border      bground     text    indicator   child_border
 client.focused          $fg         $bg0        $fg     $fg         $fg

sway/config.d/41-theme-swayfx.conf

@@ -1,8 +1,11 @@
-titlebar_separator disable
+gaps outer 6
+gaps inner 6
+gaps top 1
+
+corner_radius 7
 
 shadows enable
 shadow_blur_radius 25
 shadow_color #0000007F
 shadow_offset 0 5
-
 blur enable

sway/config.d/50-keybind.conf

@@ -71,7 +71,7 @@ bindsym $mod+e layout toggle split
 bindsym $mod+f fullscreen
 
 # focus
-bindsym $mod+Shift+space floating toggle; [floating] border pixel $border; [tiling] border normal $border
+bindsym $mod+Shift+space floating toggle; [floating] border pixel 3; [tiling] border normal 3
 bindsym $mod+space focus mode_toggle
 bindsym $mod+a focus parent
 
@@ -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

@@ -1,12 +1,12 @@
 # additional theming
-for_window [floating] border pixel $border
+for_window [floating] border pixel 3
-for_window [tiling] border normal $border
+for_window [tiling] border normal 3
 
 # workspace assignment
 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

sway/config.d/80-autostart.conf

@@ -1,10 +1,7 @@
 # deamon
 exec swayidle -w 
 exec wlsunset -l 46.1 -L 14.5
-exec rm -f $wobs \
+exec rm -f $wobs && mkfifo $wobs && tail -f $wobs | wob
-        && mkfifo $wobs \
-        && tail -f $wobs \
-        | wob
 exec protonmail-bridge -n
 
 # traditional "start when os starts" programs

waybar/config.jsonc

@@ -1,214 +1,201 @@
-[
+{
-  {
+        "layer": "top",
-    "layer": "top",
+        "position": "top",
-    "position": "top",
+        "height": 45,
-    "height": 30,
+        "spacing": 1,
-    "spacing": 1,
+        "margin": 0,
-    "margin": 0,
+        "modules-left": [
-    "modules-left": [
+                "clock",
-      "sway/workspaces", "sway/mode"
+        ],
-    ],
+        "modules-center": [
-    "modules-center": [
+                "sway/workspaces",
-      "privacy",
+                "sway/mode",
-      "custom/ssh-login"
+                "sway/scratchpad",
-    ],
+        ],
-    "modules-right": [
+        "modules-right": [
-      "custom/cider",
+                "custom/cider",
-      "pulseaudio",
+                "pulseaudio",
-      "power-profiles-daemon",
+                "network",
-      "cpu",
+                "power-profiles-daemon",
-      "memory",
+                "cpu",
-      "temperature",
+                "memory",
-      "backlight",
+                "temperature",
-      "battery",
+                "backlight",
-      "tray",
+                "battery",
-    ],
+                "tray",
-  //
+                "custom/notification"
-  "sway/workspaces": {
+        ],
-    "disable-scroll": true,
+    // Modules configuration
-    "format": "{icon}",
+    "sway/workspaces": {
-    "format-icons": {
+            "disable-scroll": true,
-      "1": "I",
+        // "all-outputs": true,
-      "2": "II",
+        "format": "{icon}",
-      "3": "III",
+        "format-icons": {
-      "4": "IV",
+                "1": "I",
-      "5": "V",
+                "2": "II",
-      "6": "VI",
+                "3": "III",
-      "7": "VII",
+                "4": "IV",
-      "8": "VIII",
+                "5": "V",
-      "9": "IX",
+                "6": "VI",
-      "10": "X",
+                "7": "VII",
+                "8": "VIII",
+                "9": "IX",
+                "10": "X",
+        }
+
     },
-  },
+    "sway/mode": {
-  "sway/mode": {
+            "format": "<span style=\"italic\">{}</span>"
-    "format": "{}",
-  },
-  "custom/cider": {
-    "format": "{}",
-    "return-type": "json",
-    "max-length": 18,
-    "interval": 1,
-    "tooltip": true,
-    "exec": "~/.config/bin/waybar-custom-cider.sh",
-    "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,
-  },
-  "cpu": {
-    "format": "cpu:{usage}%",
-    "tooltip": false,
-    "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",
-  },
-  "temperature": {
-    // "thermal-zone": 2,
-    // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-    "critical-threshold": 80,
-    // "format-critical": "{temperatureC}°C {icon}",
-    "format": "{temperatureC}°C {icon}",
-    "format-icons": ["", "", ""],
-    "on-click": "ghostty -e s-tui",
-    "tooltip": false,
-  },
-  "backlight": {
-    // "device": "acpi_video1",
-    "format": "{percent}% {icon}",
-    "format-icons": ["", "", "", "", "", "", "", "", ""],
-    "tooltip": false,
-  },
-  "battery": {
-    "states": {
-      // "good": 95,
-      "warning": 30,
-      "critical": 15,
     },
-    "format": "{capacity}% {icon}",
+    "sway/scratchpad": {
-    "format-full": "{capacity}% {icon}",
+            "format": "{icon} {count}",
-    "format-charging": "{capacity}% ",
+            "show-empty": false,
-    "format-plugged": "{capacity}% ",
+            "format-icons": ["", ""],
-    "format-alt": "{time} {icon}",
+            "tooltip": true,
-    // "format-good": "", // An empty format will hide the module
+            "tooltip-format": "{app}: {title}"
-    // "format-full": "",
-    "format-icons": ["", "", "", "", ""],
-  },
-  "power-profiles-daemon": {
-    "format": "{icon}",
-    "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
-    "tooltip": true,
-    "format-icons": {
-      "default": "",
-      "performance": "",
-      "balanced": "",
-      "power-saver": "",
     },
-  },
+    "custom/cider": {
-  "network": {
+            "format": "{}",
-    // "interface": "wlp2*", // (Optional) To force the use of this interface
+            "return-type": "json",
-    "format-wifi": "{essid} ({signalStrength}%) ",
+            "max-length": 18,
-    "format-ethernet": "ipv4:{ipaddr}/{cidr}",
+            "interval": 1,
-    "tooltip-format": "{ifname} via {gwaddr} ",
+            "tooltip": true,
-    "format-linked": "{ifname} (No IP) ",
+            "exec": "~/.config/bin/waybar-custom-cider.sh",
-    "format-disconnected": "Disconnected ⚠",
+            "on-click": "curl -s -X POST http://localhost:10767/api/v1/playback/playpause",
-    "format-alt": "{ifname}: {ipaddr}/{cidr}",
+            "on-click-right": "curl -s -X POST http://localhost:10767/api/v1/playback/next",
-  },
-  "pulseaudio": {
-    // "scroll-step": 1, // %, can be a float
-    "format": "vol:{volume}%/{format_source}",
-    "format-bluetooth": "{volume}% {icon} {format_source}",
-    "format-bluetooth-muted": " {icon} {format_source}",
-    "format-muted": " {format_source}",
-    "format-source": "{volume}%",
-    "format-source-muted": "",
-    "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""],
     },
-    "on-click": "pavucontrol",
+    "tray": {
-  },
+            "icon-size": 18,
-  "custom/power": {
+            "spacing": 10
-    "format": "⏻ ",
-    "tooltip": false,
-    "menu": "on-click",
-    "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
-    "menu-actions": {
-      "shutdown": "shutdown",
-      "reboot": "reboot",
-      "suspend": "systemctl suspend",
-      "hibernate": "systemctl hibernate",
-    },
-  },
-  "custom/ssh-login": {
-    "format": "{}",
-    "interval": 1,
-    // "exec-if": "who",
-    "exec": "who | awk '{ print $2 }'",
-    "on-click": "pkill -9 -t $(who | awk '{ print $2 }')",
-  },
-  },
-  {
-    "layer": "top",
-    "position": "bottom",
-    "height": 30,
-    "spacing": 1,
-    "margin": 0,
-    "modules-right": [
-      "network",
-      "clock",
-    ],
-    "network": {
-      "format-ethernet": "{ipaddr}/{cidr}",
-      "format-disconnected": "disconnected"
     },
     "clock": {
-      "interval": 1,
+            "interval": 1,
-      "format": "{:%Y/%m/%d %H:%M:%S}",
+            "format": "{:%Y/%m/%d %H:%M:%S}",
-      "tooltip-format": "<big><tt>{calendar}</tt></big>",
+            "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
     },
-  }
+    "cpu": {
-]
+            "format": "cpu:{usage}%",
+            "tooltip": false,
+            "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"
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""],
+        "on-click": "ghostty -e s-tui",
+        "tooltip": false
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", "", "", "", "", "", "", "", ""],
+        "tooltip": false
+    },
+    "battery": {
+            "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+            },
+            "format": "{capacity}% {icon}",
+            "format-full": "{capacity}% {icon}",
+            "format-charging": "{capacity}% ",
+            "format-plugged": "{capacity}% ",
+            "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "power-profiles-daemon": {
+            "format": "{icon}",
+            "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+            "tooltip": true,
+            "format-icons": {
+                    "default": "",
+                    "performance": "",
+                    "balanced": "",
+                    "power-saver": ""
+            }
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "ipv4:{ipaddr}/{cidr}",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "vol:{volume}%/{format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}%",
+        "format-source-muted": "",
+        "format-icons": {
+                "headphone": "",
+                "hands-free": "",
+                "headset": "",
+                "phone": "",
+                "portable": "",
+                "car": "",
+                "default": ["", "", ""]
+        },
+        "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" : "⏻ ",
+            "tooltip": false,
+            "menu": "on-click",
+            "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
+            "menu-actions": {
+                    "shutdown": "shutdown",
+                    "reboot": "reboot",
+                    "suspend": "systemctl suspend",
+                    "hibernate": "systemctl hibernate"
+            }
+    },
+    "custom/notification": {
+            "tooltip": true,
+            "format": "<span size='16pt'>{0} {icon} </span>",
+            "format-icons": {
+                    "notification": "󱅫",
+                    "none": "󰂜",
+                    "dnd-notification": "󰂠",
+                    "dnd-none": "󰪓",
+                    "inhibited-notification": "󰂛",
+                    "inhibited-none": "󰪑",
+                    "dnd-inhibited-notification": "󰂛",
+                    "dnd-inhibited-none": "󰪑"
+            },
+            "return-type": "json",
+            "exec-if": "which swaync-client",
+            "exec": "swaync-client -swb",
+            "on-click": "swaync-client -t -sw",
+            "on-click-right": "swaync-client -d -sw",
+            "escape": true
+    }
+}

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 0px 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\""