From 3f961b9d8602eb4bc2f6219cb3370407cd6f133a Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Sun, 30 Jun 2024 21:18:43 +1200
Subject: [PATCH] feat(home:neovim): add nixvim initial config

---
 flake.nix                                     |  6 +++++
 home/modules/console/editor/default.nix       |  2 +-
 home/modules/console/editor/nvim/default.nix  | 26 +------------------
 .../console/editor/nvim/plugins/telescope.nix |  2 --
 home/modules/console/editor/nvim/settings.nix | 24 +----------------
 home/modules/console/tools/git.nix            |  2 ++
 home/profiles/suites/console-tools.nix        |  1 +
 7 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/flake.nix b/flake.nix
index 228965d..73b8cbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,6 +95,12 @@
       inputs.nixpkgs.follows = "nixpkgs-small";
     };
 
+    # neovim configured with nix
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # packaged firefox addons
     firefox-addons = {
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
diff --git a/home/modules/console/editor/default.nix b/home/modules/console/editor/default.nix
index cf00117..224f37d 100644
--- a/home/modules/console/editor/default.nix
+++ b/home/modules/console/editor/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
     ./helix
-    # ./nvim
+    ./nvim
   ];
 }
diff --git a/home/modules/console/editor/nvim/default.nix b/home/modules/console/editor/nvim/default.nix
index 30ef0fc..f790ab6 100644
--- a/home/modules/console/editor/nvim/default.nix
+++ b/home/modules/console/editor/nvim/default.nix
@@ -1,7 +1,6 @@
-{ config, lib, inputs, pkgs, ... }:
+{ config, lib, inputs, ... }:
 
 let
-  inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
   cfg = config.ooknet.editor.nvim;
   console = config.ooknet.console;
@@ -31,29 +30,6 @@ in
           };
         };
       };  
-
-      colorschemes.base16 = {
-        enable = true;
-        colorscheme = config.colorscheme.slug;
-        customColorScheme = {
-          base00 = "#${palette.base00}";
-          base01 = "#${palette.base01}";
-          base02 = "#${palette.base02}";
-          base03 = "#${palette.base03}";
-          base04 = "#${palette.base04}";
-          base05 = "#${palette.base05}";
-          base06 = "#${palette.base06}";
-          base07 = "#${palette.base07}";
-          base08 = "#${palette.base08}";
-          base09 = "#${palette.base09}";
-          base0A = "#${palette.base0A}";
-          base0B = "#${palette.base0B}";
-          base0C = "#${palette.base0C}";
-          base0D = "#${palette.base0D}";
-          base0E = "#${palette.base0E}";
-          base0F = "#${palette.base0F}";
-        };
-      };
     };
   };
 }
diff --git a/home/modules/console/editor/nvim/plugins/telescope.nix b/home/modules/console/editor/nvim/plugins/telescope.nix
index 1a5fd1c..fb9d039 100644
--- a/home/modules/console/editor/nvim/plugins/telescope.nix
+++ b/home/modules/console/editor/nvim/plugins/telescope.nix
@@ -28,8 +28,6 @@ in
           "<C-f>" = "live_grep";
         };
 
-        keymapsSilent = true;
-
         defaults = {
           file_ignore_patterns = [
             "^.git/"
diff --git a/home/modules/console/editor/nvim/settings.nix b/home/modules/console/editor/nvim/settings.nix
index 9e67cee..9947759 100644
--- a/home/modules/console/editor/nvim/settings.nix
+++ b/home/modules/console/editor/nvim/settings.nix
@@ -1,7 +1,6 @@
 { config, lib, ... }:
 
 let
-  inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
   cfg = config.ooknet.editor.nvim;
   console = config.ooknet.console;
@@ -35,28 +34,7 @@ in
         providers.wl-copy.enable = true;
       };
 
-      colorschemes.base16 = {
-        enable = true;
-        colorscheme = config.colorscheme.slug;
-        customColorScheme = {
-          base00 = "#${palette.base00}";
-          base01 = "#${palette.base01}";
-          base02 = "#${palette.base02}";
-          base03 = "#${palette.base03}";
-          base04 = "#${palette.base04}";
-          base05 = "#${palette.base05}";
-          base06 = "#${palette.base06}";
-          base07 = "#${palette.base07}";
-          base08 = "#${palette.base08}";
-          base09 = "#${palette.base09}";
-          base0A = "#${palette.base0A}";
-          base0B = "#${palette.base0B}";
-          base0C = "#${palette.base0C}";
-          base0D = "#${palette.base0D}";
-          base0E = "#${palette.base0E}";
-          base0F = "#${palette.base0F}";
-        };
-      };
+      colorscheme = "${config.colorscheme.slug}";
     };
   };
 }
diff --git a/home/modules/console/tools/git.nix b/home/modules/console/tools/git.nix
index 680f67f..9357dd6 100644
--- a/home/modules/console/tools/git.nix
+++ b/home/modules/console/tools/git.nix
@@ -1,9 +1,11 @@
 { pkgs, config, lib, osConfig, ... }:
+
   let 
     inherit (lib) mkIf;
     cfg = config.ooknet.tools.git;
     admin = osConfig.ooknet.host.admin;
   in
+  
 { 
   config = mkIf cfg.enable {
     programs.git = {
diff --git a/home/profiles/suites/console-tools.nix b/home/profiles/suites/console-tools.nix
index f48f7a3..da35d2e 100644
--- a/home/profiles/suites/console-tools.nix
+++ b/home/profiles/suites/console-tools.nix
@@ -22,5 +22,6 @@ in
       ffmpeg.enable = true;
       sourcegraph.enable = true;
     };
+    ooknet.editor.nvim.enable = true;
   };
 }