diff options
| -rw-r--r-- | flake.lock | 42 | ||||
| -rw-r--r-- | modules/neovim/default.nix | 68 | ||||
| -rw-r--r-- | modules/neovim/nvim/lua/config/colorscheme.lua | 2 |
3 files changed, 61 insertions, 51 deletions
@@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1766171975, - "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", + "lastModified": 1771102945, + "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", + "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1766189079, - "narHash": "sha256-K+xdRPIfIE8Xr3JHKNkVNnxPnihrPtW+D1rtcjHx1u4=", + "lastModified": 1771113898, + "narHash": "sha256-0t6wai1op7OUc4mAhM4BYIbfQMvYmMhW2jXP2VQ0/KA=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7e47a8c64312e726aafc0789a5d9043501a7e3ae", + "rev": "5e829d6d57633d5d56a0f351564331fca40d507b", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1766187129, - "narHash": "sha256-SqvXXTi+nLihMFhHUT7/1JtNqWk2cMKiCvWxYKE03r8=", + "lastModified": 1771089488, + "narHash": "sha256-xHSWR7wo4GiZVWAoBlD4f2szoftfoxOCqlOu1UBL9Wc=", "owner": "neovim", "repo": "neovim", - "rev": "eac2f0443e032ba238ca6b4a9e2fd6135be454b3", + "rev": "8ab511bba524bcd5b5913d1b1205b5e4fe3f7210", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1770882871, + "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1766178318, - "narHash": "sha256-AAW3VTgyBpiJVih/KXos1HYzXb3sspy4kezoO7IPw4E=", + "lastModified": 1771036703, + "narHash": "sha256-tfKkIWZQBpevF03/8m1yEKbkNUCr01MV48lkx+353I4=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "a0b5507666bccc2733f3778fc939242745f5ef25", + "rev": "586bb62d2ed6aaa9d4dbd0440955e41cc9a3be1f", "type": "github" }, "original": { diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index d940448..1b9e345 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -276,38 +276,48 @@ in ''; } ]; - extraLuaConfig = + extraLuaConfig = # lua '' ${builtins.readFile ./nvim/init.lua} - require('tinted-colorscheme').setup({ - base00 = "${scheme.base00}", - base01 = "${scheme.base01}", - base02 = "${scheme.base02}", - base03 = "${scheme.base03}", - base04 = "${scheme.base04}", - base05 = "${scheme.base05}", - base06 = "${scheme.base06}", - base07 = "${scheme.base07}", - base08 = "${scheme.base08}", - base09 = "${scheme.base09}", - base0A = "${scheme.base0A}", - base0B = "${scheme.base0B}", - base0C = "${scheme.base0C}", - base0D = "${scheme.base0D}", - base0E = "${scheme.base0E}", - base0F = "${scheme.base0F}", - base10 = "${scheme.base10}", - base11 = "${scheme.base11}", - base12 = "${scheme.base12}", - base13 = "${scheme.base13}", - base14 = "${scheme.base14}", - base15 = "${scheme.base15}", - base16 = "${scheme.base16}", - base17 = "${scheme.base17}", - }, { - supports = { tinty = false, live_reload = false }, - highlights = { telescope_borders = true }, + require('tinted-nvim').setup({ + compile = true, + default_scheme = "base24-system-theme", + capabilities = { + undercurl = true, + }, + styles = { + comments = { italic = false }, + }, + schemes = { + ["base24-system-theme"] = { + variant = "${if scheme.light then "light" else "dark"}", + base00 = "${scheme.base00}", + base01 = "${scheme.base01}", + base02 = "${scheme.base02}", + base03 = "${scheme.base03}", + base04 = "${scheme.base04}", + base05 = "${scheme.base05}", + base06 = "${scheme.base06}", + base07 = "${scheme.base07}", + base08 = "${scheme.base08}", + base09 = "${scheme.base09}", + base0A = "${scheme.base0A}", + base0B = "${scheme.base0B}", + base0C = "${scheme.base0C}", + base0D = "${scheme.base0D}", + base0E = "${scheme.base0E}", + base0F = "${scheme.base0F}", + base10 = "${scheme.base10}", + base11 = "${scheme.base11}", + base12 = "${scheme.base12}", + base13 = "${scheme.base13}", + base14 = "${scheme.base14}", + base15 = "${scheme.base15}", + base16 = "${scheme.base16}", + base17 = "${scheme.base17}", + }, + }, }) vim.cmd[[doautocmd ColorScheme]] diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua index ee7ed5b..b6bd545 100644 --- a/modules/neovim/nvim/lua/config/colorscheme.lua +++ b/modules/neovim/nvim/lua/config/colorscheme.lua @@ -1,6 +1,6 @@ vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args) -- local colors = require('base16-colorscheme').colors - local colors = require('tinted-colorscheme').colors + local colors = require("tinted-nvim").get_palette() -- i dislike syntax highlighting -- vim.api.nvim_set_hl(0, 'Comment', {}) vim.api.nvim_set_hl(0, 'Constant', {}) |