From 910c6316e6606308e2340a64a8ebae9c6926c12e Mon Sep 17 00:00:00 2001
From: Julian T <julian@jtle.dk>
Date: Mon, 6 Jul 2020 23:18:54 +0200
Subject: Fixed i3 config and volume in bar

---
 i3/.config/i3/config | 16 ++++++++--------
 i3/.i3status.conf    |  9 ++++++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'i3')

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index d743610..fe11bd3 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -38,7 +38,7 @@ floating_modifier $mod
 bindsym $mod+i exec --no-startup-id i3-sensible-terminal
 
 # kill focused window
-bindsym $mod+Shift+q kill
+bindsym $mod+q kill
 
 # start dmenu (a program launcher)
 bindsym $mod+d exec rofi -show drun
@@ -72,10 +72,7 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+e split h
-
-# split in vertical orientation
-bindsym $mod+q split v
+bindsym $mod+e split toggle
 
 # enter fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
@@ -168,14 +165,17 @@ bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 5
 bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5
 
 # volume settings
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5%
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5%
-bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 
 # launch script thingy
 bindsym $mod+semicolon exec --no-startup-id Scripts/lc --dmenu
 bindsym $mod+Shift+o exec --no-startup-id Scripts/lc common
 
+# Password manager
+bindsym $mod+p exec --no-startup-id Scripts/lc pass
+
 # default app workspaces
 assign [class="firefox"] $ws9
 assign [class="Evolution"] $ws8
diff --git a/i3/.i3status.conf b/i3/.i3status.conf
index f36815d..92ca6ed 100644
--- a/i3/.i3status.conf
+++ b/i3/.i3status.conf
@@ -11,15 +11,22 @@ general {
         interval = 5
 }
 
-order += "ipv6"
+# order += "ipv6"
 order += "wireless _first_"
 order += "ethernet _first_"
+order += "volume master"
 order += "battery all"
 order += "disk /"
 order += "load"
 order += "memory"
 order += "tztime local"
 
+volume master {
+    format = "V: %volume"
+    format_muted = "V: muted (%volume)"
+    device = "pulse"
+}
+
 wireless _first_ {
         format_up = "W: (%quality at %essid) %ip"
         format_down = "W: down"
-- 
cgit v1.2.3