From a01956a3236be82fba4f6a89ecdc1a75553c0ebb Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sun, 21 Jan 2024 00:01:17 +0100 Subject: [PATCH] nvim: updates --- flake.lock | 21 ++++++++------- home/config/nvim/nifoc/theme.fnl | 45 +++++++++++++++++++++++++++++++- home/programs/nvim/plugins.nix | 34 ++++++++++++------------ home/programs/nvim/plugins.yaml | 2 +- 4 files changed, 73 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 783aedd..a2fb341 100644 --- a/flake.lock +++ b/flake.lock @@ -290,6 +290,7 @@ "dir": "contrib", "owner": "neovim", "repo": "neovim", + "rev": "98a4ed0a110625e63950d85b26f3e4614393ea04", "type": "github" } }, @@ -304,11 +305,11 @@ ] }, "locked": { - "lastModified": 1705716075, - "narHash": "sha256-0s0OQtscSdewcaaELjOE6RbxnfpCHgXkSF481qvfvO8=", + "lastModified": 1705788789, + "narHash": "sha256-yPNoTRPi5w69vgnZGa3IPErDUuGzaHIn8wBPmgcIbqA=", "ref": "refs/heads/master", - "rev": "81dcd871ad2f3d92ed41dcc4f15462ea4def75a3", - "revCount": 674, + "rev": "8a346a1db4636f53b472f8df3b79137f554b6066", + "revCount": 676, "type": "git", "url": "https://git.kempkens.io/daniel/nix-overlay" }, @@ -371,11 +372,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705666311, - "narHash": "sha256-VYdSQm7zq3AStyHhRr3SBCTA8fVzrl6WtIlXTs2Wlts=", + "lastModified": 1705697961, + "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a455c5fb3ee513e2f443838a0e84d52b035adb67", + "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", "type": "github" }, "original": { @@ -446,11 +447,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1705229514, - "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=", + "lastModified": 1705757126, + "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05", + "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", "type": "github" }, "original": { diff --git a/home/config/nvim/nifoc/theme.fnl b/home/config/nvim/nifoc/theme.fnl index afa221e..d0fc227 100644 --- a/home/config/nvim/nifoc/theme.fnl +++ b/home/config/nvim/nifoc/theme.fnl @@ -95,6 +95,49 @@ (highlight :NeogitDiffDelete {:fg mod.colors.comment :bg mod.colors.red}) (highlight :NeogitDiffDeleteHighlight {:fg mod.colors.black :bg mod.colors.bright_red}) - (highlight :NeogitCursorLine {:fg mod.colors.fg :bg mod.colors.visual})) + (highlight :NeogitCursorLine {:fg mod.colors.fg :bg mod.colors.visual}) + ;; nvim-treesitter + (highlight-link "@variable.parameter" "@parameter") + (highlight-link "@variable.member" "@field") + (highlight-link "@module" "@namespace") + (highlight-link "@number.float" "@float") + (highlight-link "@string.special.symbol" "@symbol") + (highlight-link "@string.regexp" "@string.regex") + (highlight-link "@markup.strong" "@text.strong") + (highlight-link "@markup.italic" "@text.emphasis") + (highlight-link "@markup.underline" "@text.underline") + (highlight-link "@markup.strikethrough" "@text.strike") + (highlight-link "@markup.heading" "@text.title") + (highlight-link "@markup.quote" "@text.quote") + (highlight-link "@markup.link.url" "@text.uri") + (highlight-link "@markup.math" "@text.math") + (highlight-link "@markup.environment" "@text.environment") + (highlight-link "@markup.environment.name" "@text.environment.name") + (highlight-link "@markup.link" "@text.reference") + (highlight-link "@markup.raw" "@text.literal") + (highlight-link "@markup.raw.block" "@text.literal.block") + (highlight-link "@markup.link.label" "@string.special") + (highlight-link "@markup.list" "@punctuation.special") + (highlight-link "@function.method" "@method") + (highlight-link "@function.method.call" "@method.call") + (highlight-link "@comment.todo" "@text.todo") + (highlight-link "@comment.error" "@text.danger") + (highlight-link "@comment.warning" "@text.warning") + (highlight-link "@comment.hint" "@text.note") + (highlight-link "@comment.info" "@text.note") + (highlight-link "@comment.note" "@text.note") + (highlight-link "@comment.ok" "@text.note") + (highlight-link "@diff.plus" "@text.diff.add") + (highlight-link "@diff.minus" "@text.diff.delete") + (highlight-link "@diff.delta" "@text.diff.change") + (highlight-link "@string.special.url" "@text.uri") + (highlight-link "@keyword.directive" "@preproc") + (highlight-link "@keyword.storage" "@storageclass") + (highlight-link "@keyword.directive" "@define") + (highlight-link "@keyword.conditional" "@conditional") + (highlight-link "@keyword.debug" "@debug") + (highlight-link "@keyword.exception" "@exception") + (highlight-link "@keyword.import" "@include") + (highlight-link "@keyword.repeat" "@repeat")) mod) diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 9d14f00..aee459b 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -121,8 +121,8 @@ in src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "1eb22367b97e277a7fbcf53f5de86167e1d2f523"; - sha256 = "0lhlyhybqdbkkclrsjs5bzp64hmzwxbmxynbxja5lqcp317jc408"; + rev = "5cc562748729b6dc9563ea5a3d676ff102ab38b1"; + sha256 = "0iwvly9i9yb0x3708kvbjr4mzxay0jrvnlhwdvrvq0zsir9j72ra"; fetchSubmodules = false; }; }; @@ -139,12 +139,12 @@ in }; rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-01-18"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "HiPhish"; repo = "rainbow-delimiters.nvim"; - rev = "8b6099f24e435036a628798585f95f62fb892838"; - sha256 = "0zqznpyig34cgh3rfkjbgyb3s31zgv7z9a18hwg3yz73ac5q8m9x"; + rev = "1951d157c07a0349c2d1af62a4ca61443aafc89a"; + sha256 = "1418czcc4hxn8phgin5v46ryxl4nagq6zhd01qqri4f4dn2k72pc"; fetchSubmodules = false; }; }; @@ -230,12 +230,12 @@ in }; nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-01-19"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "042aa6b27b8b8d4f4e1bd42de2037c83d676a8a0"; - sha256 = "0gg39lw853r9kvfzkcdp55yymryl9nsr7ggq8ml6szvlkmb8rydl"; + rev = "8917d2c830e04bf944a699b8c41f097621283828"; + sha256 = "0wiqy0k83qjh2y9r3rdm8jrrfmrwfm2729wrshxmxbdns0vjrmja"; fetchSubmodules = false; }; }; @@ -252,12 +252,12 @@ in }; schemastore-nvim = buildVimPlugin { pname = "schemastore.nvim"; - version = "2024-01-19"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "b0o"; repo = "schemastore.nvim"; - rev = "22156da516a2555800232e8406738b05951cb1bf"; - sha256 = "1r3vvar2pzpqbj2kdqq55bq22yicc6bg8vm10826zp6nzfbrxvss"; + rev = "0f86f114e099c008a7cca8f6deea072207f81204"; + sha256 = "02clmz7cfvkacbj3sd0i0df041ls2spdvh2x13j9y2nmm656a5sk"; fetchSubmodules = false; }; }; @@ -296,12 +296,12 @@ in }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-01-18"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "b32127ba52f3a1f7dc86773c2ca3f0029afa12c1"; - sha256 = "19pxi87ji05hyp3xc1z8v3q4gqc9ggq27sg9wrjfi6zsym04xgw5"; + rev = "2cf9ad095130755d7d87f1730bcf33c91ee822e4"; + sha256 = "1ssb0xwki31gi83apq5apfmc7d9dyfdyshrg8pf6w36v0b6s17b3"; fetchSubmodules = false; }; }; @@ -516,12 +516,12 @@ in }; gitsigns-nvim = buildVimPlugin { pname = "gitsigns.nvim"; - version = "2024-01-12"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "4aaacbf5e5e2218fd05eb75703fe9e0f85335803"; - sha256 = "0583bcg23hf4clg6r737ns6whg9hinz3rn0bmvs6692lmrjsiinb"; + rev = "c5ff7628e19a47ec14d3657294cc074ecae27b99"; + sha256 = "1gwpiq3fdjg3b6hg82lq7i0cxfyyb89cr079jc9ja36ypwbkclkl"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index 86a3a71..0ceb5f0 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -11,7 +11,7 @@ - src: hinell/move.nvim # Themes - src: Mofiqul/dracula.nvim -# Syntax + # Syntax - src: nvim-treesitter/nvim-treesitter - src: NoahTheDuke/vim-just - src: HiPhish/rainbow-delimiters.nvim