From 76ede0bb29b723123c2c1b9dc3a058ad9659c360 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 23 Mar 2023 09:10:47 -0400 Subject: [PATCH 1/7] Auto Update --- files/.bash_aliases | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/.bash_aliases b/files/.bash_aliases index 2894bc6..784abb5 100644 --- a/files/.bash_aliases +++ b/files/.bash_aliases @@ -4,7 +4,7 @@ alias dprune='docker image prune -f' alias dcrestart='docker compose down --remove-orphans && docker compose up -d' alias docker='docker ' -alias ps='ps -a --format "table {{.Names}}:\t{{.State}}\t{{.Status}}"' +alias ps='ps -a --format "table {{.Names}}:\t{{.State}}"' alias ncht='docker exec -it --user www-data app-server php occ maintenance:update:htaccess' From 48e19ded58100c06d9d203312e5c933fda4e8d7f Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 23 Mar 2023 09:40:54 -0400 Subject: [PATCH 2/7] feat(.nanorc): add autoindent and co --- files/.nanorc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/.nanorc b/files/.nanorc index ed8835d..17dd1e6 100644 --- a/files/.nanorc +++ b/files/.nanorc @@ -14,12 +14,12 @@ ## When soft line wrapping is enabled, make it wrap lines at blanks ## (tabs and spaces) instead of always at the edge of the screen. -# set atblanks +set atblanks ## Automatically indent a newly created line to the same number of ## tabs and/or spaces as the preceding line -- or as the next line ## if the preceding line is the beginning of a paragraph. -# set autoindent +set autoindent ## Back up files to the current filename plus a tilde. # set backup @@ -102,7 +102,7 @@ set linenumbers # set multibuffer ## Don't convert files from DOS/Mac format. -# set noconvert +set noconvert ## Don't display the helpful shortcut lists at the bottom of the screen. # set nohelp From 770e4df1243c2d5a9412e8c4f2931c65a047f345 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Fri, 24 Mar 2023 01:34:18 -0400 Subject: [PATCH 3/7] Auto Update --- files/.bashrc | 1 + 1 file changed, 1 insertion(+) diff --git a/files/.bashrc b/files/.bashrc index 1ab14a6..5132887 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -32,6 +32,7 @@ export TERM=xterm-color # set PATH so it includes user's private bin if it exists [[ -d "$HOME/bin" ]] && PATH+=":$HOME/bin" [[ -d "$HOME/.local/bin" ]] && PATH+=":$HOME/.local/bin" +[[ -d "/usr/local/go/bin" ]] && PATH+=":/usr/local/go/bin" # source misc user scripts if [ -d ~/git/dotfiles/source ]; then From 0eb05cd3ed6701e36bc1b14d85a29c4a273c2f95 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 26 Mar 2023 01:24:57 -0400 Subject: [PATCH 4/7] Auto Update --- files/.bashrc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/files/.bashrc b/files/.bashrc index 5132887..79e284d 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -40,11 +40,7 @@ if [ -d ~/git/dotfiles/source ]; then fi # set prompt colors and style -if [ -f ~/.PS1 ]; then - source ~/.PS1 -else - PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ ' -fi +[[ -f ~/.PS1 ]] && . ~/.PS1 || PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ ' # fetch uninstalled package names when attempting command (arch only) if [ -f /usr/share/doc/pkgfile/command-not-found.bash ]; then From 9ba21d9cb899af810ec8606dcb3cd72fa2db1e21 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 26 Mar 2023 01:32:49 -0400 Subject: [PATCH 5/7] Auto Update --- files/.bashrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/files/.bashrc b/files/.bashrc index 79e284d..34cbfa3 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -40,12 +40,12 @@ if [ -d ~/git/dotfiles/source ]; then fi # set prompt colors and style -[[ -f ~/.PS1 ]] && . ~/.PS1 || PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ ' +[[ -f ~/.PS1 ]] && . ~/.PS1 || +PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ ' # fetch uninstalled package names when attempting command (arch only) -if [ -f /usr/share/doc/pkgfile/command-not-found.bash ]; then - source /usr/share/doc/pkgfile/command-not-found.bash -fi +PKG_COMP=/usr/share/doc/pkgfile/command-not-found.bash +[[ -f $PKG_COMP ]] . $PKG_COMP if [ -d ~/.fzf ]; then source ~/.fzf/completion.bash From 96b2980333a15e9ccf560933e3a51d3cc6ad2746 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 26 Mar 2023 01:33:25 -0400 Subject: [PATCH 6/7] Auto Update --- files/.bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/.bashrc b/files/.bashrc index 34cbfa3..a8a15e3 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -45,7 +45,7 @@ PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ ' # fetch uninstalled package names when attempting command (arch only) PKG_COMP=/usr/share/doc/pkgfile/command-not-found.bash -[[ -f $PKG_COMP ]] . $PKG_COMP +[[ -f $PKG_COMP ]] && . $PKG_COMP if [ -d ~/.fzf ]; then source ~/.fzf/completion.bash From 574ac34e491aaaad429e0df90280e7a0b5e8c7f5 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 26 Mar 2023 01:38:35 -0400 Subject: [PATCH 7/7] Auto Update --- files/.bashrc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/files/.bashrc b/files/.bashrc index a8a15e3..63f1ea6 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -29,10 +29,10 @@ export TERM=xterm-color # Alias definitions. [[ -f ~/.bash_aliases ]] && . ~/.bash_aliases -# set PATH so it includes user's private bin if it exists -[[ -d "$HOME/bin" ]] && PATH+=":$HOME/bin" -[[ -d "$HOME/.local/bin" ]] && PATH+=":$HOME/.local/bin" -[[ -d "/usr/local/go/bin" ]] && PATH+=":/usr/local/go/bin" +# set PATH so it includes certain bin folders if they exist +[[ -d ~/bin ]] && PATH+=":$HOME/bin" +[[ -d ~/.local/bin ]] && PATH+=":$HOME/.local/bin" +[[ -d /usr/local/go/bin ]] && PATH+=":/usr/local/go/bin" # source misc user scripts if [ -d ~/git/dotfiles/source ]; then @@ -47,6 +47,7 @@ PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ ' PKG_COMP=/usr/share/doc/pkgfile/command-not-found.bash [[ -f $PKG_COMP ]] && . $PKG_COMP +# source fzf scripts if [ -d ~/.fzf ]; then source ~/.fzf/completion.bash source ~/.fzf/key-bindings.bash