matt1432/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Auto Update

Browse source
This commit is contained in:
matt1432 2023-04-03 11:26:54 -04:00
commit 20b8410fb2
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
files/.bash_aliases
View file

@ -4,7 +4,7 @@ alias dprune='docker image prune -f'
alias dcrestart='docker compose down --remove-orphans && docker compose up -d' alias dcrestart='docker compose down --remove-orphans && docker compose up -d'
alias docker='docker ' 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' alias ncht='docker exec -it --user www-data app-server php occ maintenance:update:htaccess'

18
files/.bashrc
View file

@ -29,10 +29,17 @@ export TERM=xterm-color
# Alias definitions. # Alias definitions.
[[ -f ~/.bash_aliases ]] && . ~/.bash_aliases [[ -f ~/.bash_aliases ]] && . ~/.bash_aliases
<<<<<<< HEAD
# set PATH so it includes user's private bin if it exists # set PATH so it includes user's private bin if it exists
[[ -d "$HOME/bin" ]] && PATH+=":$HOME/bin" [[ -d "$HOME/bin" ]] && PATH+=":$HOME/bin"
[[ -d "$HOME/.local/bin" ]] && PATH+=":$HOME/.local/bin" [[ -d "$HOME/.local/bin" ]] && PATH+=":$HOME/.local/bin"
[[ -d "$HOME/scipts/bin" ]] && PATH+=":$HOME/scripts/bin" [[ -d "$HOME/scipts/bin" ]] && PATH+=":$HOME/scripts/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"
>>>>>>> 574ac34e491aaaad429e0df90280e7a0b5e8c7f5
# source misc user scripts # source misc user scripts
if [ -d ~/git/dotfiles/source ]; then if [ -d ~/git/dotfiles/source ]; then
@ -40,17 +47,14 @@ if [ -d ~/git/dotfiles/source ]; then
fi fi
# set prompt colors and style # set prompt colors and style
if [ -f ~/.PS1 ]; then [[ -f ~/.PS1 ]] && . ~/.PS1 ||
source ~/.PS1
else
PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ ' PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
fi
# fetch uninstalled package names when attempting command (arch only) # fetch uninstalled package names when attempting command (arch only)
if [ -f /usr/share/doc/pkgfile/command-not-found.bash ]; then PKG_COMP=/usr/share/doc/pkgfile/command-not-found.bash
source /usr/share/doc/pkgfile/command-not-found.bash [[ -f $PKG_COMP ]] && . $PKG_COMP
fi
# source fzf scripts
if [ -d ~/.fzf ]; then if [ -d ~/.fzf ]; then
source ~/.fzf/completion.bash source ~/.fzf/completion.bash
source ~/.fzf/key-bindings.bash source ~/.fzf/key-bindings.bash

6
files/.nanorc
View file

@ -14,12 +14,12 @@
## When soft line wrapping is enabled, make it wrap lines at blanks ## When soft line wrapping is enabled, make it wrap lines at blanks
## (tabs and spaces) instead of always at the edge of the screen. ## (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 ## Automatically indent a newly created line to the same number of
## tabs and/or spaces as the preceding line -- or as the next line ## tabs and/or spaces as the preceding line -- or as the next line
## if the preceding line is the beginning of a paragraph. ## if the preceding line is the beginning of a paragraph.
# set autoindent set autoindent
## Back up files to the current filename plus a tilde. ## Back up files to the current filename plus a tilde.
# set backup # set backup
@ -102,7 +102,7 @@ set linenumbers
# set multibuffer # set multibuffer
## Don't convert files from DOS/Mac format. ## 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. ## Don't display the helpful shortcut lists at the bottom of the screen.
# set nohelp # set nohelp