diff --git a/home/editors/nvim/plugins/builds.nix b/home/editors/nvim/plugins/builds.nix deleted file mode 100644 index eade126..0000000 --- a/home/editors/nvim/plugins/builds.nix +++ /dev/null @@ -1,56 +0,0 @@ -pkgs: let - build = { - version, - owner, - name, - rev, - hash, - }: - pkgs.vimUtils.buildVimPlugin { - pname = name; - inherit version; - src = pkgs.fetchFromGitHub { - repo = name; - inherit owner rev; - sha256 = hash; - }; - }; -in { - # INFO: Last update: 18. Aug. 2025 | Sort latest -> oldest - - # https://github.com/SCJangra/table-nvim - table-nvim = build { - version = "27-09-2024"; - owner = "SCJangra"; - name = "table-nvim"; - rev = "c044fd37169eb10376962b0d0cec5f94d58ca626"; - hash = "1ygn4bvnpbd49gcgbkh0cdj3p75jsmwi87hby78w0fd22205pvmi"; - }; - - # https://github.com/michaelrommel/nvim-silicon - silicon = build { - version = "09-01-2025"; - owner = "michaelrommel"; - name = "nvim-silicon"; - rev = "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32"; - hash = "1zk6lgghvdcys20cqvh2g1kjf661q1w97niq5nx1zz4yppy2f9jy"; - }; - - # https://github.com/b0o/incline.nvim - incline = build { - version = "05-06-2025"; - owner = "b0o"; - name = "incline.nvim"; - rev = "0fd2d5a27504dba7fdc507a53275f22c081fe640"; - hash = "19x35z2sj3hl3icrxzbs67xhxgq9d237vhgzqrz8ppdc74p8wgaz"; - }; - - # https://github.com/Aasim-A/scrollEOF.nvim - scrollEOF = build { - version = "31-05-2025"; - owner = "Aasim-A"; - name = "scrollEOF.nvim"; - rev = "2575109749b4bf3a0bf979a17947b3c1e8c5137e"; - hash = "1s66v9n0arg81wgw1z8iv9s304j78cd506z522avpc88d3ji4yl4"; - }; -} diff --git a/home/editors/nvim/plugins/decoration/default.nix b/home/editors/nvim/plugins/decoration/default.nix index 7e17725..aefb9cb 100644 --- a/home/editors/nvim/plugins/decoration/default.nix +++ b/home/editors/nvim/plugins/decoration/default.nix @@ -1,10 +1,17 @@ {pkgs, ...}: { extraPlugins = let - builds = import ../builds.nix pkgs; + scrollEOF = pkgs.vimUtils.buildVimPlugin { + pname = "scrollEOF.nvim"; + version = "09-14-2025"; + src = pkgs.fetchFromGitHub { + owner = "Aasim-A"; + repo = "scrollEOF.nvim"; + rev = "e462b9a07b8166c3e8011f1dcbc6bf68b67cd8d7"; + hash = "sha256-y7yOCRSGTtQcFyWVkGe3xQqstHZMQKayxtqkOVlZ4PM="; + }; + }; in - with builds; with pkgs.vimPlugins; [ - incline scrollEOF vim-hexokinase diff --git a/home/editors/nvim/plugins/lang/docs/markdown.nix b/home/editors/nvim/plugins/lang/docs/markdown.nix index b4cca62..8101a40 100644 --- a/home/editors/nvim/plugins/lang/docs/markdown.nix +++ b/home/editors/nvim/plugins/lang/docs/markdown.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ plugins = { markdown-preview = { enable = true; @@ -16,8 +16,4 @@ }; }; }; - - extraPlugins = let - builds = import ../../builds.nix pkgs; - in [builds.table-nvim]; } diff --git a/home/editors/nvim/plugins/utils/default.nix b/home/editors/nvim/plugins/utils/default.nix index 859a643..0112b82 100644 --- a/home/editors/nvim/plugins/utils/default.nix +++ b/home/editors/nvim/plugins/utils/default.nix @@ -6,7 +6,7 @@ ./fzf-lua.nix ./grug-far.nix ./presence.nix - ./silicon.nix + # ./silicon.nix ./todo-comments.nix ./debugging.nix ./snacks diff --git a/home/editors/nvim/plugins/utils/silicon.nix b/home/editors/nvim/plugins/utils/silicon.nix index f669eca..4d63560 100644 --- a/home/editors/nvim/plugins/utils/silicon.nix +++ b/home/editors/nvim/plugins/utils/silicon.nix @@ -1,6 +1,23 @@ {pkgs, ...}: let - theme = "Catppuccin"; - font = "JetBrainsMono Nerd Font=32;Noto Color Emoji=34"; + silicon-nvim = pkgs.vimUtils.buildVimPlugin { + pname = "silicon.nvim"; + version = "12-03-2024"; + src = pkgs.fetchFromGitHub { + owner = "krivahtoo"; + repo = "silicon.nvim"; + rev = "d8a6852b7158cc98f44ab12a0811ccf7d111dc71"; + hash = "sha256-3ABUsfJpb6RO6AiuuSL5gwDofJIwC5tlEMzBrlY9/s0="; + }; + }; + theme = + pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "sublime-text"; + rev = "3d8625d937d89869476e94bc100192aa220ce44a"; + hash = "sha256-3ABUsfJpb6RO6AiuuSL5gwDofJIwC5tlEMzBrlY9/s0="; + } + + "/Mocha.tmTheme"; + font = "JetBrainsMono Nerd Font=16;Noto Color Emoji=16"; in { extraPackages = with pkgs; [ silicon @@ -8,17 +25,18 @@ in { noto-fonts-color-emoji ]; - extraPlugins = let - builds = import ../builds.nix pkgs; - in - with builds; [silicon]; + extraPlugins = [silicon-nvim]; - extraConfigLua = '' - require 'nvim-silicon'.setup { - font = '${font}', - theme = '${theme}', - no_line_number = true, - no_window_controls = true, - } - ''; + extraConfigLua = + # lua + '' + require("silicon").setup { + font = "${font}", + theme = "${theme}", + window_controls = false, + output = { + path = "~/Downloads", + }, + } + ''; } diff --git a/home/editors/nvim/plugins/utils/which-key/config.lua b/home/editors/nvim/plugins/utils/which-key/config.lua index e774c0a..1aab40a 100644 --- a/home/editors/nvim/plugins/utils/which-key/config.lua +++ b/home/editors/nvim/plugins/utils/which-key/config.lua @@ -172,9 +172,9 @@ wk.add { set_key.cmd("mv", "MarkdownPreviewToggle", "Browser preview"), --- Snap (Silicon) -- - { "S", group = "Snap(Silicon)" }, - set_key.cmd("Ss", require("silicon").file, "Save as file"), - set_key.cmd("Sc", require("silicon").clip, "Copy to clipboard"), + -- { "S", group = "Snap(Silicon)" }, + -- set_key.cmd("Ss", require("silicon").file, "Save as file"), + -- set_key.cmd("Sc", require("silicon").clip, "Copy to clipboard"), --- Latex (Vimtex) -- { "L", group = "Latex" },