diff --git a/config/.bashrc b/config/.bashrc index 7a619ae..751d496 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -131,7 +131,7 @@ alias zf='z $(flirt)' # ~/.bash_aliases, instead of adding them here directly. # See /usr/share/doc/bash-doc/examples in the bash-doc package. if [ -z "$EDITOR" ]; then - export EDITOR='kak' + export EDITOR='nvim' fi if [ -f ~/.bash_aliases ]; then @@ -176,14 +176,19 @@ run_kak() { } if [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ] && [ -z "$TMUX" ]; then - SESH="$((tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)" - alias kak='tmux new-session -e "EDITOR=\"kak -c $SESH\"" -s $SESH kak -s $SESH > /dev/null' + SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)" + # alias kak='tmux new-session -e "EDITOR=\"kak -c $SESH\"" -s $SESH kak -s $SESH > /dev/null' elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then SESH="$(tmux display-message -p '#S')" # alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH' alias kak=run_kak - alias vidir='EDITOR="kak -c $SESH 2/dev/null || kak -s $SESH" vidir' - alias vipe='EDITOR="kak -c $SESH 2>/dev/null|| kak -s $SESH" vipe' + # alias vidir='EDITOR="kak -c $SESH 2/dev/null || kak -s $SESH" vidir' + # alias vipe='EDITOR="kak -c $SESH 2>/dev/null|| kak -s $SESH" vipe' +fi + +if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then + SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)" + alias tmux="tmux new-session -s $SESH" fi alias enter-dev='. enter-dev.sh' diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc index c84c4f8..08a57ff 100644 --- a/config/.config/kak/kakrc +++ b/config/.config/kak/kakrc @@ -31,6 +31,13 @@ plug "your-tools/kak-subvert" do %{ plug "https://git.sr.ht/~nasmevka/repl.kak" +plug "https://gitlab.com/kstr0k/mru-files.kak" demand mru-files %{ # %{} needed even if empty + # suggested mappings: *after* plugin loads + # think "go alt[ernate]-f[iles]" + # map global goto ': mru-files ' -docstring 'mru-files' + # map global goto ': mru-files-related' -docstring 'mru-files-related' +} + plug "custom-filetypes" load-path "~/.config/kak/al" # # Color Themes plug "tinted-theming/base16-kakoune" theme @@ -458,4 +465,5 @@ map -docstring 'clear spell check' global spell c ':spell-clear' map -docstring 'next spell check' global spell n ':spell-next' map -docstring 'spell check replacements' global spell r ':spell-replace' +map -docstring 'quit kakoune' global user q ':q!' colorscheme base16-rose-pine diff --git a/config/.scripts/store/projects b/config/.scripts/store/projects index 8474063..161a2f2 100755 --- a/config/.scripts/store/projects +++ b/config/.scripts/store/projects @@ -8,4 +8,8 @@ /home/mikec/Documents/College/CSSE403/csse403/Homework /home/mikec/Documents/College/CSSE142 /home/mikec/Documents/College/CSSE403/inclass.rs +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= +/home/mikec/Documents/College/CSSE403/csse403/Homework/RustWebserver >>>>>>> Stashed changes