From 802ff4475ea3aa23128f3f492c8d3eb990997952 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Sun, 15 Jan 2023 22:42:44 -0500
Subject: [PATCH 1/3] add helix runtime to git ignore

---
 .gitignore             |  1 +
 config/bash/.bashrc    | 85 +++++++++++++++++++++---------------------
 config/tmux/.tmux.conf |  2 +-
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3291ac2..e626613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *packer_compiled.lua
+helix/runtime
diff --git a/config/bash/.bashrc b/config/bash/.bashrc
index 4b3e954..03eed2c 100644
--- a/config/bash/.bashrc
+++ b/config/bash/.bashrc
@@ -1,6 +1,7 @@
 # This .bashrc is kept under git version control
-# To make any edits or configurations, please edit `~/.config/bashrc`
-# as this is sourced at the end of this file
+
+# To make any local (non-tracked) edits or configurations, 
+# please edit `~/.local/.bashrc`, which is sourced from this file.
 
 # If not running interactively, don't do anything
 case $- in
@@ -9,22 +10,19 @@ case $- in
 esac
 
 ##* environment variables *##
+# {{{
 
 # environment variables for commands
+export PAGER="less"
 export EDITOR="/usr/bin/vim"
 export VISUAL="/usr/bin/vim"
-export PAGER="less"
 
 # bash history options
 HISTSIZE= ;
-HISTFILESIZE=
+HISTFILESIZE= ;
 HISTCONTROL="ignoreboth:erasedups"
 HISTTIMEFORMAT="%F %T  "
 
-
-##* aliases *##
-# {{{
-
 # ls options
 ls --version &> /dev/null
 if [ "$? " -eq 0 ]; then
@@ -33,6 +31,10 @@ else
   LS_OPTS="-GF"
   export CLICOLOR=1
 fi
+# }}}
+
+##* aliases *##
+# {{{
 
 # core utils (ls, grep, tree)
 alias l="ls ${LS_OPTS}"
@@ -65,20 +67,20 @@ alias tmka="tmux kill-server" # aka killall
 alias d="docker"
 alias dc="docker-compose"
 
+# kubernetes
+alias k="kubectl"
+alias mink="minikube"
+
 # python
-# python3 is python unless python is python
+# python3 is python unless python is already python3
 if ! command -v python &> /dev/null && command -v python3 &> /dev/null;  then
   alias python="python3"
   alias py="python3"
   alias ipy="ipython3"
 fi
 alias venvac="source venv/bin/activate"
+alias mkvenv="python -m venv venv"
 
-# linux gui things
-alias xo="xdg-open"
-alias firefox-temp='firefox --profile $(mktemp -d) &> /dev/null &'
-# mac gui things
-alias o="open"
 
 # compression/archives
 alias untar="tar -xvf"
@@ -267,8 +269,7 @@ watip() {
 }
 #}}}
 
-
-## prompt settings (PS1) ##
+##* prompt settings (PS1) *##
 # {{{
 
 # git prompt function
@@ -311,7 +312,7 @@ PS1="${bold}${bright_blue}\w\$(parse_git)${white} \\$ ${reset}"
 # PS1="${bold}${bright_cyan}\u${bright_magenta}@${bright_yellow}\h${white}:${bright_blue}\w\$(parse_git)${white}\\$ ${reset}"
 # }}}
 
-## bash completions and integrations ##
+##* bash completions and integrations *##
 # {{{
 # bash autocompletion
 if ! shopt -oq posix; then
@@ -327,10 +328,10 @@ fi
 
 # fzf shell integration
 export FZF_DEFAULT_OPTS="--bind=ctrl-f:page-down,ctrl-b:page-up"
-[ -f ~/.config/.fzf.bash ] && source ~/.config/.fzf.bash
+[ -f "~/.config/.fzf.bash" ] && source "~/.config/.fzf.bash"
 # }}}
 
-## paths ##
+##* paths *##
 # language version managers
 # {{{
 # ruby (rbenv)
@@ -387,23 +388,37 @@ fi
 [ -d "$HOME/.cargo" ] && appendpath "$HOME/.cargo/bin"
 #}}}
 
-## macOS package managers and specific config ##
+##* OS specific config *##
 # {{{
