From a1f1e24d62a0ea5f633324c6362b566abf9ec66c Mon Sep 17 00:00:00 2001 From: triethyl Date: Thu, 3 Jul 2025 10:06:37 -0400 Subject: rearranged fennel and lua code Former-commit-id: a5f5aa6e19e52b3734a395369a9b40b9833aa27a --- pkgs/custom-neovim/default.nix | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index a6e5b62..acf24f1 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -5,34 +5,12 @@ inputs.mnw.lib.wrap pkgs { neovim = pkgs.neovim-unwrapped; - plugins = with pkgs.vimPlugins; let - tangerine-nvim = pkgs.vimUtils.buildVimPlugin { - name = "tangerine-nvim"; - src = pkgs.fetchFromGitHub { - owner = "udayvir-singh"; - repo = "tangerine.nvim"; - tag = "v2.9"; - hash = "sha256-C4QmsW83SxTn+eIkCMWDnd/Vdc9Mb7yD7a0bYSiIRJI="; - }; - }; - hibiscus-nvim = pkgs.vimUtils.buildVimPlugin { - name = "hibiscus-nvim"; - src = pkgs.fetchFromGitHub { - owner = "udayvir-singh"; - repo = "hibiscus.nvim"; - tag = "v1.7"; - hash = "sha256-fjdwT2rdDZ6OF4SByMrcvFNXhF4lhBwzmTLhpwgOQ6o="; - }; - }; - in { + plugins = with pkgs.vimPlugins; { dev.config = { pure = ./config; impure = "/home/culsans/Sync/setup/pkgs/custom-neovim"; }; start = [ - tangerine-nvim # Allow configuration in fennel. - hibiscus-nvim # Adds extra fennel macros. - # Core Plugins mini-nvim # Ton of small modules. nvim-lspconfig # Adds lsp presets. @@ -57,6 +35,11 @@ inputs.mnw.lib.wrap pkgs { luaFiles = [./config/init.lua]; + extraLuaPackages = lua: + with lua; [ + fennel + ]; + extraBinPath = with pkgs; [ # LSP Servers lua-language-server # Lua LS -- cgit v1.2.3 From 41224173cfce3d4bd189a4a41aadab14973a609b Mon Sep 17 00:00:00 2001 From: triethyl Date: Sat, 5 Jul 2025 22:22:29 -0400 Subject: testing custom nvim Former-commit-id: 700073b729c559dbfa63870db6ea0869ebac61ae --- pkgs/custom-neovim/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index acf24f1..57eea1d 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -7,8 +7,7 @@ inputs.mnw.lib.wrap pkgs { plugins = with pkgs.vimPlugins; { dev.config = { - pure = ./config; - impure = "/home/culsans/Sync/setup/pkgs/custom-neovim"; + pure = ./nvim; }; start = [ # Core Plugins @@ -33,7 +32,7 @@ inputs.mnw.lib.wrap pkgs { opt = []; }; - luaFiles = [./config/init.lua]; + # luaFiles = [./config/init.lua]; extraLuaPackages = lua: with lua; [ -- cgit v1.2.3 From 99038c67b0886ae02f7dd46c3d436d18837d9019 Mon Sep 17 00:00:00 2001 From: triethyl Date: Sun, 6 Jul 2025 18:38:20 -0400 Subject: removed fennel Former-commit-id: 5a902687c37a002dfa1b71b61a100eb3c4447c75 --- pkgs/custom-neovim/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 57eea1d..28d448a 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -7,7 +7,7 @@ inputs.mnw.lib.wrap pkgs { plugins = with pkgs.vimPlugins; { dev.config = { - pure = ./nvim; + pure = ./config; }; start = [ # Core Plugins @@ -32,17 +32,11 @@ inputs.mnw.lib.wrap pkgs { opt = []; }; - # luaFiles = [./config/init.lua]; - - extraLuaPackages = lua: - with lua; [ - fennel - ]; + luaFiles = [./config/init.lua]; extraBinPath = with pkgs; [ # LSP Servers lua-language-server # Lua LS - fennel-ls # Fennel LS nixd # Nix LS marksman # Markdown LS -- cgit v1.2.3 From 546752feb6576be92fe421be1998217aa7d657ff Mon Sep 17 00:00:00 2001 From: triethyl Date: Sun, 6 Jul 2025 22:21:45 -0400 Subject: working on nvim setup Former-commit-id: a43ab0499838d262445d8af9cb954a84e259bb35 --- pkgs/custom-neovim/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 28d448a..06ad3b2 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -17,6 +17,7 @@ inputs.mnw.lib.wrap pkgs { nvim-treesitter.withAllGrammars # All treesitter grammars. # tabby-nvim # Tab bar. # friendly-snippets # Extra snippets. + lualine-nvim # Colorschemes oxocarbon-nvim # IBM Carbon themes. -- cgit v1.2.3 From be6c16189410b280dd9f94cc2821ffcbd721dbc2 Mon Sep 17 00:00:00 2001 From: triethyl Date: Mon, 7 Jul 2025 11:43:06 -0400 Subject: working on neovim Former-commit-id: 025d1930a0ae07909efe826cc902424ff57d5ce9 --- pkgs/custom-neovim/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 06ad3b2..e8bf783 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -13,11 +13,13 @@ inputs.mnw.lib.wrap pkgs { # Core Plugins mini-nvim # Ton of small modules. nvim-lspconfig # Adds lsp presets. - # actions-preview-nvim # Adds a selector for LSP actions. + actions-preview-nvim # Adds a selector for LSP actions. nvim-treesitter.withAllGrammars # All treesitter grammars. - # tabby-nvim # Tab bar. + tabby-nvim # Tab bar. # friendly-snippets # Extra snippets. - lualine-nvim + lualine-nvim # Status line. + telescope-nvim # Picker. + plenary-nvim # General Library. # Colorschemes oxocarbon-nvim # IBM Carbon themes. -- cgit v1.2.3 From 405c50fe980449290fa11c0c3b813954eacf4c4f Mon Sep 17 00:00:00 2001 From: triethyl Date: Tue, 8 Jul 2025 16:52:49 -0400 Subject: working on custom nvim Former-commit-id: 7d898c7680f9611b803438b88026d3d126672437 --- pkgs/custom-neovim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index e8bf783..d210cdf 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -16,10 +16,10 @@ inputs.mnw.lib.wrap pkgs { actions-preview-nvim # Adds a selector for LSP actions. nvim-treesitter.withAllGrammars # All treesitter grammars. tabby-nvim # Tab bar. - # friendly-snippets # Extra snippets. lualine-nvim # Status line. telescope-nvim # Picker. plenary-nvim # General Library. + alpha-nvim # Dashboard. # Colorschemes oxocarbon-nvim # IBM Carbon themes. -- cgit v1.2.3 From d65a4b2e6fb66f51b21da8d5397f89ea1c2aaedc Mon Sep 17 00:00:00 2001 From: triethyl Date: Wed, 9 Jul 2025 01:02:02 -0400 Subject: working on dashboard Former-commit-id: 10503c9edf27043e403a17ac693af14e5f663537 --- pkgs/custom-neovim/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index d210cdf..61f69ef 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -20,6 +20,7 @@ inputs.mnw.lib.wrap pkgs { telescope-nvim # Picker. plenary-nvim # General Library. alpha-nvim # Dashboard. + dashboard-nvim # Colorschemes oxocarbon-nvim # IBM Carbon themes. -- cgit v1.2.3 From 4afdfee5c1ce99a09fc70075ca674b961fd3faed Mon Sep 17 00:00:00 2001 From: triethyl Date: Wed, 9 Jul 2025 13:11:23 -0400 Subject: working on custom neovim Former-commit-id: 4baf1a9c64b861ce1a934487b93b36bdb1438cf3 --- pkgs/custom-neovim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 61f69ef..423fdf9 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -20,7 +20,7 @@ inputs.mnw.lib.wrap pkgs { telescope-nvim # Picker. plenary-nvim # General Library. alpha-nvim # Dashboard. - dashboard-nvim + persisted-nvim # Session manager. # Colorschemes oxocarbon-nvim # IBM Carbon themes. -- cgit v1.2.3 From 96792596b8b48fdf73d99caab5781394c6fab00c Mon Sep 17 00:00:00 2001 From: triethyl Date: Thu, 10 Jul 2025 19:02:27 -0400 Subject: working on custom neovim Former-commit-id: 4ce0bec0e948790108ad93d37bd99097537302a6 --- pkgs/custom-neovim/default.nix | 98 ++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 43 deletions(-) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 423fdf9..820aba1 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -1,53 +1,65 @@ { pkgs, inputs, -}: -inputs.mnw.lib.wrap pkgs { - neovim = pkgs.neovim-unwrapped; - - plugins = with pkgs.vimPlugins; { - dev.config = { - pure = ./config; +}: let + plenary-nvim-git = pkgs.vimPlugins.plenary-nvim.overrideAttrs (old: { + version = "git"; + src = pkgs.fetchFromGitHub { + owner = "emmanueltouzery"; + repo = "plenary.nvim"; + rev = "7750bc895a1f06aa7a940f5aea43671a74143be0"; + sha256 = "sha256-9Un7ekhBxcnmFE1xjCCFTZ7eqIbmXvQexpnhduAg4M0="; }; - start = [ - # Core Plugins - mini-nvim # Ton of small modules. - nvim-lspconfig # Adds lsp presets. - actions-preview-nvim # Adds a selector for LSP actions. - nvim-treesitter.withAllGrammars # All treesitter grammars. - tabby-nvim # Tab bar. - lualine-nvim # Status line. - telescope-nvim # Picker. - plenary-nvim # General Library. - alpha-nvim # Dashboard. - persisted-nvim # Session manager. + }); # go back to regular plenary when this commit is merged: https://github.com/nvim-lua/plenary.nvim/pull/649 +in + inputs.mnw.lib.wrap pkgs { + neovim = pkgs.neovim-unwrapped; - # Colorschemes - oxocarbon-nvim # IBM Carbon themes. - rose-pine # Rose Pine themes. - kanagawa-nvim # Kanagawa themes. - everforest # Green themes. - nordic-nvim # Warm dark nordic theme. + plugins = with pkgs.vimPlugins; { + dev.config = { + pure = ./config; + }; + start = [ + # Core Plugins + mini-nvim # Ton of small modules. + nvim-lspconfig # Adds lsp presets. + actions-preview-nvim # Adds a selector for LSP actions. + nvim-treesitter.withAllGrammars # All treesitter grammars. + tabby-nvim # Tab bar. + lualine-nvim # Status line. + telescope-nvim # Picker. + # plenary-nvim # General Library. + plenary-nvim-git + alpha-nvim # Dashboard. + persisted-nvim # Session manager. - # Miscellaneous Plugins - presence-nvim # Discord RPC for nvim. - cellular-automaton-nvim # Fun useless plugin. - ]; - opt = []; - }; + # Colorschemes + oxocarbon-nvim # IBM Carbon themes. + rose-pine # Rose Pine themes. + kanagawa-nvim # Kanagawa themes. + everforest # Green themes. + nordic-nvim # Warm dark nordic theme. - luaFiles = [./config/init.lua]; + # Miscellaneous Plugins + presence-nvim # Discord RPC for nvim. + cellular-automaton-nvim # Fun useless plugin. + ]; + opt = []; + }; - extraBinPath = with pkgs; [ - # LSP Servers - lua-language-server # Lua LS - nixd # Nix LS - marksman # Markdown LS + luaFiles = [./config/init.lua]; - # Formatters - alejandra # Nix Formatter + extraBinPath = with pkgs; [ + # LSP Servers + lua-language-server # Lua LS + nixd # Nix LS + marksman # Markdown LS - # Extra Tools - ripgrep - ]; -} + # Formatters + alejandra # Nix Formatter + + # Extra Tools + ripgrep + fd + ]; + } -- cgit v1.2.3 From 0c3ab10a8f5587ef64476fc4cf425531df73e3d4 Mon Sep 17 00:00:00 2001 From: triethyl Date: Fri, 11 Jul 2025 10:07:40 -0400 Subject: working on custom nvim Former-commit-id: b28cf748561ffb9e66ce669dde53530ff394e4af --- pkgs/custom-neovim/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 820aba1..a6dfcb6 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -32,6 +32,7 @@ in plenary-nvim-git alpha-nvim # Dashboard. persisted-nvim # Session manager. + which-key-nvim # Colorschemes oxocarbon-nvim # IBM Carbon themes. -- cgit v1.2.3 From 8e2f4297ba08f945e4f78d7c3a86aa4cc1e553ed Mon Sep 17 00:00:00 2001 From: triethyl Date: Fri, 11 Jul 2025 17:01:04 -0400 Subject: working on adding snacks.nvim Former-commit-id: 4e263cc0bcc079adaa4eb9487c7c31553e186388 --- pkgs/custom-neovim/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index a6dfcb6..8abc968 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -11,6 +11,15 @@ sha256 = "sha256-9Un7ekhBxcnmFE1xjCCFTZ7eqIbmXvQexpnhduAg4M0="; }; }); # go back to regular plenary when this commit is merged: https://github.com/nvim-lua/plenary.nvim/pull/649 + which-key-nvim-git = pkgs.vimPlugins.which-key-nvim.overrideAttrs (old: { + version = "git"; + src = pkgs.fetchFromGitHub { + owner = "cameronr"; + repo = "which-key.nvim"; + rev = "ab1a3b0d3005a95507ba6c18b96531d430370885"; + sha256 = "sha256-Zbs+Xd6kGfR+s/f6xhxXBdKJA2N4WqcJDPWVkGaM7S0="; + }; + }); # go back to regular which-key when this commit is merged: https://github.com/folke/which-key.nvim/pull/974 in inputs.mnw.lib.wrap pkgs { neovim = pkgs.neovim-unwrapped; @@ -32,7 +41,9 @@ in plenary-nvim-git alpha-nvim # Dashboard. persisted-nvim # Session manager. - which-key-nvim + # which-key-nvim + which-key-nvim-git + snacks-nvim # Colorschemes oxocarbon-nvim # IBM Carbon themes. -- cgit v1.2.3 From fd886e18472da2884ea6c593aecfbfc7bc658cbf Mon Sep 17 00:00:00 2001 From: triethyl Date: Sat, 12 Jul 2025 22:23:30 -0400 Subject: working on custom nvim Former-commit-id: 7eeb50b4c2b95b3d917b37a3a6f0b98ed7b0d077 --- pkgs/custom-neovim/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/custom-neovim/default.nix') diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 8abc968..7c63e5f 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -55,6 +55,7 @@ in # Miscellaneous Plugins presence-nvim # Discord RPC for nvim. cellular-automaton-nvim # Fun useless plugin. + vim-wakatime # For hack club challenge. ]; opt = []; }; @@ -73,5 +74,7 @@ in # Extra Tools ripgrep fd + + wakatime-cli ]; } -- cgit v1.2.3