From 15aadd211219bfd6b53a675c9c71753737cc71a6 Mon Sep 17 00:00:00 2001 From: natemaia Date: Fri, 13 Jul 2018 14:01:38 -0700 Subject: [PATCH] More ping sites for network script, vimrc changes, remove .config/setup --- home/.config/i3/config | 4 ++-- home/.config/openbox/autostart | 3 --- .../polybar/sessions/bspwm-sessionfile | 2 +- home/.config/setup | 22 ------------------- home/.vimrc | 22 +++++++++++++------ home/.zprofile | 2 ++ home/bin/check-network | 12 +++++----- 7 files changed, 26 insertions(+), 41 deletions(-) delete mode 100755 home/.config/setup diff --git a/home/.config/i3/config b/home/.config/i3/config index ee726254..605c3ab4 100644 --- a/home/.config/i3/config +++ b/home/.config/i3/config @@ -76,8 +76,8 @@ exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec --no-startup-id gnome-keyring-daemon --start --components=pkcs11 # pressing super key alone simulates pressing Alt-F1 -exec --no-startup-id ksuperkey -e 'Super_L=Alt_L|F1' & -exec --no-startup-id ksuperkey -e 'Super_R=Alt_L|F1' & +exec --no-startup-id ksuperkey -e 'Super_L=Alt_L|F1' +exec --no-startup-id ksuperkey -e 'Super_R=Alt_L|F1' ########################################################### ############# Bindings ################## diff --git a/home/.config/openbox/autostart b/home/.config/openbox/autostart index d44fc845..51a8a349 100644 --- a/home/.config/openbox/autostart +++ b/home/.config/openbox/autostart @@ -1,8 +1,6 @@ # compton al-compositor --start & -#$HOME/.config/setup & - # enable numlock, commented out for laptop users # numlockx & @@ -32,4 +30,3 @@ xfsettingsd & xdg-user-dirs-gtk-update & $HOME/.config/keypack & -# al-hello diff --git a/home/.config/polybar/sessions/bspwm-sessionfile b/home/.config/polybar/sessions/bspwm-sessionfile index 2e889ee4..29846c1e 100644 --- a/home/.config/polybar/sessions/bspwm-sessionfile +++ b/home/.config/polybar/sessions/bspwm-sessionfile @@ -4,4 +4,4 @@ # To load session at startup use the following line # sleep 1; al-polybar-session & -/home/liveuser/.config/polybar/config bspwm-bar \ No newline at end of file +/home/liveuser/.config/polybar/config bspwm-bar diff --git a/home/.config/setup b/home/.config/setup deleted file mode 100755 index 4854a6d0..00000000 --- a/home/.config/setup +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -# this script will setup configs for any user created from /etc/skel -# if this is not run immediately at startup, polybar WILL fail to load - -files=( -"$HOME/.config/polybar/config" -"$HOME/.config/polybar/sessions/i3-sessionfile" -"$HOME/.config/polybar/sessions/bspwm-sessionfile" -"$HOME/.config/polybar/sessions/openbox-sessionfile" -"$HOME/.config/openbox/autostart" -"$HOME/.config/gtk-3.0/bookmarks" -"$HOME/.mozilla/firefox/archlabs.default/prefs.js" -"$HOME/.mozilla/firefox/archlabs.default/sessionstore.js" -) - -for f in "${files[@]}"; do - sed -i "s/liveuser/${USER}/g" "$f" -done - -sed -i '/setup/d' "$HOME/.config/openbox/autostart" -rm -f "$HOME/.config/setup" diff --git a/home/.vimrc b/home/.vimrc index 69f8096d..91b4f7fc 100644 --- a/home/.vimrc +++ b/home/.vimrc @@ -70,6 +70,12 @@ nnoremap r :call ranger() " paste while in insert mode inoremap :set pastea+:set nopastea +" change windows with ctrl+(hjkl) +nnoremap +nnoremap +nnoremap +nnoremap + " alt defaults nnoremap 0 ^ nnoremap Y y$ @@ -81,10 +87,12 @@ nnoremap ==j vnoremap > >gv vnoremap < j v:count ? 'j' : 'gj' nnoremap k v:count ? 'k' : 'gk' +" open a new tab in the current directory with netrw +nnoremap - :tabedit =expand("%:p:h") " ------ autocmd ------ @@ -101,6 +109,12 @@ augroup save_cursor_position autocmd BufReadPost * call setpos(".", getpos("'\"")) augroup END +" enable cursorline in the currently active window +augroup cursorline + autocmd! + autocmd VimEnter,WinEnter,BufWinEnter * setlocal cursorline + autocmd WinLeave * setlocal nocursorline +augroup END " ------ adv maps ------ @@ -177,25 +191,19 @@ nnoremap fw " open ranger as a file chooser function! ranger() let l:temp = tempname() - execute 'silent !st -e ranger --choosefiles='.shellescape(l:temp).' $PWD' - if !filereadable(temp) redraw! return endif - let l:names = readfile(l:temp) if empty(l:names) redraw! return endif - execute 'edit '.fnameescape(l:names[0]) - for l:name in l:names[1:] execute 'argadd '.fnameescape(l:name) endfor - redraw! endfunction diff --git a/home/.zprofile b/home/.zprofile index 67e463a2..2f549ea7 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -14,4 +14,6 @@ # automatically run startx when logging in on tty1 +# comment this out if using the above example + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx -- vt1 &>/dev/null diff --git a/home/bin/check-network b/home/bin/check-network index e57b8705..711c2f89 100755 --- a/home/bin/check-network +++ b/home/bin/check-network @@ -7,8 +7,12 @@ wireless_connected="" ethernet_connected="" while true; do - if ping -c1 archlabslinux.com &>/dev/null || ping -c1 bitbucket.org &>/dev/null || ping -c1 github.com &>/dev/null; then - + if ! (ping -c 1 archlabslinux.com || ping -c 1 google.com || ping -c 1 bitbucket.org) &>/dev/null; then + if ! (ping -c 1 github.com || ping -c 1 sourceforge.net) &>/dev/null; then + echo "$disconnected" ; sleep 0.6 + echo "$disconnected2" ; sleep 0.6 + fi + else # avoid checking what type of interface it is every loop if (( count < 1 )); then ID="$(ip link | awk '/state UP/ {print $2}')" @@ -20,9 +24,5 @@ while true; do else echo "$wireless_connected" ; sleep 20 fi - - else - echo "$disconnected" ; sleep 0.6 - echo "$disconnected2" ; sleep 0.6 fi done