diff --git a/.gitmodules b/.gitmodules index a21ce25..9777e68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,12 +52,3 @@ [submodule "vim/start/vim-polyglot"] path = vim/start/vim-polyglot url = https://github.com/sheerun/vim-polyglot.git -[submodule "zsh/zsh-autosuggestions"] - path = zsh/zsh-autosuggestions - url = https://github.com/zsh-users/zsh-autosuggestions.git -[submodule "zsh/zsh-syntax-highlighting"] - path = zsh/zsh-syntax-highlighting - url = https://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule "zsh/oh-my-zsh"] - path = zsh/oh-my-zsh - url = https://github.com/ohmyzsh/ohmyzsh.git diff --git a/install.conf.yaml b/install.conf.yaml index 34614b3..d785790 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -56,10 +56,6 @@ ~/.wgetrc: wget/wgetrc ~/.config/yay/config.json: yay/config.json ~/.Xresources: i3/Xresources - ~/.zshrc: zsh/zshrc - ~/.oh-my-zsh: zsh/oh-my-zsh - ~/.zsh-syntax-highlighting: zsh/zsh-syntax-highlighting - ~/.zsh-autosuggestions: zsh/zsh-autosuggestions # graphic - link: diff --git a/shell/aliases.sh b/shell/aliases.sh index 183a59e..2b5454d 100755 --- a/shell/aliases.sh +++ b/shell/aliases.sh @@ -97,21 +97,7 @@ alias aur-update='yay -Syua' # NIX: alias nix-list-results='ls -l /nix/var/nix/gcroots/auto/' -nixpkgs-build() { - if [[ $# -lt 1 ]]; then - echo "Usage: nixpkgs-build [parameters...]" - return 1 - fi - - local pkg="$1" - shift - - if command -v nom >/dev/null 2>&1; then - nom build ".#$pkg" "$@" - else - nix build ".#$pkg" "$@" - fi -} +alias nixpkgs-build='nix-build . -A' alias nixpkgs-review-fast-merge='nixpkgs-review post-result && nixpkgs-review approve && nixpkgs-review merge' # DOTFILES: diff --git a/zsh/oh-my-zsh b/zsh/oh-my-zsh deleted file mode 160000 index 35068db..0000000 --- a/zsh/oh-my-zsh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35068db8373917a23eb9e3dabeb6596348e6534c diff --git a/zsh/zsh-autosuggestions b/zsh/zsh-autosuggestions deleted file mode 160000 index 85919cd..0000000 --- a/zsh/zsh-autosuggestions +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 85919cd1ffa7d2d5412f6d3fe437ebdbeeec4fc5 diff --git a/zsh/zsh-syntax-highlighting b/zsh/zsh-syntax-highlighting deleted file mode 160000 index 5eb677b..0000000 --- a/zsh/zsh-syntax-highlighting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5eb677bb0fa9a3e60f0eff031dc13926e093df92 diff --git a/zsh/zshrc b/zsh/zshrc deleted file mode 100644 index ccf96a7..0000000 --- a/zsh/zshrc +++ /dev/null @@ -1,39 +0,0 @@ -# Path to your oh-my-zsh installation. -export ZSH=~/.oh-my-zsh -fpath=( ~/.zcomplete "${fpath[@]}" ) - -ZSH_THEME="" - -CASE_SENSITIVE="true" -DISABLE_AUTO_UPDATE="true" -DISABLE_LS_COLORS="false" -DISABLE_AUTO_TITLE="true" -ENABLE_CORRECTION="false" -COMPLETION_WAITING_DOTS="true" -DISABLE_UNTRACKED_FILES_DIRTY="true" -HIST_STAMPS="yyyy-mm-dd" -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder -plugins=( - colored-man-pages - common-aliases - sudo -) -source $ZSH/oh-my-zsh.sh - -alias reload=". ~/.zshrc" - -ZSH_AUTOSUGGEST_STRATEGY=(history) -source ~/.zsh-autosuggestions/zsh-autosuggestions.zsh -# Ctrl+Space -bindkey '^ ' autosuggest-accept - -source ~/.zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - -source ~/.profile.d/load - -if type kubectl &>/dev/null; then - source <(kubectl completion zsh) -fi - -RPROMPT='[%*]'