diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e033bc6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +lazy-lock.json diff --git a/README.md b/README.md index 501248a..f846733 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,12 @@ git clone git@github.com:itme-brain/nvim.git ~/.config/nvim git clone --recurse-submodules git@github.com:itme-brain/nixos.git ``` +## Plugin Lockfile + +This config does not commit `lazy-lock.json`. + +When Home Manager deploys this config from a flake, `~/.config/nvim` can point into `/nix/store`, which is read-only. lazy.nvim normally writes its lockfile to `stdpath("config")`, so this config stores the runtime lockfile at `stdpath("state") .. "/lazy-lock.json"` instead. + ## Features - **Native LSP** (`vim.lsp.config` / `vim.lsp.enable`) - no manual server list needed diff --git a/colors/anticuus.lua b/colors/anticuus.lua new file mode 100644 index 0000000..21bb51c --- /dev/null +++ b/colors/anticuus.lua @@ -0,0 +1,84 @@ +vim.cmd("highlight clear") +if vim.fn.exists("syntax_on") then + vim.cmd("syntax reset") +end +vim.g.colors_name = "anticuus" + +local set = vim.api.nvim_set_hl + +-- Base +set(0, "Normal", { fg = "#dadada", bg = "#000000" }) +set(0, "Comment", { fg = "#00b300" }) +set(0, "Constant", { fg = "#dadada" }) +set(0, "String", { fg = "#00b300" }) +set(0, "Character", { link = "Comment" }) +set(0, "Number", { fg = "#dadada" }) +set(0, "Boolean", { fg = "#ffcc00" }) +set(0, "Float", { fg = "#dadada" }) +set(0, "Identifier", { fg = "#dadada" }) +set(0, "Function", { fg = "#dadada" }) +set(0, "Statement", { fg = "#ffcc00" }) +set(0, "Conditional", { fg = "#ffcc00" }) +set(0, "Repeat", { fg = "#dadada" }) +set(0, "Keyword", { fg = "#ffcc00" }) +set(0, "Operator", { fg = "#dadada" }) +set(0, "PreProc", { fg = "#00b300" }) +set(0, "Include", { fg = "#00b300" }) +set(0, "Define", { fg = "#00b300" }) +set(0, "Macro", { fg = "#00b300" }) +set(0, "Type", { fg = "#dadada" }) +set(0, "Typedef", { fg = "#ffcc00" }) +set(0, "Special", { link = "PreProc" }) + +-- UI +set(0, "CursorLineNr", { fg = "#dadada", bg = "#282828" }) +set(0, "LineNr", { fg = "#dadada" }) +set(0, "SignColumn", { fg = "#00b300", bg = "#000000" }) +set(0, "Search", { fg = "#000000", bg = "#ffcc00" }) +set(0, "Visual", { bg = "#3a3a3a" }) +set(0, "StatusLine", { fg = "#dadada", bg = "#000000" }) +set(0, "StatusLineNC", { fg = "#dadada", bg = "#000000" }) + +-- Popup menu / completion +set(0, "Pmenu", { fg = "#dadada", bg = "#181818" }) +set(0, "PmenuSel", { fg = "#000000", bg = "#ffcc00" }) +set(0, "PmenuSbar", { bg = "#181818" }) +set(0, "PmenuThumb", { bg = "#3a3a3a" }) + +set(0, "DiagnosticError", { fg = "#ff6b6b" }) +set(0, "DiagnosticWarn", { fg = "#ffcc00" }) +set(0, "DiagnosticInfo", { fg = "#00b300" }) +set(0, "DiagnosticHint", { fg = "#dadada" }) + +set(0, "DiagnosticVirtualTextError", { fg = "#dadada", bg = "NONE" }) +set(0, "DiagnosticVirtualTextWarn", { fg = "#dadada", bg = "NONE" }) +set(0, "DiagnosticVirtualTextInfo", { fg = "#dadada", bg = "NONE" }) +set(0, "DiagnosticVirtualTextHint", { fg = "#dadada", bg = "NONE" }) + +set(0, "@comment", { fg = "#00b300" }) +set(0, "@string", { fg = "#00b300" }) +set(0, "@keyword", { fg = "#ffcc00" }) +set(0, "@keyword.operator", { fg = "#ffcc00" }) +set(0, "@variable", { fg = "#dadada" }) +set(0, "@function", { fg = "#dadada" }) +set(0, "@type", { fg = "#ffcc00" }) +set(0, "@attribute", { fg = "#dadada" }) +set(0, "@constant", { fg = "#dadada" }) +set(0, "@constant.builtin", { fg = "#dadada" }) +set(0, "@number", { fg = "#dadada" }) +set(0, "@boolean", { fg = "#ffcc00" }) +set(0, "@property", { fg = "#dadada" }) +set(0, "@parameter", { fg = "#dadada" }) + +set(0, "markdownH1", { link = "PreProc" }) +set(0, "markdownH2", { link = "PreProc" }) +set(0, "markdownH3", { link = "PreProc" }) +set(0, "markdownH4", { link = "PreProc" }) +set(0, "markdownH5", { link = "PreProc" }) +set(0, "markdownH6", { link = "PreProc" }) +set(0, "markdownHeadingDelimiter", { link = "PreProc" }) + +set(0, "NormalFloat", { bg = "#000000" }) +set(0, "FloatBorder", { fg = "#dadada", bg = "#000000" }) +set(0, "ColorColumn", { bg = "#1a1a1a" }) +set(0, "CursorLine", { bg = "#121212" }) diff --git a/lazy-lock.json b/lazy-lock.json deleted file mode 100644 index 6af47f8..0000000 --- a/lazy-lock.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "anticuus": { "branch": "main", "commit": "259315038503e2327cc3024dc306af36563d7f5b" }, - "autoclose.nvim": { "branch": "main", "commit": "bafd0368716216fa6a7bb2a43ecd889b44efdb46" }, - "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, - "fzf-lua": { "branch": "main", "commit": "b437bafc981a180d609bb4092c56ce8999f7a2c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, - "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "log-highlight.nvim": { "branch": "main", "commit": "ca88628f6dd3b9bb46f9a7401669e24cf7de47a4" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, - "mason.nvim": { "branch": "main", "commit": "cb8445f8ce85d957416c106b780efd51c6298f89" }, - "neovim-treesitter": { "branch": "main", "commit": "df7489eeea351bece7fd0f9c825be5cb6a1438f0" }, - "nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" }, - "nvim-lspconfig": { "branch": "master", "commit": "31026a13eefb20681124706a79fc1df6bf11ab27" }, - "nvim-web-devicons": { "branch": "master", "commit": "4fc505ac7bd7692824a142e96e5f529c133862f8" }, - "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, - "pi.nvim": { "branch": "main", "commit": "6e86a704ed6ff488fda78b64f4e564d6ee620785" }, - "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "render-markdown.nvim": { "branch": "main", "commit": "3f3eea97b80839f629c951ca660ffd125bfa5b34" }, - "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, - "treesitter-parser-registry": { "branch": "main", "commit": "6eb15358bb9fc88f0d3401d8538d56652e9bdf3c" }, - "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } -} diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index c06ab36..cf4219c 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -21,12 +21,15 @@ vim.opt.rtp:prepend(lazypath) vim.g.mapleader = " " vim.g.maplocalleader = "\\" +local writable_lockfile = vim.fn.stdpath("state") .. "/lazy-lock.json" + -- Setup lazy.nvim require("lazy").setup({ spec = { -- import your plugins { import = "plugins" }, }, + lockfile = writable_lockfile, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. install = { colorscheme = { "anticuus" } }, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 56b757d..c902d5a 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,9 +1,8 @@ return { { - "https://codeberg.org/juanmilkah/anticuus.nvim", - name = "anticuus", + dir = vim.fn.stdpath("config"), + name = "local-colorscheme", lazy = false, - priority = 1000, config = function() local color_group = vim.api.nvim_create_augroup("config_colorscheme", { clear = true })