From b94713c5f94ee968c9947f2408f40ed0460379d8 Mon Sep 17 00:00:00 2001
From: Marco Thomas <rb.ma.tho@gmail.com>
Date: Wed, 7 Sep 2022 22:28:56 +0200
Subject: [PATCH] random stuff

---
 files/git/.gitconfig                  | 19 ++++++++++---------
 files/sway/.config/sway/config        |  3 ++-
 files/waybar/.config/waybar/config    |  7 +++++++
 files/waybar/.config/waybar/style.css |  4 ++++
 files/zsh/.zshrc                      |  2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/files/git/.gitconfig b/files/git/.gitconfig
index ba90560..f0a6402 100644
--- a/files/git/.gitconfig
+++ b/files/git/.gitconfig
@@ -5,20 +5,21 @@
 	path = "~/dev/uni/lrz-gitlab/.gitconfig"
 [alias]
 	aa = add .
-	st = status
-	sh = show
-	d = diff
+	b = blame -L
+	br = branch
 	c = commit -v
 	ca = commit -v --amend
 	co = checkout
-	br = branch
-	pl = pull --rebase
-	u = pull --rebase
-	ps = push
+	d = diff
 	lg = log --oneline --decorate --graph
-	yoink = pull
+	lgp = lg -p
+	pl = pull --rebase
+	ps = push
+	sh = show
+	st = status
+	u = pull --rebase
 	yeet = push
-	b = blame -L
+	yoink = pull
 [blame]
 	date = relative
 	coloring = highlightRecent
diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config
index 27a9270..1e005ec 100644
--- a/files/sway/.config/sway/config
+++ b/files/sway/.config/sway/config
@@ -143,9 +143,10 @@ bindswitch --reload --locked lid:off output $laptop enable
     set $SHOW_VOL pactl get-sink-volume @DEFAULT_SINK@ | head -n 1| awk '{print substr($5, 1, length($5)-1)}' > $WOBSOCK
     bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% && $SHOW_VOL
     bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && $SHOW_VOL
-    set $SHOW_MUTE_OUT notify-send "Audio Output" "$(pactl get-sink-mute @DEFAULT_SINK@)" -i speaker -u low
+    set $SHOW_MUTE_OUT notify-send "Audio" "$(pactl get-sink-mute @DEFAULT_SINK@)" -i speaker -u low
     set $SHOW_MUTE_IN notify-send "Microphone" "$(pactl get-source-mute @DEFAULT_SOURCE@)" -i microphone -u low
     bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle && $SHOW_MUTE_IN
+    bindsym $mod+m exec pactl set-source-mute @DEFAULT_SOURCE@ toggle && $SHOW_MUTE_IN
     bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && $SHOW_MUTE_OUT
 
 # Moving around:
diff --git a/files/waybar/.config/waybar/config b/files/waybar/.config/waybar/config
index da8520b..bd868dd 100644
--- a/files/waybar/.config/waybar/config
+++ b/files/waybar/.config/waybar/config
@@ -9,6 +9,7 @@
     ],
     "modules-right": [
         "tray",
+        "pulseaudio#mic",
         "battery",
         "clock#time",
     ],
@@ -135,6 +136,12 @@
         "on-click": "pavucontrol"
     },
 
+    "pulseaudio#mic": {
+        "format": "{format_source}",
+        "format-source": "",
+        "format-source-muted": ""
+    },
+
     "temperature": {
       "critical-threshold": 80,
       "thermal-zone": 10,
diff --git a/files/waybar/.config/waybar/style.css b/files/waybar/.config/waybar/style.css
index d08d65b..2654f07 100644
--- a/files/waybar/.config/waybar/style.css
+++ b/files/waybar/.config/waybar/style.css
@@ -179,6 +179,10 @@
     /* No styles */
 }
 
+#pulseaudio.mic {
+    padding-top: 0px;
+}
+
 #temperature {
     /* No styles */
 }
diff --git a/files/zsh/.zshrc b/files/zsh/.zshrc
index 59776de..ae901ac 100644
--- a/files/zsh/.zshrc
+++ b/files/zsh/.zshrc
@@ -44,7 +44,7 @@ alias mv='mv -i' # Ask before removal
 
 alias -g G='| grep -i'
 alias -g L='| less'
-alias gg='git grep'
+alias gg='git grep $1'
 
 alias code='/usr/bin/code --enable-features=UseOzonePlatform --ozone-platform=wayland . 2>/dev/null'