Edits on i3HEADmain

2 files changed, 36 insertions, 11 deletions

diff --git a/private_dot_config/i3/config b/private_dot_config/i3/config
index 879c25f..9e6e3d3 100644
--- a/private_dot_config/i3/config
+++ b/private_dot_config/i3/config
@@ -1,7 +1,8 @@
 # Default modkey
 set $mod Mod4
 
-font pango:Fantasque Sans Mono 11
+# font pango:Fantasque Sans Mono 11
+font pango:Inter 12
 
 # Start a terminal
 bindsym $mod+Return exec alacritty --config-file ~/.alacritty.toml
@@ -56,6 +57,9 @@ bindsym $mod+space focus mode_toggle
 # Focus the parent container
 bindsym $mod+a focus parent
 
+# Lock
+bindsym $mod+Shift+e exec "i3lock"
+
 # Open d-menu
 # bindsym $mod+d exec dmenu_run
 bindsym $mod+d exec "rofi -show combi -combi-modi window,drun -matching normal -drun-match-fields name,exec"
@@ -97,10 +101,26 @@ bindsym $mod+Shift+0 move container to workspace number $ws10
 
 
 # Volume
-set $sink `pactl list short sinks | grep RUNNING | cut -f1`
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume $sink +5%
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume $sink -5%
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute $sink toggle
+set $volumepath ~/i3-volume
+
+# Command for the status line
+#   ie: i3blocks, i3status
+set $statuscmd i3blocks
+
+# Signal used to update the status line
+#   i3blocks uses SIGRTMIN+10 by default
+#   i3status uses SIGUSR1 by default
+set $statussig SIGRTMIN+10
+
+# Volume control keybindings
+bindsym XF86AudioRaiseVolume exec --no-startup-id $volumepath/volume -n -t $statuscmd -u $statussig up 5
+bindsym XF86AudioLowerVolume exec --no-startup-id $volumepath/volume -n -t $statuscmd -u $statussig down 5
+bindsym XF86AudioMute        exec --no-startup-id $volumepath/volume -n -t $statuscmd -u $statussig mute
+
+# set $sink `pactl list short sinks | grep RUNNING | cut -f1`
+# bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume $sink +5%
+# bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume $sink -5%
+# bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute $sink toggle
 
 bindsym XF86MonBrightnessUp exec light -A 1 # increase screen brightness
 bindsym XF86MonBrightnessDown exec light -U 1 # decrease screen brightness
diff --git a/private_dot_config/i3blocks/config b/private_dot_config/i3blocks/config
index 0eb34cd..c9f543e 100644
--- a/private_dot_config/i3blocks/config
+++ b/private_dot_config/i3blocks/config
@@ -31,13 +31,18 @@ interval=5
 label= 
 
 [battery]
-command=i3_battery.sh
-interval=10
+label=⚡ 
+command=acpi -b | awk -F', ' '{print $2}'
+interval=30
 
-[volume]
-command=pulsemixer --get-volume | cut -d " " -f 1; exit 0
-interval=1
-label= 
+[i3volume]
+label=   
+command=~/i3-volume/volume output "%v\n%v"
+interval=once
+signal=10
+color=#b8bb26
+separator_block_width=10
+markup=pango
 
 [time]
 command=date