PlexSheep
/
home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into minimal

This commit is contained in:
Christoph J. Scherr 2023-09-13 21:02:09 +02:00
parent f482554f1a 281611cd67
commit 46294adcac
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitconfig
View File

@ -6,3 +6,5 @@
helper = store --file ~/.git-credentials helper = store --file ~/.git-credentials
[commit] [commit]
gpgsign = false gpgsign = false
[pull]
rebase = false

8
.zshrc
View File

@ -1,8 +1,6 @@
### ENVVARS ### ENVVARS
export PATH="$PATH:/usr/local/sbin:/usr/sbin/:/usr/local/bin:/usr/bin:/var/lib/flatpak/exports/bin:" PATH="/usr/bin:/usr/sbin:$HOME/.local/bin:$HOME/.cargo/bin:/usr/local/bin"
export PATH="$PATH:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:~/.local/bin:~/.cargo/bin" export PATH
export PATH="$PATH:/home/plex/.local/bin"
export PATH="$HOME/tools/node-v14.15.4-linux-x64/bin:$PATH"
export EDITOR=nvim export EDITOR=nvim
export editor=nvim export editor=nvim
export XDG_CONFIG_HOME=~/.config export XDG_CONFIG_HOME=~/.config
@ -23,7 +21,7 @@ alias isotime='date +"%Y-%m-%dT%H:%M:%S%z"'
alias gg=lazygit alias gg=lazygit
alias reload="source ~/.zshrc" alias reload="source ~/.zshrc"
alias gls=/bin/ls alias gls=/bin/ls
alias neorg='nvim -c "Neorg workspace main"' alias neorg='nvim -c "Neorg workspace $1"'
### non standard aliases ### non standard aliases
if [ -f ~/.zsh_aliases ]; then if [ -f ~/.zsh_aliases ]; then