From e743691d94c29c865d0219230433e0f9a86d9870 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Mon, 1 Jul 2024 21:28:47 +1200
Subject: [PATCH] feat(home:git): add gh tool

---
 .../console/editor/nvim/colorscheme.nix       | 37 ++++++++
 home/modules/console/editor/nvim/default.nix  |  1 +
 .../console/editor/nvim/keymapping.nix        | 41 ++-------
 .../console/editor/nvim/plugins/default.nix   |  5 ++
 .../console/editor/nvim/plugins/lsp.nix       | 38 +++++++++
 .../console/editor/nvim/plugins/lualine.nix   |  1 -
 .../console/editor/nvim/plugins/noice.nix     | 19 +++++
 .../editor/nvim/plugins/nvim-autopairs.nix    | 15 ++++
 .../editor/nvim/plugins/treesitter.nix        | 15 ++++
 .../console/editor/nvim/plugins/vim-nix.nix   | 15 ++++
 home/modules/console/editor/nvim/settings.nix | 84 ++++++++++++++++---
 home/modules/console/tools/git.nix            |  1 +
 12 files changed, 225 insertions(+), 47 deletions(-)
 create mode 100644 home/modules/console/editor/nvim/colorscheme.nix
 create mode 100644 home/modules/console/editor/nvim/plugins/lsp.nix
 create mode 100644 home/modules/console/editor/nvim/plugins/noice.nix
 create mode 100644 home/modules/console/editor/nvim/plugins/nvim-autopairs.nix
 create mode 100644 home/modules/console/editor/nvim/plugins/treesitter.nix
 create mode 100644 home/modules/console/editor/nvim/plugins/vim-nix.nix

diff --git a/home/modules/console/editor/nvim/colorscheme.nix b/home/modules/console/editor/nvim/colorscheme.nix
new file mode 100644
index 0000000..a5655bd
--- /dev/null
+++ b/home/modules/console/editor/nvim/colorscheme.nix
@@ -0,0 +1,37 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib) mkIf;
+  inherit (config.colorscheme) slug palette;
+  cfg = config.ooknet.editor.nvim;
+  console = config.ooknet.console;
+in
+
+{
+  config = mkIf (cfg.enable || console.editor == "nvim") {
+    programs.nixvim = {
+      colorschemes.base16 = {
+        enable = true;
+        colorscheme = "${slug}";
+        # colorscheme = {
+        #   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/default.nix b/home/modules/console/editor/nvim/default.nix
index f790ab6..479b52b 100644
--- a/home/modules/console/editor/nvim/default.nix
+++ b/home/modules/console/editor/nvim/default.nix
@@ -12,6 +12,7 @@ in
     ./settings.nix
     ./keymapping.nix
     ./plugins
+    ./colorscheme.nix
   ];
   
   config = mkIf (cfg.enable || console.editor == "nvim") {
diff --git a/home/modules/console/editor/nvim/keymapping.nix b/home/modules/console/editor/nvim/keymapping.nix
index 72fcba0..97b1693 100644
--- a/home/modules/console/editor/nvim/keymapping.nix
+++ b/home/modules/console/editor/nvim/keymapping.nix
@@ -13,40 +13,13 @@ in
         mapleader = " ";
         maplocalleader = " ";
       };
-
-      keymaps = let
-        normal = 
-          mapAttrsToList
-          (key: action: {
-            mode = "n";
-            inherit action key;
-          })
-          {
-            "<Space>" = "<NOP>";
-            "esc" = ":noh<CR>";
-            "Y" = "$y";
-          };
-          visual =
-            mapAttrsToList
-            (key: action: {
-              mode = "v";
-              inherit action key;
-            })
-            {
-              # better indenting
-              ">" = ">gv";
-              "<" = "<gv";
-              "<TAB>" = ">gv";
-              "<S-TAB>" = "<gv";
-
-              # move selected line / block of text in visual mode
-              "K" = ":m '<-2<CR>gv=gv";
-              "J" = ":m '>+1<CR>gv=gv";
-            };
-      in
-      config.nixvim.helpers.keymaps.mkKeymaps
-      {options.silent = true;}
-      (normal ++ visual);
+      keymaps = [
+        {
+          mode = "n";
+          key = "<leader>f";
+          action = "+find/file";
+        }
+      ]; 
     };
   };
 }
