diff --git a/dots/.config/nvim/flake.lock b/dots/.config/nvim/flake.lock index 3dc97f8..4757ee1 100644 --- a/dots/.config/nvim/flake.lock +++ b/dots/.config/nvim/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixCats": { "locked": { - "lastModified": 1762227818, - "narHash": "sha256-GSnU4XJucZojGVBGY7djqsT37P9YViCMTVw58tsqrOs=", + "lastModified": 1763330129, + "narHash": "sha256-KbOeWIF52SV53BOeETGO2C5ewaV2Ex9iaXH7G72gOr8=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "fa7991a4fa7d7227486910ce6724215b88eb8296", + "rev": "c81551ed87db2aefab30a12cf7425ff94dc0ad64", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763191728, - "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", + "lastModified": 1763464769, + "narHash": "sha256-AJHrsT7VoeQzErpBRlLJM1SODcaayp0joAoEA35yiwM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "rev": "6f374686605df381de8541c072038472a5ea2e2d", "type": "github" }, "original": { diff --git a/dots/.config/nvim/flake.nix b/dots/.config/nvim/flake.nix index c50bcf7..fe3dec7 100644 --- a/dots/.config/nvim/flake.nix +++ b/dots/.config/nvim/flake.nix @@ -79,6 +79,28 @@ startupPlugins = { general = with pkgs.vimPlugins; [ + ## plug + vim-plug + vim-sandwich + context_filetype-vim + editorconfig-vim + vim-snippets + unicode-vim + vim-css-color + quarto-nvim + vimtex + wiki-vim + vim-pandoc + vim-pandoc-syntax + # TODO: ferrine/md-img-paste.vim + # TODO: supercollider/scvim + # TODO: tidalcycles/vim-tidal + vim-glsl + # TODO: timtro/glslView-nvim + # TODO: sirtaj/vim-openscad + jupytext-nvim + vim-openscad + ## paq eyeliner-nvim fzf-lua ltex_extra-nvim diff --git a/dots/.config/nvim/lua/plug.lua b/dots/.config/nvim/lua/plug.lua index 401554a..142768f 100644 --- a/dots/.config/nvim/lua/plug.lua +++ b/dots/.config/nvim/lua/plug.lua @@ -1,30 +1,35 @@ -vim.cmd([[ -call plug#begin() -Plug 'machakann/vim-sandwich' -Plug 'Shougo/context_filetype.vim' -Plug 'editorconfig/editorconfig-vim' -Plug 'honza/vim-snippets' -Plug 'chrisbra/unicode.vim' -Plug 'ap/vim-css-color' -" Jupyter -Plug 'quarto-dev/quarto-vim' -" LaTeX -Plug 'lervag/vimtex' -" Wiki -Plug 'lervag/wiki.vim' -" Markdown -Plug 'vim-pandoc/vim-pandoc' -Plug 'vim-pandoc/vim-pandoc-syntax' -Plug 'ferrine/md-img-paste.vim' -" TidalCycles -Plug 'supercollider/scvim' -Plug 'tidalcycles/vim-tidal' -" GLSL -Plug 'tikhomirov/vim-glsl' -Plug 'timtro/glslView-nvim' -" Jupyter notebooks -Plug 'goerz/jupytext.vim' -" OpenSCAD -Plug 'sirtaj/vim-openscad' -call plug#end() -]]) +if not vim.g[ [[nixCats-special-rtp-entry-nixCats]] ] then + local vim = vim + local Plug = vim.fn["plug#"] + + vim.call("plug#begin") + + Plug("machakann/vim-sandwich") + Plug("Shougo/context_filetype.vim") + Plug("editorconfig/editorconfig-vim") + Plug("honza/vim-snippets") + Plug("chrisbra/unicode.vim") + Plug("ap/vim-css-color") + -- Jupyter + Plug("quarto-dev/quarto-vim") + -- LaTeX + Plug("lervag/vimtex") + -- Wiki + Plug("lervag/wiki.vim") + -- Markdown + Plug("vim-pandoc/vim-pandoc") + Plug("vim-pandoc/vim-pandoc-syntax") + Plug("ferrine/md-img-paste.vim") + -- TidalCycles + Plug("supercollider/scvim") + Plug("tidalcycles/vim-tidal") + -- GLSL + Plug("tikhomirov/vim-glsl") + Plug("timtro/glslView-nvim") + -- Jupyter notebooks + Plug("goerz/jupytext.vim") + -- OpenSCAD + Plug("sirtaj/vim-openscad") + + vim.call("plug#end") +end diff --git a/flake.lock b/flake.lock index b1e0ba5..fefa3d7 100644 --- a/flake.lock +++ b/flake.lock @@ -82,6 +82,24 @@ "type": "github" } }, + "nix-secrets": { + "flake": false, + "locked": { + "lastModified": 1762546290, + "narHash": "sha256-a0mXF68to0eJQiIq1vCBMcGCX1UA1lBpwHgCinKfORA=", + "ref": "main", + "rev": "b0473511f3718fb95f01e6c8bad6da3eb582974c", + "shallow": true, + "type": "git", + "url": "ssh://git@github.com/hektor/nix-secrets" + }, + "original": { + "ref": "main", + "shallow": true, + "type": "git", + "url": "ssh://git@github.com/hektor/nix-secrets" + } + }, "nixCats": { "locked": { "lastModified": 1763330129, @@ -291,6 +309,7 @@ "disko": "disko", "firefox-addons": "firefox-addons", "home-manager": "home-manager", + "nix-secrets": "nix-secrets", "nixgl": "nixgl", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs",