diff --git a/flake.lock b/flake.lock index 796f36d..6a17eff 100644 --- a/flake.lock +++ b/flake.lock @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1700695018, - "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=", + "lastModified": 1700847865, + "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", "owner": "nix-community", "repo": "home-manager", - "rev": "134deb46abd5d0889d913b8509413f6f38b0811e", + "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1700751952, - "narHash": "sha256-BliTb/KMnXmnMDaOI5g2iDOxjyf+gGQbuTbu2h2QC5Q=", + "lastModified": 1700914107, + "narHash": "sha256-oIM9LTjiV0pmgiJwMD1mEm20KsXGUIrSkvZgBYVXZic=", "owner": "neovim", "repo": "neovim", - "rev": "b514edcdf4747b2ebf00a97f89f310d6d4f090f5", + "rev": "0da62b579fbd3a21c7ab808f1bb10263d469a1e9", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1700754329, - "narHash": "sha256-3/Q+TULTG7OSYSicLqEiWGaNeyORpjT99VnpISYQTfc=", + "lastModified": 1700916297, + "narHash": "sha256-+DXUTK9PQFR0qBt2oW7L5/nUkcjBfzwXq0ZLbGi9IjE=", "ref": "refs/heads/master", - "rev": "22088d188af6e6bad330eb817e1e78a789e5f407", - "revCount": 595, + "rev": "5616cb369dc363f6534a4bc96bbb34312ee35c27", + "revCount": 596, "type": "git", "url": "https://git.kempkens.io/daniel/nix-overlay" }, @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1700732776, - "narHash": "sha256-Q4hhnBVg4EVaqCQb9R84oGJNDqLg0KK9FY2LbCL0oV8=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c465a67a54aa34cf2883536c97d4e856fa4a373d", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -363,11 +363,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1700641131, - "narHash": "sha256-M3bsoVMQM2PcuBWb6n1KDNeMX87svcSj/4qlBcVqs3k=", + "lastModified": 1700867874, + "narHash": "sha256-0Dk63BLiG9rmfBf8LxFpz8KgpUkepehVzhhVDgfxWSo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da41de71f62bf7fb989a04e39629b8adbf8aa8b5", + "rev": "1b99d72c8b7468def0c633635c469bf828db33a0", "type": "github" }, "original": { @@ -379,11 +379,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700538105, - "narHash": "sha256-uZhOCmwv8VupEmPZm3erbr9XXmyg7K67Ul3+Rx2XMe0=", + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "51a01a7e5515b469886c120e38db325c96694c2f", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", "type": "github" }, "original": { diff --git a/home/config/nvim/nifoc/tabline.fnl b/home/config/nvim/nifoc/tabline.fnl index 33fffae..fdca24e 100644 --- a/home/config/nvim/nifoc/tabline.fnl +++ b/home/config/nvim/nifoc/tabline.fnl @@ -1,12 +1,14 @@ +(import-macros {: highlight-get-field} :../macros/cmd) + (let [mod {} api vim.api heirline-utils (require :heirline.utils) colors (. (require :nifoc.theme) :colors) statusline (require :nifoc.statusline) - fg-active (. (heirline-utils.get_highlight :TabLineSel) :fg) - fg-inactive (. (heirline-utils.get_highlight :TabLine) :fg) - bg-active (. (heirline-utils.get_highlight :TabLineSel) :bg) - bg-inactive (. (heirline-utils.get_highlight :TabLine) :bg)] + fg-active (highlight-get-field :TabLineSel :fg) + fg-inactive (highlight-get-field :TabLine :fg) + bg-active (highlight-get-field :TabLineSel :bg) + bg-inactive (highlight-get-field :TabLine :bg)] ;; Utils (set mod.space {:provider " " diff --git a/home/config/nvim/plugins/cmp.fnl b/home/config/nvim/plugins/cmp.fnl index 1bc62ed..2a607a2 100644 --- a/home/config/nvim/plugins/cmp.fnl +++ b/home/config/nvim/plugins/cmp.fnl @@ -1,7 +1,10 @@ (let [cmp (require :cmp) luasnip (require :luasnip) lspkind (require :lspkind) - npairs (require :nvim-autopairs.completion.cmp)] + npairs (require :nvim-autopairs.completion.cmp) + maybe-tabnine (if (pcall require :cmp_tabnine.config) + [{:name :cmp_tabnine}] + [])] (fn has-words-before? [] (let [(line col) (-> 0 (vim.api.nvim_win_get_cursor) (unpack))] (if (not= col 0) @@ -21,13 +24,14 @@ (luasnip.jumpable -1) (luasnip.jump -1) (fallback))) - (cmp.setup {:sources (cmp.config.sources [{:name :nvim_lsp} - {:name :luasnip} - {:name :cmp_tabnine} - {:name :treesitter - :keyword_length 3} - {:name :buffer :keyword_length 3} - {:name :async_path}]) + (cmp.setup {:sources (cmp.config.sources (vim.list_extend [{:name :nvim_lsp} + {:name :luasnip} + {:name :treesitter + :keyword_length 3} + {:name :buffer + :keyword_length 3} + {:name :async_path}] + maybe-tabnine)) :mapping (cmp.mapping.preset.insert {: (cmp.mapping {:i (cmp.mapping.abort) :c (cmp.mapping.close)}) : (cmp.mapping {:i (cmp.mapping.abort)}) diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 3cdeb3d..48ca310 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -237,7 +237,6 @@ in cmp-buffer cmp-cmdline cmp-nvim-lsp-document-symbol - pkgs.vimPlugins.cmp-tabnine # Formatting @@ -315,6 +314,8 @@ in config = builtins.readFile ../../config/nvim/plugins/fidget.fnl; type = "fennel"; } + ] ++ optionals isDarwin [ + pkgs.vimPlugins.cmp-tabnine ]; }; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index a624202..330ae22 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -18,23 +18,23 @@ in }; plenary-nvim = buildVimPlugin { pname = "plenary.nvim"; - version = "2023-10-11"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "50012918b2fc8357b87cff2a7f7f0446e47da174"; - sha256 = "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd"; + rev = "366b0837486f60ae0e7550c15de8ff66d057c4cd"; + sha256 = "18jza11q0zyqwxjr42hal7hf5zv075zxm0kvhn7lg0f2hlcrb40w"; fetchSubmodules = false; }; }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-20"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "05f4a49cd85a67b90328a1bcbae4d9ed2a0a417b"; - sha256 = "1m1z451p8bx5x9cal3a1yy3a28sjp7pmsisrfgsy2vckkxqf8m05"; + rev = "baf17e6472b0968661dce5daa372251e934da39f"; + sha256 = "1icagypgcdqsiz1p4m8kan8wdbjgxcz4qa415rplyrx9rxbpp4rl"; fetchSubmodules = false; }; }; @@ -62,12 +62,12 @@ in }; yanky-nvim = buildVimPlugin { pname = "yanky.nvim"; - version = "2023-11-23"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "631b44d4129b04f9b3e87e4a29627504d350eba4"; - sha256 = "0p5bj24zlsgn8fkxqfjh9hkzhhdw5cf1gjkzqm4sg6qhbxz1a2n6"; + rev = "5ba331de8a8d18e1ec345d26e865bc3a0db2e8be"; + sha256 = "0zv322rybvky8qkzrrbc2nsrh6rfq7awnwlh9ydkkpkm63nphzl8"; fetchSubmodules = false; }; }; @@ -106,12 +106,12 @@ in }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-23"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "71bdf97bf6dafc776ad957169533f2f669a8c562"; - sha256 = "0y8scsr8xy02cnwjr0fddn62f2fv74qash6aspnfdfp3b400v2qm"; + rev = "d8a71826a20dfc9ed3d8a43e28a00611a302b456"; + sha256 = "1lc43vij0li4dwpbylvxksk7ls4vzv0wwhx8p9rnlgglc3idbvr1"; fetchSubmodules = false; }; }; @@ -128,12 +128,12 @@ in }; rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-11-22"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "HiPhish"; repo = "rainbow-delimiters.nvim"; - rev = "7f3cfa07f243261a0428d782bef6496929e9dcd8"; - sha256 = "18dmkf04315rna28pzxps8idph4a33w6nypdazwm0g2h0dvlhv2l"; + rev = "fdd507455a10c3841027c04ab33012d24d5b2c92"; + sha256 = "0sxw3kfln3f0yiv7sqzph7al19ri4m92mz0cjca3470m9zmz7lnc"; fetchSubmodules = false; }; }; @@ -186,12 +186,12 @@ in }; telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; - version = "2023-11-08"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "0fc69ebbf178631b8ab76745459fade062156ec5"; - sha256 = "16ri6gxy4pgjf2rxxnd6p0i1ibaz08sd31n2v40n6y84is2nywrd"; + rev = "c261d903a78c2cda47a5e44488621f10f9dd7fcf"; + sha256 = "13clvq5zhhf6msawjsf42bja0avhngzzq0c0v5jfv2qzpdgbl5k2"; fetchSubmodules = false; }; }; @@ -285,12 +285,12 @@ in }; LuaSnip = buildVimPlugin { pname = "LuaSnip"; - version = "2023-11-20"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "L3MON4D3"; repo = "LuaSnip"; - rev = "cab667e2674881001a86a7478fff7dc7791c63f5"; - sha256 = "10ij1bd3rdbyc87rlnq89h59gxmz6kfpq4wqbdhy9cml996ixpkp"; + rev = "df58ee1664cfda71479cd2bbd56114f56599eba6"; + sha256 = "08sgnd2s3glz21akby0g7w41ggb8wcfcx5jcbd1kg3ac5dc59cx9"; fetchSubmodules = false; }; }; @@ -373,12 +373,12 @@ in }; conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-21"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "a5df96556c4c895777bf53177a8704b9b3e884e1"; - sha256 = "0qg0mcy7i00p93vqycq1nx7svfn758a3qy30lkwgkydvz4g8nhzg"; + rev = "cbc510ca5b4aec1fd104b6c6f070a7fcf36cc0c8"; + sha256 = "1329gqbgwrcql56ymmfsanh7fc84ddy7rqklhplivkkgd8xdrphk"; fetchSubmodules = false; }; }; @@ -395,12 +395,12 @@ in }; vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2023-11-05"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "d30b72d20f01478a8486f15a57c89fe3177373db"; - sha256 = "0zlficdwybcz8mvzv70vp4mkzrwpmvp3v0dq88fyimyajyxi1aqp"; + rev = "269f9bea87e20a01438085eb13df539929a12727"; + sha256 = "0ca3fhdr6pp77z72lxlhlkzi1ng713nfzvyywmq8a31z8j2vkh87"; fetchSubmodules = false; }; }; @@ -417,12 +417,12 @@ in }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-11-20"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "05cb8257cb9257144e63f41ccfe5a41ba3d1003c"; - sha256 = "0y2lfdx75d418jdypp1yg3sdmr88csb4z3p1dnxnggx4xk1yghrx"; + rev = "e89a8f8adeef2dfab851fd056d38ee7afc97c249"; + sha256 = "1f5201yb7kqbggn0dgpl9p5mnxdxg6ffpfmzih7rzzkp4fhn2vb4"; fetchSubmodules = false; }; };