diff options
| author | srdusr <trevorgray@srdusr.com> | 2025-09-01 19:42:20 +0200 |
|---|---|---|
| committer | srdusr <trevorgray@srdusr.com> | 2025-09-01 19:42:20 +0200 |
| commit | a28e0769b8ff188240589ddb7c0e99c46169de7b (patch) | |
| tree | a57ab7aef291386c7f23a7da8e85579713039363 | |
| parent | 904d22e678128ca77706c9bf4eccb92d03b34f73 (diff) | |
| download | dotfiles-a28e0769b8ff188240589ddb7c0e99c46169de7b.tar.gz dotfiles-a28e0769b8ff188240589ddb7c0e99c46169de7b.zip | |
Testing
| -rw-r--r-- | .gitconfig | 28 | ||||
| -rw-r--r-- | .gitignore | 48 | ||||
| -rw-r--r-- | linux/home/.zprofile | 2 |
3 files changed, 2 insertions, 76 deletions
diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 8b2ef30..0000000 --- a/.gitconfig +++ /dev/null @@ -1,28 +0,0 @@ -[user] - name = srdusr - email = trevorgray@srdusr.com -[init] - defaultBranch = main -[color] - ui = true -[alias] - graph = log --oneline --graph --decorate - ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate - ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat - lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short - conflicts = diff --name-only --diff-filter=U - local-branches = !git branch -vv | cut -c 3- | awk '$3 !~/\\[/ { print $1 }' - recent-branches = !git branch --sort=-committerdate | head - authors = !git log --format='%aN <%aE>' | grep -v 'users.noreply.github.com' | sort -u --ignore-case - sba ="!f() { git subtree add --prefix $2 $1 main; }; f" - sbu ="!f() { git subtree pull --prefix $2 $1 main; }; f" - stashrebase = "!f() { if [ \"$(git symbolic-ref --short HEAD)\" = \"main\" ]; then git stash save && git fetch && git rebase origin main && git stash apply; else git stash save && git fetch && git rebase origin master && git stash apply; fi; }; f" - dotfiles = "!f() { git --git-dir=$HOME/.cfg --work-tree=$HOME stashrebase; }; f" - - -[credential "https://github.com"] - helper = - helper = !/usr/bin/gh auth git-credential -[credential "https://gist.github.com"] - helper = - helper = !/usr/bin/gh auth git-credential diff --git a/.gitignore b/.gitignore deleted file mode 100644 index dc6a064..0000000 --- a/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -.cfg -install.sh -# Ignore Packer's compiled files -packer_compiled.lua - -# Ignore Zsh plugins directory -~/.config/zsh/plugins - -# Ignore zcompdump files -zcompdump - -# Ignore .DS_Store files (macOS) -*.DS_Store - -# Ignore .git directory -.git/ - -# Ignore .spl files -*.spl - -# Ignore node_modules directory -node_modules/ - -## Ignore .png files -#*.png - -# Ignore .zip files -*.zip - -# Ignore .pxd files -*.pxd - -# Ignore .local directory -#^.local/ - -# Ignore .cache directory -^.cache/ - -# Ignore downloads directory -^downloads/ - -# Ignore music directory -^music/ - -^images/ -^pictures/ -^machines/ - diff --git a/linux/home/.zprofile b/linux/home/.zprofile index 322d2ce..dafce71 100644 --- a/linux/home/.zprofile +++ b/linux/home/.zprofile @@ -1 +1,3 @@ emulate sh -c '. ~/.profile' +#[[ -f ~/.config/zsh/.zshenv ]] && . ~/.config/zsh/.zshenv +#[[ -f ~/.profile ]] && . ~/.profile |