-# homebrew
-[ -d "/opt/homebrew/bin" ] && appendpath "/opt/homebrew/bin"
-# python3 (macOS)
-[ -d "$HOME/Library/Python/3.8/bin" ] && appendpath "$HOME/Library/Python/3.8/bin"
+case "$OSTYPE" in
+  darwin*)  
+    # homebrew
+    [ -d "/opt/homebrew/bin" ] && appendpath "/opt/homebrew/bin"
+    # python3 (macOS)
+    [ -d "$HOME/Library/Python/3.8/bin" ] && appendpath "$HOME/Library/Python/3.8/bin"
+    # gui things
+    alias o="open"
+  ;;
+  linux*)
+    # linux gui things
+    alias xo="xdg-open"
+    alias firefox-temp='firefox --profile $(mktemp -d) &> /dev/null &'
+  ;;
+esac
+
 
 # local bins
 [ -d "$HOME/.local/bin" ] && appendpath "$HOME/.local/bin"
 [ -d "$HOME/.local/scripts" ] && appendpath "$HOME/.local/scripts"
 
 # local rc
-[ -r "$HOME/.config/.bashrc.local" ] && source "$HOME/.config/.bashrc.local"
+[ -r "$HOME/.local/.bashrc" ] && source "$HOME/.local/.bashrc"
 #}}}
 
-## alias to *new* and *improved* unix cli tools (exa, bat, nvim)
-# Check for nvim and set as editor after paths are added
+## section for *new* and *improved* cli tools (exa, bat, nvim)
+# {{{
+# nvim
+# {{{
 NVIM=$(command -v nvim)
 if [ -x "$NVIM" ]; then
   EDITOR="$NVIM"
@@ -412,21 +427,7 @@ fi
 alias v="$EDITOR"
 alias vi="$EDITOR"
 alias vim="$EDITOR"
-
-# dead code
-# {{{
-# start in tmux session if possible
-# if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
-#   exec tmux
-# fi
-
-# shell options
-# if ! shopt -q checkhash 2> /dev/null; then shopt -s checkhash fi
-# if ! shopt -q checkwinsize 2> /dev/null; then shopt -s checkwinsize; fi
-# if ! shopt -q cmdhist 2> /dev/null; then shopt -s cmdhist; fi
-# if ! shopt -q histappend 2> /dev/null; then shopt -s histappend; fi
-# if ! shopt -q extglob 2> /dev/null; then shopt -s extglob; fi
-# if ! shopt -q globstar 2> /dev/null; then shopt -s globstar; fi
+# }}}
 # }}}
 
 # vim:ft=sh
diff --git a/config/tmux/.tmux.conf b/config/tmux/.tmux.conf
index c240837..b228129 100644
--- a/config/tmux/.tmux.conf
+++ b/config/tmux/.tmux.conf
@@ -10,7 +10,7 @@ set -g default-terminal "xterm-256color"
 setw -g mode-keys vi
 
 # unset the annoying delay
-set -sg escape-time 0
+# set -sg escape-time -1
 
 # mouse settings
 # set -g mouse on

From 3c87825c08dbfc921c4821d78b3fe10c34f44638 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Sun, 15 Jan 2023 22:44:40 -0500
Subject: [PATCH 2/3] modify gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e626613..01d205f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 *packer_compiled.lua
-helix/runtime
+config/helix/.config/helix/runtime

From 7f3600312ae7e52c4d5c3f4bccb8dd92d03c6a09 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Sun, 15 Jan 2023 22:51:53 -0500
Subject: [PATCH 3/3] restore previous README

---
 README.md | 60 +++++++++++++++++++------------------------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 2cbc815..cb46c4c 100644
--- a/README.md
+++ b/README.md
@@ -3,61 +3,41 @@
 I am using [GNU Stow](https://www.gnu.org/software/stow/) to symlink
 my dotfiles to their correct locations in my `$HOME` directory.
 
-## Installing `stow`
-
-### Ubuntu/Debian
-
-```bash
-apt install stow
-```
-
-### Fedora/RHEL
-
-```bash
-dnf install stow
-```
-
-### Arch
-
-```bash
-pacman -S stow
-```
-
-### MacOS
-
-```bash
-brew install stow
-```
-
 ## Cloning this repo
 
 ```bash
 git clone https://github.com/lemonase/dotfiles.git && cd dotfiles/config
 ```
 
+## Installing `stow` on Linux and macOS
+
+```bash
+# Ubuntu/Debian
+apt install stow
+
+# Fedora/RHEL
+dnf install stow
+
+# Arch
+pacman -S stow
+
+# macOS
+brew install stow
+```
+
 ## Using `stow`
 
-### Installing all symlinks
-
 ```bash
+# Installing all symlinks
 stow -t "$HOME" -S *
-```
 
-### Uninstalling all symlinks
-
-```bash
+# Uninstalling all symlinks
 stow -t "$HOME" -D *
-```
 
-### Repairing all symlinks
-
-```bash
+# Repairing all symlinks
 stow -t "$HOME" -R *
-```
 
-### Installing specific dotfiles
-
-```bash
+# Installing specific dotfiles
 stow -t "$HOME" -S git
 ```