mchalupiak/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Michael Chalupiak 2025-04-03 11:33:46 -04:00
commit 723895373e
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/.bashrc
View File

@ -131,7 +131,7 @@ alias zf='z $(flirt)'
# ~/.bash_aliases, instead of adding them here directly. # ~/.bash_aliases, instead of adding them here directly.
# See /usr/share/doc/bash-doc/examples in the bash-doc package. # See /usr/share/doc/bash-doc/examples in the bash-doc package.
if [ -z "$EDITOR" ]; then if [ -z "$EDITOR" ]; then
export EDITOR='kak' export EDITOR='nvim'
fi fi
if [ -f ~/.bash_aliases ]; then if [ -f ~/.bash_aliases ]; then
@ -176,14 +176,19 @@ run_kak() {
} }
if [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ] && [ -z "$TMUX" ]; then 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)" 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' # 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 elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then
SESH="$(tmux display-message -p '#S')" SESH="$(tmux display-message -p '#S')"
# alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH' # alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH'
alias kak=run_kak alias kak=run_kak
alias vidir='EDITOR="kak -c $SESH 2/dev/null || kak -s $SESH" vidir' # 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 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 fi
alias enter-dev='. enter-dev.sh' alias enter-dev='. enter-dev.sh'

8
config/.config/kak/kakrc
View File

@ -31,6 +31,13 @@ plug "your-tools/kak-subvert" do %{
plug "https://git.sr.ht/~nasmevka/repl.kak" 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 <a-f> '<esc>: mru-files ' -docstring 'mru-files'
# map global goto <a-F> '<esc>: mru-files-related<ret>' -docstring 'mru-files-related'
}
plug "custom-filetypes" load-path "~/.config/kak/al" plug "custom-filetypes" load-path "~/.config/kak/al"
# # Color Themes # # Color Themes
plug "tinted-theming/base16-kakoune" theme plug "tinted-theming/base16-kakoune" theme
@ -459,4 +466,5 @@ map -docstring 'clear spell check' global spell c ':spell-clear<ret>'
map -docstring 'next spell check' global spell n ':spell-next<ret>' map -docstring 'next spell check' global spell n ':spell-next<ret>'
map -docstring 'spell check replacements' global spell r ':spell-replace<ret>' map -docstring 'spell check replacements' global spell r ':spell-replace<ret>'
map -docstring 'quit kakoune' global user q ':q!<ret>'
colorscheme base16-rose-pine colorscheme base16-rose-pine

1
config/.scripts/store/projects
View File

@ -6,3 +6,4 @@
/home/mikec/Documents/College/CSSE403/csse403/Homework /home/mikec/Documents/College/CSSE403/csse403/Homework
/home/mikec/Documents/College/CSSE142 /home/mikec/Documents/College/CSSE142
/home/mikec/Documents/College/CSSE403/inclass.rs /home/mikec/Documents/College/CSSE403/inclass.rs
/home/mikec/Documents/College/CSSE403/csse403/Homework/RustWebserver