From 7db50fa82b04b726f0fb0eefd658006ba7b0cd42 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Mon, 23 Aug 2021 02:40:09 +0100
Subject: [PATCH] zsh + foot: vim bindings + new config

---
 config/profiles/base/packages.nix   |  1 +
 config/users/kat/base/vim/vimrc.nix |  2 +-
 config/users/kat/base/zsh.nix       | 20 ++++++++------------
 config/users/kat/gui/foot.nix       |  9 ++++++++-
 nix/sources.json                    |  6 +++---
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/config/profiles/base/packages.nix b/config/profiles/base/packages.nix
index 93e43832..1b43e33f 100644
--- a/config/profiles/base/packages.nix
+++ b/config/profiles/base/packages.nix
@@ -8,5 +8,6 @@
     cachix
     pinentry-curses
     gnupg
+    foot.terminfo
   ];
 }
diff --git a/config/users/kat/base/vim/vimrc.nix b/config/users/kat/base/vim/vimrc.nix
index aca3f07b..7e8ceb65 100644
--- a/config/users/kat/base/vim/vimrc.nix
+++ b/config/users/kat/base/vim/vimrc.nix
@@ -46,7 +46,7 @@
     set hidden
     set nobackup
     set nowritebackup
-    set cmdheight=2
+    set cmdheight=1
     set updatetime=300
     set cursorline
     set colorcolumn=100
diff --git a/config/users/kat/base/zsh.nix b/config/users/kat/base/zsh.nix
index 1139aef9..966e6d88 100644
--- a/config/users/kat/base/zsh.nix
+++ b/config/users/kat/base/zsh.nix
@@ -63,19 +63,7 @@ in
             zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
             zstyle ':completion:*:complete:pass:*:*' matcher 'r:|[./_-]=** r:|=*' 'l:|=* r:|=*'
                 ${lib.concatStringsSep "\n" (map (opt: "setopt ${opt}") zshOpts)}
-                source ${./zshrc-vimode}
           bindkey '^ ' autosuggest-accept
-          autoload -Uz history-search-end
-          autoload -Uz history-beginning-search-menu
-        zle -N history-beginning-search-menu
-        zle -N history-beginning-search-backward-end \
-                        history-search-end
-        zle -N history-beginning-search-forward-end \
-                        history-search-end
-        bindkey "\e[5~" history-beginning-search-backward-end
-        bindkey "\e[6~" history-beginning-search-forward-end
-        bindkey "^p" history-beginning-search-menu
-                echo ""; akiflags -rb;
       '';
     shellAliases = {
       nixdirfmt = "fd --color=never .nix | xargs nixpkgs-fmt";
@@ -100,6 +88,14 @@ in
         name = "zsh-syntax-highlighting";
         inherit src;
       })
+      (with pkgs.zsh-plugins.vim-mode; {
+        name = "zsh-vim-mode";
+        inherit src;
+      })
+      (with pkgs.zsh-plugins.evil-registers; {
+        name = "evil-registers";
+        inherit src;
+      })
       {
         name = "z";
         file = "z.sh";
diff --git a/config/users/kat/gui/foot.nix b/config/users/kat/gui/foot.nix
index 01fb7051..8fb83542 100644
--- a/config/users/kat/gui/foot.nix
+++ b/config/users/kat/gui/foot.nix
@@ -7,13 +7,20 @@ with lib;
     enable = true;
     settings = {
       main = {
-        term = "xterm-256color";
+        term = "foot";
         font = "${config.kw.font.name}:size=${toString config.kw.font.size}, Twitter Color Emoji:size=8";
         font-bold = "${config.kw.font.name}:size=${toString config.kw.font.size}:style=Bold";
         font-italic = "${config.kw.font.name}:size=${toString config.kw.font.size}:style=Italic";
         font-bold-italic = "${config.kw.font.name}:size=${toString config.kw.font.size}:style=Bold Italic";
         dpi-aware = "no";
       };
+      cursor = {
+        style = "beam";
+      };
+      bell = {
+        urgent = true;
+        notify = true;
+      };
       colors = {
         alpha = "0.9";
       };
diff --git a/nix/sources.json b/nix/sources.json
index 174faff4..720d103b 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": null,
         "owner": "arcnmx",
         "repo": "nixexprs",
-        "rev": "4ebb785dde22feae297e5c51b7175f4e78f0d816",
-        "sha256": "1hslmzgjdfwdzcms56px8g06mk1q7k6yxiwk1g9i9kwsb62p6a9l",
+        "rev": "484f3b3270fec0bd6b67154400bdd5213f7c681c",
+        "sha256": "1r16kpy6rzl5ixly3g07lxrs92wskbrl1viys0bj25xmmfq5p6yi",
         "type": "tarball",
-        "url": "https://github.com/arcnmx/nixexprs/archive/4ebb785dde22feae297e5c51b7175f4e78f0d816.tar.gz",
+        "url": "https://github.com/arcnmx/nixexprs/archive/484f3b3270fec0bd6b67154400bdd5213f7c681c.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "ci": {