mostly fixing xinitrc and i3; switched back to i3 from i3-gaps

7 files changed, 24 insertions, 30 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 9237dae..81ff3a7 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -148,7 +148,7 @@ font:
     #style: Bold Italic
 
   # Point size
-  size: 10.0
+  size: 13
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
diff --git a/.config/i3blocks/config b/.config/i3blocks/config
index bc079d5..1ff958c 100644
--- a/.config/i3blocks/config
+++ b/.config/i3blocks/config
@@ -15,16 +15,16 @@ separator_block_width=15
 interval=3600
 command=i3blocks-packages.sh
 
-[news]
-interval=3600
-signal=13
-command=i3blocks-news.sh
-
 [mail]
 interval=1800
 signal=12
 command=i3blocks-mail.sh
 
+[news]
+interval=3600
+signal=13
+command=i3blocks-news.sh
+
 [weather]
 interval=3600
 command=i3blocks-weather.sh
diff --git a/.config/wpg/templates/i3.base b/.config/wpg/templates/i3.base
index 768384c..f3e4cb4 100644
--- a/.config/wpg/templates/i3.base
+++ b/.config/wpg/templates/i3.base
@@ -45,18 +45,12 @@ bindsym $mod+shift+9 move container to workspace $ws9
 bindsym $mod+shift+0 move container to workspace $ws10
 
 ## GAPS/BORDERS
-default_border pixel 3
-default_floating_border pixel 3
+default_border pixel 2
+default_floating_border pixel 2
 hide_edge_borders smart
-gaps inner 10
-smart_borders no_gaps
 title_align center
 workspace_auto_back_and_forth yes
 
-# If there's only one container, give it a 4:3-ish aspect ratio
-gaps horizontal 450
-smart_gaps inverse_outer
-
 ## COLORS
 # base colors -- set by WPG
 set $coloract "{active}"
@@ -96,14 +90,10 @@ bindsym $mod+shift+$right move right
 bindsym $mod+shift+$up move up
 
 # resize
-bindsym $mod+i 				resize grow height 
-bindsym $mod+o 				resize grow width 
-bindsym $mod+u 				resize shrink height 
-bindsym $mod+y				resize shrink width 
-bindsym $mod+minus			gaps inner current plus 10
-bindsym $mod+plus        	gaps inner current minus 10
-bindsym $mod+shift+minus 	gaps horizontal current set 250
-bindsym $mod+shift+plus  	gaps horizontal current set 0
+bindsym $mod+i 				resize grow height 50 or 10
+bindsym $mod+o 				resize grow width 50 or 10
+bindsym $mod+u 				resize shrink height 50 or 10
+bindsym $mod+y				resize shrink width 50 or 10
 
 ## LAYOUT
 # split direction
@@ -113,7 +103,7 @@ bindsym $mod+q split toggle
 bindsym $mod+f fullscreen toggle
 
 # container layout
-bindsym $mod+shift+w layout tabbed
+bindsym $mod+shift+w layout toggle tabbed stacking
 bindsym $mod+shift+e layout toggle split
 
 # toggle tiling / floating / sticky
@@ -138,7 +128,6 @@ bindsym $mod+Shift+F8			exec toggle-screencast.sh
 bindsym $mod+F9					exec abraham-porter.sh
 bindsym $mod+shift+F9			exec toggle-compositing.sh
 bindsym $mod+F10				exec mixer vol 0 && $sigaudio
-bindsym $mod+Shift+F10			exec arandr
 bindsym $mod+F11				exec mixer vol -5 && $sigaudio
 bindsym $mod+Shift+F11			exec xautolock -toggle
 bindsym $mod+F12				exec mixer vol +5 && $sigaudio
@@ -151,7 +140,8 @@ bindsym $mod+a					exec rofi -show run
 bindsym $mod+shift+q			kill
 bindsym --release Print			exec i3-screeniecmd.sh
 bindsym --release shift+Print	exec i3-screenie_regioncmd.sh
-bindsym Mod4+p					exec arandr
+bindsym --release $mod+Print	exec i3-screenie_regioncmd.sh
+bindsym Mod4+p					exec nvidia-settings
 bindsym XF86AudioLowerVolume	exec mixer vol -5 && $sigaudio
 bindsym XF86AudioMute			exec mixer vol 0 && $sigaudio
 bindsym XF86AudioRaiseVolume 	exec mixer vol +5 && $sigaudio
@@ -189,7 +179,7 @@ bindsym $mod+F1 mode "$mode_help"
 
 ## BARS
 bar {{
-	height 30
+	modifier Mod1
 	strip_workspace_numbers yes
 	position bottom
 	status_command i3blocks 2>/var/log/xinit/i3blocks.log
@@ -216,4 +206,3 @@ for_window [title = "sxiv"] floating enable
 
 ## STARTUP
 exec --no-startup-id firefox
-exec --no-startup-id dockd.sh 2>&1 > /var/log/xinit/dockd.log 
diff --git a/.pkglist b/.pkglist
index f1516cb..7f09b25 100644
--- a/.pkglist
+++ b/.pkglist
@@ -5,6 +5,7 @@ audio/cdparanoia
 audio/mixertui
 audio/virtual_oss
 databases/sqlite3
+deskutils/anydesk
 devel/git
 devel/libnotify
 devel/py-gobject
@@ -69,11 +70,13 @@ www/newsboat
 www/node
 www/yarn
 www/youtube_dl
+x11-drivers/xf86-input-libinput
 x11-fonts/fontconfig
 x11-fonts/iosevka
 x11-fonts/material-icons-ttf
 x11-fonts/twemoji-color-font-ttf
-x11-wm/i3-gaps
+x11-servers/xorg-server
+x11-wm/i3
 x11/alacritty
 x11/arandr
 x11/i3blocks
@@ -84,5 +87,5 @@ x11/rofi
 x11/xauth
 x11/xautolock
 x11/xclip
-x11/xorg-minimal
+x11/xinit
 x11/xrandr
diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index 3c8a610..13d56ea 100644
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@ -4,3 +4,5 @@ Nvidia
 Xorg
 ZFS
 ransomware
+whitelist
+usr
diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl
index 3b81614..eee3df2 100644
--- a/.vim/spell/en.utf-8.add.spl
+++ b/.vim/spell/en.utf-8.add.spl
diff --git a/.xinitrc b/.xinitrc
index 0125bce..4deb7b6 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -2,5 +2,5 @@
 xrdb -merge ~/.Xresources &&
 picom &
 dunst &
+~/.local/scripts/dockd.sh &
 exec i3 2>&1 > /var/log/xinit/i3wm.log
-#exec twm