Update config

13 files changed, 37 insertions, 23 deletions

diff --git a/.bashrc b/.bashrc
index f3e804f..ed2243e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -4,6 +4,7 @@
 [[ $- != *i* ]] && return
 
 export PATH=$PATH:~/.local/bin
+export MANPATH=$MANPATH:~/.local/share/man
 export XDG_RUNTIME_DIR=/tmp/runtime_$(whoami)
 export VISUAL=vim
 export EDITOR="$VISUAL"
diff --git a/.gitignore b/.gitignore
index d91f820..7921528 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *~
 tags
+.vim/*
++.vim/colors
diff --git a/.local/bin/dwmstatus.sh b/.local/bin/dwmstatus.sh
index 89018bb..e8bc702 100755
--- a/.local/bin/dwmstatus.sh
+++ b/.local/bin/dwmstatus.sh
@@ -5,7 +5,12 @@ while true; do
     cpu="load $(uptime -r | cut -d ' ' -f 4)"
     clock="$(date +'%a %b %d, %r')"
     volume="vol $(pactl get-sink-volume @DEFAULT_SINK@ | cut -d ' ' -f 6)"
-    xsetroot -name " $ram ~ $cpu ~ $volume ~ $clock "
+    media="$(playerctl metadata title) - $(playerctl metadata artist)"
+    if [ "$(playerctl status)" == "Paused" ]; then
+        media="no media"
+    fi
+
+    xsetroot -name " $media ~ $ram ~ $cpu ~ $volume ~ $clock "
 
     sleep 1
 done
diff --git a/.vim/colors/mooncheese.vim b/.vim/colors/mooncheese.vim
index bf2ce0e..a866406 100644
--- a/.vim/colors/mooncheese.vim
+++ b/.vim/colors/mooncheese.vim
@@ -17,6 +17,11 @@ hi! StatusLine guifg=#FFF050
 hi! StatusLineNC guifg=#886A10
 hi! VertSplit guibg=#101010 guifg=#000000
 hi! Pmenu guibg=#101010
+hi! SpellBad guifg=#FF0000 guibg=#202020 gui=underline
+hi! SpellCap guifg=#04AAFF guibg=#202020 gui=underline
+hi! link SpellLocal SpellCap
+hi! link SpellRare Normal
+
 hi! link PmenuSel DarkYellowBg
 hi! link WildMenu PmenuSel
 
diff --git a/.vimrc b/.vimrc
index 9ffc8da..1dfa193 100644
--- a/.vimrc
+++ b/.vimrc
@@ -25,6 +25,7 @@ set hlsearch
 set cinoptions+=:0,N-s,E-s,(s,m1,t0
 set completeopt=menu,menuone,noselect
 set autoread
+set spell
 
 filetype plugin on
 filetype indent on
@@ -36,12 +37,11 @@ let fuzzbox_mappings = 0
 let g:apc_enable_ft = {'c':1}
 let g:netrw_list_hide = '\~$'
 
-xmap ga <Plug>(EasyAlign)
-nmap ga <Plug>(EasyAlign)
-nmap <leader>f :FuzzyFilesRoot<cr>
-nmap <leader>t :! ctags -R .<cr><cr>
+nmap <silent> <leader>f :FuzzyFilesRoot<cr>
+nmap <silent> <leader>t :! ctags -R .<cr><cr>
+nmap <silent> <leader>s :Alternate<cr>
 
-nnoremap <C-l> :noh<cr>
+nnoremap <silent> <C-l> :noh<cr>
 nnoremap <C-u> <C-u>zz
 nnoremap <C-d> <C-d>zz
 nnoremap gd <C-]>
@@ -53,9 +53,16 @@ au FileType lua set shiftwidth=2
 colors mooncheese
 hi clear Error
 
+" Saves the last line I was on in a file
+autocmd BufReadPost *
+     \ if line("'\"") > 0 && line("'\"") <= line("$") |
+     \   exe "normal! g`\"" |
+     \ endif
+
 call plug#begin()
 
 Plug 'vim-fuzzbox/fuzzbox.vim'
 Plug 'tpope/vim-fugitive'
+Plug 'ton/vim-alternate'
 
 call plug#end()
diff --git a/.xinitrc b/.xinitrc
index b4161eb..a442b0c 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -5,6 +5,7 @@ eval $(dbus-launch --sh-syntax)
 export DBUS_SESSION_BUS_ADDRESS
 
 pipewire &
+xbanish &
 devmon --exec-on-drive "notify-send '%p'" &
 dunst &
 ~/.fehbg &
diff --git a/src/dmenu/config.mk b/src/dmenu/config.mk
index dcc5bb3..0d84528 100644
--- a/src/dmenu/config.mk
+++ b/src/dmenu/config.mk
@@ -2,7 +2,7 @@
 VERSION = 5.4
 
 # paths
-PREFIX = /usr/local
+PREFIX = $(HOME)/.local
 MANPREFIX = $(PREFIX)/share/man
 
 X11INC = /usr/X11R6/include
diff --git a/src/dwm/config.h b/src/dwm/config.h
index 05c4971..1e6b3e8 100644
--- a/src/dwm/config.h
+++ b/src/dwm/config.h
@@ -35,12 +35,10 @@ static const int refreshrate = 120;  /* refresh rate (per second) for client mov
 
 static const Layout lmonocle = { "[M]",      monocle };
 static const Layout ltile    = { "[]=",      tile };
-static const Layout lfloat   = { "><>",      NULL };
 
 static const Layout layouts[] = {
     lmonocle,
     ltile,
-    lfloat,
 };
 
 /* key definitions */
