Fish time 🐟

Author: DylanJones

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "zsh-syntax-highlighting"]
 	path = zsh-syntax-highlighting
 	url = https://github.com/zsh-users/zsh-syntax-highlighting
+[submodule "vim/bundle/Vundle.vim"]
+	path = vim/bundle/Vundle.vim
+	url = https://github.com/VundleVim/Vundle.vim.git

README.md

@@ -1,4 +1,6 @@
 # Dylan's config files
-This is a repository that has most of my normal setup.  I made sure that most of it doesn't require root privelages to install.
-The script will install Powerline, `oh-my-zsh`, my custom Powerline modules, a few vim plugins, and more.
-The file `install.sh` should remove any existing conflicting configuration and replace it with this one.  It should work on any Debian, Raspbian, Ubuntu, or Arch Linux system.
+
+This repository kind of, sort of contains my normal configs.  There's a bunch of stuff missing, but this does cover the gist of it.
+
+
+Take a look at install.sh for an idea of what packages you'll need to install and what symlinks to make, but don't expect it to actually work if you try to run it.

aliases

@@ -1,12 +1,15 @@
 #!/bin/zsh
+#
+# These are old aliases for zsh, and aren't used anymore - 
+# fish aliases go in their own folder.
 alias emacs='emacs -nw'
 alias intl='setxkbmap us intl'
 alias us='setxkbmap us'
 alias nmap='nmap -n'
 alias tjvpn='sudo openvpn ~/openvpn/tj.ovpn'
 alias vpn='sudo openvpn ~/openvpn/laptop-tun.ovpn'
 
-pacs() { pacman -Fo /usr/bin/$1 }
+pacs() { pacman -F /usr/bin/$1 }
 
 alias rel='exec zsh'
 

fish/.gitignore

@@ -0,0 +1 @@
+fish_variables

fish/functions/ga.fish

@@ -0,0 +1 @@
+alias ga="git add"

fish/functions/gc.fish

@@ -0,0 +1 @@
+alias gc="git commit -v"

fish/functions/gd.fish

@@ -0,0 +1 @@
+alias gd="git diff"

fish/functions/gl.fish

@@ -0,0 +1 @@
+alias gl="git pull"

fish/functions/glog.fish

@@ -0,0 +1 @@
+alias glog="git log --oneline --decorate --graph"

fish/functions/gp.fish

@@ -0,0 +1 @@
+alias gp="git push"

fish/functions/ls.fish

@@ -0,0 +1,4 @@
+# Copied from the default ls alias
+function ls --description 'List contents of directory'
+    command ls --color=auto $argv
+end

i3/config

@@ -36,7 +36,9 @@ floating_modifier $mod
 # start a terminal
 #bindsym $mod+Return exec i3-sensible-terminal
 # LXterm has support for the powerline fonts, also it kinda looks better
-bindsym $mod+Return exec lxterminal
+# however, I'm going to go back to i3-sensible-terminal because that has
+# support on Ubuntu for launching gnome-terminal instead.
+bindsym $mod+Return exec i3-sensible-terminal
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -197,8 +199,8 @@ hide_edge_borders both
 
 # Set desktop background
 #exec_always feh --bg-fill /home/dylan/Wallpapers/LunarEclipse.jpg
-# Random arch bg
-exec_always feh --bg-fill $(zsh -c 'export a=(~/Wallpapers/arch_quotes/*); echo $a[$((($RANDOM % ${#a}) + 1))]')
+# Random bg
+exec_always feh --bg-fill $(zsh -c 'export a=(/usr/share/backgrounds/*{png,jpg}); echo $a[$((($RANDOM % ${#a}) + 1))]')
 
 # Make certian windows always float
 for_window [title="Python jumping game"] floating enable
@@ -213,3 +215,6 @@ bindsym $mod+t exec zsh ~/bin/togglemouse
 # facilities for locking the screen
 bindsym $mod+l exec xautolock -locknow
 exec xautolock -locker ~/bin/lock -time 5
+
+# C O M P T O N
+exec compton

install.sh

@@ -1,56 +1,57 @@
-#!/bin/zsh
+#!/bin/bash
 
-# even though the shebang *says* zsh, make sure its actually using zsh
-if [ -z "$ZSH_VERSION" ]; then
-    echo "Doesn't look like you're using zsh..."
-    echo "Please install zsh and then re-run this script using zsh"
-    exit 1
-fi
+echo "TODO: actually make the fish symlinks :/"
+# also: set -U EDITOR vim
+#       set -U ????
+#       uhh, maybe just like, copy the uvars or somethihng?
+exit
 
 INSTALL_PATH="$(realpath $(dirname $0))"
 USER="$(whoami)"
 
 # do the config symlinks
