diff --git a/flake.lock b/flake.lock index 98bdbe8..0b53f44 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1690915766, - "narHash": "sha256-YynUr5VU7AKjFl74tGKo9RHkyYw4TSFLLtRsNg9SDbQ=", + "lastModified": 1697840768, + "narHash": "sha256-GWRAjeRh95UgSMd43GGJe1xQizaR5XacQPjj74WIVIk=", "owner": "notashelf", "repo": "arrpc-flake", - "rev": "4d72fe05df250a93e32c70ba6893ddadde438e28", + "rev": "6848e98b0a9f4e76d7096aa07996ccd0fbb1eb7b", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1697688028, - "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=", + "lastModified": 1698128422, + "narHash": "sha256-Qf39ATHrj6wfeC+K6uwD/FnI7RKrdEiN3uWaciUi0rM=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19", + "rev": "6045b68ee725167ed0487f0fb88123202ba61923", "type": "github" }, "original": { @@ -65,11 +65,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1697795617, - "narHash": "sha256-+u9Af2+YRj85oRgIr6J+lChTvp4XJx3VqRolqtH/DoY=", + "lastModified": 1698105820, + "narHash": "sha256-elFzVUbFWhkWwezzV+dgMIfupGU4WblM4XpEBnKSqWk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "bb9d0aed5bd11879f5a532e26fc0a91d1a8af714", + "rev": "14a3c939ce019623126893aa4c454e62bb29779c", "type": "github" }, "original": { @@ -171,11 +171,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nur": { "locked": { - "lastModified": 1697793907, - "narHash": "sha256-V2nTR/bN1GwozE2+Wz/YuuRq2uZhGo8HUSKCteJGQFs=", + "lastModified": 1698136132, + "narHash": "sha256-lNCbMLMq1Z3+MWnEIeyqMPO3UXPBZl19QAigbItl7cA=", "owner": "nix-community", "repo": "NUR", - "rev": "d531cd7ef0001eaba84743d6666726df3c3b5620", + "rev": "8ea003a1d3e54c1e814e21f5d8a78f9c3c1946e3", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "nixpkgs-stable": [] }, "locked": { - "lastModified": 1697339241, - "narHash": "sha256-ITsFtEtRbCBeEH9XrES1dxZBkE1fyNNUfIyQjQ2AYQs=", + "lastModified": 1697943852, + "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", "owner": "mic92", "repo": "sops-nix", - "rev": "51186b8012068c417dac7c31fb12861726577898", + "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", "type": "github" }, "original": { diff --git a/nix/users/base/neovim/default.nix b/nix/users/base/neovim/default.nix index fad4754..dbd50c1 100644 --- a/nix/users/base/neovim/default.nix +++ b/nix/users/base/neovim/default.nix @@ -23,31 +23,31 @@ defaultEditor = true; - plugins = with pkgs; [ + plugins = with pkgs.vimPlugins; [ # Colorschemes { - plugin = vimPlugins.catppuccin-nvim; + plugin = catppuccin-nvim; config = toLuaFile ./plugins/colorschemes/catppuccin.lua; } # LSP { - plugin = vimPlugins.nvim-lspconfig; + plugin = nvim-lspconfig; config = toLuaFile ./plugins/lsp.lua; } - vimPlugins.cmp-buffer - vimPlugins.cmp-cmdline - vimPlugins.cmp-nvim-lsp - vimPlugins.cmp-nvim-lua - vimPlugins.cmp-path - vimPlugins.cmp_luasnip - vimPlugins.luasnip - vimPlugins.nvim-cmp + cmp-buffer + cmp-cmdline + cmp-nvim-lsp + cmp-nvim-lua + cmp-path + cmp_luasnip + luasnip + nvim-cmp # The rest { - plugin = vimPlugins.indent-blankline-nvim; + plugin = indent-blankline-nvim; config = toLuaFile ./plugins/indent.lua; } @@ -55,22 +55,22 @@ # TODO: enable this when treesitter is installed # { - # plugin = vimPlugins.nvim-ts-autotag; + # plugin = nvim-ts-autotag; # config = toLuaFile ./plugins/autotag.lua; # } { - plugin = vimPlugins.nvim-colorizer-lua; + plugin = nvim-colorizer-lua; config = toLuaFile ./plugins/colorizer.lua; } # GIT { - plugin = vimPlugins.gitsigns-nvim; + plugin = gitsigns-nvim; config = toLuaFile ./plugins/gitsigns.lua; } - vimPlugins.vim-fugitive + vim-fugitive { plugin = (fromGitHub "3af6232c8d39d51062702e875ff6407c1eeb0391" "main" "xiyaowong/transparent.nvim"); @@ -78,28 +78,52 @@ } { - plugin = vimPlugins.presence-nvim; + plugin = presence-nvim; config = toLuaFile ./plugins/presence.lua; } { - plugin = vimPlugins.comment-nvim; + plugin = comment-nvim; config = toLuaFile ./plugins/comment.lua; } { - plugin = vimPlugins.which-key-nvim; + plugin = which-key-nvim; config = toLuaFile ./plugins/whichkey.lua; } { - plugin = vimPlugins.nvim-autopairs; - config = toLuaFile ./plugins/autopairs.lua + plugin = nvim-autopairs; + config = toLuaFile ./plugins/autopairs.lua; } { - plugin = vimPlugins.nvim-treesitter; - config = toLuaFile ./plugins/treesitter.lua + plugin = (nvim-treesitter.withPlugins (p: [ + p.tree-sitter-nix + p.tree-sitter-c + p.tree-sitter-lua + p.tree-sitter-vim + p.tree-sitter-python + p.tree-sitter-html + p.tree-sitter-go + p.tree-sitter-javascript + p.tree-sitter-toml + p.tree-sitter-css + p.tree-sitter-gitignore + p.tree-sitter-gitcommit + p.tree-sitter-git_rebase + p.tree-sitter-cpp + p.tree-sitter-dockerfile + p.tree-sitter-c_sharp + p.tree-sitter-jq + p.tree-sitter-jsonnet + p.tree-sitter-rust + p.tree-sitter-ruby + p.tree-sitter-solidity + p.tree-sitter-sql + p.tree-sitter-yaml + ])); + config = toLuaFile ./plugins/treesitter.lua; } ]; diff --git a/nix/users/base/neovim/plugins/indent.lua b/nix/users/base/neovim/plugins/indent.lua index 3bd6d05..dd20b0e 100644 --- a/nix/users/base/neovim/plugins/indent.lua +++ b/nix/users/base/neovim/plugins/indent.lua @@ -4,7 +4,7 @@ if not status then return end plugin.setup{ - show_current_context = true, - show_current_context_start = true, + -- show_current_context = true, + -- show_current_context_start = true, } -vim.g.indent_blankline_filetype_exclude = {'dashboard'} \ No newline at end of file +-- vim.g.indent_blankline_filetype_exclude = {'dashboard'} \ No newline at end of file diff --git a/nix/users/base/neovim/plugins/treesitter.lua b/nix/users/base/neovim/plugins/treesitter.lua index 3a1fa0d..2133e02 100644 --- a/nix/users/base/neovim/plugins/treesitter.lua +++ b/nix/users/base/neovim/plugins/treesitter.lua @@ -4,59 +4,14 @@ if not status then return end plugin.setup { - -- A list of parser names, or "all" (the four listed parsers should always be installed) - ensure_installed = { - "c", - "lua", - "vim", - "python", - "html", - "htmldjango", - "go", - "javascript", - "typescript", - "toml", - "css", - "gitignore", - "gitcommit", - "git_rebase", - "gitattributes", - "cpp", - "dockerfile", - "c_sharp", - "jq", - "jsonnet", - "kotlin", - "rust", - "ruby", - "solidity", - "sql", - "yaml", - "nix", - }, + ensure_installed = {}, - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = false, - - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = true, - - -- List of parsers to ignore installing (for "all") - --ignore_install = { "javascript" }, - - ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) - -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + auto_install = false, highlight = { - -- `false` will disable the whole extension enable = true, use_languagetree = true, disable = {"css", "html" }, - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages additional_vim_regex_highlighting = false, - }, } \ No newline at end of file diff --git a/nix/users/nicolaivds/programs/webcord.nix b/nix/users/nicolaivds/programs/webcord.nix index 91f4ad2..2fb1186 100644 --- a/nix/users/nicolaivds/programs/webcord.nix +++ b/nix/users/nicolaivds/programs/webcord.nix @@ -8,7 +8,7 @@ let }; in { home.packages = with pkgs; [ - (webcord-vencord.override { webcord = webcord.override { electron_25 = electron_24;};}) + (webcord-vencord.override { webcord = webcord.override { electron_27 = electron_24;};}) inputs.arrpc.packages.${pkgs.system}.arrpc ];