Merge remote-tracking branch 'k-kyrias/master' into theos

2 files changed, 35 insertions, 25 deletions

diff --git a/i3/bar.py b/i3/bar.py
index 873f63f..064eafc 100644
--- a/i3/bar.py
+++ b/i3/bar.py
@@ -7,7 +7,7 @@ from i3pystatus import Status
 status = Status(standalone=True)
 
 status.register("clock",
-    format="%y-%m-%d %H:%M:%S",)
+    format="%y-%m-%d %H:%M:%S%z",)
 
 status.register("battery",
     format="⚡:{percentage:.2f}% {remaining:%E%hh:%Mm}{status}",
@@ -18,7 +18,7 @@ status.register("battery",
         "CHR": "↑",
         "FULL": "=",
     },
-    battery_ident="BAT1",)
+    battery_ident="BAT0",)
 
 
 status.register("temp",
@@ -36,8 +36,8 @@ status.register("pulseaudio",
 #    },)
 
 status.register("network",
-    interface="wlp3s0",
-    format_up="{v4cidr} {quality:3.0f}%",)
+    interface="wlp4s0",
+    format_up="{essid:.10s}: {v4cidr} {quality:3.0f}%",)
 
 # Shows disk usage of /
 # Format:
diff --git a/i3/config b/i3/config
index 4175450..0cabb5c 100644
--- a/i3/config
+++ b/i3/config
@@ -1,7 +1,7 @@
 set $mod Mod4
 
 #font pango:visitor tt2 brk 10
-font pango:Source Code Pro 8
+font pango:Source Code Pro 9
 
 floating_modifier $mod
 bindsym $mod+Return exec termite
@@ -21,12 +21,12 @@ bindsym $mod+Shift+j move down
 bindsym $mod+Shift+k move up
 bindsym $mod+Shift+l move right
 
-bindsym $mod+b split h
+bindsym $mod+w split h
 bindsym $mod+v split v
 
 bindsym $mod+f fullscreen
 bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
+bindsym $mod+t layout tabbed
 bindsym $mod+e layout toggle split
 bindsym $mod+Shift+space floating toggle
 # change focus between tiling / floating windows
@@ -111,7 +111,7 @@ bindsym $mod+r mode "resize"
 
 # i3bar
 bar {
-	status_command    python ~/.config/i3/bar.py
+	status_command    ~/.local/venv/bin/python ~/.config/i3/bar.py
 	position          bottom
 	workspace_buttons yes
 	colors {
@@ -125,18 +125,15 @@ bar {
 	}
 }
 
+for_window [class="Gifview"] floating enable
+
+
 bindsym $mod+Shift+g exec --no-startup-id setxkbmap us
 #bindsym $mod+Shift+u exec --no-startup-id setxkbmap dvp
 bindsym $mod+Shift+u exec --no-startup-id setxkbmap dvorak
 
-# TrackPoint scrolling
-exec --no-startup-id xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
-exec --no-startup-id xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
-exec --no-startup-id xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 150
-exec --no-startup-id xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
-exec --no-startup-id xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Middle Button Emulation" 1
-exec --no-startup-id xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Inertia" 25
-exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "Synaptics Off" 1
+bindsym XF86MonBrightnessUp     exec --no-startup-id xbacklight -inc 10
+bindsym XF86MonBrightnessDown   exec --no-startup-id xbacklight -dec 10
 
 # control ncmpcpp / mpd from media keys
 bindsym XF86AudioPlay exec --no-startup-id mpc toggle
@@ -144,19 +141,32 @@ bindsym XF86AudioStop exec --no-startup-id mpc stop
 bindsym XF86AudioNext exec --no-startup-id mpc next
 bindsym XF86AudioPrev exec --no-startup-id mpc prev
 
+
 # control PulseAudio from media keys
-bindsym XF86AudioMute exec volumecontrol.bash mute
-bindsym XF86Back exec volumecontrol.bash lower
-bindsym XF86AudioLowerVolume exec volumecontrol.bash lower
-bindsym XF86Forward exec volumecontrol.bash raise
-bindsym XF86AudioRaiseVolume exec volumecontrol.bash raise
+bindsym XF86AudioMute exec volumecontrol mute
+bindsym XF86AudioMicMute exec volumecontrol mute-mic
+bindsym XF86AudioLowerVolume exec volumecontrol lower
+bindsym XF86AudioRaiseVolume exec volumecontrol raise
+
+
 bindsym XF86ScreenSaver exec screenlock.bash
 
+
 new_window 1pixel
-bindsym $mod+t border normal
-bindsym $mod+y border 1pixel
-bindsym $mod+u border none
+bindsym $mod+b border normal
+bindsym $mod+p border 1pixel
+bindsym $mod+n border none
+
+
+# Make the currently focused window a scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# Show the first scratchpad window
+bindsym $mod+minus scratchpad show
+
+
+# TrackPoint scrolling
+exec setup-trackpoint
 
-for_window [class="Gifview"] floating enable
 
 exec --no-startup-id dex -s $HOME/.config/autostart -a -e i3