README.md

@@ -5,28 +5,26 @@ Clone this repo:
 $ git clone --recurse-submodules https://git.sr.ht/~jswank/dotfiles
 ```
 
-But since you forgot to grab the submodules, get them now:
-```
-$ git submodule update --init --recursive
-```
-
 Install my dotfiles:
 ```console
-$ ./install.sh
+$ ./install
 ```
 
-This will install most common dotfiles: if you want to install a set, provide
-that as an argument:
-```console
-$ ./install.sh i3  # installed i3 dotfiles
-```
+(which just runs: `ls -d */ | tr -d / | xargs stow -R`)
 
 There are two potential gotchas:
 
-1. `stow` is not installed on the system. There is a bash equivalent that is
-   close enough for most purposes in this repo that the install script will
-   use.
+1. `stow` is not installed on the system. Be sure to install it. 
 
 2. There submodules in this repo (mostly neovim plugins) and they didn't get
-   populated when you cloned the repo.  See above.
+   populated when you cloned the repo.
 
+This repo should have been cloned using the --recurse-submodules flag, i.e.
+```console
+$ git clone --recurse-submodules https://git.sr.ht/~jswank/dotfiles
+```
+
+But, since you forgot, fix this by running:
+```console
+$ git submodule update --init --recursive
+```

install.sh

@@ -3,7 +3,7 @@
 # Install my dotfiles.
 #
 
-STOW=$(which stow || echo -n "")
+STOW=$(which stow)
 if [ -z "$STOW" ]; then
   STOW=./stow.sh
 fi
@@ -12,15 +12,11 @@ git submodule update --init --recursive
 
 # if these aren't links, move them out of the way?
 for f in ~/.zshrc ~/.profile; do
-  if [ -f "$f" ]; then
-    mv "$f" "$f.orig"
+  if [ -f $f ]; then
+    mv $f $f.orig
   fi
 done
 
-if [ -n "$1" ]; then
-  $STOW -t $HOME "$1"
-  exit 1
-fi
 
 # rm -f $HOME/.zshrc $HOME/.profile >/dev/null 2>&1
 
@@ -36,6 +32,6 @@ for dir in  \
   tmux \
   zsh
 do
-  $STOW -t $HOME $dir
+  $STOW -t ~/ $dir
 done
 

mpd/.mpd/.gitignore

@@ -1,4 +1,3 @@
 socket
 mpdstate
 mpd.pid
-mpd.db

mpd/.mpd/playlists/KEXP.m3u

@@ -1 +1 @@
-https://kexp-mp3-128.streamguys1.com/kexp128.mp3
+http://216.246.37.218:80/kexp128.mp3

ssh/.ssh/scalene-config

@@ -1,12 +1,6 @@
 Host nyyrikki-vpn
   Hostname 10.147.19.238
 
-Host tuulikki-vpn
-  Hostname 10.147.19.243
-
-Host tonttu-vpn
-  Hostname 10.147.19.60
-
 Host nyyrikki
   Hostname 192.168.101.110
 
@@ -22,6 +16,3 @@ Host www.scalene.net
 
 Host tilde.club
   User eke
-
-Match host git.scalene.net exec "ip route |grep -q ^192.168.101.0/24"
-  Hostname tonttu.scalene.net

vim/.vimrc

@@ -1,45 +0,0 @@
-syntax on
-set smarttab ts=2 sw=2
-set softtabstop=2 
-set expandtab
-set autoindent
-
-set backspace=indent,eol,start
-
-set t_Co=16
-
-"use semicolon as colon for commands
-nmap ; :
-
-filetype plugin on
-filetype indent on
-set ofu=syntaxcomplete#Complete#
-
-au FileType python setlocal tabstop=4 expandtab shiftwidth=4 softtabstop=4
-
-" typing idate inserts the current date 
-iab idate <c-r>=strftime("%Y-%m-%d")<cr>
-
-set lazyredraw " redraw only when req'd
-set wildmenu " visual auto-complete
-set showmatch
-"set cursorline
-
-" Search down into subfolders
-" Provides tab-completion for all file-related tasks
-set path+=**
-
-" netrw config
-let g:netrw_banner=0        " disable annoying banner
-let g:netrw_browse_split=0  " open in prior window
-let g:netrw_altv=1          " open splits to the right
-let g:netrw_liststyle=3     " tree view
-let g:netrw_list_hide=netrw_gitignore#Hide()
-let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
-
-" NOW WE CAN:
-" - :edit a folder to open a file browser
-" - <CR>/v/t to open in an h-split/v-split/tab
-" - check |netrw-browse-maps| for more mappings
-
-

zsh/.zlogin

@@ -1,4 +1,3 @@
-if [[ ! $DISPLAY && $(tty) = "/dev/tty1" ]]; then
+if [ $(tty) = "/dev/tty1" ]; then
   startx
-  exit
 fi

zsh/.zshrc

@@ -24,13 +24,6 @@ case $TERM in
     ;;
 esac
 
-if [ -n "$SSH_AUTH_SOCK" ]; then
-  if [ "$SSH_AUTH_SOCK" != ~/.ssh/ssh_auth_sock ]; then
-    ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
-    export SSH_AUTH_SOCK=$HOME/.ssh/ssh_auth_sock
-  fi
-fi
-
 if [ -e /usr/bin/keychain ]; then
   eval $(/usr/bin/keychain --eval --agents ssh -Q --quiet id_ed25519)
 fi