@@ -86,7 +84,6 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_Tab,    view,           {0} },
 	{ MODKEY,                       XK_w,      killclient,     {0} },
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &ltile} },
-	{ MODKEY,                       XK_f,      setlayout,      {.v = &lfloat} },
 	{ MODKEY,                       XK_m,      setlayout,      {.v = &lmonocle} },
 	{ MODKEY,                       XK_space,  setlayout,      {0} },
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
@@ -107,16 +104,8 @@ static const Key keys[] = {
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
 	/* click                event mask      button          function        argument */
-	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
-	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
-	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
 	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
 	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
 	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
-	{ ClkTagBar,            0,              Button1,        view,           {0} },
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
 };
 
diff --git a/src/dwm/config.mk b/src/dwm/config.mk
index 982dc21..0327c0b 100644
--- a/src/dwm/config.mk
+++ b/src/dwm/config.mk
@@ -4,7 +4,7 @@ VERSION = 6.8
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
+PREFIX = $(HOME)/.local
 MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
diff --git a/src/dwm/dwm.c b/src/dwm/dwm.c
index fc3365c..1017cb6 100644
--- a/src/dwm/dwm.c
+++ b/src/dwm/dwm.c
@@ -1088,6 +1088,10 @@ manage(Window w, XWindowAttributes *wa)
 	c->bw = borderpx;
 
 	wc.border_width = c->bw;
+
+    if (c->x == selmon->wx) c->x += (c->mon->ww - WIDTH(c)) / 2 - c->bw;
+    if (c->y == selmon->wy) c->y += (c->mon->wh - HEIGHT(c)) / 2 - c->bw;
+
 	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
 	XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
 	configure(c); /* propagates border_width, if size doesn't change */
diff --git a/src/st/config.h b/src/st/config.h
index 58e5e06..86cc542 100644
--- a/src/st/config.h
+++ b/src/st/config.h
@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "CommitMono:pixelsize=16:antialias=true:autohint=true";
+static char *font = "Commit Mono:pixelsize=15";
 static int borderpx = 2;
 
 /*
diff --git a/src/st/config.mk b/src/st/config.mk
index 2fc854e..2ac1814 100644
--- a/src/st/config.mk
+++ b/src/st/config.mk
@@ -4,7 +4,7 @@ VERSION = 0.9.3
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
+PREFIX = $(HOME)/.local
 MANPREFIX = $(PREFIX)/share/man
 
 X11INC = /usr/X11R6/include
@@ -22,7 +22,7 @@ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
 
 # flags
 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
-STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
+STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) -g -ggdb
 STLDFLAGS = $(LIBS) $(LDFLAGS)
 
 # OpenBSD:
diff --git a/src/st/st.c b/src/st/st.c
index 3286a8f..9819cf7 100644
--- a/src/st/st.c
+++ b/src/st/st.c
@@ -3209,7 +3209,7 @@ draw(void)
 	LIMIT(term.ocy, 0, term.row-1);
 	if (term.line[term.ocy][term.ocx].mode & ATTR_WDUMMY)
 		term.ocx--;
-	if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
+    if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
 		cx--;
 
 	drawregion(0, 0, term.col, term.row);