Configured nixvim

6 files changed, 163 insertions, 27 deletions

diff --git a/assets/onedark-dark.yml b/assets/onedark-dark.yml
new file mode 100644
index 0000000..eeeca99
--- /dev/null
+++ b/assets/onedark-dark.yml
@@ -0,0 +1,21 @@
+system: "base16"
+name: "OneDark Dark"
+author: "olimorris (https://github.com/olimorris)"
+variant: "dark"
+palette:
+  base00: "#000000"
+  base01: "#1c1f24"
+  base02: "#2c313a"
+  base03: "#434852"
+  base04: "#565c64"
+  base05: "#abb2bf"
+  base06: "#b6bdca"
+  base07: "#c8ccd4"
+  base08: "#ef596f"
+  base09: "#d19a66"
+  base0A: "#e5c07b"
+  base0B: "#89ca78"
+  base0C: "#2bbac5"
+  base0D: "#61afef"
+  base0E: "#d55fde"
+  base0F: "#be5046"
diff --git a/flake.lock b/flake.lock
index 648a543..994c221 100644
--- a/flake.lock
+++ b/flake.lock
@@ -75,24 +75,7 @@
       "inputs": {
         "base16": "base16",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "tt-schemes": "tt-schemes"
-      }
-    },
-    "tt-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1750770351,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 74d9de8..1261eb8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,10 +8,6 @@
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
 		base16.url = "github:SenchoPens/base16.nix";
-		tt-schemes = {
-			url = "github:tinted-theming/schemes";
-			flake = false;
-		};
 	};
 
 	outputs = { nixpkgs, home-manager, base16, ... }@inputs: {
@@ -26,7 +22,7 @@
 					./modules
 					base16.homeManagerModule
 					{
-						scheme = "${inputs.tt-schemes}/base16/onedark-dark.yaml";
+						scheme = ./assets/onedark-dark.yml;
 					}
 				];
 			};
diff --git a/modules/tools/default.nix b/modules/tools/default.nix
index 8a207b0..0217362 100644
--- a/modules/tools/default.nix
+++ b/modules/tools/default.nix
@@ -17,7 +17,7 @@
 		./lsd
 		./neofetch
 		./nixvim
-		./neovim
+		# ./neovim
 		./nnn
 		./nvtop
 		./pamixer
diff --git a/modules/tools/nixvim/default.nix b/modules/tools/nixvim/default.nix
index 1bde14e..bff6220 100644
--- a/modules/tools/nixvim/default.nix
+++ b/modules/tools/nixvim/default.nix
@@ -17,6 +17,17 @@ in {
 	{
 		programs.nixvim = {
 			enable = true;
+			keymaps = [
+				{ key = "<c-h>"; action = "<c-w>h"; }
+				{ key = "<c-w>"; action = "<c-w>j"; }
+				{ key = "<c-k>"; action = "<c-w>k"; }
+				{ key = "<c-l>"; action = "<c-w>l"; }
+				{
+					key = "<c-n>";
+					action = "<cmd>NvimTreeToggle<cr>";
+					mode = [ "n" "i" ];
+				}
+			];
 			colorschemes.base16 = {
 				enable = true;
 				colorscheme = with config.scheme.withHashtag; {
@@ -42,11 +53,136 @@ in {
 				number = true;
 				relativenumber = true;
 				shiftwidth = 3;
+				tabstop = 3;
+				softtabstop = 3;
+				expandtab = false;
+				list = true;
+				laststatus = 3;
 			};
+			clipboard.providers.xclip.enable = true;
+			extraConfigLuaPre = with config.scheme.withHashtag; ''
+				vim.opt.fillchars:append({ eob = " " })
+				vim.opt.listchars = { tab = "| ", trail = "_", lead = "_" }
+				vim.api.nvim_set_hl(0, "WinSeparator", {
+					fg = "${base01}",
+					bg = "${base00}",
+				})
+			'';
 			plugins = {
-				lightline = {
+				comment = {
 					enable = true;
 				};
+				lualine = {
+					enable = true;
+					settings = {
+						options = {
+							theme = with config.scheme.withHashtag; {
+								normal = {
+									a = { fg = base00; bg = base0D; gui = "bold"; };
+									b = { fg = base05; bg = base01; };
+									c = { fg = base05; bg = base00; };
+								};
+								insert = {
+									a = { fg = base00; bg = base0B; gui = "bold"; };
+									b = { fg = base05; bg = base01; };
+									c = { fg = base05; bg = base00; };
+								};
+								visual = {
+									a = { fg = base00; bg = base0A; gui = "bold"; };
+									b = { fg = base05; bg = base01; };
+									c = { fg = base05; bg = base00; };
+								};
+								replace = {
+									a = { fg = base00; bg = base08; gui = "bold"; };
+									b = { fg = base05; bg = base01; };
+									c = { fg = base05; bg = base00; };
+								};
+								inactive = {
+									a = { fg = base04; bg = base00; gui = "bold"; };
+									b = { fg = base04; bg = base00; };
+									c = { fg = base04; bg = base00; };
+								};
+							};
+							icons_enabled = true;
+						};
+					};
+				};
+				noice = {
+					enable = true;
+					cmdline = {
+						enabled = true;
+						view = "cmdline_popup";
+					};
+					popupmenu = {
+						enabled = true;
+						backend = "cmp";
+					};
+					presets = {
+						command_palette = true;
+					};
+				};
+				nvim-tree = {
+					enable = true;
+					settings = {
+						filters = {
+							dotfiles = false;
+							git_clean = false;
+							no_buffer = false;
+							custom = {};
+						};
+						git = {
+							enable = true;
+							ignore = false;
+						};
+						view = {
+							width = {
+								padding = 0;
+							};
+						};
+						renderer = {
+							indent_markers = {
+								enable = true;
+								inline_arrows = false;
+								icons = {
+									corner = "└";
+									edge = "│";
+									item = "├";
+									bottom = "─";
+									none = " ";
+								};
+							};
+							icons = {
+								show = {
+									folder = true;
+									folder_arrow = false;
+									file = true;
+									git = true;
+								};
+							};
+						};
+					};
+				};
+				treesitter = {
+					enable = true;
+					settings = {
+						highlight = { enable = true; };
+						indent = { enable = true; };
+					};
+				};
+				web-devicons = {
+					enable = true;
+				};
+				which-key = {
+					enable = true;
+					settings = {
+						plugins = {
+							marks = true;
+							registers = true;
+							spelling = { enabled = true; suggestions = 20; };
+						};
+						window = { border = "single"; };
+					};
+				};
 			};
 		};
 	};
diff --git a/users/arpit.nix b/users/arpit.nix
index d6e423d..77b688a 100644
--- a/users/arpit.nix
+++ b/users/arpit.nix
@@ -27,8 +27,8 @@
 	tools.libreoffice.enable = true;
 	tools.lsd.enable = true;
 	tools.neofetch.enable = true;
-	tools.neovim.enable = false;
-	tools.neovim.profile = "full";
+	# tools.neovim.enable = false;
+	# tools.neovim.profile = "full";
 	tools.nixvim.enable = true;
 	tools.nnn.enable = true;
 	tools.nvtop.enable = true;