diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cece139 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +tags +.luarc.json +/result diff --git a/.gitingore b/.gitingore deleted file mode 100644 index e20408f..0000000 --- a/.gitingore +++ /dev/null @@ -1,2 +0,0 @@ -result -result/ diff --git a/kickstart/.gitignore b/kickstart/.gitignore new file mode 100644 index 0000000..cece139 --- /dev/null +++ b/kickstart/.gitignore @@ -0,0 +1,3 @@ +tags +.luarc.json +/result diff --git a/kickstart/.stylua.toml b/kickstart/.stylua.toml new file mode 100644 index 0000000..139e939 --- /dev/null +++ b/kickstart/.stylua.toml @@ -0,0 +1,6 @@ +column_width = 160 +line_endings = "Unix" +indent_type = "Spaces" +indent_width = 2 +quote_style = "AutoPreferSingle" +call_parentheses = "None" diff --git a/kickstart/README.md b/kickstart/README.md new file mode 100644 index 0000000..b03e3c3 --- /dev/null +++ b/kickstart/README.md @@ -0,0 +1,44 @@ +# This is the help for the nixCats lazy wrapper + +Or well, most of the help for it. There is also help for it at [:h nixCats.luaUtils](https://nixcats.org/nixCats_luaUtils.html) + +It is the entirety of [kickstart.nvim](https://github.com/nvim-lua/kickstart.nvim) with very few changes, but uses nixCats to download everything + +enter a new directory then run: + +`nix flake init -t github:BirdeeHub/nixCats-nvim#kickstart-nvim` + +then to build, `nix build .` + +and the result will be found at `./result/bin/nvim` + +It also can work without any nix whatsoever. +It has been adapted such that it works either way! + +All notes about the lazy wrapper are in comments that begin with the string: `NOTE: nixCats:` so to find all of the info, search for that. + +One other note. + +If you install your grammars via `lazy.nvim` rather than `nix`, you will need to add a c compiler to your `lspsAndRuntimeDeps` section in your `categoryDefinitions` + +If you install your grammars via nix, the only methods supported via the `lazy.nvim` wrapper are the following. + +Summary: as long as `pkgs.neovimUtils.grammarToPlugin` is called on it somehow, it will work. + +Any other ways will still work in nixCats, but not when using the lazy wrapper, because the lazy wrapper has to add them back to the runtimepath. + +```nix +pkgs.vimPlugins.nvim-treesitter.withAllGrammars +# or +pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: with plugins; [ + nix + lua + # etc... +]); +# or +pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: pkgs.vimPlugins.nvim-treesitter.allGrammars) +# or +builtins.attrValues pkgs.vimPlugins.nvim-treesitter.grammarPlugins +# or +pkgs.neovimUtils.grammarToPlugin pkgs.tree-sitter-grammars.somegrammar +``` diff --git a/kickstart/flake.lock b/kickstart/flake.lock new file mode 100644 index 0000000..d691fc8 --- /dev/null +++ b/kickstart/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "nixCats": { + "locked": { + "lastModified": 1740837766, + "narHash": "sha256-LKeBL3gjm+Fg2yVDKqB2gIiVnccv4TSUtt5NmQcasrk=", + "owner": "BirdeeHub", + "repo": "nixCats-nvim", + "rev": "83264cfaf7d7438c52db28a95934d87ae45faaae", + "type": "github" + }, + "original": { + "owner": "BirdeeHub", + "repo": "nixCats-nvim", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixCats": "nixCats", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/kickstart/flake.nix b/kickstart/flake.nix new file mode 100644 index 0000000..eb47f27 --- /dev/null +++ b/kickstart/flake.nix @@ -0,0 +1,348 @@ +# Copyright (c) 2023 BirdeeHub +# Licensed under the MIT license + +# This is an empty nixCats config. +# you may import this template directly into your nvim folder +# and then add plugins to categories here, +# and call the plugins with their default functions +# within your lua, rather than through the nvim package manager's method. +# Use the help, and the example config github:BirdeeHub/nixCats-nvim?dir=templates/example + +# It allows for easy adoption of nix, +# while still providing all the extra nix features immediately. +# Configure in lua, check for a few categories, set a few settings, +# output packages with combinations of those categories and settings. + +# All the same options you make here will be automatically exported in a form available +# in home manager and in nixosModules, as well as from other flakes. +# each section is tagged with its relevant help section. + +{ + description = "A Lua-natic's neovim flake, with extra cats! nixCats!"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixCats.url = "github:BirdeeHub/nixCats-nvim"; + + # neovim-nightly-overlay = { + # url = "github:nix-community/neovim-nightly-overlay"; + # }; + + # see :help nixCats.flake.inputs + # If you want your plugin to be loaded by the standard overlay, + # i.e. if it wasnt on nixpkgs, but doesnt have an extra build step. + # Then you should name it "plugins-something" + # If you wish to define a custom build step not handled by nixpkgs, + # then you should name it in a different format, and deal with that in the + # overlay defined for custom builds in the overlays directory. + # for specific tags, branches and commits, see: + # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake.html#examples + + }; + + # see :help nixCats.flake.outputs + outputs = { self, nixpkgs, nixCats, ... }@inputs: let + inherit (nixCats) utils; + luaPath = "${./.}"; + forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all; + # the following extra_pkg_config contains any values + # which you want to pass to the config set of nixpkgs + # import nixpkgs { config = extra_pkg_config; inherit system; } + # will not apply to module imports + # as that will have your system values + extra_pkg_config = { + # allowUnfree = true; + }; + # management of the system variable is one of the harder parts of using flakes. + + # so I have done it here in an interesting way to keep it out of the way. + # It gets resolved within the builder itself, and then passed to your + # categoryDefinitions and packageDefinitions. + + # this allows you to use ${pkgs.system} whenever you want in those sections + # without fear. + + # sometimes our overlays require a ${system} to access the overlay. + # Your dependencyOverlays can either be lists + # in a set of ${system}, or simply a list. + # the nixCats builder function will accept either. + # see :help nixCats.flake.outputs.overlays + dependencyOverlays = /* (import ./overlays inputs) ++ */ [ + # This overlay grabs all the inputs named in the format + # `plugins-` + # Once we add this overlay to our nixpkgs, we are able to + # use `pkgs.neovimPlugins`, which is a set of our plugins. + (utils.standardPluginOverlay inputs) + # add any other flake overlays here. + + # when other people mess up their overlays by wrapping them with system, + # you may instead call this function on their overlay. + # it will check if it has the system in the set, and if so return the desired overlay + # (utils.fixSystemizedOverlay inputs.codeium.overlays + # (system: inputs.codeium.overlays.${system}.default) + # ) + ]; + + # see :help nixCats.flake.outputs.categories + # and + # :help nixCats.flake.outputs.categoryDefinitions.scheme + categoryDefinitions = { pkgs, settings, categories, extra, name, mkNvimPlugin, ... }@packageDef: { + # to define and use a new category, simply add a new list to a set here, + # and later, you will include categoryname = true; in the set you + # provide when you build the package using this builder function. + # see :help nixCats.flake.outputs.packageDefinitions for info on that section. + + # lspsAndRuntimeDeps: + # this section is for dependencies that should be available + # at RUN TIME for plugins. Will be available to PATH within neovim terminal + # this includes LSPs + lspsAndRuntimeDeps = with pkgs; { + general = [ + universal-ctags + ripgrep + fd + stdenv.cc.cc + nix-doc + lua-language-server + nixd + stylua + ]; + kickstart-debug = [ + delve + ]; + kickstart-lint = [ + markdownlint-cli + ]; + }; + + # This is for plugins that will load at startup without using packadd: + startupPlugins = with pkgs.vimPlugins; { + general = [ + vim-sleuth + lazy-nvim + comment-nvim + gitsigns-nvim + which-key-nvim + telescope-nvim + telescope-fzf-native-nvim + telescope-ui-select-nvim + nvim-web-devicons + plenary-nvim + nvim-lspconfig + lazydev-nvim + fidget-nvim + conform-nvim + nvim-cmp + luasnip + cmp_luasnip + cmp-nvim-lsp + cmp-path + catppuccin-nvim + todo-comments-nvim + mini-nvim + nvim-treesitter.withAllGrammars + # This is for if you only want some of the grammars + # (nvim-treesitter.withPlugins ( + # plugins: with plugins; [ + # nix + # lua + # ] + # )) + ]; + kickstart-debug = [ + nvim-dap + nvim-dap-ui + nvim-dap-go + nvim-nio + ]; + kickstart-indent_line = [ + indent-blankline-nvim + ]; + kickstart-lint = [ + nvim-lint + ]; + kickstart-autopairs = [ + nvim-autopairs + ]; + kickstart-neo-tree = [ + neo-tree-nvim + nui-nvim + # nixCats will filter out duplicate packages + # so you can put dependencies with stuff even if they're + # also somewhere else + nvim-web-devicons + plenary-nvim + ]; + }; + + # not loaded automatically at startup. + # use with packadd and an autocommand in config to achieve lazy loading + # NOTE: this template is using lazy.nvim so, which list you put them in is irrelevant. + # startupPlugins or optionalPlugins, it doesnt matter, lazy.nvim does the loading. + # I just put them all in startupPlugins. I could have put them all in here instead. + optionalPlugins = {}; + + # shared libraries to be added to LD_LIBRARY_PATH + # variable available to nvim runtime + sharedLibraries = { + general = with pkgs; [ + # libgit2 + ]; + }; + + # environmentVariables: + # this section is for environmentVariables that should be available + # at RUN TIME for plugins. Will be available to path within neovim terminal + environmentVariables = { + test = { + CATTESTVAR = "It worked!"; + }; + }; + + # If you know what these are, you can provide custom ones by category here. + # If you dont, check this link out: + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/setup-hooks/make-wrapper.sh + extraWrapperArgs = { + test = [ + '' --set CATTESTVAR2 "It worked again!"'' + ]; + }; + + # lists of the functions you would have passed to + # python.withPackages or lua.withPackages + + # get the path to this python environment + # in your lua config via + # vim.g.python3_host_prog + # or run from nvim terminal via :!-python3 + extraPython3Packages = { + test = (_:[]); + }; + # populates $LUA_PATH and $LUA_CPATH + extraLuaPackages = { + test = [ (_:[]) ]; + }; + }; + + + + # And then build a package with specific categories from above here: + # All categories you wish to include must be marked true, + # but false may be omitted. + # This entire set is also passed to nixCats for querying within the lua. + + # see :help nixCats.flake.outputs.packageDefinitions + packageDefinitions = { + # These are the names of your packages + # you can include as many as you wish. + nvim = { pkgs , ... }: { + # they contain a settings set defined above + # see :help nixCats.flake.outputs.settings + settings = { + wrapRc = true; + # IMPORTANT: + # your alias may not conflict with your other packages. + aliases = [ "vim" ]; + # neovim-unwrapped = inputs.neovim-nightly-overlay.packages.${pkgs.system}.neovim; + }; + # and a set of categories that you want + # (and other information to pass to lua) + categories = { + general = true; + gitPlugins = true; + customPlugins = true; + test = true; + + kickstart-autopairs = true; + kickstart-neo-tree = true; + kickstart-debug = true; + kickstart-lint = true; + kickstart-indent_line = true; + + # this kickstart extra didnt require any extra plugins + # so it doesnt have a category above. + # but we can still send the info from nix to lua that we want it! + kickstart-gitsigns = true; + + # we can pass whatever we want actually. + have_nerd_font = false; + + example = { + youCan = "add more than just booleans"; + toThisSet = [ + "and the contents of this categories set" + "will be accessible to your lua with" + "nixCats('path.to.value')" + "see :help nixCats" + "and type :NixCats to see the categories set in nvim" + ]; + }; + }; + }; + }; + # In this section, the main thing you will need to do is change the default package name + # to the name of the packageDefinitions entry you wish to use as the default. + defaultPackageName = "nvim"; + in + + + # see :help nixCats.flake.outputs.exports + forEachSystem (system: let + nixCatsBuilder = utils.baseBuilder luaPath { + inherit nixpkgs system dependencyOverlays extra_pkg_config; + } categoryDefinitions packageDefinitions; + defaultPackage = nixCatsBuilder defaultPackageName; + # this is just for using utils such as pkgs.mkShell + # The one used to build neovim is resolved inside the builder + # and is passed to our categoryDefinitions and packageDefinitions + pkgs = import nixpkgs { inherit system; }; + in + { + # these outputs will be wrapped with ${system} by utils.eachSystem + + # this will make a package out of each of the packageDefinitions defined above + # and set the default package to the one passed in here. + packages = utils.mkAllWithDefault defaultPackage; + + # choose your package for devShell + # and add whatever else you want in it. + devShells = { + default = pkgs.mkShell { + name = defaultPackageName; + packages = [ defaultPackage ]; + inputsFrom = [ ]; + shellHook = '' + ''; + }; + }; + + }) // (let + # we also export a nixos module to allow reconfiguration from configuration.nix + nixosModule = utils.mkNixosModules { + moduleNamespace = [ defaultPackageName ]; + inherit defaultPackageName dependencyOverlays luaPath + categoryDefinitions packageDefinitions extra_pkg_config nixpkgs; + }; + # and the same for home manager + homeModule = utils.mkHomeModules { + moduleNamespace = [ defaultPackageName ]; + inherit defaultPackageName dependencyOverlays luaPath + categoryDefinitions packageDefinitions extra_pkg_config nixpkgs; + }; + in { + + # these outputs will be NOT wrapped with ${system} + + # this will make an overlay out of each of the packageDefinitions defined above + # and set the default overlay to the one named here. + overlays = utils.makeOverlays luaPath { + inherit nixpkgs dependencyOverlays extra_pkg_config; + } categoryDefinitions packageDefinitions defaultPackageName; + + nixosModules.default = nixosModule; + homeModules.default = homeModule; + + inherit utils nixosModule homeModule; + inherit (utils) templates; + }); +} diff --git a/kickstart/init.lua b/kickstart/init.lua new file mode 100644 index 0000000..079e51b --- /dev/null +++ b/kickstart/init.lua @@ -0,0 +1,916 @@ +-- like this one: +-- NOTE: nixCats: this just gives nixCats global command a default value +-- so that it doesnt throw an error if you didnt install via nix. +-- usage of both this setup and the nixCats command is optional, +-- but it is very useful for passing info from nix to lua so you will likely use it at least once. +require('nixCatsUtils').setup { + non_nix_value = true, +} + +-- Set , as the leader key +-- See `:help mapleader` +-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) +vim.g.mapleader = ',' +vim.g.maplocalleader = ',' + +-- Set to true if you have a Nerd Font installed and selected in the terminal +-- NOTE: nixCats: we asked nix if we have it instead of setting it here. +-- because nix is more likely to know if we have a nerd font or not. +vim.g.have_nerd_font = nixCats 'have_nerd_font' + +-- [[ Setting options ]] +-- See `:help vim.opt` +-- NOTE: You can change these options as you wish! +-- For more options, you can see `:help option-list` + +-- Make line numbers default +vim.opt.number = true +-- You can also add relative line numbers, to help with jumping. +-- Experiment for yourself to see if you like it! +-- vim.opt.relativenumber = true + +-- Enable mouse mode, can be useful for resizing splits for example! +vim.opt.mouse = 'a' + +-- Don't show the mode, since it's already in the status line +vim.opt.showmode = false + +-- Sync clipboard between OS and Neovim. +-- Remove this option if you want your OS clipboard to remain independent. +-- See `:help 'clipboard'` +vim.opt.clipboard = 'unnamedplus' + +-- Enable break indent +vim.opt.breakindent = true + +-- Save undo history +vim.opt.undofile = true + +-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.opt.ignorecase = true +vim.opt.smartcase = true + +-- Keep signcolumn on by default +vim.opt.signcolumn = 'yes' + +-- Decrease update time +vim.opt.updatetime = 250 + +-- Decrease mapped sequence wait time +-- Displays which-key popup sooner +vim.opt.timeoutlen = 300 + +-- Configure how new splits should be opened +vim.opt.splitright = true +vim.opt.splitbelow = true + +-- Sets how neovim will display certain whitespace characters in the editor. +-- See `:help 'list'` +-- and `:help 'listchars'` +vim.opt.list = true +vim.opt.listchars = { tab = 'ยป ', trail = 'ยท', nbsp = 'โฃ' } + +-- Preview substitutions live, as you type! +vim.opt.inccommand = 'split' + +-- Show which line your cursor is on +vim.opt.cursorline = true + +-- Minimal number of screen lines to keep above and below the cursor. +vim.opt.scrolloff = 10 + +-- [[ Basic Keymaps ]] +-- See `:help vim.keymap.set()` + +-- Set highlight on search, but clear on pressing in normal mode +vim.opt.hlsearch = true +vim.keymap.set('n', '', 'nohlsearch') + +-- Diagnostic keymaps +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' }) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' }) +vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' }) +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier +-- for people to discover. Otherwise, you normally need to press , which +-- is not what someone will guess without a bit more experience. +-- +-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping +-- or just use to exit terminal mode +vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) + +-- TIP: Disable arrow keys in normal mode +vim.keymap.set('n', '', 'echo "Use h to move!!"') +vim.keymap.set('n', '', 'echo "Use l to move!!"') +vim.keymap.set('n', '', 'echo "Use k to move!!"') +vim.keymap.set('n', '', 'echo "Use j to move!!"') + +-- Keybinds to make split navigation easier. +-- Use CTRL+ to switch between windows +-- +-- See `:help wincmd` for a list of all window commands +vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) + +-- [[ Basic Autocommands ]] +-- See `:help lua-guide-autocommands` + +-- Highlight when yanking (copying) text +-- Try it with `yap` in normal mode +-- See `:help vim.highlight.on_yank()` +vim.api.nvim_create_autocmd('TextYankPost', { + desc = 'Highlight when yanking (copying) text', + group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), + callback = function() + vim.highlight.on_yank() + end, +}) + +-- NOTE: nixCats: You might want to move the lazy-lock.json file +local function getlockfilepath() + if require('nixCatsUtils').isNixCats and type(nixCats.settings.unwrappedCfgPath) == 'string' then + return nixCats.settings.unwrappedCfgPath .. '/lazy-lock.json' + else + return vim.fn.stdpath 'config' .. '/lazy-lock.json' + end +end +local lazyOptions = { + lockfile = getlockfilepath(), + ui = { + -- If you are using a Nerd Font: set icons to an empty table which will use the + -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table + icons = vim.g.have_nerd_font and {} or { + cmd = 'โŒ˜', + config = '๐Ÿ› ', + event = '๐Ÿ“…', + ft = '๐Ÿ“‚', + init = 'โš™', + keys = '๐Ÿ—', + plugin = '๐Ÿ”Œ', + runtime = '๐Ÿ’ป', + require = '๐ŸŒ™', + source = '๐Ÿ“„', + start = '๐Ÿš€', + task = '๐Ÿ“Œ', + lazy = '๐Ÿ’ค ', + }, + }, +} + +-- [[ Configure and install plugins ]] +-- +-- To check the current status of your plugins, run +-- :Lazy +-- +-- You can press `?` in this menu for help. Use `:q` to close the window +-- +-- To update plugins you can run +-- :Lazy update +-- +-- NOTE: Here is where you install your plugins. +-- NOTE: nixCats: this the lazy wrapper. Use it like require('lazy').setup() but with an extra +-- argument, the path to lazy.nvim as downloaded by nix, or nil, before the normal arguments. +require('nixCatsUtils.lazyCat').setup(nixCats.pawsible { 'allPlugins', 'start', 'lazy.nvim' }, { + -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). + 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically + + -- NOTE: Plugins can also be added by using a table, + -- with the first argument being the link and the following + -- keys can be used to configure plugin behavior/loading/etc. + -- + -- Use `opts = {}` to force a plugin to be loaded. + -- + -- This is equivalent to: + -- require('Comment').setup({}) + + -- "gc" to comment visual regions/lines + -- NOTE: nixCats: nix downloads it with a different file name. + -- tell lazy about that. + { 'numToStr/Comment.nvim', name = 'comment.nvim', opts = {} }, + + -- Here is a more advanced example where we pass configuration + -- options to `gitsigns.nvim`. This is equivalent to the following Lua: + -- require('gitsigns').setup({ ... }) + -- + -- See `:help gitsigns` to understand what the configuration keys do + { -- Adds git related signs to the gutter, as well as utilities for managing changes + 'lewis6991/gitsigns.nvim', + opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = 'โ€พ' }, + changedelete = { text = '~' }, + }, + }, + }, + + -- NOTE: Plugins can also be configured to run Lua code when they are loaded. + -- + -- This is often very useful to both group configuration, as well as handle + -- lazy loading plugins that don't need to be loaded immediately at startup. + -- + -- For example, in the following configuration, we use: + -- event = 'VimEnter' + -- + -- which loads which-key before all the UI elements are loaded. Events can be + -- normal autocommands events (`:help autocmd-events`). + -- + -- Then, because we use the `config` key, the configuration only runs + -- after the plugin has been loaded: + -- config = function() ... end + + { -- Useful plugin to show you pending keybinds. + 'folke/which-key.nvim', + event = 'VimEnter', -- Sets the loading event to 'VimEnter' + config = function() -- This is the function that runs, AFTER loading + require('which-key').setup() + + -- Document existing key chains + require('which-key').add { + { 'c', group = '[C]ode' }, + { 'c_', hidden = true }, + { 'd', group = '[D]ocument' }, + { 'd_', hidden = true }, + { 'r', group = '[R]ename' }, + { 'r_', hidden = true }, + { 's', group = '[S]earch' }, + { 's_', hidden = true }, + { 't', group = '[T]oggle' }, + { 't_', hidden = true }, + { 'w', group = '[W]orkspace' }, + { 'w_', hidden = true }, + { + mode = { 'v' }, + { 'h', group = 'Git [H]unk' }, + { 'h_', hidden = true }, + }, + } + end, + }, + + -- NOTE: Plugins can specify dependencies. + -- + -- The dependencies are proper plugin specifications as well - anything + -- you do for a plugin at the top level, you can do for a dependency. + -- + -- Use the `dependencies` key to specify the dependencies of a particular plugin + + { -- Fuzzy Finder (files, lsp, etc) + 'nvim-telescope/telescope.nvim', + event = 'VimEnter', + branch = '0.1.x', + dependencies = { + 'nvim-lua/plenary.nvim', + { -- If encountering errors, see telescope-fzf-native README for installation instructions + 'nvim-telescope/telescope-fzf-native.nvim', + + -- `build` is used to run some command when the plugin is installed/updated. + -- This is only run then, not every time Neovim starts up. + -- NOTE: nixCats: use lazyAdd to only run build steps if nix wasnt involved. + -- because nix already did this. + build = require('nixCatsUtils').lazyAdd 'make', + + -- `cond` is a condition used to determine whether this plugin should be + -- installed and loaded. + -- NOTE: nixCats: use lazyAdd to only add this if nix wasnt involved. + -- because nix built it already, so who cares if we have make in the path. + cond = require('nixCatsUtils').lazyAdd(function() + return vim.fn.executable 'make' == 1 + end), + }, + { 'nvim-telescope/telescope-ui-select.nvim' }, + + -- Useful for getting pretty icons, but requires a Nerd Font. + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + }, + config = function() + -- Telescope is a fuzzy finder that comes with a lot of different things that + -- it can fuzzy find! It's more than just a "file finder", it can search + -- many different aspects of Neovim, your workspace, LSP, and more! + -- + -- The easiest way to use Telescope, is to start by doing something like: + -- :Telescope help_tags + -- + -- After running this command, a window will open up and you're able to + -- type in the prompt window. You'll see a list of `help_tags` options and + -- a corresponding preview of the help. + -- + -- Two important keymaps to use while in Telescope are: + -- - Insert mode: + -- - Normal mode: ? + -- + -- This opens a window that shows you all of the keymaps for the current + -- Telescope picker. This is really useful to discover what Telescope can + -- do as well as how to actually do it! + + -- [[ Configure Telescope ]] + -- See `:help telescope` and `:help telescope.setup()` + require('telescope').setup { + -- You can put your default mappings / updates / etc. in here + -- All the info you're looking for is in `:help telescope.setup()` + -- + -- defaults = { + -- mappings = { + -- i = { [''] = 'to_fuzzy_refine' }, + -- }, + -- }, + -- pickers = {} + extensions = { + ['ui-select'] = { + require('telescope.themes').get_dropdown(), + }, + }, + } + + -- Enable Telescope extensions if they are installed + pcall(require('telescope').load_extension, 'fzf') + pcall(require('telescope').load_extension, 'ui-select') + + -- See `:help telescope.builtin` + local builtin = require 'telescope.builtin' + vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) + vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) + vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) + vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) + vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) + vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) + vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) + vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + + -- Slightly advanced example of overriding default behavior and theme + vim.keymap.set('n', '/', function() + -- You can pass additional configuration to Telescope to change the theme, layout, etc. + builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { + winblend = 10, + previewer = false, + }) + end, { desc = '[/] Fuzzily search in current buffer' }) + + -- It's also possible to pass additional configuration options. + -- See `:help telescope.builtin.live_grep()` for information about particular keys + vim.keymap.set('n', 's/', function() + builtin.live_grep { + grep_open_files = true, + prompt_title = 'Live Grep in Open Files', + } + end, { desc = '[S]earch [/] in Open Files' }) + + -- Shortcut for searching your Neovim configuration files + vim.keymap.set('n', 'sn', function() + builtin.find_files { cwd = vim.fn.stdpath 'config' } + end, { desc = '[S]earch [N]eovim files' }) + end, + }, + + { -- LSP Configuration & Plugins + 'neovim/nvim-lspconfig', + dependencies = { + -- Automatically install LSPs and related tools to stdpath for Neovim + { + 'williamboman/mason.nvim', + -- NOTE: nixCats: use lazyAdd to only enable mason if nix wasnt involved. + -- because we will be using nix to download things instead. + enabled = require('nixCatsUtils').lazyAdd(true, false), + config = true, + }, -- NOTE: Must be loaded before dependants + { + 'williamboman/mason-lspconfig.nvim', + -- NOTE: nixCats: use lazyAdd to only enable mason if nix wasnt involved. + -- because we will be using nix to download things instead. + enabled = require('nixCatsUtils').lazyAdd(true, false), + }, + { + 'WhoIsSethDaniel/mason-tool-installer.nvim', + -- NOTE: nixCats: use lazyAdd to only enable mason if nix wasnt involved. + -- because we will be using nix to download things instead. + enabled = require('nixCatsUtils').lazyAdd(true, false), + }, + + -- Useful status updates for LSP. + -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` + { 'j-hui/fidget.nvim', opts = {} }, + + -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins + -- used for completion, annotations and signatures of Neovim apis + { + 'folke/lazydev.nvim', + ft = 'lua', + opts = { + library = { + -- adds type hints for nixCats global + { path = (nixCats.nixCatsPath or '') .. '/lua', words = { 'nixCats' } }, + }, + }, + }, + -- kickstart.nvim was still on neodev. lazydev is the new version of neodev + }, + config = function() + -- Brief aside: **What is LSP?** + -- + -- LSP is an initialism you've probably heard, but might not understand what it is. + -- + -- LSP stands for Language Server Protocol. It's a protocol that helps editors + -- and language tooling communicate in a standardized fashion. + -- + -- In general, you have a "server" which is some tool built to understand a particular + -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers + -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone + -- processes that communicate with some "client" - in this case, Neovim! + -- + -- LSP provides Neovim with features like: + -- - Go to definition + -- - Find references + -- - Autocompletion + -- - Symbol Search + -- - and more! + -- + -- Thus, Language Servers are external tools that must be installed separately from + -- Neovim. This is where `mason` and related plugins come into play. + -- + -- If you're wondering about lsp vs treesitter, you can check out the wonderfully + -- and elegantly composed help section, `:help lsp-vs-treesitter` + + -- This function gets run when an LSP attaches to a particular buffer. + -- That is to say, every time a new file is opened that is associated with + -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this + -- function will be executed to configure the current buffer + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + callback = function(event) + -- NOTE: Remember that Lua is a real programming language, and as such it is possible + -- to define small helper and utility functions so you don't have to repeat yourself. + -- + -- In this case, we create a function that lets us more easily define mappings specific + -- for LSP related items. It sets the mode, buffer and description for us each time. + local map = function(keys, func, desc) + vim.keymap.set('n', keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- Jump to the definition of the word under your cursor. + -- This is where a variable was first declared, or where a function is defined, etc. + -- To jump back, press . + map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + + -- Find references for the word under your cursor. + map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + + -- Jump to the implementation of the word under your cursor. + -- Useful when your language has ways of declaring types without an actual implementation. + map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + + -- Jump to the type of the word under your cursor. + -- Useful when you're not sure what type a variable is and you want to see + -- the definition of its *type*, not where it was *defined*. + map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') + + -- Fuzzy find all the symbols in your current document. + -- Symbols are things like variables, functions, types, etc. + map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') + + -- Fuzzy find all the symbols in your current workspace. + -- Similar to document symbols, except searches over your entire project. + map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + + -- Rename the variable under your cursor. + -- Most Language Servers support renaming across files, etc. + map('rn', vim.lsp.buf.rename, '[R]e[n]ame') + + -- Execute a code action, usually your cursor needs to be on top of an error + -- or a suggestion from your LSP for this to activate. + map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction') + + -- Opens a popup that displays documentation about the word under your cursor + -- See `:help K` for why this keymap. + map('K', vim.lsp.buf.hover, 'Hover Documentation') + + -- WARN: This is not Goto Definition, this is Goto Declaration. + -- For example, in C this would take you to the header. + map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + + -- The following two autocommands are used to highlight references of the + -- word under your cursor when your cursor rests there for a little while. + -- See `:help CursorHold` for information about when this is executed + -- + -- When you move your cursor, the highlights will be cleared (the second autocommand). + local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client.server_capabilities.documentHighlightProvider then + local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) + vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.document_highlight, + }) + + vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.clear_references, + }) + + vim.api.nvim_create_autocmd('LspDetach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), + callback = function(event2) + vim.lsp.buf.clear_references() + vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + end, + }) + end + + -- The following autocommand is used to enable inlay hints in your + -- code, if the language server you are using supports them + -- + -- This may be unwanted, since they displace some of your code + if client and client.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then + map('th', function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) + end, '[T]oggle Inlay [H]ints') + end + end, + }) + + -- LSP servers and clients are able to communicate to each other what features they support. + -- By default, Neovim doesn't support everything that is in the LSP specification. + -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. + -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) + + -- Enable the following language servers + -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. + -- + -- Add any additional override configuration in the following tables. Available keys are: + -- - cmd (table): Override the default command used to start the server + -- - filetypes (table): Override the default list of associated filetypes for the server + -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. + -- - settings (table): Override the default settings passed when initializing the server. + -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ + -- NOTE: nixCats: there is help in nixCats for lsps at `:h nixCats.LSPs` and also `:h nixCats.luaUtils` + local servers = {} + -- servers.clangd = {}, + -- servers.gopls = {}, + -- servers.pyright = {}, + -- servers.rust_analyzer = {}, + -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs + -- + -- Some languages (like typescript) have entire language plugins that can be useful: + -- https://github.com/pmizio/typescript-tools.nvim + -- + -- But for many setups, the LSP (`tsserver`) will work just fine + -- servers.tsserver = {}, + -- + + -- NOTE: nixCats: nixd is not available on mason. + -- Feel free to check the nixd docs for more configuration options: + -- https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md + if require('nixCatsUtils').isNixCats then + servers.nixd = {} + else + servers.rnix = {} + servers.nil_ls = {} + end + servers.lua_ls = { + -- cmd = {...}, + -- filetypes = { ...}, + -- capabilities = {}, + settings = { + Lua = { + completion = { + callSnippet = 'Replace', + }, + -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings + diagnostics = { + globals = { 'nixCats' }, + disable = { 'missing-fields' }, + }, + }, + }, + } + + -- NOTE: nixCats: if nix, use lspconfig instead of mason + -- You could MAKE it work, using lspsAndRuntimeDeps and sharedLibraries in nixCats + -- but don't... its not worth it. Just add the lsp to lspsAndRuntimeDeps. + if require('nixCatsUtils').isNixCats then + for server_name, _ in pairs(servers) do + require('lspconfig')[server_name].setup { + capabilities = capabilities, + settings = (servers[server_name] or {}).settings, + filetypes = (servers[server_name] or {}).filetypes, + cmd = (servers[server_name] or {}).cmd, + root_pattern = (servers[server_name] or {}).root_pattern, + } + end + else + -- NOTE: nixCats: and if no nix, do it the normal way + + -- Ensure the servers and tools above are installed + -- To check the current status of installed tools and/or manually install + -- other tools, you can run + -- :Mason + -- + -- You can press `g?` for help in this menu. + require('mason').setup() + + -- You can add other tools here that you want Mason to install + -- for you, so that they are available from within Neovim. + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, { + 'stylua', -- Used to format Lua code + }) + require('mason-tool-installer').setup { ensure_installed = ensure_installed } + + require('mason-lspconfig').setup { + handlers = { + function(server_name) + local server = servers[server_name] or {} + -- This handles overriding only values explicitly passed + -- by the server configuration above. Useful when disabling + -- certain features of an LSP (for example, turning off formatting for tsserver) + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + require('lspconfig')[server_name].setup(server) + end, + }, + } + end + end, + }, + + { -- Autoformat + 'stevearc/conform.nvim', + lazy = false, + keys = { + { + 'f', + function() + require('conform').format { async = true, lsp_fallback = true } + end, + mode = '', + desc = '[F]ormat buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well standardized coding style. You can add additional + -- languages here or re-enable it for the disabled ones. + local disable_filetypes = { c = true, cpp = true } + return { + timeout_ms = 500, + lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], + } + end, + formatters_by_ft = { + lua = { 'stylua' }, + -- Conform can also run multiple formatters sequentially + -- python = { "isort", "black" }, + -- + -- You can use a sub-list to tell conform to run *until* a formatter + -- is found. + -- javascript = { { "prettierd", "prettier" } }, + }, + }, + }, + + { -- Autocompletion + 'hrsh7th/nvim-cmp', + event = 'InsertEnter', + dependencies = { + -- Snippet Engine & its associated nvim-cmp source + { + 'L3MON4D3/LuaSnip', + -- NOTE: nixCats: nix downloads it with a different file name. + -- tell lazy about that. + name = 'luasnip', + build = require('nixCatsUtils').lazyAdd((function() + -- Build Step is needed for regex support in snippets. + -- This step is not supported in many windows environments. + -- Remove the below condition to re-enable on windows. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + return + end + return 'make install_jsregexp' + end)()), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, + }, + 'saadparwaiz1/cmp_luasnip', + + -- Adds other completion capabilities. + -- nvim-cmp does not ship with all sources by default. They are split + -- into multiple repos for maintenance purposes. + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-path', + }, + config = function() + -- See `:help cmp` + local cmp = require 'cmp' + local luasnip = require 'luasnip' + luasnip.config.setup {} + + cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + completion = { completeopt = 'menu,menuone,noinsert' }, + + -- For an understanding of why these mappings were + -- chosen, you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + mapping = cmp.mapping.preset.insert { + -- Select the [n]ext item + [''] = cmp.mapping.select_next_item(), + -- Select the [p]revious item + [''] = cmp.mapping.select_prev_item(), + + -- Scroll the documentation window [b]ack / [f]orward + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + + -- Accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + [''] = cmp.mapping.confirm { select = true }, + + -- If you prefer more traditional completion keymaps, + -- you can uncomment the following lines + --[''] = cmp.mapping.confirm { select = true }, + --[''] = cmp.mapping.select_next_item(), + --[''] = cmp.mapping.select_prev_item(), + + -- Manually trigger a completion from nvim-cmp. + -- Generally you don't need this, because nvim-cmp will display + -- completions whenever it has completion options available. + [''] = cmp.mapping.complete {}, + + -- Think of as moving to the right of your snippet expansion. + -- So if you have a snippet that's like: + -- function $name($args) + -- $body + -- end + -- + -- will move you to the right of each of the expansion locations. + -- is similar, except moving you backwards. + [''] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { 'i', 's' }), + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + }, + } + end, + }, + + { -- You can easily change to a different colorscheme. + -- Change the name of the colorscheme plugin below, and then + -- change the command in the config to whatever the name of that colorscheme is. + -- + -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + 'catppucchin/nvim', + priority = 1000, -- Make sure to load this before all the other start plugins. + init = function() + -- Load the colorscheme here. + -- Like many other themes, this one has different styles, and you could load + -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + vim.cmd.colorscheme 'catppuccin-macchiato' + + -- You can configure highlights by doing something like: + vim.cmd.hi 'Comment gui=none' + end, + }, + + -- Highlight todo, notes, etc in comments + { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, + + { -- Collection of various small independent plugins/modules + 'echasnovski/mini.nvim', + config = function() + -- Better Around/Inside textobjects + -- + -- Examples: + -- - va) - [V]isually select [A]round [)]paren + -- - yinq - [Y]ank [I]nside [N]ext [']quote + -- - ci' - [C]hange [I]nside [']quote + require('mini.ai').setup { n_lines = 500 } + + -- Add/delete/replace surroundings (brackets, quotes, etc.) + -- + -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren + -- - sd' - [S]urround [D]elete [']quotes + -- - sr)' - [S]urround [R]eplace [)] ['] + require('mini.surround').setup() + + -- Simple and easy statusline. + -- You could remove this setup call if you don't like it, + -- and try some other statusline plugin + local statusline = require 'mini.statusline' + -- set use_icons to true if you have a Nerd Font + statusline.setup { use_icons = vim.g.have_nerd_font } + + -- You can configure sections in the statusline by overriding their + -- default behavior. For example, here we set the section for + -- cursor location to LINE:COLUMN + ---@diagnostic disable-next-line: duplicate-set-field + statusline.section_location = function() + return '%2l:%-2v' + end + + -- ... and there is more! + -- Check out: https://github.com/echasnovski/mini.nvim + end, + }, + { -- Highlight, edit, and navigate code + 'nvim-treesitter/nvim-treesitter', + build = require('nixCatsUtils').lazyAdd ':TSUpdate', + opts = { + -- NOTE: nixCats: use lazyAdd to only set these 2 options if nix wasnt involved. + -- because nix already ensured they were installed. + ensure_installed = require('nixCatsUtils').lazyAdd { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, + auto_install = require('nixCatsUtils').lazyAdd(true, false), + + highlight = { + enable = true, + -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. + -- If you are experiencing weird indenting issues, add the language to + -- the list of additional_vim_regex_highlighting and disabled languages for indent. + additional_vim_regex_highlighting = { 'ruby' }, + }, + indent = { enable = true, disable = { 'ruby' } }, + }, + config = function(_, opts) + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` + + -- Prefer git instead of curl in order to improve connectivity in some environments + require('nvim-treesitter.install').prefer_git = true + ---@diagnostic disable-next-line: missing-fields + require('nvim-treesitter.configs').setup(opts) + + -- There are additional nvim-treesitter modules that you can use to interact + -- with nvim-treesitter. You should go explore a few and see what interests you: + -- + -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` + -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context + -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + end, + }, + + -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the + -- init.lua. If you want these files, they are in the repository, so you can just download them and + -- place them in the correct locations. + + -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart + -- + -- Here are some example plugins that I've included in the Kickstart repository. + -- Uncomment any of the lines below to enable them (you will need to restart nvim). + -- + -- NOTE: nixCats: instead of uncommenting them, you can enable them + -- from the categories set in your packageDefinitions in your flake or other template! + -- This is because within them, we used nixCats to check if it should be loaded! + require 'kickstart.plugins.debug', + require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.lint', + require 'kickstart.plugins.autopairs', + require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + + -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` + -- This is the easiest way to modularize your config. + -- + -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. + -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` + { import = 'custom.plugins' }, +}, lazyOptions) + +-- The line beneath this is called `modeline`. See `:help modeline` +-- vim: ts=2 sts=2 sw=2 et diff --git a/kickstart/lua/custom/plugins/init.lua b/kickstart/lua/custom/plugins/init.lua new file mode 100644 index 0000000..be0eb9d --- /dev/null +++ b/kickstart/lua/custom/plugins/init.lua @@ -0,0 +1,5 @@ +-- You can add your own plugins here or in other files in this directory! +-- I promise not to create any merge conflicts in this directory :) +-- +-- See the kickstart.nvim README for more information +return {} diff --git a/kickstart/lua/kickstart/health.lua b/kickstart/lua/kickstart/health.lua new file mode 100644 index 0000000..04df77b --- /dev/null +++ b/kickstart/lua/kickstart/health.lua @@ -0,0 +1,52 @@ +--[[ +-- +-- This file is not required for your own configuration, +-- but helps people determine if their system is setup correctly. +-- +--]] + +local check_version = function() + local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch) + if not vim.version.cmp then + vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) + return + end + + if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then + vim.health.ok(string.format("Neovim version is: '%s'", verstr)) + else + vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) + end +end + +local check_external_reqs = function() + -- Basic utils: `git`, `make`, `unzip` + for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do + local is_executable = vim.fn.executable(exe) == 1 + if is_executable then + vim.health.ok(string.format("Found executable: '%s'", exe)) + else + vim.health.warn(string.format("Could not find executable: '%s'", exe)) + end + end + + return true +end + +return { + check = function() + vim.health.start 'kickstart.nvim' + + vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth` + + Fix only warnings for plugins and languages you intend to use. + Mason will give warnings for languages that are not installed. + You do not need to install, unless you want to use those languages!]] + + local uv = vim.uv or vim.loop + vim.health.info('System Information: ' .. vim.inspect(uv.os_uname())) + + check_version() + check_external_reqs() + end, +} diff --git a/kickstart/lua/kickstart/plugins/autopairs.lua b/kickstart/lua/kickstart/plugins/autopairs.lua new file mode 100644 index 0000000..8670f61 --- /dev/null +++ b/kickstart/lua/kickstart/plugins/autopairs.lua @@ -0,0 +1,18 @@ +-- autopairs +-- https://github.com/windwp/nvim-autopairs + +return { + 'windwp/nvim-autopairs', + -- NOTE: nixCats: return true only if category is enabled, else false + enabled = require('nixCatsUtils').enableForCategory("kickstart-autopairs"), + event = 'InsertEnter', + -- Optional dependency + dependencies = { 'hrsh7th/nvim-cmp' }, + config = function() + require('nvim-autopairs').setup {} + -- If you want to automatically add `(` after selecting a function or method + local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + local cmp = require 'cmp' + cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) + end, +} diff --git a/kickstart/lua/kickstart/plugins/debug.lua b/kickstart/lua/kickstart/plugins/debug.lua new file mode 100644 index 0000000..e82b034 --- /dev/null +++ b/kickstart/lua/kickstart/plugins/debug.lua @@ -0,0 +1,100 @@ +-- debug.lua +-- +-- Shows how to use the DAP plugin to debug your code. +-- +-- Primarily focused on configuring the debugger for Go, but can +-- be extended to other languages as well. That's why it's called +-- kickstart.nvim and not kitchen-sink.nvim ;) + +return { + 'mfussenegger/nvim-dap', + -- NOTE: nixCats: return true only if category is enabled, else false + enabled = require('nixCatsUtils').enableForCategory("kickstart-debug"), + dependencies = { + -- Creates a beautiful debugger UI + 'rcarriga/nvim-dap-ui', + + -- Required dependency for nvim-dap-ui + 'nvim-neotest/nvim-nio', + + -- Installs the debug adapters for you + -- NOTE: nixCats: dont use mason on nix. We can already download stuff just fine. + { 'williamboman/mason.nvim', enabled = require('nixCatsUtils').lazyAdd(true, false) }, + { 'jay-babu/mason-nvim-dap.nvim', enabled = require('nixCatsUtils').lazyAdd(true, false) }, + + -- Add your own debuggers here + 'leoluz/nvim-dap-go', + }, + config = function() + local dap = require 'dap' + local dapui = require 'dapui' + + -- NOTE: nixCats: dont use mason on nix. We can already download stuff just fine. + if not require('nixCatsUtils').isNixCats then + require('mason-nvim-dap').setup { + -- Makes a best effort to setup the various debuggers with + -- reasonable debug configurations + automatic_installation = true, + + -- You can provide additional configuration to the handlers, + -- see mason-nvim-dap README for more information + handlers = {}, + + -- You'll need to check that you have the required things installed + -- online, please don't ask me how to install them :) + ensure_installed = { + -- Update this to ensure that you have the debuggers for the langs you want + 'delve', + }, + } + end + + -- Basic debugging keymaps, feel free to change to your liking! + vim.keymap.set('n', '', dap.continue, { desc = 'Debug: Start/Continue' }) + vim.keymap.set('n', '', dap.step_into, { desc = 'Debug: Step Into' }) + vim.keymap.set('n', '', dap.step_over, { desc = 'Debug: Step Over' }) + vim.keymap.set('n', '', dap.step_out, { desc = 'Debug: Step Out' }) + vim.keymap.set('n', 'b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' }) + vim.keymap.set('n', 'B', function() + dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') + end, { desc = 'Debug: Set Breakpoint' }) + + -- Dap UI setup + -- For more information, see |:help nvim-dap-ui| + dapui.setup { + -- Set icons to characters that are more likely to work in every terminal. + -- Feel free to remove or use ones that you like more! :) + -- Don't feel like these are good choices. + icons = { expanded = 'โ–พ', collapsed = 'โ–ธ', current_frame = '*' }, + controls = { + icons = { + pause = 'โธ', + play = 'โ–ถ', + step_into = 'โŽ', + step_over = 'โญ', + step_out = 'โฎ', + step_back = 'b', + run_last = 'โ–ถโ–ถ', + terminate = 'โน', + disconnect = 'โ', + }, + }, + } + + -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. + vim.keymap.set('n', '', dapui.toggle, { desc = 'Debug: See last session result.' }) + + dap.listeners.after.event_initialized['dapui_config'] = dapui.open + dap.listeners.before.event_terminated['dapui_config'] = dapui.close + dap.listeners.before.event_exited['dapui_config'] = dapui.close + + -- Install golang specific config + require('dap-go').setup { + delve = { + -- On Windows delve must be run attached or it crashes. + -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring + detached = vim.fn.has 'win32' == 0, + }, + } + end, +} diff --git a/kickstart/lua/kickstart/plugins/gitsigns.lua b/kickstart/lua/kickstart/plugins/gitsigns.lua new file mode 100644 index 0000000..85251ba --- /dev/null +++ b/kickstart/lua/kickstart/plugins/gitsigns.lua @@ -0,0 +1,63 @@ +-- Adds git related signs to the gutter, as well as utilities for managing changes +-- NOTE: gitsigns is already included in init.lua but contains only the base +-- config. This will add also the recommended keymaps. + +return { + { + 'lewis6991/gitsigns.nvim', + -- NOTE: nixCats: return true only if category is enabled, else false + enabled = require('nixCatsUtils').enableForCategory("kickstart-gitsigns"), + opts = { + on_attach = function(bufnr) + local gitsigns = require 'gitsigns' + + local function map(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end + + -- Navigation + map('n', ']c', function() + if vim.wo.diff then + vim.cmd.normal { ']c', bang = true } + else + gitsigns.nav_hunk 'next' + end + end, { desc = 'Jump to next git [c]hange' }) + + map('n', '[c', function() + if vim.wo.diff then + vim.cmd.normal { '[c', bang = true } + else + gitsigns.nav_hunk 'prev' + end + end, { desc = 'Jump to previous git [c]hange' }) + + -- Actions + -- visual mode + map('v', 'hs', function() + gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'stage git hunk' }) + map('v', 'hr', function() + gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'reset git hunk' }) + -- normal mode + map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) + map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) + map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) + map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) + map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) + map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) + map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) + map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) + map('n', 'hD', function() + gitsigns.diffthis '@' + end, { desc = 'git [D]iff against last commit' }) + -- Toggles + map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) + map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) + end, + }, + }, +} diff --git a/kickstart/lua/kickstart/plugins/indent_line.lua b/kickstart/lua/kickstart/plugins/indent_line.lua new file mode 100644 index 0000000..ef14cd2 --- /dev/null +++ b/kickstart/lua/kickstart/plugins/indent_line.lua @@ -0,0 +1,11 @@ +return { + { -- Add indentation guides even on blank lines + 'lukas-reineke/indent-blankline.nvim', + -- NOTE: nixCats: return true only if category is enabled, else false + enabled = require('nixCatsUtils').enableForCategory("kickstart-indent_line"), + -- Enable `lukas-reineke/indent-blankline.nvim` + -- See `:help ibl` + main = 'ibl', + opts = {}, + }, +} diff --git a/kickstart/lua/kickstart/plugins/lint.lua b/kickstart/lua/kickstart/plugins/lint.lua new file mode 100644 index 0000000..f5f9f0b --- /dev/null +++ b/kickstart/lua/kickstart/plugins/lint.lua @@ -0,0 +1,57 @@ +return { + + { -- Linting + 'mfussenegger/nvim-lint', + -- NOTE: nixCats: return true only if category is enabled, else false + enabled = require('nixCatsUtils').enableForCategory("kickstart-lint"), + event = { 'BufReadPre', 'BufNewFile' }, + config = function() + local lint = require 'lint' + lint.linters_by_ft = { + markdown = { 'markdownlint' }, + } + + -- To allow other plugins to add linters to require('lint').linters_by_ft, + -- instead set linters_by_ft like this: + -- lint.linters_by_ft = lint.linters_by_ft or {} + -- lint.linters_by_ft['markdown'] = { 'markdownlint' } + -- + -- However, note that this will enable a set of default linters, + -- which will cause errors unless these tools are available: + -- { + -- clojure = { "clj-kondo" }, + -- dockerfile = { "hadolint" }, + -- inko = { "inko" }, + -- janet = { "janet" }, + -- json = { "jsonlint" }, + -- markdown = { "vale" }, + -- rst = { "vale" }, + -- ruby = { "ruby" }, + -- terraform = { "tflint" }, + -- text = { "vale" } + -- } + -- + -- You can disable the default linters by setting their filetypes to nil: + -- lint.linters_by_ft['clojure'] = nil + -- lint.linters_by_ft['dockerfile'] = nil + -- lint.linters_by_ft['inko'] = nil + -- lint.linters_by_ft['janet'] = nil + -- lint.linters_by_ft['json'] = nil + -- lint.linters_by_ft['markdown'] = nil + -- lint.linters_by_ft['rst'] = nil + -- lint.linters_by_ft['ruby'] = nil + -- lint.linters_by_ft['terraform'] = nil + -- lint.linters_by_ft['text'] = nil + + -- Create autocommand which carries out the actual linting + -- on the specified events. + local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) + vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { + group = lint_augroup, + callback = function() + require('lint').try_lint() + end, + }) + end, + }, +} diff --git a/kickstart/lua/kickstart/plugins/neo-tree.lua b/kickstart/lua/kickstart/plugins/neo-tree.lua new file mode 100644 index 0000000..42d0125 --- /dev/null +++ b/kickstart/lua/kickstart/plugins/neo-tree.lua @@ -0,0 +1,27 @@ +-- Neo-tree is a Neovim plugin to browse the file system +-- https://github.com/nvim-neo-tree/neo-tree.nvim + +return { + 'nvim-neo-tree/neo-tree.nvim', + -- NOTE: nixCats: return true only if category is enabled, else false + enabled = require('nixCatsUtils').enableForCategory("kickstart-neo-tree"), + version = '*', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended + 'MunifTanjim/nui.nvim', + }, + cmd = 'Neotree', + keys = { + { '\\', ':Neotree reveal', { desc = 'NeoTree reveal' } }, + }, + opts = { + filesystem = { + window = { + mappings = { + ['\\'] = 'close_window', + }, + }, + }, + }, +} diff --git a/kickstart/lua/nixCatsUtils/init.lua b/kickstart/lua/nixCatsUtils/init.lua new file mode 100644 index 0000000..b6a6128 --- /dev/null +++ b/kickstart/lua/nixCatsUtils/init.lua @@ -0,0 +1,129 @@ +--[[ + This directory is the luaUtils template. + You can choose what things from it that you would like to use. + And then delete the rest. + Everything in this directory is optional. +--]] + +local M = {} + +--[[ + This file is for making your config still work WITHOUT nixCats. + When you don't use nixCats to load your config, + you wont have the nixCats plugin. + + The setup function defined here defines a mock nixCats plugin when nixCats wasnt used to load the config. + This will help avoid indexing errors when the nixCats plugin doesnt exist. + + NOTE: If you only ever use nixCats to load your config, you don't need this file. +--]] + +---@type boolean +M.isNixCats = vim.g[ [[nixCats-special-rtp-entry-nixCats]] ] ~= nil + +---@class nixCatsSetupOpts +---@field non_nix_value boolean|nil + +---This function will setup a mock nixCats plugin when not using nix +---It will help prevent you from running into indexing errors without a nixCats plugin from nix. +---If you loaded the config via nix, it does nothing +---non_nix_value defaults to true if not provided or is not a boolean. +---@param v nixCatsSetupOpts +function M.setup(v) + if not M.isNixCats then + local nixCats_default_value + if type(v) == "table" and type(v.non_nix_value) == "boolean" then + nixCats_default_value = v.non_nix_value + else + nixCats_default_value = true + end + local mk_with_meta = function (tbl) + return setmetatable(tbl, { + __call = function(_, attrpath) + local strtable = {} + if type(attrpath) == "table" then + strtable = attrpath + elseif type(attrpath) == "string" then + for key in attrpath:gmatch("([^%.]+)") do + table.insert(strtable, key) + end + else + print("function requires a table of strings or a dot separated string") + return + end + return vim.tbl_get(tbl, unpack(strtable)); + end + }) + end + package.preload['nixCats'] = function () + local ncsub = { + get = function(_) return nixCats_default_value end, + cats = mk_with_meta({ + nixCats_config_location = vim.fn.stdpath('config'), + wrapRc = false, + }), + settings = mk_with_meta({ + nixCats_config_location = vim.fn.stdpath('config'), + configDirName = os.getenv("NVIM_APPNAME") or "nvim", + wrapRc = false, + }), + petShop = mk_with_meta({}), + extra = mk_with_meta({}), + pawsible = mk_with_meta({ + allPlugins = { + start = {}, + opt = {}, + }, + }), + configDir = vim.fn.stdpath('config'), + packageBinPath = os.getenv('NVIM_WRAPPER_PATH_NIX') or vim.v.progpath + } + return setmetatable(ncsub, {__call = function(_, cat) return ncsub.get(cat) end}) + end + _G.nixCats = require('nixCats') + end +end + +---allows you to guarantee a boolean is returned, and also declare a different +---default value than specified in setup when not using nix to load the config +---@overload fun(v: string|string[]): boolean +---@overload fun(v: string|string[], default: boolean): boolean +function M.enableForCategory(v, default) + if M.isNixCats or default == nil then + if nixCats(v) then + return true + else + return false + end + else + return default + end +end + +---if nix, return value of nixCats(v) else return default +---Exists to specify a different non_nix_value than the one in setup() +---@param v string|string[] +---@param default any +---@return any +function M.getCatOrDefault(v, default) + if M.isNixCats then + return nixCats(v) + else + return default + end +end + +---for conditionally disabling build steps on nix, as they are done via nix +---I should probably have named it dontAddIfCats or something. +---@overload fun(v: any): any|nil +---Will return the second value if nix, otherwise the first +---@overload fun(v: any, o: any): any +function M.lazyAdd(v, o) + if M.isNixCats then + return o + else + return v + end +end + +return M diff --git a/kickstart/lua/nixCatsUtils/lazyCat.lua b/kickstart/lua/nixCatsUtils/lazyCat.lua new file mode 100644 index 0000000..6d8fd7f --- /dev/null +++ b/kickstart/lua/nixCatsUtils/lazyCat.lua @@ -0,0 +1,119 @@ +--[[ + This directory is the luaUtils template. + You can choose what things from it that you would like to use. + And then delete the rest. + Everything in this directory is optional. +--]] + +local M = {} +-- NOTE: If you don't use lazy.nvim, you don't need this file. + +---lazy.nvim wrapper +---@overload fun(nixLazyPath: string|nil, lazySpec: any, opts: table) +---@overload fun(nixLazyPath: string|nil, opts: table) +function M.setup(nixLazyPath, lazySpec, opts) + local lazySpecs = nil + local lazyCFG = nil + if opts == nil and type(lazySpec) == "table" and lazySpec.spec then + lazyCFG = lazySpec + else + lazySpecs = lazySpec + lazyCFG = opts + end + + local function regularLazyDownload() + local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" + if not vim.loop.fs_stat(lazypath) then + vim.fn.system { + 'git', + 'clone', + '--filter=blob:none', + 'https://github.com/folke/lazy.nvim.git', + '--branch=stable', -- latest stable release + lazypath, + } + end + return lazypath + end + + local isNixCats = vim.g[ [[nixCats-special-rtp-entry-nixCats]] ] ~= nil + local lazypath + if not isNixCats then + -- No nixCats? Not nix. Do it normally + lazypath = regularLazyDownload() + vim.opt.rtp:prepend(lazypath) + else + local nixCats = require('nixCats') + -- Else, its nix, so we wrap lazy with a few extra config options + lazypath = nixLazyPath + -- and also we probably dont have to download lazy either + if lazypath == nil then + lazypath = regularLazyDownload() + end + + local oldPath + local lazypatterns + local fallback + if type(lazyCFG) == "table" and type(lazyCFG.dev) == "table" then + lazypatterns = lazyCFG.dev.patterns + fallback = lazyCFG.dev.fallback + oldPath = lazyCFG.dev.path + end + + local myNeovimPackages = nixCats.vimPackDir .. "/pack/myNeovimPackages" + + local newLazyOpts = { + performance = { + rtp = { + reset = false, + }, + }, + dev = { + path = function(plugin) + local path = nil + if type(oldPath) == "string" and vim.fn.isdirectory(oldPath .. "/" .. plugin.name) == 1 then + path = oldPath .. "/" .. plugin.name + elseif type(oldPath) == "function" then + path = oldPath(plugin) + if type(path) ~= "string" then + path = nil + end + end + if path == nil then + if vim.fn.isdirectory(myNeovimPackages .. "/start/" .. plugin.name) == 1 then + path = myNeovimPackages .. "/start/" .. plugin.name + elseif vim.fn.isdirectory(myNeovimPackages .. "/opt/" .. plugin.name) == 1 then + path = myNeovimPackages .. "/opt/" .. plugin.name + else + path = "~/projects/" .. plugin.name + end + end + return path + end, + patterns = lazypatterns or { "" }, + fallback = fallback == nil and true or fallback, + } + } + lazyCFG = vim.tbl_deep_extend("force", lazyCFG or {}, newLazyOpts) + -- do the reset we disabled without removing important stuff + local cfgdir = nixCats.configDir + vim.opt.rtp = { + cfgdir, + nixCats.nixCatsPath, + nixCats.pawsible.allPlugins.ts_grammar_path, + vim.fn.stdpath("data") .. "/site", + lazypath, + vim.env.VIMRUNTIME, + vim.fn.fnamemodify(vim.v.progpath, ":p:h:h") .. "/lib/nvim", + cfgdir .. "/after", + } + end + + if lazySpecs then + require('lazy').setup(lazySpecs, lazyCFG) + else + require('lazy').setup(lazyCFG) + end +end + +return M diff --git a/config/default.nix b/old/config/default.nix similarity index 100% rename from config/default.nix rename to old/config/default.nix diff --git a/config/src/lazygit/config.yml b/old/config/src/lazygit/config.yml similarity index 100% rename from config/src/lazygit/config.yml rename to old/config/src/lazygit/config.yml diff --git a/config/src/lazygit/state.yml b/old/config/src/lazygit/state.yml similarity index 100% rename from config/src/lazygit/state.yml rename to old/config/src/lazygit/state.yml diff --git a/config/src/nvim/.neoconf.json b/old/config/src/nvim/.neoconf.json similarity index 100% rename from config/src/nvim/.neoconf.json rename to old/config/src/nvim/.neoconf.json diff --git a/config/src/nvim/init.lua b/old/config/src/nvim/init.lua similarity index 100% rename from config/src/nvim/init.lua rename to old/config/src/nvim/init.lua diff --git a/config/src/nvim/lazy-lock.json b/old/config/src/nvim/lazy-lock.json similarity index 100% rename from config/src/nvim/lazy-lock.json rename to old/config/src/nvim/lazy-lock.json diff --git a/config/src/nvim/lazyvim.json b/old/config/src/nvim/lazyvim.json similarity index 100% rename from config/src/nvim/lazyvim.json rename to old/config/src/nvim/lazyvim.json diff --git a/config/src/nvim/lua/config/autocmds.lua b/old/config/src/nvim/lua/config/autocmds.lua similarity index 100% rename from config/src/nvim/lua/config/autocmds.lua rename to old/config/src/nvim/lua/config/autocmds.lua diff --git a/config/src/nvim/lua/config/keymaps.lua b/old/config/src/nvim/lua/config/keymaps.lua similarity index 100% rename from config/src/nvim/lua/config/keymaps.lua rename to old/config/src/nvim/lua/config/keymaps.lua diff --git a/config/src/nvim/lua/config/lazy.lua b/old/config/src/nvim/lua/config/lazy.lua similarity index 100% rename from config/src/nvim/lua/config/lazy.lua rename to old/config/src/nvim/lua/config/lazy.lua diff --git a/config/src/nvim/lua/config/options.lua b/old/config/src/nvim/lua/config/options.lua similarity index 100% rename from config/src/nvim/lua/config/options.lua rename to old/config/src/nvim/lua/config/options.lua diff --git a/config/src/nvim/lua/plugins/catppuccin.lua b/old/config/src/nvim/lua/plugins/catppuccin.lua similarity index 100% rename from config/src/nvim/lua/plugins/catppuccin.lua rename to old/config/src/nvim/lua/plugins/catppuccin.lua diff --git a/config/src/nvim/lua/plugins/lang/nix.lua b/old/config/src/nvim/lua/plugins/lang/nix.lua similarity index 100% rename from config/src/nvim/lua/plugins/lang/nix.lua rename to old/config/src/nvim/lua/plugins/lang/nix.lua diff --git a/config/src/nvim/lua/plugins/lang/shell.lua b/old/config/src/nvim/lua/plugins/lang/shell.lua similarity index 100% rename from config/src/nvim/lua/plugins/lang/shell.lua rename to old/config/src/nvim/lua/plugins/lang/shell.lua diff --git a/config/src/nvim/lua/plugins/misc/bigfile.lua b/old/config/src/nvim/lua/plugins/misc/bigfile.lua similarity index 100% rename from config/src/nvim/lua/plugins/misc/bigfile.lua rename to old/config/src/nvim/lua/plugins/misc/bigfile.lua diff --git a/config/src/nvim/lua/plugins/misc/tmux-navigator.lua b/old/config/src/nvim/lua/plugins/misc/tmux-navigator.lua similarity index 100% rename from config/src/nvim/lua/plugins/misc/tmux-navigator.lua rename to old/config/src/nvim/lua/plugins/misc/tmux-navigator.lua diff --git a/config/src/nvim/lua/plugins/telescope.lua b/old/config/src/nvim/lua/plugins/telescope.lua similarity index 100% rename from config/src/nvim/lua/plugins/telescope.lua rename to old/config/src/nvim/lua/plugins/telescope.lua diff --git a/config/src/nvim/lua/plugins/tokyonight.lua b/old/config/src/nvim/lua/plugins/tokyonight.lua similarity index 100% rename from config/src/nvim/lua/plugins/tokyonight.lua rename to old/config/src/nvim/lua/plugins/tokyonight.lua diff --git a/config/src/nvim/lua/plugins/ui/colorizer.lua b/old/config/src/nvim/lua/plugins/ui/colorizer.lua similarity index 100% rename from config/src/nvim/lua/plugins/ui/colorizer.lua rename to old/config/src/nvim/lua/plugins/ui/colorizer.lua diff --git a/config/src/nvim/lua/plugins/undotree.lua b/old/config/src/nvim/lua/plugins/undotree.lua similarity index 100% rename from config/src/nvim/lua/plugins/undotree.lua rename to old/config/src/nvim/lua/plugins/undotree.lua diff --git a/config/src/nvim/stylua.toml b/old/config/src/nvim/stylua.toml similarity index 100% rename from config/src/nvim/stylua.toml rename to old/config/src/nvim/stylua.toml diff --git a/flake.lock b/old/flake.lock similarity index 100% rename from flake.lock rename to old/flake.lock diff --git a/flake.nix b/old/flake.nix similarity index 100% rename from flake.nix rename to old/flake.nix diff --git a/packages/lazyVim.nix b/old/packages/lazyVim.nix similarity index 100% rename from packages/lazyVim.nix rename to old/packages/lazyVim.nix diff --git a/renovate.json5 b/old/renovate.json5 similarity index 100% rename from renovate.json5 rename to old/renovate.json5 diff --git a/runtimeDeps.nix b/old/runtimeDeps.nix similarity index 100% rename from runtimeDeps.nix rename to old/runtimeDeps.nix