8 files changed, 71 insertions(+), 17 deletions(-)

A .Xresources
M .gitconfig
M .xinitrc -rw-r--r-- => -rwxr-xr-x
M config/i3/config
R .config/kitty/kitty.conf => config/kitty/kitty.conf
R .config/mpd/mpd.conf => config/mpd/mpd.conf
R .config/polybar/config => config/polybar/config
R .config/termite/config => config/termite/config

@@ 0,0 1,37 @@
+XTerm.termName: xterm-256color
+
+! hard contrast: *background: #1d2021
+*background: #282828
+! soft contrast: *background: #32302f
+*foreground: #ebdbb2
+! Black + DarkGrey
+*color0:  #282828
+*color8:  #928374
+! DarkRed + Red
+*color1:  #cc241d
+*color9:  #fb4934
+! DarkGreen + Green
+*color2:  #98971a
+*color10: #b8bb26
+! DarkYellow + Yellow
+*color3:  #d79921
+*color11: #fabd2f
+! DarkBlue + Blue
+*color4:  #458588
+*color12: #83a598
+! DarkMagenta + Magenta
+*color5:  #b16286
+*color13: #d3869b
+! DarkCyan + Cyan
+*color6:  #689d6a
+*color14: #8ec07c
+! LightGrey + White
+*color7:  #a89984
+*color15: #ebdbb2
+
+Xft.autohint: 0
+Xft.lcdfilter: lcddefault
+Xft.hintstyle: hintslight
+Xft.hinting: 1
+Xft.antialias: 1
+Xft.rgba: rgb

@@ 1,7 1,6 @@
 [user]
   email = zah@andrewzah.com
   name = Andrew Zah
-  signingkey = 6DA8AD68401EFD0D3F86F52477E0757829DDB540
 [core]
   editor = nvim
   excludesfile = ~/.global_gitignore

@@ 1,2 1,21 @@
+export LANG=en_US.UTF-8
+
+export apmd_flags="-A -Z 8"
+
+xrdb -merge $HOME/.resources
+
+xidle -timeout 300 &
+
+while true; do
+    batt="$(sysctl -n hw.sensors.acpibat0.watthour3 | cut -f1,2 -d" ")"
+    xsetroot -name "$batt"
+    sleep 60
+done &
+
+xset b off
+
+xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1
+xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2
+xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 6 7 4 5
+
 exec i3
-xautolock -time 5 -locker lock

@@ 2,24 2,22 @@
 font pango:Inconsolata 10
 
 ## i3 ModKeys
-set $mod Mod4
-set $cmod Mod1
+set $mod Mod1
+set $cmod Mod4
 
-gaps inner 5
-set $work1 "미륵"
-set $work2 "조왕신"
-set $work3 "업신"
-set $work4 "산신"
-set $work5 "터주신"
-set $work6 "자청비"
+set $work1 "Goku"
+set $work2 "Kakarot"
+set $work3 "Vegeta"
+set $work4 "Piccolo"
+set $work5 "Trunks"
+set $work6 "Bulma"
 
 # default workspaces to each monitor
-workspace $work1 output DVI-I-1
-workspace $work2 output HDMI-0
+workspace $work1 output LDVS-1
 
 # startup applications
-exec_always --no-startup-id $HOME/.config/polybar/launch.sh
-exec_always feh --bg-scale ~/Wallpapers/1.jpg ~/Wallpapers/2.jpg
+# exec_always --no-startup-id $HOME/.config/polybar/launch.sh
+exec_always feh --bg-scale ~/Wallpapers/2.png
 
 ## i3 Opts
 default_border pixel 2


@@ 83,8 81,9 @@ bindsym $mod+Shift+r restart
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3?' -b 'Yes, exit i3' 'i3-msg exit'"
 
 # General
-bindsym $mod+d exec rofi -show run -config /home/andrew/.config/rofi/config
-bindsym $mod+w exec rofi -show window -config /home/andrew/.config/rofi/config
+# bindsym $mod+d exec rofi -show run -config /home/andrew/.config/rofi/config
+# bindsym $mod+w exec rofi -show window -config /home/andrew/.config/rofi/config
+bindsym $mod+d exec dmenu_run
 bindsym $mod+Shift+w kill
 
 set $green #98971a