re-added some stuff that was lost to rebase

3 files changed, 26 insertions, 13 deletions

diff --git a/.config/i3/config b/.config/i3/config
index 18dfc51..08ee40a 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -48,11 +48,11 @@ bindsym $mod+Shift+C kill
 bindsym $mod+Shift+F exec firefox -P default-release
 bindsym $mod+Shift+B exec firefox -P less-strict
 bindsym $mod+Shift+E exec emacsclient -c -a ""
-bindsym $mod+z exec boomer
-bindsym $mod+m exec mpdmenu
 bindsym $mod+Shift+M exec mpdinfo
-bindsym $mod+b exec bm -o
 bindsym $mod+Control+b exec bm -y
+bindsym $mod+b exec bm -o
+bindsym $mod+m exec mpdmenu
+bindsym $mod+z exec boomer
 bindsym --release Print exec scrot -u -e 'mv $f ~/pics/'
 bindsym --release $mod+Print exec scrot -s -e 'mv $f ~/pics/'
 
@@ -68,11 +68,14 @@ bindsym $mod+Shift+J move down
 bindsym $mod+Shift+K move up
 bindsym $mod+Shift+L move right
 
+bindsym $mod-Shift+Control+H move workspace to output left
+bindsym $mod-Shift+Control+L move workspace to output right
+
 # split in horizontal orientation
-bindsym $mod+s split v
+bindsym $mod+s split h
 
 # split in vertical orientation
-bindsym $mod+v split h
+bindsym $mod+v split v
 
 # enter fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
diff --git a/.config/i3status/config b/.config/i3status/config
index c3c1691..c5492ec 100644
--- a/.config/i3status/config
+++ b/.config/i3status/config
@@ -8,7 +8,7 @@
 
 general {
         colors = true
-        interval = 5
+        interval = 2
 }
 
 order += "ethernet br0"
@@ -32,17 +32,16 @@ ethernet wg0 {
 }
 
 cpu_temperature 0 {
-    format = "temp: %degrees °C"
-    path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp1_input"
-#    path = "/sys/devices/pci0000:00/0000:00:03.1/0000:2d:00.0/0000:2e:00.0/0000:2f:00.0/hwmon/hwmon2/temp1_input"
+    format = "tea: %degrees °C"
+    path = "/sys/class/hwmon/hwmon2/temp1_input"
 }
 
 disk "/" {
-        format = "root: %used"
+        format = "porn: %used"
 }
 
 load {
-        format = "load: %1min"
+        format = "hot loads: %1min"
 }
 
 memory {
@@ -58,5 +57,5 @@ volume master {
 }
 
 tztime local {
-        format = "%A, %Y-%m-%d %H:%M "
+        format = "%A, %F %H:%M "
 }
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index 5ecbb89..cfa0ee2 100644
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -20,4 +20,15 @@ xset s off -dpms
 setxkbmap -option "ctrl:nocaps"
 xrdb -merge ~/.Xresources
 
-exec stumpwm
+~/.local/bin/set-wallpaper &
+/usr/bin/emacs --daemon &
+
+/usr/bin/urxvtd -q -o -f &
+/usr/bin/ibus-daemon -d -r -x
+/usr/bin/pipewire &
+/usr/bin/mpd &
+
+exec i3
+#exec fvwm
+#exec ratpoison
+#exec stumpwm