From 97bce681e442f61b1da8246dcd07f4897a402d4e Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Thu, 20 Jan 2022 22:37:36 +0000 Subject: [PATCH] Nix: some fiddling with home-manager --- nix-environment/darwin.nix | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/nix-environment/darwin.nix b/nix-environment/darwin.nix index eed4375..eb25957 100644 --- a/nix-environment/darwin.nix +++ b/nix-environment/darwin.nix @@ -68,6 +68,7 @@ in "discord" "firefox" "gitkraken" + "ghidra" "google-drive" "keybase" "multimc" @@ -122,6 +123,41 @@ in lsa = "exa -lhgbHma --git"; lsat = "exa -lhgbHmaT --git"; }; + programs.zsh.completionInit = "autoload -U compinit && compinit -C"; + programs.zsh.initExtraBeforeCompInit = "ZSH_DISABLE_COMPFIX=true"; + + programs.zsh.oh-my-zsh.enable = true; + programs.zsh.oh-my-zsh.plugins = [ + "globalias" + "git" + "you-should-use" + ] ++ lib.optional (!pkgs.stdenv.isDarwin) [ "archlinux" ]; + + programs.zsh.plugins = [ + { + name = "zsh-vim-mode"; + src = pkgs.fetchFromGitHub { + owner = "softmoth"; + repo = "zsh-vim-mode"; + rev = "1f9953b7d6f2f0a8d2cb8e8977baa48278a31eab"; + sha256 = "sha256-a+6EWMRY1c1HQpNtJf5InCzU7/RphZjimLdXIXbO6cQ"; + }; + } + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.4.0"; + sha256 = "037wz9fqmx0ngcwl9az55fgkipb745rymznxnssr3rx9irb6apzg"; + }; + } + ]; + #name = "globalias"; + #src = builtins.fetchurl "https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/globalias/globalias.plugin.zsh"; + #file = "globalias.plugin.zsh"; + #}]; programs.starship.package = custompkgs.starship; programs.starship.enable = true; @@ -195,6 +231,8 @@ in pkgs.fzf custompkgs.starship + + pkgs.python3 ]; programs.bat.enable = true;