cleanup

config.yml

@@ -51,12 +51,6 @@
       path: gitconfig.prefer-ssh
     ~/.gitignore.global: gitignore.global
     ~/bin/git-review-pr: bin/git-review-pr
-    ~/.gnupg/gpg.conf:
-      if: "[ `uname` = Darwin ]"
-      path: gnupg/gpg.conf
-    ~/.gnupg/gpg-agent.conf:
-      if: "[ `uname` = Darwin ]"
-      path: gnupg/gpg-agent.conf
 
 # starship
 - link:

gitconfig

@@ -2,15 +2,14 @@
     excludesfile = ~/.gitignore.global
     whitespace = space-before-tab,trailing-space
 	pager = delta
-	editor = vim
+	editor = nvim
 
 [interactive]
     diffFilter = delta --color-only --features=interactive
 
 [user]
     name = Bence Nagy
     email = [email protected]
-    signingkey = 88D12683EFF2E23E
 
 [init]
 	defaultBranch = main

gitignore.global

@@ -1,4 +1,4 @@
-env/
+.env
 .envrc
 
 *.pyc

ssh/config

@@ -4,13 +4,3 @@ Host *
   AddKeysToAgent yes
   UseKeychain yes
   IdentityFile ~/.ssh/id_ed25519
-
-Host remarkable
-  HostName 192.168.8.157
-  User root
-  IdentityFile ~/.ssh/remarkable
-
-Host remarkable-usb
-  HostName 10.11.99.1
-  User root
-  IdentityFile ~/.ssh/remarkable

zsh/aliases

@@ -3,14 +3,9 @@ alias g="git"
 alias k="kubectl"
 alias dc="docker-compose"
 alias l="ls -AltrhG"
-alias lo="m lock"
 
 alias zshrc="$EDITOR ~/.zsh"
 alias vimrc="$EDITOR ~/.vimrc"
 alias nvimrc="$EDITOR ~/.config/nvim/init.vim"
 
-alias release="python3 setup.py bdist_wheel --universal upload --sign && python3 setup.py sdist upload --sign"
-alias venv="source env/bin/activate"
-
-alias pip-up='gfind . -name "*requirements.in" -exec pip-compile --upgrade "{}" \;'
-alias pip-push-up="git stash && git checkout master && git pull && git branch -D bence/pip-up; git checkout -b bence/pip-up && pip-up && git add *requirements.txt && git commit -m 'Update requirements' && git push --force origin bence/pip-up && git show --unified=0"
+alias venv="source .env/bin/activate"

zsh/environment

@@ -3,7 +3,6 @@ export LANG=en_US.UTF-8
 
 export GOPATH="$HOME/go"
 export PATH="./node_modules/.bin:$HOME/.cargo/bin:$HOME/bin:$HOME/.local/bin:$GOPATH/bin:/opt/homebrew/bin:/usr/local/sbin:$PATH"
-export PIPENV_VENV_IN_PROJECT=true
 export SKIP="semgrep"
 export AWS_PROFILE="engineer"
 
@@ -16,8 +15,8 @@ if exists vim; then
   export EDITOR=$(command -v vim)
 fi
 
-if exists gpg; then
-  export GPG_TTY=$(tty)
+if exists nvim; then
+  export EDITOR=$(command -v nvim)
 fi
 
 export VISUAL="$EDITOR"

zsh/functions

@@ -2,14 +2,6 @@ exists() {
   type -p $1 > /dev/null
 }
 
-mgmt() {
-  if [[ -z $1 ]]; then
-    ssh -t mgmt tmux attach -t $(whoami)
-    return 0
-  fi
-  ssh -t mgmt tmux new-session -t $(whoami)-ssh\\\; new-window -t $(whoami)-ssh\\\; new-window -n $1 \"sudo ssh $1\"
-}
-
 fixup() {
   if [[ -z $1 ]]; then
     echo "Usage: fixup <commit-ish>"

zsh/main

@@ -5,9 +5,6 @@ zinit snippet $ZSHHOME/functions
 zinit snippet $ZSHHOME/environment
 zinit snippet $ZSHHOME/aliases
 
-zinit ice as'program' pick'bin/asdf' src'asdf.sh' atinit'export PATH=$(bin/asdf where python)/bin:$PATH'
-zinit load asdf-vm/asdf
-
 zinit ice \
   wait lucid from'gh-r' as'program' mv'direnv* -> direnv' \
   atclone'./direnv hook zsh > zhook.zsh' atpull'%atclone' \
@@ -31,22 +28,12 @@ zinit wait lucid for \
 zinit ice wait lucid from'gh-r' as'program' pick'delta*/delta'
 zinit load dandavison/delta
 
-zinit ice wait lucid from'gh-r' as'program'
-zinit load junegunn/fzf
-
-zinit ice wait lucid from'gh-r' as'program' pick'bat*/bat' atload'alias cat=bat'
-zinit load sharkdp/bat
-
 zinit ice wait lucid from'gh-r' as'program' pick'ripgrep*/rg'
 zinit load BurntSushi/ripgrep
 
 zinit ice wait lucid from'gh-r' as'program' pick'fd*/fd'
 zinit load sharkdp/fd
 
-zinit ice wait lucid from'gh-r' as'program' mv'gh* -> gh' pick'gh/bin/gh' \
-  atclone='./gh/bin/gh completion --shell zsh > _gh' atpull'%atclone'
-zinit load cli/cli
-
 # from https://github.com/zdharma-continuum/fast-syntax-highlighting/tree/a62d721affc771de2c78201d868d80668a84c1e1#zinit
 # needs to be the last one loaded
 zinit wait lucid for \

zsh/zsh-settings

@@ -15,3 +15,5 @@ export SAVEHIST=100000
 export HIST_IGNORE_SPACE=1
 
 export ZSH_CACHE_DIR=$ZSHHOME/.cache
+
+export ZSHZ_UNCOMMON=1

zshrc

@@ -9,24 +9,3 @@ source $ZSHHOME/main
 for file in ~/.zshlocal/post/*(.N); do
   source $file
 done
-
-# opam configuration
-[[ ! -r /Users/underyx/.opam/opam-init/init.zsh ]] || source /Users/underyx/.opam/opam-init/init.zsh  > /dev/null 2> /dev/null
-
-export PNPM_HOME="$HOME/Library/pnpm"
-test -e "${PNPM_HOME}" && export PATH="$PNPM_HOME:$PATH"
-
-test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
-
-# pnpm
-export PNPM_HOME="/Users/underyx/Library/pnpm"
-case ":$PATH:" in
-  *":$PNPM_HOME:"*) ;;
-  *) export PATH="$PNPM_HOME:$PATH" ;;
-esac
-# pnpm end
-
-
-source "$HOME/.rye/env"
-
-. "$HOME/.cargo/env"