wip

.gitignore

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

git/config

@@ -1,12 +1,3 @@
-[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
@@ -54,3 +45,12 @@
 
 [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

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

git/config.d/flare.conf

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

sway/config.d/30-input.conf

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

sway/config.d/50-keybind.conf

@@ -83,7 +83,8 @@ 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 XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+bindsym --locked F16 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 [class=".*BoltLauncher.*"] workspace 5
+assign [app_id=".*BoltLauncher.*"] workspace 5
 assign [class="net-runelite.*"] workspace 5
 assign [app_id="vesktop"] workspace 8
 assign [app_id="Slack"] workspace 8

waybar/config.jsonc

@@ -9,7 +9,8 @@
       "sway/workspaces", "sway/mode"
     ],
     "modules-center": [
-      "privacy"
+      "privacy",
+      "custom/ssh-login"
     ],
     "modules-right": [
       "custom/cider",
@@ -170,18 +171,6 @@
     },
     "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,
@@ -194,6 +183,13 @@
       "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",
@@ -205,14 +201,14 @@
       "network",
       "clock",
     ],
-  "network": {
+    "network": {
-    "format-ethernet": "{ipaddr}/{cidr}",
+      "format-ethernet": "{ipaddr}/{cidr}",
-    "format-disconnected": "disconnected"
+      "format-disconnected": "disconnected"
-  },
+    },
-  "clock": {
+    "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><tt>{calendar}</tt></big>",
-  },
+    },
   }
 ]

zsh/aliases.zsh

@@ -24,6 +24,7 @@ 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\""