summaryrefslogtreecommitdiff
path: root/home/zsh
diff options
context:
space:
mode:
Diffstat (limited to 'home/zsh')
-rw-r--r--home/zsh/default.nix14
-rw-r--r--home/zsh/plugins.nix129
2 files changed, 73 insertions, 70 deletions
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 91c7ba3..8884f56 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -1,10 +1,12 @@
-{ pkgs, config, lib, ... }:
-
{
- imports =
- [
- ./plugins.nix
- ];
+ pkgs,
+ config,
+ lib,
+ ...
+}: {
+ imports = [
+ ./plugins.nix
+ ];
programs.zsh = {
enable = true;
diff --git a/home/zsh/plugins.nix b/home/zsh/plugins.nix
index 68e1bfc..73a35a3 100644
--- a/home/zsh/plugins.nix
+++ b/home/zsh/plugins.nix
@@ -1,76 +1,77 @@
-{ pkgs, lib, config, ... }:
-
-let
+{
+ pkgs,
+ lib,
+ config,
+ ...
+}: let
inherit (lib.strings) concatStringsSep;
inherit (lib.attrsets) catAttrs;
- plugins =
- [
- {
- name = "autovenv";
+ 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 = "linnnus";
- repo = "autovenv";
- rev = "d9f0cd7";
- hash = "sha256-GfJIybMYxE97xLSkrOSGsn+AREmnCyqe9n2aZwjw4w4=";
+ owner = "ericfreese";
+ repo = pname;
+ rev = version;
+ hash = "sha256-xW11wPFDuFU80AzgAgLwkvK7Qv58fo3i3kSasE3p0zs=";
};
- }
- {
- 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.hashdeep}/bin/md5deep
- fixupPhase = ''
- substituteInPlace ${pname}.zsh \
- --replace md5 ${pkgs.hashdeep}/bin/md5deep
-
- mkdir -p $out
- mv * $out
- '';
+ 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"
+ # 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=";
- };
- }
- {
- name = "zsh-nix-shell";
- file = "nix-shell.plugin.zsh";
- src = pkgs.fetchFromGitHub {
- owner = "chisui";
- repo = "zsh-nix-shell";
- rev = "v0.7.0";
- sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1";
- };
- }
- ];
-in
-{
+ # 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=";
+ };
+ }
+ {
+ name = "zsh-nix-shell";
+ file = "nix-shell.plugin.zsh";
+ src = pkgs.fetchFromGitHub {
+ owner = "chisui";
+ repo = "zsh-nix-shell";
+ rev = "v0.7.0";
+ sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1";
+ };
+ }
+ ];
+in {
programs.zsh = {
plugins = map (p: removeAttrs p ["config"]) plugins;