From 770e35644cda54c6728a37f5d9b1737899214b86 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Tue, 2 Apr 2024 16:19:47 +0200
Subject: [PATCH] telescope & zsh config update

---
 .gitignore                             |  1 +
 machines/kat-probook/configuration.nix |  2 ++
 machines/kat-r86s/configuration.nix    |  2 +-
 modules/neovim/default.nix             |  1 -
 modules/neovim/nvim.lua                | 22 +++++++++++++++++++--
 modules/zsh.nix                        | 27 +++++++++++++++++++-------
 6 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 042d299..be0e181 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 installer-iso-image
+result
diff --git a/machines/kat-probook/configuration.nix b/machines/kat-probook/configuration.nix
index 99bebf4..f23116e 100644
--- a/machines/kat-probook/configuration.nix
+++ b/machines/kat-probook/configuration.nix
@@ -54,6 +54,8 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   programs.zsh.enable = true;
 
+  boot.kernel.sysctl."net.ipv4.ip_forward" = true;
+
   environment.systemPackages = with pkgs; [
     wget
     brightnessctl
diff --git a/machines/kat-r86s/configuration.nix b/machines/kat-r86s/configuration.nix
index 77b2c80..140bf1f 100644
--- a/machines/kat-r86s/configuration.nix
+++ b/machines/kat-r86s/configuration.nix
@@ -60,7 +60,7 @@
       # maurice
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpwF+XD3HgX64kqD42pcEZRNYAWoO4YNiOm5KO4tH6o maurice@polaris"
 
-      #raito
+      # raito
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcEkYM1r8QVNM/G5CxJInEdoBCWjEHHDdHlzDYNSUIdHHsn04QY+XI67AdMCm8w30GZnLUIj5RiJEWXREUApby0GrfxGGcy8otforygfgtmuUKAUEHdU2MMwrQI7RtTZ8oQ0USRGuqvmegxz3l5caVU7qGvBllJ4NUHXrkZSja2/51vq80RF4MKkDGiz7xUTixI2UcBwQBCA/kQedKV9G28EH+1XfvePqmMivZjl+7VyHsgUVj9eRGA1XWFw59UPZG8a7VkxO/Eb3K9NF297HUAcFMcbY6cPFi9AaBgu3VC4eetDnoN/+xT1owiHi7BReQhGAy/6cdf7C/my5ehZwD"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE0xMwWedkKosax9+7D2OlnMxFL/eV4CvFZLsbLptpXr"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiXXYkhRh+s7ixZ8rvG8ntIqd6FELQ9hh7HoaHQJRPU"
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 439893b..f0c965c 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -11,7 +11,6 @@
       telescope-nvim
       todo-comments-nvim
 
-      fugitive
       gitsigns-nvim
     ];
     extraPackages = with pkgs; [
diff --git a/modules/neovim/nvim.lua b/modules/neovim/nvim.lua
index c85b215..56421ab 100644
--- a/modules/neovim/nvim.lua
+++ b/modules/neovim/nvim.lua
@@ -1,2 +1,20 @@
-local telescope = require('telescope')
-telescope.setup {}
+local actions = require('telescope.actions')
+
+require("telescope").setup {
+  pickers = {
+    buffers = {
+      show_all_buffers = true,
+      sort_lastused = true,
+      --theme = "dropdown",
+      --previewer = false,
+      mappings = {
+        i = {
+          ["<c-d>"] = actions.delete_buffer,
+        },
+        n = {
+          ["<c-d>"] = actions.delete_buffer,
+        }
+      }
+    }
+  }
+}
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 945ee2e..6f49988 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -6,13 +6,6 @@
       enable = true;
       plugins = [ "git" ];
     };
-    zplug = {
-      enable = true;
-      plugins = [
-        { name = "zsh-users/zsh-autosuggestions"; }
-        { name = "zsh-users/zsh-syntax-highlighting"; }
-      ];
-    };
     plugins = [
       {
         name = "zsh-nix-shell";
@@ -24,6 +17,26 @@
           sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
         };
       }
+      {
+        name = "zsh-autosuggestion";
+        file = "zsh-autosuggestions.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "zsh-users";
+          repo = "zsh-autosuggestions";
+          rev = "v0.7.0";
+          sha256 = "1g3pij5qn2j7v7jjac2a63lxd97mcsgw6xq6k5p7835q9fjiid98";
+        };
+      }
+      {
+        name = "zsh-syntax-highlighting";
+        file = "zsh-syntax-highlighting.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "zsh-users";
+          repo = "zsh-syntax-highlighting";
+          rev = "0.8.0";
+          sha256 = "1yl8zdip1z9inp280sfa5byjbf2vqh2iazsycar987khjsi5d5w8";
+        };
+      }
     ];
   };