.github/workflows/main.yml

@@ -1,10 +1,9 @@
 ---
-name: tests
-on:
-  push:
-    branches:
-      - main
-  pull_request: null
+name: dots
+
+on: 
+  push: main
+  pull_request: main
 
 permissions: {}
 
@@ -28,6 +27,6 @@ jobs:
           fetch-depth: 0
 
       - name: Super-linter
-        uses: super-linter/super-linter@v7.3.0
+        uses: super-linter/super-linter@v7.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.SUPERLINTER }}

README.md

@@ -1,5 +1,3 @@
-![tests](https://github.com/iskm/dots/actions/workflows/tests.yml/badge.svg)
-
 # dotfiles
 Quick configs i can't live without on my machines. 
 

bash/.bash_profile

@@ -17,7 +17,7 @@ shopt -s histappend
 shopt -s cdspell
 
 # solarized directory color listings
-# eval `dircolors $HOME/.dir_colors`
+eval `dircolors $HOME/.dir_colors`
 
 # tmuxifier
-# eval "$(starship init bash)"
+eval "$(starship init bash)"

bash/.bashrc

@@ -44,7 +44,8 @@ fi
 # work around for fzf
 set -o vi
 
-eval "$(fzf --bash)"
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash
+
 # tmuxifier
 eval "$(tmuxifier init -)"
 

install.sh

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-# Author: Ibrahim Mkusa
+
+# Author : Ibrahim Mkusa
 # Description: installs and sets up core environment for my dev work on servers
 
+set -e  # subshells inherit environment from parent
+
 function usage() {
    echo "./install #installs and setups this environment"
    echo "./install undo  #removes all configs"
@@ -17,60 +20,36 @@ if [[ -f /etc/os-release ]]; then
       echo "Running on debian-family.."
       package_manager=apt
       vim="vim-nox"
-      firewall="ufw"
       ;;
     fedora)
-      echo "Running on rpm-family.."
-      package_manager=dnf
+      echo "Running on debian-family.."
+      package_manager=fedora
       vim="vim-enhanced"
-      ansible="ansible-core"
-      firewall=""  #firewall & firewall-cmd installed by default on rpm OSes
-      ;;
-    *)
-      echo "Running on best-guess"
-      package_manager=apt
-      vim="vim-nox"
-      firewall="ufw"
-      ;;
   esac
 else
   echo "You are running an unrecognized family of os. Quitting..."
   exit 1
 fi
 
-
 # could have used a case, but i prefer the if statement
 if [[ -z "$1" ]]; then
   echo "Installing packages"
-  sudo "$package_manager" install -y "$vim" git stow curl ranger tmux \
-    qemu-guest-agent $firewall cloud-init
-
-  # firewall rules
-  sudo $firewall allow ssh
-
-  # install vim-plug
-  curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
-      https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-
-  # backup current configs
-  [[ -f ~/.bashrc ]] && mv ~/.bashrc ~/.bashrc.bak || echo "bashrc ~exists"
-  [[ -f ~/.bash_profile ]] && mv ~/.bash_profile ~/.bash_profile.bak || echo ".bash_profile ~exists"
+  sudo "$package_manager" install -y "$vim" git stow curl ranger tmux
 
   # use gnu stow to symlink config files to home directory
-  stow bash ranger shellenv tmux vim
-  
-  # install everything via plug "the vim package manager"
-  vim +PlugInstall +qall
+  stow bash git ranger shellenv tmux vim
+
 elif [[ undo = "$1" ]]; then
   echo "undoing"
   stow -D bash git ranger shellenv tmux vim
+
 elif [[ wipe = "$1" ]]; then
   stow -D bash git ranger shellenv tmux vim
   sudo "$package_manager" remove "$vim" git stow curl ranger tmux
   echo "wiping"
+
 elif [[ "$1" = "help" ]]; then
   usage
 fi
   
-# extras for tmux
-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm || true
+

shellenv/.aliases

@@ -123,4 +123,4 @@ alias tpmux='git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm'
 alias fd='fdfind'
 
 # k8s
-# alias kubectl="minikube kubectl --"
+alias kubectl="minikube kubectl --"

shellenv/.functions

@@ -14,7 +14,3 @@ pdfmerge() {
     gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -dPDFSETTTINGS=/prepress\
          -sOutputFile=$@ ;
 }
-
-apdoc () {
-	ansible-doc $1 | grep EXAMPLES -A 100 | less
-}

vim/.vimrc.plug

@@ -22,7 +22,7 @@ endfunction
 """ Plugins
 call plug#begin('~/.vim/plugged')
 """ core
-"Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') } " completion engine for vim
+Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') } " completion engine for vim
 Plug 'flazz/vim-colorschemes'                           " color scheme pack
 Plug 'sheerun/vim-polyglot'                             " language pack for vim
 Plug 'w0rp/ale'                                         " Asynchronous linter