updates

programs/nvim/default.nix

@@ -1,9 +1,4 @@
-{ pkgs, ... }:
-let
-  map = mode: key: action: {
-    inherit mode key action;
-  };
-in
+{ pkgs, inputs, ... }:
 {
   home = {
     sessionVariables = {
@@ -14,6 +9,7 @@ in
   imports = [
     ./options.nix
     ./plugins.nix
+    ./keys.nix
   ];
 
   programs.nixvim = {
@@ -47,64 +43,8 @@ in
     extraLuaPackages = ps: [ ps.magick ];
     extraPackages = [ pkgs.imagemagick ];
 
-    # package = pkgs.neovim-unwrapped;
-    package = (pkgs.neovim-unwrapped.override { lua = pkgs.luajit; }).overrideAttrs (_: {
-      version = "git";
-      src = pkgs.fetchFromGitHub {
-        owner = "neovim";
-        repo = "neovim";
-        rev = "76dcc7029b200e1d85024d7ba4a34c602e730dbe";
-        hash = "sha256-y3LmGebXuQhLz9w1IzkDU8b464WvMvPCbIImpVvxmcI=";
-      };
-      buildInputs =
-        [
-          (pkgs.utf8proc.overrideAttrs (_: {
-            version = "git";
-
-            src = pkgs.fetchFromGitHub {
-              owner = "JuliaStrings";
-              repo = "utf8proc";
-              rev = "3de4596fbe28956855df2ecb3c11c0bbc3535838";
-              hash = "sha256-DNnrKLwks3hP83K56Yjh9P3cVbivzssblKIx4M/RKqw=";
-            };
-
-          }))
-        ]
-        ++ pkgs.neovim-unwrapped.buildInputs
-        ++ pkgs.neovim-unwrapped.nativeBuildInputs;
-    });
-
-    keymaps = [
-      {
-        key = "<f2>";
-        action = "<cmd>Lspsaga rename<cr>";
-      }
-      {
-        key = "<leader>o";
-        action = "<cmd>Lspsaga outline<cr>";
-      }
-      {
-        key = "<leader>.";
-        action = "<cmd>Lspsaga code_action<cr>";
-      }
-
-      # {
-      # key = "/";
-      # action = "<cmd>lua require('spectre').open_file_search({select_word=true})<CR>";
-      # }
-
-      (map "n" "t" "<cmd>Neotree toggle<cr>")
-
-      # tab for indent/dedent
-      (map "n" "<tab>" ">>_")
-      (map "n" "<S-tab>" "<<_")
-      (map "i" "<S-tab>" "<c-d>")
-      (map "v" "<tab>" ">gv")
-      (map "v" "<S-tab>" "<gv")
-
-      # to avoid many typos
-      (map "n" ";" ":")
-    ];
+    # package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped;
+    package = pkgs.neovim-unwrapped;
 
     colorschemes.onedark = {
       enable = true;
@@ -117,6 +57,8 @@ in
           "@comment.documentation.rust".fg = "#77B767";
           "@comment.documentation".fg = "#77B767";
           "@comment".fg = "#426639";
+          # "Visual".bg = "#2a2e36";
+          # "Cursorline".bg = "#2a2e36";
         };
 
       };