From b77ae0f51147b117d12c193f05c3368c27552228 Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Thu, 25 Apr 2024 15:35:47 +0200 Subject: [PATCH] update nvf and fix the treesitter issue --- flake.lock | 190 ++++++++++++++++++++++------------------- modules/tui/neovim.nix | 3 + 2 files changed, 106 insertions(+), 87 deletions(-) diff --git a/flake.lock b/flake.lock index 9e5c3fa..a708611 100644 --- a/flake.lock +++ b/flake.lock @@ -1234,6 +1234,7 @@ "plugin-catppuccin": "plugin-catppuccin", "plugin-ccc": "plugin-ccc", "plugin-cellular-automaton": "plugin-cellular-automaton", + "plugin-chatgpt": "plugin-chatgpt", "plugin-cheatsheet-nvim": "plugin-cheatsheet-nvim", "plugin-cinnamon-nvim": "plugin-cinnamon-nvim", "plugin-cmp-buffer": "plugin-cmp-buffer", @@ -1332,11 +1333,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1713467798, - "narHash": "sha256-W3SL74/W25NJa2gNw/jJvdgKAxVjSLmnVrQj1FrRFfc=", + "lastModified": 1714051991, + "narHash": "sha256-4Ss/vDDYBfIh+eEz9bOM+NVW8drhzJdcYA643f9ZnBQ=", "owner": "NotAShelf", "repo": "neovim-flake", - "rev": "a6bb6c3e9180faadbd180d798e2f42ef7add533c", + "rev": "115d38e48ec32f927d16d526b86ef4b811210cb2", "type": "github" }, "original": { @@ -1997,11 +1998,11 @@ "plugin-catppuccin": { "flake": false, "locked": { - "lastModified": 1713033163, - "narHash": "sha256-hmWp/+qFEJ0zZBjR6kz+EuyHswI0T+DhmUneSPZVhkM=", + "lastModified": 1713105352, + "narHash": "sha256-yTVou/WArEWygBBs2NFPI9Dm9iSGfwVftKFbOAGl8tk=", "owner": "catppuccin", "repo": "nvim", - "rev": "fc98570d85ae772e56dc42cf8d7d6a497a909bdb", + "rev": "a1439ad7c584efb3d0ce14ccb835967f030450fe", "type": "github" }, "original": { @@ -2042,6 +2043,22 @@ "type": "github" } }, + "plugin-chatgpt": { + "flake": false, + "locked": { + "lastModified": 1709721561, + "narHash": "sha256-vD3NEsYmPRWlxBSOxyIMIQiJXQXxx0hhsw4zIxxXB3o=", + "owner": "jackMort", + "repo": "ChatGPT.nvim", + "rev": "df53728e05129278d6ea26271ec086aa013bed90", + "type": "github" + }, + "original": { + "owner": "jackMort", + "repo": "ChatGPT.nvim", + "type": "github" + } + }, "plugin-cheatsheet-nvim": { "flake": false, "locked": { @@ -2237,11 +2254,11 @@ "plugin-dashboard-nvim": { "flake": false, "locked": { - "lastModified": 1712210522, - "narHash": "sha256-i/kKj69yeij/aUP3RpIL1opN5tUiy6C1vehSSLYHbgw=", + "lastModified": 1713420371, + "narHash": "sha256-zcWBgDM409n6rmb06FqVXbC+HU9HJN0+ADoTJDWHvbA=", "owner": "glepnir", "repo": "dashboard-nvim", - "rev": "681300934baf36f6184ca41f0b26aed22056d4ee", + "rev": "6d06924b562de6f0bb136edf1bf549afbf6b7d00", "type": "github" }, "original": { @@ -2301,11 +2318,11 @@ "plugin-elixir-ls": { "flake": false, "locked": { - "lastModified": 1711286188, - "narHash": "sha256-OIB5f+FBOPsTWKGWyoU+/NQDMsJXBdj1v7UclbTP5ZY=", + "lastModified": 1713724318, + "narHash": "sha256-1kLMxznNRRJ7M10zkuWexA/sPFaN449M0SKUjLrnc8c=", "owner": "elixir-lsp", "repo": "elixir-ls", - "rev": "3e71900e0d0891f9f95e35d9a52b16c6a773a259", + "rev": "8486de473a219dcdb72408702f8d56d0227c7366", "type": "github" }, "original": { @@ -2317,11 +2334,11 @@ "plugin-elixir-tools": { "flake": false, "locked": { - "lastModified": 1710172806, - "narHash": "sha256-pVDeS9oCFzA9t9J/JfYG/RfdMoSmaaERd5nUgL9KHyM=", + "lastModified": 1713617654, + "narHash": "sha256-pJgtW51FLs+Yr+tlQckRmGkRnSUQNI3fEROn3D51mMs=", "owner": "elixir-tools", "repo": "elixir-tools.nvim", - "rev": "4d003f4b41ab9b4f8b569104fa7818f048ed4e25", + "rev": "3c4f8344a341818417b3d75c04eb96d894cb4640", "type": "github" }, "original": { @@ -2349,11 +2366,11 @@ "plugin-flutter-tools": { "flake": false, "locked": { - "lastModified": 1711622317, - "narHash": "sha256-TQRz2MHg6qnzZGUDVFUoaZJiTBwQ3Hjqvc8AAeVS93Y=", + "lastModified": 1713525182, + "narHash": "sha256-krcaaDPJsftkrcEov1QdKQUQBH6+PgjNwFamWpmNFkU=", "owner": "akinsho", "repo": "flutter-tools.nvim", - "rev": "4f18033c3b78aa5450e538d81dfbbb3e67aeadec", + "rev": "f04131d6b2c82c2a7624a8843642d6269b50b437", "type": "github" }, "original": { @@ -2365,11 +2382,11 @@ "plugin-gesture-nvim": { "flake": false, "locked": { - "lastModified": 1704802204, - "narHash": "sha256-vAky7yvPw2ZmS0i268eKCpUp75bylNGA+ckvhuWVKgc=", + "lastModified": 1713827672, + "narHash": "sha256-YsE4mqM5hBsv4uaCYEpqcA6ZhVKgWWQ4/oHVVdX+vnA=", "owner": "notomo", "repo": "gesture.nvim", - "rev": "5124a05debd62326cc899a35a09862a675d7f3da", + "rev": "547f9b50b87e2ec40e72465fc2f975bb6b6232ff", "type": "github" }, "original": { @@ -2381,11 +2398,11 @@ "plugin-gitsigns-nvim": { "flake": false, "locked": { - "lastModified": 1712937200, - "narHash": "sha256-8pAy6mICiXpUO36ctWXbmRVB7cDSSDIArh9Nq59az9I=", + "lastModified": 1713620636, + "narHash": "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2", + "rev": "035da036e68e509ed158414416c827d022d914bd", "type": "github" }, "original": { @@ -2429,11 +2446,11 @@ "plugin-highlight-undo": { "flake": false, "locked": { - "lastModified": 1695227852, - "narHash": "sha256-I1AwVYqpJNA3K1AwGy/VgPnbrYvX19qfI9bQFZNu1SU=", + "lastModified": 1713721901, + "narHash": "sha256-5zYUpfSR56gCufR+Y18qo8ZpMRg8N3ejkRZNJswJ4wQ=", "owner": "tzachar", "repo": "highlight-undo.nvim", - "rev": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1", + "rev": "a0dbc6afa19b438ca5a6f54bc7f1a10399f21a15", "type": "github" }, "original": { @@ -2477,11 +2494,11 @@ "plugin-image-nvim": { "flake": false, "locked": { - "lastModified": 1712327429, - "narHash": "sha256-usDtW+WnaeTdxx1ALCiZu/gnx2so7QneOjWoEXiChoQ=", + "lastModified": 1713467683, + "narHash": "sha256-qSGtiBl94RJMffoxXEV74fNcmrYcKtfPc3Aw65tzuDM=", "owner": "3rd", "repo": "image.nvim", - "rev": "9be5ede323756d7ee2bbef2bc157767b3972cce6", + "rev": "301de7919b2c0378cb7a782663f67abbcb198b17", "type": "github" }, "original": { @@ -2669,11 +2686,11 @@ "plugin-neocord": { "flake": false, "locked": { - "lastModified": 1713035039, - "narHash": "sha256-XAHKXxueUeUMdlAMiVTWyDLkICcKvCU7JJnjGL8exPs=", + "lastModified": 1713646638, + "narHash": "sha256-lcARsc0JxnzYbucRP0pY/bRMsSfm4P4Cpc5A6EoY3Lc=", "owner": "IogaMaster", "repo": "neocord", - "rev": "878866dc7882b34c750fcb6ceee9e347cb244567", + "rev": "014e78cff9f1fc7b3b46ec67fdca68a91a9b7c65", "type": "github" }, "original": { @@ -2766,11 +2783,11 @@ "plugin-nvim-bufferline-lua": { "flake": false, "locked": { - "lastModified": 1709805539, - "narHash": "sha256-drvgwupiyRAoShL2enXEYUumkYJnG+QtIkBIVqVZK+U=", + "lastModified": 1713769392, + "narHash": "sha256-bHlmaNXfZTlTm/8v48FwCde9ljZFLv25efYF5355bnw=", "owner": "akinsho", "repo": "nvim-bufferline.lua", - "rev": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef", + "rev": "73540cb95f8d95aa1af3ed57713c6720c78af915", "type": "github" }, "original": { @@ -2782,11 +2799,11 @@ "plugin-nvim-cmp": { "flake": false, "locked": { - "lastModified": 1712041554, - "narHash": "sha256-DBxQTmwuEGj2g7LP7d1PJk/SyO0iJq2CIIHsFh0QJ4I=", + "lastModified": 1713837627, + "narHash": "sha256-rz+JMd/hsUEDNVan2sCuEGtbsOVi6oRmPtps+7qSXQE=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "ce16de5665c766f39c271705b17fff06f7bcb84f", + "rev": "8f3c541407e691af6163e2447f3af1bd6e17f9a3", "type": "github" }, "original": { @@ -2846,11 +2863,11 @@ "plugin-nvim-dap": { "flake": false, "locked": { - "lastModified": 1711382674, - "narHash": "sha256-HoLnYeA18TpHM1SJ3NOY53ZAyBo2y2EoUbAIr7TqtQI=", + "lastModified": 1713432622, + "narHash": "sha256-kEn2INrNMQSLHY3gpSVV+cTx9f1nFeUCM6by9WGn5Sg=", "owner": "mfussenegger", "repo": "nvim-dap", - "rev": "405df1dcc2e395ab5173a9c3d00e03942c023074", + "rev": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb", "type": "github" }, "original": { @@ -2910,11 +2927,11 @@ "plugin-nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1713075103, - "narHash": "sha256-3GS1udfgzbghho1xtwZ5N1MZgWXWrJnW36Gnl/SAzIQ=", + "lastModified": 1713863504, + "narHash": "sha256-q82z4V3718/XvrCB9zRL5VwMFgkt3KS5olICSV0UUHo=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "76b1bbaecbe7215498983356d50a16b46c20d6b0", + "rev": "ee3d635692451bc3ef0e5d4b30ea2fbfdeefc373", "type": "github" }, "original": { @@ -3038,11 +3055,11 @@ "plugin-nvim-tree-lua": { "flake": false, "locked": { - "lastModified": 1712366921, - "narHash": "sha256-6pbOeklf+otsJIjt9IUyUfuTAedShnwERYq1IfhyrJs=", + "lastModified": 1713668329, + "narHash": "sha256-QEvHQcEAGkm5UKVLc1DYvEqs5/JFNrkEFKHFZpe5ZDE=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "81eb8d519233c105f30dc0a278607e62b20502fd", + "rev": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa", "type": "github" }, "original": { @@ -3054,11 +3071,11 @@ "plugin-nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1713029046, - "narHash": "sha256-9r8UjGPAbLFHR3eYReLOR7SmBI+H6l6BeUrzaocq3YU=", + "lastModified": 1713520917, + "narHash": "sha256-AT49dDlwPaV41O+rcUCzzdra8moIg4iDAIhZJb6j0zE=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "ba05c6b753130d96b284d3e8ba8f54c28c0fb6d1", + "rev": "ba4289ad345ececd335a9cdd7b9616fd0bb6be92", "type": "github" }, "original": { @@ -3086,11 +3103,11 @@ "plugin-nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1712684166, - "narHash": "sha256-v+dhVbAN2OKLdS5YbSLmZsLijO4meSUBG26R+Ivm/BM=", + "lastModified": 1713675782, + "narHash": "sha256-AW2W6H7OTv52hfZCcYQc5UjFArBWKLeVclrwMt13HOM=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "6e355632387a085f15a66ad68cf681c1d7374a04", + "rev": "beb6367ab8496c9e43f22e0252735fdadae1872d", "type": "github" }, "original": { @@ -3102,11 +3119,11 @@ "plugin-obsidian-nvim": { "flake": false, "locked": { - "lastModified": 1712778222, - "narHash": "sha256-jjsDXGdFMgdalgkw8HSY3+EfiTkYotsNA6txk1/09VY=", + "lastModified": 1713538455, + "narHash": "sha256-nIAaQa0DBYBQyfTEJi3Lzqs7QJqyw0Cemq6Hm704K60=", "owner": "epwalsh", "repo": "obsidian.nvim", - "rev": "1265a1fbfca5979f629ecedb2552f743c70f458f", + "rev": "ec0f44e1921d2701bd99a542031d280f1e3930b5", "type": "github" }, "original": { @@ -3134,11 +3151,11 @@ "plugin-orgmode-nvim": { "flake": false, "locked": { - "lastModified": 1712982802, - "narHash": "sha256-zfw3eHBnJPPhsNr8aG8kn3pAchxklvk5aiFm2rys7PQ=", + "lastModified": 1713539113, + "narHash": "sha256-0Ayu2kVpnsxu/ER0nx+t7nyU9oNN8URLrGQtAKKb7Ls=", "owner": "nvim-orgmode", "repo": "orgmode", - "rev": "5875037fa9c7c8e0abf29cd69510150355d248a0", + "rev": "389e91f6f935aa845bc0cd13dd80f75431c34751", "type": "github" }, "original": { @@ -3150,16 +3167,15 @@ "plugin-oxocarbon": { "flake": false, "locked": { - "lastModified": 1687168305, - "narHash": "sha256-2o++5aRDULfI35d+7psa6bk0eSXH2HwfuGjGtYGjR4w=", - "owner": "glyh", + "lastModified": 1701119822, + "narHash": "sha256-++JALLPklok9VY2ChOddTYDvDNVadmCeB98jCAJYCZ0=", + "owner": "nyoom-engineering", "repo": "oxocarbon.nvim", - "rev": "7591d2e18df05374d612acba2b2573c7ff44dce4", + "rev": "c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2", "type": "github" }, "original": { - "owner": "glyh", - "ref": "lualine-support", + "owner": "nyoom-engineering", "repo": "oxocarbon.nvim", "type": "github" } @@ -3167,11 +3183,11 @@ "plugin-plenary-nvim": { "flake": false, "locked": { - "lastModified": 1711369325, - "narHash": "sha256-wM/FuK24NPEyaWntwT+mi2SuPExC/abXDK9c2WvgUBk=", + "lastModified": 1713788468, + "narHash": "sha256-orGs1npIGIk7MUYadatYrcEXygK7JTj6OqQwy2TLDn0=", "owner": "nvim-lua", "repo": "plenary.nvim", - "rev": "8aad4396840be7fc42896e3011751b7609ca4119", + "rev": "5129a3693c482fcbc5ab99a7706ffc4360b995a0", "type": "github" }, "original": { @@ -3215,11 +3231,11 @@ "plugin-rose-pine": { "flake": false, "locked": { - "lastModified": 1712685632, - "narHash": "sha256-A9C5BJiOdT/F6JzWxJw/La77nxCoX3/bND15DM9st6k=", + "lastModified": 1713451685, + "narHash": "sha256-AdPSz5+nCOnLWexBasHuxRxEKbL4WVg+uV78//W5nLs=", "owner": "rose-pine", "repo": "neovim", - "rev": "9cd7d8aad3606a95d733a45d16275eb7a5a836a3", + "rev": "17b466e79479758b332a3cac12544a3ad2be6241", "type": "github" }, "original": { @@ -3311,11 +3327,11 @@ "plugin-telescope": { "flake": false, "locked": { - "lastModified": 1713022073, - "narHash": "sha256-ZktFx77Ukuk1/Qhmf1wUEe0+wODM7f2H+PlXsDDTjcA=", + "lastModified": 1713665692, + "narHash": "sha256-wlRiwT1TCtwPXnIwnzqa6ZABUzJYn+lSRyvkqe6Dbsw=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb", + "rev": "7d1698f3d88b448e0639974248cc17f49b7b8acf", "type": "github" }, "original": { @@ -3343,11 +3359,11 @@ "plugin-toggleterm-nvim": { "flake": false, "locked": { - "lastModified": 1707733615, - "narHash": "sha256-FJyDxQm2vs9R4WkqAbh6ryCvEABfrLSKRrAGo/qI5jM=", + "lastModified": 1713792255, + "narHash": "sha256-mM5bGgAemsRJD9U6U5K6ia5qb8NaTusM99x6xrtEBfw=", "owner": "akinsho", "repo": "toggleterm.nvim", - "rev": "193786e0371e3286d3bc9aa0079da1cd41beaa62", + "rev": "066cccf48a43553a80a210eb3be89a15d789d6e6", "type": "github" }, "original": { @@ -3359,11 +3375,11 @@ "plugin-tokyonight": { "flake": false, "locked": { - "lastModified": 1711665767, - "narHash": "sha256-ItCmSUMMTe8iQeneIJLuWedVXsNgm+FXNtdrrdJ/1oE=", + "lastModified": 1713855116, + "narHash": "sha256-vUEPbgDen3ubcyJZdWCgnChOo1T0LFvZI++8RgGGx1Y=", "owner": "folke", "repo": "tokyonight.nvim", - "rev": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5", + "rev": "67afeaf7fd6ebba000633e89f63c31694057edde", "type": "github" }, "original": { @@ -3423,11 +3439,11 @@ "plugin-vim-illuminate": { "flake": false, "locked": { - "lastModified": 1707016059, - "narHash": "sha256-KNIu4cNyZddZSRS8KZ0U0T8uSSLJu8iqNLQN8e+Bv94=", + "lastModified": 1713467568, + "narHash": "sha256-o0D1edrsHkaljrzBFZXjdxiK/5ziCGJxM/kYNJgBI1E=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "305bf07b919ac526deb5193280379e2f8b599926", + "rev": "e522e0dd742a83506db0a72e1ced68c9c130f185", "type": "github" }, "original": { @@ -4180,11 +4196,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1713070736, - "narHash": "sha256-FatD7AHSoZGfn2JCOkDt9v04YkJG3PLfC7U7pU6r+bM=", + "lastModified": 1713745451, + "narHash": "sha256-j5/bimg/wI14yTDUXZcSQRosV1LIOYuxYkZjvVJC/yg=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "1c04fe593ef5124fd84e3d8726d481cba8b527b8", + "rev": "2c86c36e7fe65faac08bdf85d041cf7b798f8ee8", "type": "github" }, "original": { diff --git a/modules/tui/neovim.nix b/modules/tui/neovim.nix index eb9d388..aa36090 100644 --- a/modules/tui/neovim.nix +++ b/modules/tui/neovim.nix @@ -32,6 +32,9 @@ in { cmdHeight = 1; useSystemClipboard = false; + # a fix for the weird treesitter thingy + syntaxHighlighting = false; + theme = { enable = true; name = "catppuccin";