1
0
Fork 0

Update deps; TabNine

This commit is contained in:
Daniel Kempkens 2023-11-23 21:33:18 +01:00
parent f4c4e492c3
commit b3049d4958
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
6 changed files with 49 additions and 41 deletions

View file

@ -244,11 +244,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700553346, "lastModified": 1700695018,
"narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=", "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f", "rev": "134deb46abd5d0889d913b8509413f6f38b0811e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +287,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1700585179, "lastModified": 1700751952,
"narHash": "sha256-aiPGciNwiqsO1BdRrKPDx+EoyZ/m3Qa2ND7XhRAHdH8=", "narHash": "sha256-BliTb/KMnXmnMDaOI5g2iDOxjyf+gGQbuTbu2h2QC5Q=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "7e97c773e3ba78fcddbb2a0b9b0d572c8210c83e", "rev": "b514edcdf4747b2ebf00a97f89f310d6d4f090f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700600149, "lastModified": 1700754329,
"narHash": "sha256-282a5d5O95R1K6uNRZtC3bPv/bcMoxV8n0lewwbOoUE=", "narHash": "sha256-3/Q+TULTG7OSYSicLqEiWGaNeyORpjT99VnpISYQTfc=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "0ca2d5027fc456daa5a3eb10f19ac4a440029a17", "rev": "22088d188af6e6bad330eb817e1e78a789e5f407",
"revCount": 592, "revCount": 595,
"type": "git", "type": "git",
"url": "https://git.kempkens.io/daniel/nix-overlay" "url": "https://git.kempkens.io/daniel/nix-overlay"
}, },
@ -332,11 +332,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699867978, "lastModified": 1700732776,
"narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", "narHash": "sha256-Q4hhnBVg4EVaqCQb9R84oGJNDqLg0KK9FY2LbCL0oV8=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", "rev": "c465a67a54aa34cf2883536c97d4e856fa4a373d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +363,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1700553648, "lastModified": 1700641131,
"narHash": "sha256-UhENpRvTgaLlfqcRNeLB0FOEhxHRvVOhRi/f9g8F3UI=", "narHash": "sha256-M3bsoVMQM2PcuBWb6n1KDNeMX87svcSj/4qlBcVqs3k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "37e6adc926fc74e270e86a544a41aecabb0effb1", "rev": "da41de71f62bf7fb989a04e39629b8adbf8aa8b5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -62,7 +62,6 @@
:CmpItemKindModule :CmpItemKindModule
:CmpItemKindOperator :CmpItemKindOperator
:CmpItemKindVariable :CmpItemKindVariable
:CmpItemKindFile
:CmpItemKindUnit :CmpItemKindUnit
:CmpItemKindSnippet :CmpItemKindSnippet
:CmpItemKindFolder :CmpItemKindFolder
@ -73,6 +72,9 @@
:CmpItemKindColor :CmpItemKindColor
:CmpItemKindTypeParameter]] :CmpItemKindTypeParameter]]
(each [_ group (pairs cmp-groups)] (each [_ group (pairs cmp-groups)]
(swap-bg-with-fg mod.colors.black group)))) (swap-bg-with-fg mod.colors.black group)))
(highlight :CmpItemKindFile {:fg mod.colors.white :bg mod.colors.black})
(highlight :CmpItemKindTabNine
{:fg mod.colors.black :bg mod.colors.bright_magenta}))
mod) mod)

View file

