From edcc3acea595d3045253c3c2fe2462599c1c54e0 Mon Sep 17 00:00:00 2001 From: Linnnus Date: Thu, 7 Sep 2023 16:53:41 +0200 Subject: Reorganize everything --- home/zsh/default.nix | 25 +++++++++++++++++++ home/zsh/plugins.nix | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 home/zsh/default.nix create mode 100644 home/zsh/plugins.nix (limited to 'home/zsh') diff --git a/home/zsh/default.nix b/home/zsh/default.nix new file mode 100644 index 0000000..1b8ce16 --- /dev/null +++ b/home/zsh/default.nix @@ -0,0 +1,25 @@ +{ pkgs, config, lib, ... }: + +{ + imports = + [ + ./plugins.nix + ]; + + programs.zsh = { + enable = true; + + defaultKeymap = "viins"; + + # Feeble attempt at cleaning up home directory. + # TODO: dotDir = (pathRelativeTo config.xdg.configHome config.home) + "/zsh"; + dotDir = ".config/zsh"; + history.path = config.xdg.cacheHome + "/zsh/history"; + + }; + + programs.fzf = { + enable = true; + enableZshIntegration = true; + }; +} diff --git a/home/zsh/plugins.nix b/home/zsh/plugins.nix new file mode 100644 index 0000000..3bebfce --- /dev/null +++ b/home/zsh/plugins.nix @@ -0,0 +1,69 @@ +{ pkgs, lib, config, ... }: + +let + inherit (lib.strings) concatStringsSep; + inherit (lib.attrsets) catAttrs; + + plugins = + [ + { + name = "autovenv"; + src = pkgs.fetchFromGitHub { + owner = "linnnus"; + repo = "autovenv"; + rev = "d9f0cd7"; + hash = "sha256-GfJIybMYxE97xLSkrOSGsn+AREmnCyqe9n2aZwjw4w4="; + }; + } + { + name = "zsh-cwd-history"; + src = pkgs.stdenvNoCC.mkDerivation rec { + pname = "zsh-cwd-history"; + version = "73afed8"; + + src = pkgs.fetchFromGitHub { + owner = "ericfreese"; + repo = pname; + rev = version; + hash = "sha256-xW11wPFDuFU80AzgAgLwkvK7Qv58fo3i3kSasE3p0zs="; + }; + + fixupPhase = '' + substituteInPlace ${pname}.zsh \ + --replace md5 ${pkgs.outils}/bin/md5 + + mkdir -p $out + mv * $out + ''; + + # This is kind of a weird, useless derivation, so we have to + # manually avoid doing lots of the usual stuff. + dontInstall = true; + }; + config = '' + # Where to but history files + export ZSH_CWD_HISTORY_DIR=${config.xdg.dataHome}/zsh-cwd-history + mkdir -p "$ZSH_CWD_HISTORY_DIR" + + # Toggle between global/local history + bindkey '^G' cwd-history-toggle + ''; + } + { + name = "zsh-vi-mode-cursor"; + src = pkgs.fetchFromGitHub { + owner = "Buckmeister"; + repo = "zsh-vi-mode-cursor"; + rev = "fa7cc0973ee71636e906e25e782d0aea19545d60"; + hash = "sha256-j73M4bvAoHWt5Wwg47hM0p5Or74x/3btTOPnI22SqG8="; + }; + } + ]; +in +{ + programs.zsh = { + plugins = map (p: removeAttrs p ["config"]) plugins; + + initExtra = concatStringsSep "\n" (catAttrs "config" plugins); + }; +} -- cgit v1.2.3