diff --git a/home/modules/console/editor/nvim/plugins/default.nix b/home/modules/console/editor/nvim/plugins/default.nix
index 601a076..7cc53d8 100644
--- a/home/modules/console/editor/nvim/plugins/default.nix
+++ b/home/modules/console/editor/nvim/plugins/default.nix
@@ -3,5 +3,10 @@
     ./indent.nix
     ./telescope.nix
     ./lualine.nix
+    ./lsp.nix
+    ./noice.nix
+    ./nvim-autopairs.nix
+    ./vim-nix.nix
+    ./treesitter.nix
   ];
 }
diff --git a/home/modules/console/editor/nvim/plugins/lsp.nix b/home/modules/console/editor/nvim/plugins/lsp.nix
new file mode 100644
index 0000000..77fa8e3
--- /dev/null
+++ b/home/modules/console/editor/nvim/plugins/lsp.nix
@@ -0,0 +1,38 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.editor.nvim;
+  console = config.ooknet.console;
+in
+
+{
+  config = mkIf (cfg.enable || console.editor == "nvim") {
+    programs.nixvim.plugins = {
+      lsp-lines.enable = true;
+      lsp = {
+        enable = true;
+        capabilities = "offsetEncoding = 'utf-16'";
+        servers = {
+
+          # nix
+          nil-ls = {
+            enable = true;
+          };
+          # markdown
+          marksman = {
+            enable = true;
+          };
+          # css
+          cssls = {
+            enable = true;
+          };
+          # c/c++
+          clangd = {
+            enable = true;
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/home/modules/console/editor/nvim/plugins/lualine.nix b/home/modules/console/editor/nvim/plugins/lualine.nix
index d6584a4..937dc4e 100644
--- a/home/modules/console/editor/nvim/plugins/lualine.nix
+++ b/home/modules/console/editor/nvim/plugins/lualine.nix
@@ -10,7 +10,6 @@ in
   config = mkIf (cfg.enable || console.editor == "nvim") {
     programs.nixvim.plugins.lualine = {
       enable = true;
-      theme = "base16";
       globalstatus = true;
       sections = {
         lualine_a = ["mode"];
diff --git a/home/modules/console/editor/nvim/plugins/noice.nix b/home/modules/console/editor/nvim/plugins/noice.nix
new file mode 100644
index 0000000..ccb0e8f
--- /dev/null
+++ b/home/modules/console/editor/nvim/plugins/noice.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.editor.nvim;
+  console = config.ooknet.console;
+in
+
+{
+  config = mkIf (cfg.enable || console.editor == "nvim") {
+    programs.nixvim.plugins.noice = {
+      enable = true;
+      presets = {
+        bottom_search = true;
+        command_palette = true;
+      };
+    };
+  };
+}
diff --git a/home/modules/console/editor/nvim/plugins/nvim-autopairs.nix b/home/modules/console/editor/nvim/plugins/nvim-autopairs.nix
new file mode 100644
index 0000000..e3b211e
--- /dev/null
+++ b/home/modules/console/editor/nvim/plugins/nvim-autopairs.nix
@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.editor.nvim;
+  console = config.ooknet.console;
+in
+
+{
+  config = mkIf (cfg.enable || console.editor == "nvim") {
+    programs.nixvim.plugins.nvim-autopairs = {
+      enable = true;
+    };
+  };
+}
diff --git a/home/modules/console/editor/nvim/plugins/treesitter.nix b/home/modules/console/editor/nvim/plugins/treesitter.nix
new file mode 100644
index 0000000..4c764bf
--- /dev/null
+++ b/home/modules/console/editor/nvim/plugins/treesitter.nix
@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.editor.nvim;
+  console = config.ooknet.console;
+in
+
+{
+  config = mkIf (cfg.enable || console.editor == "nvim") {
+    programs.nixvim.plugins.treesitter = {
+      enable = true;
+    };
+  };
+}
diff --git a/home/modules/console/editor/nvim/plugins/vim-nix.nix b/home/modules/console/editor/nvim/plugins/vim-nix.nix
new file mode 100644
index 0000000..8e2555a
--- /dev/null
+++ b/home/modules/console/editor/nvim/plugins/vim-nix.nix
@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.editor.nvim;
+  console = config.ooknet.console;
+in
+
+{
+  config = mkIf (cfg.enable || console.editor == "nvim") {
+    programs.nixvim.plugins.nix = {
+      enable = true;
+    };
+  };
+}
diff --git a/home/modules/console/editor/nvim/settings.nix b/home/modules/console/editor/nvim/settings.nix
index 9947759..1fedb1a 100644
--- a/home/modules/console/editor/nvim/settings.nix
+++ b/home/modules/console/editor/nvim/settings.nix
@@ -9,32 +9,92 @@ in
 {
   config = mkIf (cfg.enable || console.editor == "nvim") {
     programs.nixvim = {
-      options = {
+      opts = {
+
+        # line numbers
         relativenumber = true;
         number = true;
+
+        # command line height
+        cmdheight = 2;
+
+        # popup menu height (0 == use all available space)
+        pumheight = 0;
+        
         hidden = true;
+
+        # mouse mode
         mouse = "a";
         mousemodel = "extend";
+
+        # undo history
         undofile = true;
         swapfile = false;
-        incsearch = true;
-        ignorecase = true;
-        smartcase = true;
-        fileencoding = "utf-8";
-        termguicolors = true;
-        autoindent = true;
-        shiftwidth = 2;
-        smartindent = true;
+        backup = false;
+
+        # tab size
+        tabstop = 2;
         expandtab = true;
-        updatetime = 100;
+        showtabline = 2;
+        softtabstop = 2;
+
+        # auto indenting
+        smartindent = true;
+        shiftwidth = 2;
+        
+        # text wrapping
+        wrap = true;
+
+        # fold settings
+        foldcolumn = "0";
+        foldlevel = 99;
+        foldlevelstart = 99;
+        foldenable = true;
+        
+        # which-key timeout
+        timeoutlen = 10;
+
+        # faster updatetime
+        updatetime = 50;
+
+        # cursor position unless at start/end
+        scrolloff = 8;
+
+        # 24 bit colors
+        termguicolors = true;
+
+        # highlight cursor line
+        cursorline = true;
+
+        # encoding
+        encoding = "utf-8";
+        fileencoding = "utf-8";
+
+        # chars list
+        # list = true;
+        # listchars = "eol:↲,tab:|->,lead:·,space: ,trail:•,extends:→,precedes:←,nbsp:␣";
+        
+        # splitting
+        splitbelow = true;
+        splitright = true;
+            
+        # better searching
+        ignorecase = true;
+        grepprg = "rg --vimgrep";
+        grepformat = "%f:%l:%c:%m";
+        smartcase = true;
+        
+        # prevent screen jumping
+        signcolumn = "yes";
+
+        incsearch = true;
+        autoindent = true;
       };
 
       clipboard = {
         register = "unnamedplus";
         providers.wl-copy.enable = true;
       };
-
-      colorscheme = "${config.colorscheme.slug}";
     };
   };
 }
diff --git a/home/modules/console/tools/git.nix b/home/modules/console/tools/git.nix
index 9357dd6..a047108 100644
--- a/home/modules/console/tools/git.nix
+++ b/home/modules/console/tools/git.nix
@@ -19,6 +19,7 @@
   
     home.packages = with pkgs; [
       lazygit
+      gh
     ];
   };
 }