From aa619622a9aa2bfa150363e50335bacfd075b447 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 10 Jan 2025 15:16:20 -0500 Subject: [PATCH] Disable oh-my-zsh I don't think I really need it any more as a result of what I get from nix + oh-my-posh --- modules/hosts/common/default.nix | 36 ++++++++++++++++---------------- modules/hosts/darwin/home.nix | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/hosts/common/default.nix b/modules/hosts/common/default.nix index 5f3a110..529ddc8 100644 --- a/modules/hosts/common/default.nix +++ b/modules/hosts/common/default.nix @@ -289,25 +289,25 @@ in { function svndiffless-nows() { svn diff -x -w "$@" |diff-so-fancy |less -R } - - # unset oh-my-zsh's gk so that gk can refer to the gitkraken-cli - unalias gk ''; - oh-my-zsh = { - enable = true; - plugins = [ - "bundler" - "gem" - "git" - "github" - "history" - "kubectl" - "pip" - "terraform" - "vagrant" - "vscode" - ]; - }; + # # unset oh-my-zsh's gk so that gk can refer to the gitkraken-cli + # unalias gk + # ''; + # oh-my-zsh = { + # enable = true; + # plugins = [ + # "bundler" + # "gem" + # "git" + # "github" + # "history" + # "kubectl" + # "pip" + # "terraform" + # "vagrant" + # "vscode" + # ]; + # }; shellAliases = { bcrr = "bolt command run --run-as root --sudo-password-prompt"; bcrrs = "bcrr --stream --no-verbose"; diff --git a/modules/hosts/darwin/home.nix b/modules/hosts/darwin/home.nix index fecd38b..205803e 100644 --- a/modules/hosts/darwin/home.nix +++ b/modules/hosts/darwin/home.nix @@ -14,7 +14,7 @@ export PATH=$PATH:/opt/puppetlabs/pdk/bin export PATH=$PATH:/opt/puppetlabs/puppet/bin ''; - oh-my-zsh.plugins = [ "macos" ]; + # oh-my-zsh.plugins = [ "macos" ]; shellAliases = { currentwifi = "networksetup -getairportnetwork en0 |cut -d ':' -f2- | cut -d ' ' -f2-"; nixdiff = "brew outdated && brew outdated --cask && mas outdated && cd ~/repos/dots && darwin-rebuild build --flake . && nvd diff /run/current-system result";