-TO_INSTALL=(bin tmux.conf i3 powerline_config zshrc vim oh-my-zsh zsh-syntax-highlighting powerline-daemon.service aliases Xmodmaprc)
-TO_PATHS=(~/bin ~/.tmux.conf ~/.i3 ~/.config/powerline ~/.zshrc ~/.vim ~/.oh-my-zsh ~/.zsh-syntax-highlighting ~/.config/systemd/user/powerline-daemon.service ~/.aliases ~/.Xmodmaprc)
+TO_INSTALL=(bin tmux.conf i3 powerline_config vim powerline-daemon.service)
+TO_PATHS=(~/bin ~/.tmux.conf ~/.i3 ~/.config/powerline ~/.vim ~/.config/systemd/user/powerline-daemon.service)
 
-for i in {1..${#TO_INSTALL}}; do
+for i in $(seq 1 ${#TO_INSTALL[@]}); do
     if [ -f "${TO_PATHS[i]}" ] || [ -d "${TO_PATHS[i]}" ]; then
         if [ -f "$INSTALL_PATH/overwrite" ]; then
-            rm "${TO_PATHS[i]}"
+            echo rm "${TO_PATHS[i]}"
         else
-            rm -ri "${TO_PATHS[i]}"
+            echo rm -ri "${TO_PATHS[i]}"
         fi
     fi
     if ! [ -f "${TO_PATHS[i]}" ]; then
-        mkdir -p "$(dirname ${TO_PATHS[i]})"
-        ln -sfT "$INSTALL_PATH/${TO_INSTALL[i]}" "${TO_PATHS[i]}"
+        echo mkdir -p "$(dirname ${TO_PATHS[i]})"
+        echo ln -sfT "$INSTALL_PATH/${TO_INSTALL[i]}" "${TO_PATHS[i]}"
     fi
 done
 
+exit 1
+
 # clone any sub-repos that need to be cloned
 cd "$INSTALL_PATH"
 git submodule update --init --recursive
 
 # install distro-specific packages
 # check for sudo access first
 if sudo -l >/dev/null; then
-    # RELEASE_STR="$(tr '[:upper:]' '[:lower:]' < /etc/issue)"
     . /etc/os-release # only works w/ systemd
 
     case "$ID" in
         *debian*|*ubuntu*|*raspbian* )
             # do apt stuff
-            sudo apt install -y python3 python3-pip python3-dev build-essential zsh cmake tmux vim
+            sudo apt install -y python3 python3-pip python3-dev build-essential cmake tmux vim fish
             ;;
         *arch* )
             # do arch stuff
-            sudo pacman -S --noconfirm --needed python-pip base-devel zsh git cmake tmux vim
+            sudo pacman -S --noconfirm --needed python-pip base-devel git cmake tmux vim fish
             ;;
         *centos* )
             # do centos stuff
+            echo -e '\n*** Just a fair warning, this centos support is uuber janky ***\n'
             sudo yum -y install epel-release
-            sudo yum -y install python36-pip git zsh vim tmux
+            sudo yum -y install python36-pip git vim tmux fish
             sudo yum -y groupinstall "Development Tools"
             sudo pip3.6 install --upgrade pip # this fixes pip3 to point to pip3.6
             sudo sh -c 'echo "export PATH=/usr/local/bin:$PATH >> /etc/profile"' # make root be able to use pip3
@@ -68,16 +69,16 @@ fi
 
 
 # install pip packages
-pip3 install --user thefuck powerline-status
+pip3 install --user powerline-status i3-py
 
 # Create the python symlink to be compatible with old pythons
 PY_VER="$(python3 -c "from sys import version_info as vi; print('python'+str(vi[0])+'.'+str(vi[1]))")"
 mkdir -p ~/.local/lib
 ln -s ~/.local/lib/$PY_VER ~/.local/lib/python3
 
-# change shell to zsh
+# change shell to fish
 echo "Changing default shell - enter password"
-chsh -s '/bin/zsh'
+chsh -s '/bin/fish'
 
 # install and enable powerline-daemon systemd service
 systemctl --user daemon-reload

oh-my-zsh

@@ -0,0 +1,2 @@
+swap/*
+backup/*

vim/.gitignore

@@ -118,7 +118,7 @@ function! pathogen#surround(path) abort
   let rtp = pathogen#split(&rtp)
   let path = fnamemodify(a:path, ':s?[\\/]\=$??')
   let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
-  let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
+  let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0 : -7])')
   call filter(rtp, 'index(before + after, v:val) == -1')
   let &rtp = pathogen#join(before, rtp, after)
   return &rtp
@@ -136,7 +136,7 @@ function! pathogen#interpose(name) abort
   let list = []
   for dir in pathogen#split(&rtp)
     if dir =~# '\<after$'
-      let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
+      let list += reverse(filter(pathogen#expand(dir[0 : -6].name, sep.'after'), '!pathogen#is_disabled(v:val[0 : -7])')) + [dir]
     else
       let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
     endif