Skip to content

Commit

Permalink
remove omz
Browse files Browse the repository at this point in the history
  • Loading branch information
marchdf committed Feb 26, 2024
1 parent 453cd92 commit 8a8cfe6
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 31 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ Improved experience

The following will lead to an improved experience:
- `zsh`
- [`oh-my-zsh`](https://github.com/robbyrussell/oh-my-zsh)
- [`fzf`](https://github.com/junegunn/fzf)
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function load_spack(){

# Grep through all python scrips in home directory
function grep_python() {
grep -r --include=\*.py --exclude-dir=.virtualenvs --exclude-dir=.emacs.d --exclude-dir=spack --exclude-dir=.oh-my-zsh "${1}" ${HOME}
grep -r --include=\*.py --exclude-dir=.virtualenvs --exclude-dir=.emacs.d --exclude-dir=spack "${1}" ${HOME}
}

# runs TensorBoard with a comma-separated list of all provided logdirs
Expand Down
44 changes: 19 additions & 25 deletions dot_zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,23 @@ zinit lucid light-mode for "hpc"
zinit ice lucid depth"1"
zinit light romkatv/powerlevel10k

ENABLE_CORRECTION="true"
CORRECT_IGNORE_FILE='.*'
zstyle ':omz:lib:theme-and-appearance' gnu-ls yes
zinit lucid light-mode for \
OMZL::compfix.zsh \
OMZL::completion.zsh \
OMZL::correction.zsh \
OMZL::directories.zsh \
OMZL::functions.zsh \
OMZL::grep.zsh \
OMZL::history.zsh \
OMZL::key-bindings.zsh \
OMZL::misc.zsh \
OMZL::termsupport.zsh \
OMZL::theme-and-appearance.zsh \
OMZL::vcs_info.zsh

zinit wait lucid light-mode \
dl'https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/emacs/emacsclient.sh' \
atclone'chmod +x emacsclient.sh' \
Expand All @@ -47,37 +64,14 @@ zinit wait lucid light-mode for \
"OMZP::poetry" \
"OMZP::pyenv" \
"OMZP::tmux" \
"OMZP::zoxide"
"OMZP::zoxide" \
"personal"

zinit ice lucid from"gh-r" as"command" \
mv"vivid-*/vivid -> vivid" \
atload'export LS_COLORS="$(vivid generate one-dark)"; zstyle ":completion:*" list-colors "${(s.:.)LS_COLORS}"'
zinit light sharkdp/vivid

# towards the end because it assumes some things are set in other plugins
zinit wait lucid light-mode for "personal"

# from OMZL: completion, correction, directories, git(?), history, key bindings, termsupport, themeandappearance(? maybe this overrides trapdoor) vcs_info (?)
zstyle ':omz:lib:theme-and-appearance' gnu-ls yes

# Path to your oh-my-zsh installation.
export ZSH=$HOME/.oh-my-zsh

# Uncomment the following line to enable command auto-correction.
ENABLE_CORRECTION="true"
CORRECT_IGNORE_FILE='.*'

# Which plugins would you like to load?
# Standard plugins can be found in ~/.oh-my-zsh/plugins/*
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=()

source $ZSH/oh-my-zsh.sh

# User configuration

# better terminal colors
export TERM=xterm-256color

Expand Down
4 changes: 0 additions & 4 deletions run_once_before_install-packages-cli.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#!/usr/bin/env bash

if [ ! -d "${HOME}/.oh-my-zsh" ]; then
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
fi

if [[ ! -x "$(command -v poetry)" ]]; then
curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.7.0 POETRY_HOME=${HOME}/.poetry python3 -
fi
Expand Down

0 comments on commit 8a8cfe6

Please sign in to comment.