From 1ab8660ee8d5b48665f348bdf25a587327b7844c Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Mon, 7 Sep 2020 21:04:03 +0200
Subject: [PATCH] ZSH s tuff

---
 files/.config/configstore/update-notifier-npm.json   |  8 +-------
 files/nix-stuff/nixpkgs/modules/base.nix             |  2 ++
 files/nix-stuff/nixpkgs/modules/desktop.nix          |  1 +
 files/nix-stuff/nixpkgs/modules/term/zsh/default.nix |  3 +++
 .../nix-stuff/nixpkgs/modules/term/zsh/keybinds.zsh  |  8 ++++++++
 .../nixpkgs/modules/term/zsh/nix/sources.json        | 12 ++++++++++++
 6 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 files/nix-stuff/nixpkgs/modules/term/zsh/keybinds.zsh

diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json
index cec4aa3..e7150ad 100644
--- a/files/.config/configstore/update-notifier-npm.json
+++ b/files/.config/configstore/update-notifier-npm.json
@@ -1,10 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1598621325936,
-	"update": {
-		"latest": "6.14.8",
-		"current": "6.14.6",
-		"type": "patch",
-		"name": "npm"
-	}
+	"lastUpdateCheck": 1599398002350
 }
\ No newline at end of file
diff --git a/files/nix-stuff/nixpkgs/modules/base.nix b/files/nix-stuff/nixpkgs/modules/base.nix
index 2556827..49529b2 100644
--- a/files/nix-stuff/nixpkgs/modules/base.nix
+++ b/files/nix-stuff/nixpkgs/modules/base.nix
@@ -54,6 +54,8 @@ in
         nodejs
         nodePackages.bash-language-server
         nodePackages.dockerfile-language-server-nodejs
+        rust-analyzer
+        cargo-outdated
 
         (addFlags bat "bat" "--theme base16")
 
diff --git a/files/nix-stuff/nixpkgs/modules/desktop.nix b/files/nix-stuff/nixpkgs/modules/desktop.nix
index 989d645..e5c1da4 100644
--- a/files/nix-stuff/nixpkgs/modules/desktop.nix
+++ b/files/nix-stuff/nixpkgs/modules/desktop.nix
@@ -22,6 +22,7 @@ in
       dragon-drop
       polybarFull
       discord
+      my-st
       #hyper-haskell
     ];
 
diff --git a/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix b/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix
index 253453d..b8eb40f 100644
--- a/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix
+++ b/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix
@@ -12,6 +12,8 @@ let
         (mapAttrs (k: v: ''abbr --session ${k}="${v}" >/dev/null 2>&1'') abbrs)
     );
 
+  keybinds-code = lib.builtins.readFile ./keybinds.zsh;
+
   manFunction = ''
     function man() {
       env \
@@ -166,6 +168,7 @@ in
         ${manFunction}
 
         ${builtins.readFile ./prompt.zsh}
+        ${builtins.readFile ./keybinds.zsh}
       '';
 
       plugins = let
diff --git a/files/nix-stuff/nixpkgs/modules/term/zsh/keybinds.zsh b/files/nix-stuff/nixpkgs/modules/term/zsh/keybinds.zsh
new file mode 100644
index 0000000..ea8eefe
--- /dev/null
+++ b/files/nix-stuff/nixpkgs/modules/term/zsh/keybinds.zsh
@@ -0,0 +1,8 @@
+_pipr_expand_widget() {
+  emulate -LR zsh
+  </dev/tty pipr --out-file /tmp/pipr_out --default "$LBUFFER" >/dev/null
+  LBUFFER=$(< /tmp/pipr_out)
+}
+zle -N _pipr_expand_widget
+bindkey '\ea' _pipr_expand_widget
+
diff --git a/files/nix-stuff/nixpkgs/modules/term/zsh/nix/sources.json b/files/nix-stuff/nixpkgs/modules/term/zsh/nix/sources.json
index 410d9aa..ed9d5c5 100644
--- a/files/nix-stuff/nixpkgs/modules/term/zsh/nix/sources.json
+++ b/files/nix-stuff/nixpkgs/modules/term/zsh/nix/sources.json
@@ -59,6 +59,18 @@
         "url": "https://github.com/olets/zsh-abbr/archive/703ba651e4f9c0ae18402e2462177e6253585386.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "zsh-abbrev-alias": {
+        "branch": "master",
+        "description": "This zsh plugin provides functionality similar to Vim's abbreviation expansion.",
+        "homepage": "",
+        "owner": "momo-lab",
+        "repo": "zsh-abbrev-alias",
+        "rev": "ae2997ea7c1519861ff6712b84379b8d03de4f39",
+        "sha256": "1b5miqli5b5n893k0qd5lxb9w73md4sz1i8g9wzlhyqg4sasxvnx",
+        "type": "tarball",
+        "url": "https://github.com/momo-lab/zsh-abbrev-alias/archive/ae2997ea7c1519861ff6712b84379b8d03de4f39.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "zsh-autosuggestions": {
         "branch": "master",
         "description": "Fish-like autosuggestions for zsh",