@ -23,6 +23,7 @@
(cmp.setup {:sources (cmp.config.sources [{:name :nvim_lsp} (cmp.setup {:sources (cmp.config.sources [{:name :nvim_lsp}
{:name :luasnip} {:name :luasnip}
{:name :cmp_tabnine}
{:name :treesitter {:name :treesitter
:keyword_length 3} :keyword_length 3}
{:name :buffer :keyword_length 3} {:name :buffer :keyword_length 3}
@ -59,11 +60,17 @@
kind (kind-fn entry vim-item) kind (kind-fn entry vim-item)
strings (vim.split kind.kind "%s" strings (vim.split kind.kind "%s"
{:trimempty true})] {:trimempty true})]
(set kind.kind (if (= entry.source.name :cmp_tabnine)
(.. " " (or (. strings 1) "") " ")) (do
(set kind.menu (set kind.kind " 󱜚 ")
(.. " (" (or (. strings 2) "") (set kind.menu " (TabNine)"))
")")) (do
(set kind.kind
(.. " " (or (. strings 1) "")
" "))
(set kind.menu
(.. " ("
(or (. strings 2) "") ")"))))
kind))}}) kind))}})
(cmp.setup.cmdline "/" (cmp.setup.cmdline "/"
{:sources (cmp.config.sources [{:name :nvim_lsp_document_symbol}] {:sources (cmp.config.sources [{:name :nvim_lsp_document_symbol}]

View file

@ -5,9 +5,7 @@
;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-clue.md ;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-clue.md
(miniclue.setup {:triggers [; Leader (miniclue.setup {:triggers [; Leader
{:mode :n :keys :<leader>} {:mode :n :keys :<leader>}
{:mode :x :keys :<leader>} {:mode :x :keys :<leader>}]
; Built-in
{:mode :i :keys :<C-x>}]
:clues [(miniclue.gen_clues.builtin_completion)]}) :clues [(miniclue.gen_clues.builtin_completion)]})
;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-hipatterns.md ;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-hipatterns.md
(hipatterns.setup {:highlighters {:fixme {:pattern "%f[%w]()FIXME()%f[%W]" (hipatterns.setup {:highlighters {:fixme {:pattern "%f[%w]()FIXME()%f[%W]"

View file

@ -237,6 +237,7 @@ in
cmp-buffer cmp-buffer
cmp-cmdline cmp-cmdline
cmp-nvim-lsp-document-symbol cmp-nvim-lsp-document-symbol
pkgs.vimPlugins.cmp-tabnine
# Formatting # Formatting

View file

@ -62,12 +62,12 @@ in
}; };
yanky-nvim = buildVimPlugin { yanky-nvim = buildVimPlugin {
pname = "yanky.nvim"; pname = "yanky.nvim";
version = "2023-11-03"; version = "2023-11-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gbprod"; owner = "gbprod";
repo = "yanky.nvim"; repo = "yanky.nvim";
rev = "9268018e92d02650a94e39dd5f5903c542f7ea11"; rev = "631b44d4129b04f9b3e87e4a29627504d350eba4";
sha256 = "07blik6lsj1qdk5y3afjc80a0rbjjxq68q3fkvkayn5zs41i76y2"; sha256 = "0p5bj24zlsgn8fkxqfjh9hkzhhdw5cf1gjkzqm4sg6qhbxz1a2n6";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -106,12 +106,12 @@ in
}; };
nvim-treesitter = buildVimPlugin { nvim-treesitter = buildVimPlugin {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-11-21"; version = "2023-11-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0"; rev = "71bdf97bf6dafc776ad957169533f2f669a8c562";
sha256 = "1bmr1j6s5r8ig3s2i2qgnr5if8vrqbmf34qk2g74mvqnl38gadyl"; sha256 = "0y8scsr8xy02cnwjr0fddn62f2fv74qash6aspnfdfp3b400v2qm";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -128,12 +128,12 @@ in
}; };
rainbow-delimiters-nvim = buildVimPlugin { rainbow-delimiters-nvim = buildVimPlugin {
pname = "rainbow-delimiters.nvim"; pname = "rainbow-delimiters.nvim";
version = "2023-11-19"; version = "2023-11-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "HiPhish"; owner = "HiPhish";
repo = "rainbow-delimiters.nvim"; repo = "rainbow-delimiters.nvim";
rev = "c6dce365e647162ae0031c1f814053beaf3dd843"; rev = "7f3cfa07f243261a0428d782bef6496929e9dcd8";
sha256 = "07px1wk23p0sxvh7sv7gki0pp0mv0618kfgl7c6s5ylrpw6a11wq"; sha256 = "18dmkf04315rna28pzxps8idph4a33w6nypdazwm0g2h0dvlhv2l";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -208,12 +208,12 @@ in
}; };
nvim-lspconfig = buildVimPlugin { nvim-lspconfig = buildVimPlugin {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-11-21"; version = "2023-11-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "addad5176dbbe8bcc82ef91c51c5f1bf6629ec2d"; rev = "553c4e0e667167640c5398573f6f3a488ff8047a";
sha256 = "166fwrhrfqr21sy1w25x2pdrk5q5g1bcnsm98j9gsd7wnabqizqg"; sha256 = "0jm03jrsy1yj293hyimakhxcsak45f55zjc1ch1smy0h0qgr23fm";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -472,12 +472,12 @@ in
}; };
gitsigns-nvim = buildVimPlugin { gitsigns-nvim = buildVimPlugin {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "2023-11-17"; version = "2023-11-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55"; rev = "5fc573f2d2a49aec74dd6dc977e8b137429d1897";
sha256 = "0xgw0p6wb33wlb4lnnjj1adxsll6lnmq3niabqzricsz4phmvf4f"; sha256 = "0ijwyxw9w4idd1qczd1d8bs8454i83s6vxny39r9vn4ykhxm9v10";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };