From 1e74ff1f141b0d75e4afc35dc3b10add83f44fb2 Mon Sep 17 00:00:00 2001 From: traxys Date: Wed, 2 Feb 2022 22:57:39 +0100 Subject: [PATCH] switch to neovim flake --- flake.lock | 1137 +++++++++++++++++------------------ flake.nix | 270 +-------- flake.nix.in | 77 --- home.nix | 19 +- nvim/.gitignore | 1 - nvim/init.lua | 98 --- nvim/lua/completion.lua | 27 - nvim/lua/lsp.lua | 104 ---- nvim/lua/statusline.lua | 288 --------- nvim/lua/tree_sitter.lua | 43 -- nvim/spell/fr.utf-8.add | 9 - nvim/spell/fr.utf-8.add.spl | Bin 167 -> 0 bytes plugins.py | 58 -- 13 files changed, 554 insertions(+), 1577 deletions(-) delete mode 100644 flake.nix.in delete mode 100644 nvim/.gitignore delete mode 100644 nvim/init.lua delete mode 100644 nvim/lua/completion.lua delete mode 100644 nvim/lua/lsp.lua delete mode 100644 nvim/lua/statusline.lua delete mode 100644 nvim/lua/tree_sitter.lua delete mode 100644 nvim/spell/fr.utf-8.add delete mode 100644 nvim/spell/fr.utf-8.add.spl delete mode 100644 plugins.py diff --git a/flake.lock b/flake.lock index ccf44b8..eba18d1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,85 +1,5 @@ { "nodes": { - "cmp-buffer": { - "flake": false, - "locked": { - "lastModified": 1641254550, - "narHash": "sha256-LXNckOkSqRMFWJhBaPUm8el0SgTS2XPvg3N8CEwHLHw=", - "owner": "hrsh7th", - "repo": "cmp-buffer", - "rev": "f83773e2f433a923997c5faad7ea689ec24d1785", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-buffer", - "type": "github" - } - }, - "cmp-calc": { - "flake": false, - "locked": { - "lastModified": 1633934766, - "narHash": "sha256-XirmcUUsW+zzMh02X+sJW7ZAFkY1WesSI1eL9Yl1CC0=", - "owner": "hrsh7th", - "repo": "cmp-calc", - "rev": "eb7bd1d7382ac26d8eb7346e36405c0ae94333a2", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-calc", - "type": "github" - } - }, - "cmp-latex-symbols": { - "flake": false, - "locked": { - "lastModified": 1631255143, - "narHash": "sha256-9KHNmb0yt/AmUOf1etbj7rkDXTYYj1S89K8ycD3gEp8=", - "owner": "kdheepak", - "repo": "cmp-latex-symbols", - "rev": "29dc9e53d17cd1f26605888f85500c8ba79cebff", - "type": "github" - }, - "original": { - "owner": "kdheepak", - "repo": "cmp-latex-symbols", - "type": "github" - } - }, - "cmp-nvim-lsp": { - "flake": false, - "locked": { - "lastModified": 1642242623, - "narHash": "sha256-itlKrCBo8wMNBCknW+7INOyVmwbcwmkGLzpc2lvvqk4=", - "owner": "hrsh7th", - "repo": "cmp-nvim-lsp", - "rev": "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-nvim-lsp", - "type": "github" - } - }, - "cmp-path": { - "flake": false, - "locked": { - "lastModified": 1642430705, - "narHash": "sha256-qKPYOW+Nid3CdFJfeU1JVb9zaDZAk2F/WQ4ddjNDRnk=", - "owner": "hrsh7th", - "repo": "cmp-path", - "rev": "c5230cb439df9547294678d0f1c1465ad7989e5f", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-path", - "type": "github" - } - }, "dotacat": { "flake": false, "locked": { @@ -96,22 +16,6 @@ "url": "https://gitlab.scd31.com/stephen/dotacat.git" } }, - "editorconfig-vim": { - "flake": false, - "locked": { - "lastModified": 1627199038, - "narHash": "sha256-HFHrm+V296IJh27yJW76DD09ehYc8hMxnnvR9+ddP2M=", - "owner": "editorconfig", - "repo": "editorconfig-vim", - "rev": "3078cd10b28904e57d878c0d0dab42aa0a9fdc89", - "type": "github" - }, - "original": { - "owner": "editorconfig", - "repo": "editorconfig-vim", - "type": "github" - } - }, "fast-syntax-highlighting": { "flake": false, "locked": { @@ -128,22 +32,6 @@ "type": "github" } }, - "filetype.nvim": { - "flake": false, - "locked": { - "lastModified": 1641177332, - "narHash": "sha256-n/UVrkRKi25i2JnkxJBkBRIPO+m0QumQYTeouGBvI9k=", - "owner": "nathom", - "repo": "filetype.nvim", - "rev": "ada8dcf39de20b30e9c8e0100148e56696704716", - "type": "github" - }, - "original": { - "owner": "nathom", - "repo": "filetype.nvim", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -161,6 +49,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1629481132, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -175,48 +78,18 @@ "type": "github" } }, - "galaxyline.nvim": { - "flake": false, - "locked": { - "lastModified": 1641367564, - "narHash": "sha256-wXZWaZSuQxku08eh9VAdiW9smOvf2JCTHNVzf11gZpk=", - "owner": "NTBBloodbath", - "repo": "galaxyline.nvim", - "rev": "1b1552bdda5daf67d6026746e561510221c6e2c8", - "type": "github" - }, - "original": { - "owner": "NTBBloodbath", - "repo": "galaxyline.nvim", - "type": "github" - } - }, - "gitsigns.nvim": { - "flake": false, - "locked": { - "lastModified": 1642235414, - "narHash": "sha256-/vdH8rdEvCY5xj2ZwjNZsX1oWXq1Xuqu0B96mjjGsNU=", - "owner": "lewis6991", - "repo": "gitsigns.nvim", - "rev": "f4648dcc055a10573f36e83343592824155ab466", - "type": "github" - }, - "original": { - "owner": "lewis6991", - "repo": "gitsigns.nvim", - "type": "github" - } - }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1642463065, - "narHash": "sha256-Db53xzDOouhsDAQ/QCvLeM0r7p+my5Zb5jgWGpCrOVo=", + "lastModified": 1643837728, + "narHash": "sha256-iW/5eMRQmzdctv2dAUlIaZnVWwcmaznNajS+ft1MXHg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c491331718bd41722a2982a5532eb0ff51c3ca28", + "rev": "9d369c75ce2fdeb296ad42bcdc8c1a523c494550", "type": "github" }, "original": { @@ -225,105 +98,11 @@ "type": "github" } }, - "indentLine": { - "flake": false, - "locked": { - "lastModified": 1611828926, - "narHash": "sha256-GFbBINmfzPoUHKKfJoTk8MDqG5p3YjUrZJOZWjLZQ9s=", - "owner": "Yggdroot", - "repo": "indentLine", - "rev": "5617a1cf7d315e6e6f84d825c85e3b669d220bfa", - "type": "github" - }, - "original": { - "owner": "Yggdroot", - "repo": "indentLine", - "type": "github" - } - }, - "kommentary": { - "flake": false, - "locked": { - "lastModified": 1642341178, - "narHash": "sha256-qr1ks04XO0aEN+6KrjdIKb8nwxpboi+hZjkvGBPzYZo=", - "owner": "b3nj5m1n", - "repo": "kommentary", - "rev": "91c8819ea264b77d63b96b16ed0cf90c4b97f87a", - "type": "github" - }, - "original": { - "owner": "b3nj5m1n", - "repo": "kommentary", - "type": "github" - } - }, - "lsp-status.nvim": { - "flake": false, - "locked": { - "lastModified": 1638992828, - "narHash": "sha256-5K7AtqAAiuma1bHba2ijbfHKWr9r7Dxd8BfGU2zxLKo=", - "owner": "nvim-lua", - "repo": "lsp-status.nvim", - "rev": "4073f766f1303fb602802075e558fe43e382cc92", - "type": "github" - }, - "original": { - "owner": "nvim-lua", - "repo": "lsp-status.nvim", - "type": "github" - } - }, - "lsp_extensions.nvim": { - "flake": false, - "locked": { - "lastModified": 1631389468, - "narHash": "sha256-xCxagAyscEgVYOfd1gTd3PDG8TOcztxpqFVZwX5T/Vs=", - "owner": "nvim-lua", - "repo": "lsp_extensions.nvim", - "rev": "4011f4aec61ba59c734f5dbf52e91f258b99d985", - "type": "github" - }, - "original": { - "owner": "nvim-lua", - "repo": "lsp_extensions.nvim", - "type": "github" - } - }, - "lsp_signature.nvim": { - "flake": false, - "locked": { - "lastModified": 1642127637, - "narHash": "sha256-C5gm4srB1BmLR4kyHxY8dxe5bC9fqGHWNF5kVgDeVQE=", - "owner": "ray-x", - "repo": "lsp_signature.nvim", - "rev": "68de04e557acdce7cf0a77defbef7ca9f0c6a457", - "type": "github" - }, - "original": { - "owner": "ray-x", - "repo": "lsp_signature.nvim", - "type": "github" - } - }, - "lspkind-nvim": { - "flake": false, - "locked": { - "lastModified": 1640888751, - "narHash": "sha256-oAA4Q4FC+7fbBw8CwGrqP05PD+q5035vurYzMQLk03I=", - "owner": "onsails", - "repo": "lspkind-nvim", - "rev": "f0d1552890e384f15b47ea88bd1b8a077cddc24a", - "type": "github" - }, - "original": { - "owner": "onsails", - "repo": "lspkind-nvim", - "type": "github" - } - }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1639947939, @@ -341,7 +120,10 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "rnix-lsp", + "nixpkgs" + ] }, "locked": { "lastModified": 1639947939, @@ -359,16 +141,20 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nvim-traxys", + "neovim-overlay", + "nixpkgs" + ] }, "locked": { "dir": "contrib", - "lastModified": 1642453919, - "narHash": "sha256-wGf/RCpNv/PGEx6wHWgyCP0FkG5kaVvWvId7uiKcay4=", + "lastModified": 1643767869, + "narHash": "sha256-Oyno3HHIKfOdb6Ij6lRxOBp0urPhXBskh/I5l5O5GSM=", "owner": "neovim", "repo": "neovim", - "rev": "fcf5dd34fdfde3a6632b96a88f66c1053cba08d1", + "rev": "2559359035b7b0dd6f94fef9573e8133176c1553", "type": "github" }, "original": { @@ -378,18 +164,18 @@ "type": "github" } }, - "neovim-nightly-overlay": { + "neovim-overlay": { "inputs": { "flake-compat": "flake-compat", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1642493727, - "narHash": "sha256-SSBCODHjzbwvndSim2VSegufAfk7L4IMB1Cq+xnf0K0=", + "lastModified": 1643789594, + "narHash": "sha256-mxEkC78afrg1KtRhlpdJ5mPLRFFCC+1LcSGpwUYgEBA=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "ecca7657b37c9d394507844d1584ed3478e17a88", + "rev": "d60554a6e96d9ba2da46cd91a4e67c06912f8da4", "type": "github" }, "original": { @@ -416,26 +202,28 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642160200, - "narHash": "sha256-5mb1nvh2vWlnKvyJzGNKsL7AQRFk+H5E/Xh83fTzYG4=", - "owner": "NixOS", + "lastModified": 1643524588, + "narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "e5a50e8f2995ff359a170d52cc40adbcfdd92ba4", + "rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-mozilla": { "flake": false, "locked": { - "lastModified": 1638887313, - "narHash": "sha256-FMYV6rVtvSIfthgC1sK1xugh3y7muoQcvduMdriz4ag=", + "lastModified": 1643634764, + "narHash": "sha256-EcFlgzZnZSHwZixELYV1pa267t+u5mCeLhSNBeAA/+c=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "7c1e8b1dd6ed0043fb4ee0b12b815256b0b9de6f", + "rev": "f233fdc4ff6ba2ffeb1e3e3cd6d63bb1297d6996", "type": "github" }, "original": { @@ -446,25 +234,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1642160200, - "narHash": "sha256-5mb1nvh2vWlnKvyJzGNKsL7AQRFk+H5E/Xh83fTzYG4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e5a50e8f2995ff359a170d52cc40adbcfdd92ba4", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1642281915, - "narHash": "sha256-jcMsXmmO1knyf99o242A+2cy1A0eKa9afly0cwBknPA=", + "lastModified": 1643524588, + "narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d5dae6569ea9952f1ae4e727946d93a71c507821", + "rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb", "type": "github" }, "original": { @@ -474,409 +248,253 @@ "type": "github" } }, - "nixpkgs_4": { + "nvim-traxys": { + "inputs": { + "flake-utils": "flake-utils", + "neovim-overlay": "neovim-overlay", + "nixpkgs": [ + "nixpkgs" + ], + "plugin:cmp-source-buffer": "plugin:cmp-source-buffer", + "plugin:cmp-source-calc": "plugin:cmp-source-calc", + "plugin:cmp-source-crates": "plugin:cmp-source-crates", + "plugin:cmp-source-latex_symbols": "plugin:cmp-source-latex_symbols", + "plugin:cmp-source-nvim_lsp": "plugin:cmp-source-nvim_lsp", + "plugin:cmp-source-path": "plugin:cmp-source-path", + "plugin:cmp-source-vsnip": "plugin:cmp-source-vsnip", + "plugin:crates": "plugin:crates", + "plugin:editorconfig": "plugin:editorconfig", + "plugin:filetype-nvim": "plugin:filetype-nvim", + "plugin:galaxyline": "plugin:galaxyline", + "plugin:gitsigns": "plugin:gitsigns", + "plugin:headerguard": "plugin:headerguard", + "plugin:indentLine": "plugin:indentLine", + "plugin:kommentary": "plugin:kommentary", + "plugin:lsp-status": "plugin:lsp-status", + "plugin:lsp_signature": "plugin:lsp_signature", + "plugin:lspkind": "plugin:lspkind", + "plugin:null-ls": "plugin:null-ls", + "plugin:nvim-cmp": "plugin:nvim-cmp", + "plugin:nvim-lightbulb": "plugin:nvim-lightbulb", + "plugin:nvim-lspconfig": "plugin:nvim-lspconfig", + "plugin:nvim-tree-lua": "plugin:nvim-tree-lua", + "plugin:nvim-treesitter": "plugin:nvim-treesitter", + "plugin:nvim-treesitter-refactor": "plugin:nvim-treesitter-refactor", + "plugin:nvim-web-devicons": "plugin:nvim-web-devicons", + "plugin:plantuml-syntax": "plugin:plantuml-syntax", + "plugin:plenary": "plugin:plenary", + "plugin:telescope": "plugin:telescope", + "plugin:vim-matchup": "plugin:vim-matchup", + "plugin:vim-moonfly-colors": "plugin:vim-moonfly-colors", + "plugin:vim-vsnip": "plugin:vim-vsnip" + }, "locked": { - "lastModified": 1642104392, - "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", + "lastModified": 1643838764, + "narHash": "sha256-Oa/5irPbFLMbav4YX/sq/8B5MSau3tjEhI3Y89EtA4M=", + "owner": "traxys", + "repo": "nvim-flake", + "rev": "f0c23033a936dcfb6cece1388f74073858c3a489", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "traxys", + "repo": "nvim-flake", "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1642281915, - "narHash": "sha256-jcMsXmmO1knyf99o242A+2cy1A0eKa9afly0cwBknPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d5dae6569ea9952f1ae4e727946d93a71c507821", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1642160200, - "narHash": "sha256-5mb1nvh2vWlnKvyJzGNKsL7AQRFk+H5E/Xh83fTzYG4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e5a50e8f2995ff359a170d52cc40adbcfdd92ba4", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1630481079, - "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-21.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "null-ls.nvim": { + "plugin:cmp-source-buffer": { "flake": false, "locked": { - "lastModified": 1642520956, - "narHash": "sha256-Q+fKq+8OZiPY/b7IwK8XtL4/SanewwnQA/R3sh1Jshw=", - "owner": "jose-elias-alvarez", - "repo": "null-ls.nvim", - "rev": "f9b31c07a2abe97860cd58a06127f7d4e8ee6582", - "type": "github" - }, - "original": { - "owner": "jose-elias-alvarez", - "repo": "null-ls.nvim", - "type": "github" - } - }, - "nvim-cmp": { - "flake": false, - "locked": { - "lastModified": 1642501971, - "narHash": "sha256-9mciDe0JnNAEBiWrADHPblrgxVXB5L7LhcXbpbXAXvw=", + "lastModified": 1641254550, + "narHash": "sha256-LXNckOkSqRMFWJhBaPUm8el0SgTS2XPvg3N8CEwHLHw=", "owner": "hrsh7th", - "repo": "nvim-cmp", - "rev": "8fc8d31cf451b8becb39087aa2190bee29a8b009", + "repo": "cmp-buffer", + "rev": "f83773e2f433a923997c5faad7ea689ec24d1785", "type": "github" }, "original": { "owner": "hrsh7th", - "repo": "nvim-cmp", + "repo": "cmp-buffer", "type": "github" } }, - "nvim-lightbulb": { + "plugin:cmp-source-calc": { "flake": false, "locked": { - "lastModified": 1636766265, - "narHash": "sha256-vxxYKJzX8hsky32Z+Tr3qYYCS0+3TDiQIg2U8/4U2qo=", - "owner": "kosayoda", - "repo": "nvim-lightbulb", - "rev": "cd5267d2d708e908dbd668c7de74e1325eb1e1da", + "lastModified": 1633934766, + "narHash": "sha256-XirmcUUsW+zzMh02X+sJW7ZAFkY1WesSI1eL9Yl1CC0=", + "owner": "hrsh7th", + "repo": "cmp-calc", + "rev": "eb7bd1d7382ac26d8eb7346e36405c0ae94333a2", "type": "github" }, "original": { - "owner": "kosayoda", - "repo": "nvim-lightbulb", + "owner": "hrsh7th", + "repo": "cmp-calc", "type": "github" } }, - "nvim-lspconfig": { + "plugin:cmp-source-crates": { "flake": false, "locked": { - "lastModified": 1642529117, - "narHash": "sha256-a7T/BcWcd2oeFr/TxtJTI45fbRzErNWg2hrn/+CC538=", - "owner": "neovim", - "repo": "nvim-lspconfig", - "rev": "37edd90592ef0e4b603634e449ce28b053d9bdd0", + "lastModified": 1642550634, + "narHash": "sha256-xq0EPyakZrd1NVD5c9Bwg4g0PDJuv389mRE5sZ+y9es=", + "owner": "saecki", + "repo": "crates.nvim", + "rev": "edf3b7aafa334d72b80d502dcca55b36a5b5ba79", "type": "github" }, "original": { - "owner": "neovim", - "repo": "nvim-lspconfig", + "owner": "saecki", + "repo": "crates.nvim", "type": "github" } }, - "nvim-tree.lua": { + "plugin:cmp-source-latex_symbols": { "flake": false, "locked": { - "lastModified": 1640353820, - "narHash": "sha256-gKKjupu0Myz2Sgh/7SBJPi7tk+yn11+fJDbSPlWzfWs=", - "owner": "kyazdani42", - "repo": "nvim-tree.lua", - "rev": "0a2f6b0b6ba558a88c77a6b262af647760e6eca8", + "lastModified": 1631255143, + "narHash": "sha256-9KHNmb0yt/AmUOf1etbj7rkDXTYYj1S89K8ycD3gEp8=", + "owner": "kdheepak", + "repo": "cmp-latex-symbols", + "rev": "29dc9e53d17cd1f26605888f85500c8ba79cebff", "type": "github" }, "original": { - "owner": "kyazdani42", - "repo": "nvim-tree.lua", + "owner": "kdheepak", + "repo": "cmp-latex-symbols", "type": "github" } }, - "nvim-treesitter": { + "plugin:cmp-source-nvim_lsp": { "flake": false, "locked": { - "lastModified": 1642496990, - "narHash": "sha256-EuXsQRKVagdWn8A4blfsVkGIkSagiv2i9T2hfAJn7YU=", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter", - "rev": "8b1d3906199e1572c2201e494bba017d823c0c8f", + "lastModified": 1642242623, + "narHash": "sha256-itlKrCBo8wMNBCknW+7INOyVmwbcwmkGLzpc2lvvqk4=", + "owner": "hrsh7th", + "repo": "cmp-nvim-lsp", + "rev": "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba", "type": "github" }, "original": { - "owner": "nvim-treesitter", - "repo": "nvim-treesitter", + "owner": "hrsh7th", + "repo": "cmp-nvim-lsp", "type": "github" } }, - "nvim-web-devicons": { + "plugin:cmp-source-path": { "flake": false, "locked": { - "lastModified": 1642530817, - "narHash": "sha256-3zigwYJrw3gocsF2WqHMBS4cFkTyj78StiSP3o9S0N0=", - "owner": "kyazdani42", - "repo": "nvim-web-devicons", - "rev": "634e26818f2bea9161b7efa76735746838971824", + "lastModified": 1643823794, + "narHash": "sha256-xYzTpqVKpBBnajqqRRzAXlHAC13VGK1D9mFr3bntepY=", + "owner": "hrsh7th", + "repo": "cmp-path", + "rev": "466b6b8270f7ba89abd59f402c73f63c7331ff6e", "type": "github" }, "original": { - "owner": "kyazdani42", - "repo": "nvim-web-devicons", + "owner": "hrsh7th", + "repo": "cmp-path", "type": "github" } }, - "plantuml-syntax": { + "plugin:cmp-source-vsnip": { "flake": false, "locked": { - "lastModified": 1640395048, - "narHash": "sha256-syM7gzq9eQO2bm9yqfX5vxfgITSN09lvVQcFAKwKsiQ=", - "owner": "aklt", - "repo": "plantuml-syntax", - "rev": "dbe57599bc340d7726938b624438779fa0ec2929", + "lastModified": 1636543683, + "narHash": "sha256-7K3shsiGK7ISFXj9D9MPK7yRqIxeCrbj1IsggToWHO4=", + "owner": "hrsh7th", + "repo": "cmp-vsnip", + "rev": "0abfa1860f5e095a07c477da940cfcb0d273b700", "type": "github" }, "original": { - "owner": "aklt", - "repo": "plantuml-syntax", + "owner": "hrsh7th", + "repo": "cmp-vsnip", "type": "github" } }, - "plenary.nvim": { + "plugin:crates": { "flake": false, "locked": { - "lastModified": 1641403390, - "narHash": "sha256-mHcBRO9zJGyeSMBYEPUk6nejwhj9Yy5UF4Wq7EyRmsQ=", - "owner": "nvim-lua", - "repo": "plenary.nvim", - "rev": "563d9f6d083f0514548f2ac4ad1888326d0a1c66", + "lastModified": 1642550634, + "narHash": "sha256-xq0EPyakZrd1NVD5c9Bwg4g0PDJuv389mRE5sZ+y9es=", + "owner": "saecki", + "repo": "crates.nvim", + "rev": "edf3b7aafa334d72b80d502dcca55b36a5b5ba79", "type": "github" }, "original": { - "owner": "nvim-lua", - "repo": "plenary.nvim", + "owner": "saecki", + "repo": "crates.nvim", "type": "github" } }, - "popup.nvim": { + "plugin:editorconfig": { "flake": false, "locked": { - "lastModified": 1637254091, - "narHash": "sha256-dNWz/xovUg55fDZUpVs/2kLphk3lqQyvPtc9ATwbeSQ=", - "owner": "nvim-lua", - "repo": "popup.nvim", - "rev": "b7404d35d5d3548a82149238289fa71f7f6de4ac", + "lastModified": 1642820146, + "narHash": "sha256-qFLXqhV+ZVhxoq+QoxWSDUrg8W/+qChJuCd4hSJqy28=", + "owner": "editorconfig", + "repo": "editorconfig-vim", + "rev": "a8e3e66deefb6122f476c27cee505aaae93f7109", "type": "github" }, "original": { - "owner": "nvim-lua", - "repo": "popup.nvim", + "owner": "editorconfig", + "repo": "editorconfig-vim", "type": "github" } }, - "powerlevel10k": { + "plugin:filetype-nvim": { "flake": false, "locked": { - "lastModified": 1642430120, - "narHash": "sha256-OTUc4KyEI8IDauMjuw5YO4w7rNIBe6/UWOf6xaQgflg=", - "owner": "romkatv", - "repo": "powerlevel10k", - "rev": "3d994b033b934b6f5d4e021b6e0b4155bf13542b", + "lastModified": 1642824185, + "narHash": "sha256-dzrJ8ddUnj7zRNLWlSoknXtSB0LT9VUuYnHSsBJpgGQ=", + "owner": "nathom", + "repo": "filetype.nvim", + "rev": "4d2c0d4488a05f9b0d18a7e2004c0182e350bb45", "type": "github" }, "original": { - "owner": "romkatv", - "repo": "powerlevel10k", + "owner": "nathom", + "repo": "filetype.nvim", "type": "github" } }, - "rnix-lsp": { - "inputs": { - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_7", - "utils": "utils" - }, - "locked": { - "lastModified": 1640347520, - "narHash": "sha256-UkieGBW9ap0pQbumYoG60Ed+BpzMRGuLQ6Zb41u7Fkk=", - "owner": "nix-community", - "repo": "rnix-lsp", - "rev": "d7cc2887ac9e65dd01715aac472edbf46b93ed31", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "rnix-lsp", - "type": "github" - } - }, - "root": { - "inputs": { - "cmp-buffer": "cmp-buffer", - "cmp-calc": "cmp-calc", - "cmp-latex-symbols": "cmp-latex-symbols", - "cmp-nvim-lsp": "cmp-nvim-lsp", - "cmp-path": "cmp-path", - "dotacat": "dotacat", - "editorconfig-vim": "editorconfig-vim", - "fast-syntax-highlighting": "fast-syntax-highlighting", - "filetype.nvim": "filetype.nvim", - "galaxyline.nvim": "galaxyline.nvim", - "gitsigns.nvim": "gitsigns.nvim", - "home-manager": "home-manager", - "indentLine": "indentLine", - "kommentary": "kommentary", - "lsp-status.nvim": "lsp-status.nvim", - "lsp_extensions.nvim": "lsp_extensions.nvim", - "lsp_signature.nvim": "lsp_signature.nvim", - "lspkind-nvim": "lspkind-nvim", - "naersk": "naersk", - "neovim-nightly-overlay": "neovim-nightly-overlay", - "nix-zsh-completions": "nix-zsh-completions", - "nixpkgs": "nixpkgs_5", - "nixpkgs-mozilla": "nixpkgs-mozilla", - "null-ls.nvim": "null-ls.nvim", - "nvim-cmp": "nvim-cmp", - "nvim-lightbulb": "nvim-lightbulb", - "nvim-lspconfig": "nvim-lspconfig", - "nvim-tree.lua": "nvim-tree.lua", - "nvim-treesitter": "nvim-treesitter", - "nvim-web-devicons": "nvim-web-devicons", - "plantuml-syntax": "plantuml-syntax", - "plenary.nvim": "plenary.nvim", - "popup.nvim": "popup.nvim", - "powerlevel10k": "powerlevel10k", - "rnix-lsp": "rnix-lsp", - "startuptime.vim": "startuptime.vim", - "stylua": "stylua", - "telescope.nvim": "telescope.nvim", - "vim-Grammalecte": "vim-Grammalecte", - "vim-LanguageTool": "vim-LanguageTool", - "vim-headerguard": "vim-headerguard", - "vim-matchup": "vim-matchup", - "vim-moonfly-colors": "vim-moonfly-colors", - "vim-vsnip": "vim-vsnip", - "zsh-nix-shell": "zsh-nix-shell" - } - }, - "startuptime.vim": { + "plugin:galaxyline": { "flake": false, "locked": { - "lastModified": 1489614997, - "narHash": "sha256-ELshiUyVaIoNJl63/0W7AiyKigPWS1K+WZJVlAC6M0Y=", - "owner": "tweekmonster", - "repo": "startuptime.vim", - "rev": "dfa57f522d6f61793fe5fea65bca7484751b8ca2", + "lastModified": 1642780556, + "narHash": "sha256-85mScXLgGp5SJSIPwVOt0RYTP4esV5SjzDD6dhox83U=", + "owner": "NTBBloodbath", + "repo": "galaxyline.nvim", + "rev": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f", "type": "github" }, "original": { - "owner": "tweekmonster", - "repo": "startuptime.vim", + "owner": "NTBBloodbath", + "repo": "galaxyline.nvim", "type": "github" } }, - "stylua": { + "plugin:gitsigns": { "flake": false, "locked": { - "lastModified": 1642435386, - "narHash": "sha256-Gz/EqhQWjxyHeZC1eV2XOitmYfaA8jvY7btUufR3MUE=", - "owner": "johnnymorganz", - "repo": "stylua", - "rev": "c57c7517d6eca4d2fe807c2e4f36af7fc3f90621", + "lastModified": 1643802670, + "narHash": "sha256-+VLrfoFBvuNFTVmJCUv+A/DvKPiXg6XNeDkIfHH5aP0=", + "owner": "lewis6991", + "repo": "gitsigns.nvim", + "rev": "672482df3e80e4e30587c54d4c5e3a7f729ce039", "type": "github" }, "original": { - "owner": "johnnymorganz", - "repo": "stylua", + "owner": "lewis6991", + "repo": "gitsigns.nvim", "type": "github" } }, - "telescope.nvim": { - "flake": false, - "locked": { - "lastModified": 1642489815, - "narHash": "sha256-0W3nHrNsunTarlLBKeZuH1zVaEyFzu2npStkfouCLIk=", - "owner": "nvim-telescope", - "repo": "telescope.nvim", - "rev": "0011b1148d3975600f5a9f0be8058cdaac4e30d9", - "type": "github" - }, - "original": { - "owner": "nvim-telescope", - "repo": "telescope.nvim", - "type": "github" - } - }, - "utils": { - "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "vim-Grammalecte": { - "flake": false, - "locked": { - "lastModified": 1627412597, - "narHash": "sha256-NtvJVqVc/2Sx8v+u0bFap6hpmZEt2ERYZZv/EEeZJDU=", - "owner": "dpelle", - "repo": "vim-Grammalecte", - "rev": "a0ce51a77e56151f62ddbfd10e7dec46000f2848", - "type": "github" - }, - "original": { - "owner": "dpelle", - "repo": "vim-Grammalecte", - "type": "github" - } - }, - "vim-LanguageTool": { - "flake": false, - "locked": { - "lastModified": 1612807145, - "narHash": "sha256-+dCUjBi5UO70Mjs8wOEM8YOc9NHbrFd4DvIzmgg1hwA=", - "owner": "dpelle", - "repo": "vim-LanguageTool", - "rev": "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a", - "type": "github" - }, - "original": { - "owner": "dpelle", - "repo": "vim-LanguageTool", - "type": "github" - } - }, - "vim-headerguard": { + "plugin:headerguard": { "flake": false, "locked": { "lastModified": 1430175944, @@ -892,14 +510,270 @@ "type": "github" } }, - "vim-matchup": { + "plugin:indentLine": { "flake": false, "locked": { - "lastModified": 1641663154, - "narHash": "sha256-iD3xd3Zuc387FlDyhk6KbL7GFvUW4cFG1TX3GJ9AwRM=", + "lastModified": 1611828926, + "narHash": "sha256-GFbBINmfzPoUHKKfJoTk8MDqG5p3YjUrZJOZWjLZQ9s=", + "owner": "Yggdroot", + "repo": "indentLine", + "rev": "5617a1cf7d315e6e6f84d825c85e3b669d220bfa", + "type": "github" + }, + "original": { + "owner": "Yggdroot", + "repo": "indentLine", + "type": "github" + } + }, + "plugin:kommentary": { + "flake": false, + "locked": { + "lastModified": 1642767507, + "narHash": "sha256-AvN88eie9jm9JJVS0CPqMqUgHSMoeuR+psG+cTb2UFw=", + "owner": "b3nj5m1n", + "repo": "kommentary", + "rev": "a190d052fca4ce74ffddb1c87c87ccf15f9111d5", + "type": "github" + }, + "original": { + "owner": "b3nj5m1n", + "repo": "kommentary", + "type": "github" + } + }, + "plugin:lsp-status": { + "flake": false, + "locked": { + "lastModified": 1638992828, + "narHash": "sha256-5K7AtqAAiuma1bHba2ijbfHKWr9r7Dxd8BfGU2zxLKo=", + "owner": "nvim-lua", + "repo": "lsp-status.nvim", + "rev": "4073f766f1303fb602802075e558fe43e382cc92", + "type": "github" + }, + "original": { + "owner": "nvim-lua", + "repo": "lsp-status.nvim", + "type": "github" + } + }, + "plugin:lsp_signature": { + "flake": false, + "locked": { + "lastModified": 1643517934, + "narHash": "sha256-4BmvDF5oC22VxhnIOsLIwo1Z4HVou70qnB3Hh4rw3+I=", + "owner": "ray-x", + "repo": "lsp_signature.nvim", + "rev": "30c7cf023782f50cfa8f65d0508163d6ebfd2442", + "type": "github" + }, + "original": { + "owner": "ray-x", + "repo": "lsp_signature.nvim", + "type": "github" + } + }, + "plugin:lspkind": { + "flake": false, + "locked": { + "lastModified": 1640888751, + "narHash": "sha256-oAA4Q4FC+7fbBw8CwGrqP05PD+q5035vurYzMQLk03I=", + "owner": "onsails", + "repo": "lspkind-nvim", + "rev": "f0d1552890e384f15b47ea88bd1b8a077cddc24a", + "type": "github" + }, + "original": { + "owner": "onsails", + "repo": "lspkind-nvim", + "type": "github" + } + }, + "plugin:null-ls": { + "flake": false, + "locked": { + "lastModified": 1643829703, + "narHash": "sha256-WTE78hReuJToqo5ndgPuCe1oTGIoPAdggT9RDnGsruw=", + "owner": "jose-elias-alvarez", + "repo": "null-ls.nvim", + "rev": "b8bedca6786e975216c073bbd72eb3e76f78e21b", + "type": "github" + }, + "original": { + "owner": "jose-elias-alvarez", + "repo": "null-ls.nvim", + "type": "github" + } + }, + "plugin:nvim-cmp": { + "flake": false, + "locked": { + "lastModified": 1643797525, + "narHash": "sha256-Vz1Tt7KI/EkDH+3OPb6y2uDUeml0TH5zmd937lv6vYw=", + "owner": "hrsh7th", + "repo": "nvim-cmp", + "rev": "de69c657ebbb2fa1ed918b97f27733b801ee639c", + "type": "github" + }, + "original": { + "owner": "hrsh7th", + "repo": "nvim-cmp", + "type": "github" + } + }, + "plugin:nvim-lightbulb": { + "flake": false, + "locked": { + "lastModified": 1636766265, + "narHash": "sha256-vxxYKJzX8hsky32Z+Tr3qYYCS0+3TDiQIg2U8/4U2qo=", + "owner": "kosayoda", + "repo": "nvim-lightbulb", + "rev": "cd5267d2d708e908dbd668c7de74e1325eb1e1da", + "type": "github" + }, + "original": { + "owner": "kosayoda", + "repo": "nvim-lightbulb", + "type": "github" + } + }, + "plugin:nvim-lspconfig": { + "flake": false, + "locked": { + "lastModified": 1643761925, + "narHash": "sha256-U8F1PADXsAghROFZC9zNFNso7P0oO2YDsktdMDKi7sc=", + "owner": "neovim", + "repo": "nvim-lspconfig", + "rev": "531751ef03d77bf094f1fc07844b6c03ec4862bb", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "nvim-lspconfig", + "type": "github" + } + }, + "plugin:nvim-tree-lua": { + "flake": false, + "locked": { + "lastModified": 1643703429, + "narHash": "sha256-8cFFyXfwyJDbmzaw0o7EYz2JveY7qmyDjuq0Pxy1PHE=", + "owner": "kyazdani42", + "repo": "nvim-tree.lua", + "rev": "99d65afd6ef05cc57f835451126e5c44db03cef1", + "type": "github" + }, + "original": { + "owner": "kyazdani42", + "repo": "nvim-tree.lua", + "type": "github" + } + }, + "plugin:nvim-treesitter": { + "flake": false, + "locked": { + "lastModified": 1643811536, + "narHash": "sha256-AbLilgMrkzUs/fjshFettSmrdISjBF6nqHVngoynaH8=", + "owner": "nvim-treesitter", + "repo": "nvim-treesitter", + "rev": "c9b11ac70c24a3854998c9a92c94759b1d1b52ef", + "type": "github" + }, + "original": { + "owner": "nvim-treesitter", + "repo": "nvim-treesitter", + "type": "github" + } + }, + "plugin:nvim-treesitter-refactor": { + "flake": false, + "locked": { + "lastModified": 1642873518, + "narHash": "sha256-Ff9YWifgRcZzWVAyMcjZW5hnlzGFy7kcPL9LfoqZbqQ=", + "owner": "nvim-treesitter", + "repo": "nvim-treesitter-refactor", + "rev": "0dc8069641226904f9757de786a6ab2273eb73ea", + "type": "github" + }, + "original": { + "owner": "nvim-treesitter", + "repo": "nvim-treesitter-refactor", + "type": "github" + } + }, + "plugin:nvim-web-devicons": { + "flake": false, + "locked": { + "lastModified": 1643703290, + "narHash": "sha256-hJYLJIIs2TqWL/hJzFQmEfLD5Y3UbVKkEVG1F9ckRPU=", + "owner": "kyazdani42", + "repo": "nvim-web-devicons", + "rev": "2f8439282575ce75784fb22d528dec7fd2e31a2e", + "type": "github" + }, + "original": { + "owner": "kyazdani42", + "repo": "nvim-web-devicons", + "type": "github" + } + }, + "plugin:plantuml-syntax": { + "flake": false, + "locked": { + "lastModified": 1643418997, + "narHash": "sha256-iLS/q44fr9rEUcc22XZz1agzInlC4qLhMEVxgkh2XRo=", + "owner": "aklt", + "repo": "plantuml-syntax", + "rev": "32428a7b7bc1f1f4efe54490c212a7bda5dd073c", + "type": "github" + }, + "original": { + "owner": "aklt", + "repo": "plantuml-syntax", + "type": "github" + } + }, + "plugin:plenary": { + "flake": false, + "locked": { + "lastModified": 1643657697, + "narHash": "sha256-kN5EjWPb6rRIJ4G+FBuwEyfIqpuxdaEgRCaGM/fE0fk=", + "owner": "nvim-lua", + "repo": "plenary.nvim", + "rev": "e86dc9b11241ff69ece50c15a5cdd49d20d4c27c", + "type": "github" + }, + "original": { + "owner": "nvim-lua", + "repo": "plenary.nvim", + "type": "github" + } + }, + "plugin:telescope": { + "flake": false, + "locked": { + "lastModified": 1643657693, + "narHash": "sha256-u7p3I9XX2DFpqjDfJm2IELl9ooQDIWZt/SS0mwEPIz4=", + "owner": "nvim-telescope", + "repo": "telescope.nvim", + "rev": "f262e7d56d37625613c5de0df5a933cccacf13c5", + "type": "github" + }, + "original": { + "owner": "nvim-telescope", + "repo": "telescope.nvim", + "type": "github" + } + }, + "plugin:vim-matchup": { + "flake": false, + "locked": { + "lastModified": 1643247497, + "narHash": "sha256-QGJtkRi2+RpApRLXJYPkvs0ypwwmqg87Tw/Mg3e13fw=", "owner": "andymass", "repo": "vim-matchup", - "rev": "0981e4d5e0ad25688362b875269499ce6de36101", + "rev": "07196cfb15070cb8f7f71f8ef4dfbebfc5e83304", "type": "github" }, "original": { @@ -908,14 +782,14 @@ "type": "github" } }, - "vim-moonfly-colors": { + "plugin:vim-moonfly-colors": { "flake": false, "locked": { - "lastModified": 1639034380, - "narHash": "sha256-jOGJoBh7jvs4rv06lau6s5QeikBeFTCV7QNNoc1aEEw=", + "lastModified": 1643524741, + "narHash": "sha256-aoZXQxQWIjDedvwaEwpk6E8wVPiEDcPZdQms5LX1IsM=", "owner": "bluz71", "repo": "vim-moonfly-colors", - "rev": "7d8badd5e1355d7a1f33033249d6a286efcd0d47", + "rev": "09de9b7e41bda1709fa9f897851e9213f9f534de", "type": "github" }, "original": { @@ -924,7 +798,7 @@ "type": "github" } }, - "vim-vsnip": { + "plugin:vim-vsnip": { "flake": false, "locked": { "lastModified": 1641477687, @@ -940,6 +814,91 @@ "type": "github" } }, + "powerlevel10k": { + "flake": false, + "locked": { + "lastModified": 1643744340, + "narHash": "sha256-DLiKH12oqaaVChRqY0Q5oxVjziZdW/PfnRW1fCSCbjo=", + "owner": "romkatv", + "repo": "powerlevel10k", + "rev": "8a676a9157d2b0e00e88d06456ac7317f11c0317", + "type": "github" + }, + "original": { + "owner": "romkatv", + "repo": "powerlevel10k", + "type": "github" + } + }, + "rnix-lsp": { + "inputs": { + "naersk": "naersk_2", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1643586450, + "narHash": "sha256-BRIAc3+zavSlJPYSbov2n1W9/a4Iuh2swFPYRWjCm1g=", + "owner": "nix-community", + "repo": "rnix-lsp", + "rev": "41eb2f3366e3f351bf2563c2a7c46fd17e78dfe0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "rnix-lsp", + "type": "github" + } + }, + "root": { + "inputs": { + "dotacat": "dotacat", + "fast-syntax-highlighting": "fast-syntax-highlighting", + "home-manager": "home-manager", + "naersk": "naersk", + "nix-zsh-completions": "nix-zsh-completions", + "nixpkgs": "nixpkgs", + "nixpkgs-mozilla": "nixpkgs-mozilla", + "nvim-traxys": "nvim-traxys", + "powerlevel10k": "powerlevel10k", + "rnix-lsp": "rnix-lsp", + "stylua": "stylua", + "zsh-nix-shell": "zsh-nix-shell" + } + }, + "stylua": { + "flake": false, + "locked": { + "lastModified": 1643750494, + "narHash": "sha256-LmmOaxB7UNQQUFBYN5wNZYt9xH5wDrBbtB9QOCb3suQ=", + "owner": "johnnymorganz", + "repo": "stylua", + "rev": "16c780c5361479aa76cb52a3295a23f777a22004", + "type": "github" + }, + "original": { + "owner": "johnnymorganz", + "repo": "stylua", + "type": "github" + } + }, + "utils": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "zsh-nix-shell": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index d8d2a3b..a6a9a04 100644 --- a/flake.nix +++ b/flake.nix @@ -36,137 +36,9 @@ url = "github:romkatv/powerlevel10k"; flake = false; }; - "plantuml-syntax" = { - url = "github:aklt/plantuml-syntax"; - flake = false; - }; - "nvim-web-devicons" = { - url = "github:kyazdani42/nvim-web-devicons"; - flake = false; - }; - "nvim-treesitter" = { - url = "github:nvim-treesitter/nvim-treesitter"; - flake = false; - }; - "nvim-lspconfig" = { - url = "github:neovim/nvim-lspconfig"; - flake = false; - }; - "lsp-status.nvim" = { - url = "github:nvim-lua/lsp-status.nvim"; - flake = false; - }; - "nvim-lightbulb" = { - url = "github:kosayoda/nvim-lightbulb"; - flake = false; - }; - "indentLine" = { - url = "github:Yggdroot/indentLine"; - flake = false; - }; - "gitsigns.nvim" = { - url = "github:lewis6991/gitsigns.nvim"; - flake = false; - }; - "plenary.nvim" = { - url = "github:nvim-lua/plenary.nvim"; - flake = false; - }; - "vim-moonfly-colors" = { - url = "github:bluz71/vim-moonfly-colors"; - flake = false; - }; - "vim-vsnip" = { - url = "github:hrsh7th/vim-vsnip"; - flake = false; - }; - "cmp-nvim-lsp" = { - url = "github:hrsh7th/cmp-nvim-lsp"; - flake = false; - }; - "cmp-buffer" = { - url = "github:hrsh7th/cmp-buffer"; - flake = false; - }; - "cmp-calc" = { - url = "github:hrsh7th/cmp-calc"; - flake = false; - }; - "cmp-path" = { - url = "github:hrsh7th/cmp-path"; - flake = false; - }; - "cmp-latex-symbols" = { - url = "github:kdheepak/cmp-latex-symbols"; - flake = false; - }; - "nvim-cmp" = { - url = "github:hrsh7th/nvim-cmp"; - flake = false; - }; - "vim-Grammalecte" = { - url = "github:dpelle/vim-Grammalecte"; - flake = false; - }; - "vim-LanguageTool" = { - url = "github:dpelle/vim-LanguageTool"; - flake = false; - }; - "lsp_extensions.nvim" = { - url = "github:nvim-lua/lsp_extensions.nvim"; - flake = false; - }; - "lsp_signature.nvim" = { - url = "github:ray-x/lsp_signature.nvim"; - flake = false; - }; - "telescope.nvim" = { - url = "github:nvim-telescope/telescope.nvim"; - flake = false; - }; - "popup.nvim" = { - url = "github:nvim-lua/popup.nvim"; - flake = false; - }; - "galaxyline.nvim" = { - url = "github:NTBBloodbath/galaxyline.nvim"; - flake = false; - }; - "vim-headerguard" = { - url = "github:drmikehenry/vim-headerguard"; - flake = false; - }; - "vim-matchup" = { - url = "github:andymass/vim-matchup"; - flake = false; - }; - "kommentary" = { - url = "github:b3nj5m1n/kommentary"; - flake = false; - }; - "lspkind-nvim" = { - url = "github:onsails/lspkind-nvim"; - flake = false; - }; - "editorconfig-vim" = { - url = "github:editorconfig/editorconfig-vim"; - flake = false; - }; - "null-ls.nvim" = { - url = "github:jose-elias-alvarez/null-ls.nvim"; - flake = false; - }; - "filetype.nvim" = { - url = "github:nathom/filetype.nvim"; - flake = false; - }; - "startuptime.vim" = { - url = "github:tweekmonster/startuptime.vim"; - flake = false; - }; - "nvim-tree.lua" = { - url = "github:kyazdani42/nvim-tree.lua"; - flake = false; + nvim-traxys = { + url = "github:traxys/nvim-flake"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -177,7 +49,7 @@ modules = [ ({ pkgs, ... }: { nixpkgs.overlays = [ - inputs.neovim-nightly-overlay.overlay + inputs.nvim-traxys.overlay."${system}" (import inputs.nixpkgs-mozilla) ]; }) @@ -196,140 +68,6 @@ zsh-nix-shell = inputs.zsh-nix-shell; nix-zsh-completions = inputs.nix-zsh-completions; powerlevel10k = inputs.powerlevel10k; - nvim-plugins = [ - { - name = "plantuml-syntax"; - path = inputs."plantuml-syntax"; - } - { - name = "nvim-web-devicons"; - path = inputs."nvim-web-devicons"; - } - { - name = "nvim-treesitter"; - path = inputs."nvim-treesitter"; - } - { - name = "nvim-lspconfig"; - path = inputs."nvim-lspconfig"; - } - { - name = "lsp-status.nvim"; - path = inputs."lsp-status.nvim"; - } - { - name = "nvim-lightbulb"; - path = inputs."nvim-lightbulb"; - } - { - name = "indentLine"; - path = inputs."indentLine"; - } - { - name = "gitsigns.nvim"; - path = inputs."gitsigns.nvim"; - } - { - name = "plenary.nvim"; - path = inputs."plenary.nvim"; - } - { - name = "vim-moonfly-colors"; - path = inputs."vim-moonfly-colors"; - } - { - name = "vim-vsnip"; - path = inputs."vim-vsnip"; - } - { - name = "cmp-nvim-lsp"; - path = inputs."cmp-nvim-lsp"; - } - { - name = "cmp-buffer"; - path = inputs."cmp-buffer"; - } - { - name = "cmp-calc"; - path = inputs."cmp-calc"; - } - { - name = "cmp-path"; - path = inputs."cmp-path"; - } - { - name = "cmp-latex-symbols"; - path = inputs."cmp-latex-symbols"; - } - { - name = "nvim-cmp"; - path = inputs."nvim-cmp"; - } - { - name = "vim-Grammalecte"; - path = inputs."vim-Grammalecte"; - } - { - name = "vim-LanguageTool"; - path = inputs."vim-LanguageTool"; - } - { - name = "lsp_extensions.nvim"; - path = inputs."lsp_extensions.nvim"; - } - { - name = "lsp_signature.nvim"; - path = inputs."lsp_signature.nvim"; - } - { - name = "telescope.nvim"; - path = inputs."telescope.nvim"; - } - { - name = "popup.nvim"; - path = inputs."popup.nvim"; - } - { - name = "galaxyline.nvim"; - path = inputs."galaxyline.nvim"; - } - { - name = "vim-headerguard"; - path = inputs."vim-headerguard"; - } - { - name = "vim-matchup"; - path = inputs."vim-matchup"; - } - { - name = "kommentary"; - path = inputs."kommentary"; - } - { - name = "lspkind-nvim"; - path = inputs."lspkind-nvim"; - } - { - name = "editorconfig-vim"; - path = inputs."editorconfig-vim"; - } - { - name = "null-ls.nvim"; - path = inputs."null-ls.nvim"; - } - { - name = "filetype.nvim"; - path = inputs."filetype.nvim"; - } - { - name = "startuptime.vim"; - path = inputs."startuptime.vim"; - } - { - name = "nvim-tree.lua"; - path = inputs."nvim-tree.lua"; - } - ]; }; # Optionally, use home-manager.extraSpecialArgs to pass # arguments to home.nix diff --git a/flake.nix.in b/flake.nix.in deleted file mode 100644 index 7fcf682..0000000 --- a/flake.nix.in +++ /dev/null @@ -1,77 +0,0 @@ -{ - description = "NixOS configuration"; - - inputs = - { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - nixpkgs-mozilla = { - url = "github:mozilla/nixpkgs-mozilla"; - flake = false; - }; - dotacat = { - url = "git+https://gitlab.scd31.com/stephen/dotacat.git"; - flake = false; - }; - rnix-lsp.url = "github:nix-community/rnix-lsp"; - stylua = { - url = "github:johnnymorganz/stylua"; - flake = false; - }; - naersk.url = "github:nix-community/naersk"; - fast-syntax-highlighting = { - url = "github:z-shell/fast-syntax-highlighting"; - flake = false; - }; - zsh-nix-shell = { - url = "github:chisui/zsh-nix-shell"; - flake = false; - }; - nix-zsh-completions = { - url = "github:spwhitt/nix-zsh-completions"; - flake = false; - }; - powerlevel10k = { - url = "github:romkatv/powerlevel10k"; - flake = false; - }; - @inputs@ - }; - - outputs = { home-manager, nixpkgs, ... }@inputs: { - nixosConfigurations = { - ZeNixLaptop = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = [ - ({ pkgs, ... }: { - nixpkgs.overlays = [ - inputs.neovim-nightly-overlay.overlay - (import inputs.nixpkgs-mozilla) - ]; - }) - ./nixos/configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.traxys = import ./home.nix; - home-manager.extraSpecialArgs = { - dotacat = inputs.dotacat; - rnix-lsp = inputs.rnix-lsp; - stylua = inputs.stylua; - naersk-lib = inputs.naersk.lib."${system}"; - fast-syntax-highlighting = inputs.fast-syntax-highlighting; - zsh-nix-shell = inputs.zsh-nix-shell; - nix-zsh-completions = inputs.nix-zsh-completions; - powerlevel10k = inputs.powerlevel10k; - @plugins@ - }; - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - } - ]; - }; - }; - }; -} diff --git a/home.nix b/home.nix index 03a705a..aacaf6b 100644 --- a/home.nix +++ b/home.nix @@ -8,7 +8,6 @@ , zsh-nix-shell , nix-zsh-completions , powerlevel10k -, nvim-plugins , ... }: @@ -18,16 +17,6 @@ let cargo = rustVersion; rustc = rustVersion; }; - plugin_path = ".local/share/nvim/site/pack/nix/start/"; - plugin-files = builtins.listToAttrs (map - ({ name, path }: { - name = "${plugin_path}/${name}"; - value = { - source = path; - recursive = true; - }; - }) - nvim-plugins); localinfo = import ./localinfo.nix; in { @@ -47,7 +36,7 @@ in home.packages = with pkgs; [ bitwarden-cli rustup - neovim-nightly + neovimTraxys rust-analyzer clang-tools nodePackages.vscode-json-languageserver @@ -182,10 +171,6 @@ in }; }; home.file = { - ".config/nvim" = { - source = ./nvim; - recursive = true; - }; ".powerlevel10k" = { source = powerlevel10k; }; @@ -196,7 +181,7 @@ in source = ./scripts; recursive = true; }; - } // plugin-files; + }; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage diff --git a/nvim/.gitignore b/nvim/.gitignore deleted file mode 100644 index 8cb205e..0000000 --- a/nvim/.gitignore +++ /dev/null @@ -1 +0,0 @@ -plugin diff --git a/nvim/init.lua b/nvim/init.lua deleted file mode 100644 index e0df950..0000000 --- a/nvim/init.lua +++ /dev/null @@ -1,98 +0,0 @@ -vim.o.termguicolors = true -vim.cmd("colorscheme moonfly") - -require("tree_sitter") -require("lsp") -require("completion") -require("statusline") - -require("gitsigns").setup() -require("nvim-tree").setup({ - auto_close = true, - diagnostics = { - enable = true, - }, -}) - -vim.o.number = true -vim.o.tabstop = 4 -vim.o.shiftwidth = 4 -vim.o.ai = true -vim.o.scrolloff = 7 -vim.o.signcolumn = "yes" -vim.o.cmdheight = 2 -vim.o.hidden = true - -vim.g.tex_flavor = "latex" - -vim.o.completeopt = "menuone,noselect" - -vim.g.indentLine_concealcursor = "inc" -vim.g.indentLine_conceallevel = 2 -vim.g.indentLine_fileTypeExclude = { "markdown", "json" } - -vim.g.grammalecte_cli_py = "/usr/bin/grammalecte-cli" -latex_ignore = [[ - typo_guillemets_typographiques_simples_doubles_ouvrants - typo_guillemets_typographiques_simples_doubles_fermants - esp_milieu_ligne -]] -vim.g.grammalecte_disable_rules = [[ apostrophe_typographique - apostrophe_typographique_après_t - espaces_début_ligne espaces_milieu_ligne - espaces_fin_de_ligne - typo_points_suspension1 - typo_tiret_incise - nbsp_avant_double_ponctuation - nbsp_avant_deux_points - nbsp_après_chevrons_ouvrants - nbsp_avant_chevrons_fermants1 - unit_nbsp_avant_unités1 - unit_nbsp_avant_unités2 - unit_nbsp_avant_unités3 - typo_espace_manquant_après2 ]] .. latex_ignore - -vim.g.languagetool_cmd = "/usr/bin/languagetool" -vim.g.languagetool_lang = "fr" - -vim.api.nvim_set_keymap("n", "bp", "Telescope buffers", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "ca", "Telescope lsp_code_actions", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "gr", "Telescope lsp_references", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "gW", "Telescope lsp_workspace_symbols", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "gF", "Telescope lsp_document_symbols", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "ft", "Telescope file_browser", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "fT", "NvimTreeToggle", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "ge", "Telescope diagnostics bufnr=0", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "gE", "Telescope diagnostics", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "mn", "Telescope man_pages sections=1,3,5", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "fg", "Telescope git_files", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "K", "lua vim.lsp.buf.hover()", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "gd", "lua vim.lsp.buf.definition()", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "ff", "lua vim.lsp.buf.formatting_seq_sync()", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "", "Telescope spell_suggest", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "mk", "Telescope keymaps", { noremap = true, silent = true }) - -vim.o.omnifunc = "v:lua.vim.lsp.omnifunc" -vim.o.updatetime = 300 - -require("nvim-web-devicons").setup({ default = true }) -require("filetype").setup({ - overrides = { - extensions = { - nix = "nix", - rsh = "rsh", - }, - }, -}) - ---autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics() - -vim.cmd([[ -command SpellFr setlocal spell spelllang=fr - -filetype plugin indent on - -autocmd CursorHold * lua vim.diagnostic.open_float() -autocmd CursorHold,CursorHoldI * lua require'nvim-lightbulb'.update_lightbulb() -autocmd CursorHold,CursorHoldI *.rs :lua require'lsp_extensions'.inlay_hints{} -]]) diff --git a/nvim/lua/completion.lua b/nvim/lua/completion.lua deleted file mode 100644 index e10a948..0000000 --- a/nvim/lua/completion.lua +++ /dev/null @@ -1,27 +0,0 @@ -require("lsp_signature").on_attach() - -local cmp = require("cmp") - -cmp.setup({ - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` user. - end, - }, - mapping = { - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "s" }), - [""] = cmp.mapping.confirm({ select = true }), - }, - sources = { - { name = "nvim_lsp" }, - { name = "vsnip" }, - { name = "buffer" }, - { name = "path" }, - { name = "calc" }, - { name = "latex_symbols" }, - }, -}) diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua deleted file mode 100644 index 690e250..0000000 --- a/nvim/lua/lsp.lua +++ /dev/null @@ -1,104 +0,0 @@ ---vim.lsp.set_log_level("info") - -local null_ls = require("null-ls") -local sources = { - --null_ls.builtins.code_actions.gitsigns, - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.trim_whitespace, - null_ls.builtins.diagnostics.shellcheck, - --null_ls.builtins.diagnostics.codespell, -} - -local lsp_status = require("lsp-status") -lsp_status.register_progress() - -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities.textDocument.completion.completionItem.snippetSupport = true -capabilities = vim.tbl_extend("keep", capabilities, lsp_status.capabilities) - -require("lspkind").init({}) -local lspconfig = require("lspconfig") -local configs = require("lspconfig/configs") -local util = require("lspconfig/util") - ---[[ if not lspconfig.rsh_lsp then - configs.rsh_lsp = { - default_config = { - cmd = { "rsh-lsp" }, - filetypes = { "rsh" }, - root_dir = util.path.dirname, - settings = {}, - }, - } -end ]] - -null_ls.setup({ - sources = sources, - on_attach = lsp_status.on_attach, -}) -lspconfig.rust_analyzer.setup({ - on_attach = lsp_status.on_attach, - settings = { - ["rust-analyzer"] = { - procMacro = { - enable = true, - }, - cargo = { - allFeatures = true, - loadOutDirsFromCheck = true, - }, - updates = { - channel = "nightly", - }, - }, - }, - capabilities = capabilities, -}) -lspconfig.jsonls.setup({ - on_attach = lsp_status.on_attach, - cmd = { "json-languageserver", "--stdio" }, - capabilities = capabilities, -}) -lspconfig.bashls.setup({ - on_attach = lsp_status.on_attach, - capabilities = capabilities, -}) ---[[ lspconfig.rsh_lsp.setup({ - on_attach = lsp_status.on_attach, - capabilities = capabilities, -}) ]] -lspconfig.clangd.setup({ - on_attach = lsp_status.on_attach, - handlers = lsp_status.extensions.clangd.setup(), - init_options = { clangdFileStatus = true }, - capabilities = capabilities, -}) -lspconfig.texlab.setup({ - on_attach = lsp_status.on_attach, - capabilities = capabilities, -}) - -lspconfig.rnix.setup({ - on_attach = lsp_status.on_attach, - capabilities = capabilities, -}) - -lspconfig.dartls.setup({ - on_attach = lsp_status.on_attach, - capabilities = capabilities, - cmd = { "dart", vim.fn.expand("$DART_SDK") .. "/snapshots/analysis_server.dart.snapshot", "--lsp" }, -}) - -lspconfig.vuels.setup({ - on_attach = lsp_status.on_attach, - capabilities = capabilities, - config = { - vetur = { - defaultFormatter = { - js = "prettier", - ts = "prettier", - html = "prettier", - }, - }, - }, -}) diff --git a/nvim/lua/statusline.lua b/nvim/lua/statusline.lua deleted file mode 100644 index ffaa0cd..0000000 --- a/nvim/lua/statusline.lua +++ /dev/null @@ -1,288 +0,0 @@ ---[[ local vi_mode_utils = require 'feline.providers.vi_mode' - -local vi_mode_colors = { - NORMAL = "#8cc85f", - INSERT = "#ff5454", - VISUAL = "#ae81ff", - OP = "#36c692", - BLOCK = "#80a0ff", - REPLACE = "#d183e8", - ['V-REPLACE'] = "#d183e8", - ENTER = "#74b2ff", - MORE = "#74b2ff", - SELECT = "#de935f", - COMMAND = "#8cc85f", - SHELL = "#8cc85f", - TERM = "#8cc85f", - NONE = "#e3c78a" -} - -local function vimode_hl() - return { - name = vi_mode_utils.get_mode_highlight_name(), - fg = vi_mode_utils.get_mode_color() - } -end - -local cmps = { - vi_mode = { - provider = '▊', - hl = vimode_hl, - right_sep = ' ' - } -} - -local components = { - left = { - active = { - cmps.vi_mode - }, - inactive = {} - }, - mid = { - active = {}, - inactive = {} - }, - right = { - active = {}, - inactive = {} - } -} - -require'feline'.setup { - components = components, - vi_mode_colors = vi_mode_colors -} ]] - -local gl = require("galaxyline") -local gls = gl.section -gl.short_line_list = { "LuaTree", "vista", "dbui" } - -local colors = { - bg = "#282c34", - yellow = "#fabd2f", - cyan = "#008080", - darkblue = "#081633", - green = "#afd700", - orange = "#FF8800", - purple = "#5d4d7a", - magenta = "#d16d9e", - grey = "#c0c0c0", - blue = "#0087d7", - red = "#ec5f67", - violet = "#6860e7", -} - -local buffer_not_empty = function() - if vim.fn.empty(vim.fn.expand("%:t")) ~= 1 then - return true - end - return false -end - -local fileinfo = require("galaxyline.providers.fileinfo") - --- Start of line -gls.left[1] = { - FirstElement = { - provider = function() - return "▋" - end, - highlight = { colors.blue, colors.yellow }, - }, -} --- Vim mode -gls.left[2] = { - ViMode = { - provider = function() - local alias = { n = "NORMAL ", i = "INSERT ", c = "COMMAND ", V = "VISUAL ", [""] = "VISUAL " } - return alias[vim.fn.mode()] - end, - separator = "", - separator_highlight = { - colors.yellow, - function() - if not buffer_not_empty() then - return colors.purple - end - return colors.darkblue - end, - }, - highlight = { colors.violet, colors.yellow, "bold" }, - }, -} --- File Icon -gls.left[3] = { - FileIcon = { - provider = "FileIcon", - condition = buffer_not_empty, - highlight = { fileinfo.get_file_icon_color, colors.darkblue }, - }, -} --- File Name -gls.left[4] = { - FileName = { - provider = { "FileName" }, - condition = buffer_not_empty, - separator = "", - separator_highlight = { colors.purple, colors.darkblue }, - highlight = { colors.magenta, colors.darkblue }, - }, -} --- GIT -gls.left[5] = { - GitIcon = { - provider = function() - return "  " - end, - condition = buffer_not_empty, - highlight = { colors.orange, colors.purple }, - }, -} -gls.left[6] = { - GitBranch = { - provider = "GitBranch", - condition = buffer_not_empty, - highlight = { colors.grey, colors.purple }, - }, -} - -local vcs = require("galaxyline.providers.vcs") - -local is_file_diff = function() - if vcs.diff_add() ~= nil or vcs.diff_modified() ~= nil or vcs.diff_remove() ~= nil then - return "" - end -end - -gls.left[7] = { - GitModified = { - provider = is_file_diff, - highlight = { colors.green, colors.purple }, - }, -} -gls.left[8] = { - LeftEnd = { - provider = function() - return "" - end, - separator = "", - separator_highlight = { colors.purple, colors.bg }, - highlight = { colors.purple, colors.purple }, - }, -} - -local lsp_diag_error = function() - local diagnostics = require("lsp-status/diagnostics") - local buf_diagnostics = diagnostics() - - if buf_diagnostics.errors and buf_diagnostics.errors > 0 then - return buf_diagnostics.errors .. " " - end -end -local lsp_diag_warn = function() - local diagnostics = require("lsp-status/diagnostics") - local buf_diagnostics = diagnostics() - - if buf_diagnostics.warnings and buf_diagnostics.warnings > 0 then - return buf_diagnostics.warnings .. " " - end -end -local lsp_diag_info = function() - local diagnostics = require("lsp-status/diagnostics") - local buf_diagnostics = diagnostics() - - if buf_diagnostics.info and buf_diagnostics.info > 0 then - return buf_diagnostics.info .. " " - end -end -local has_lsp = function() - return #vim.lsp.buf_get_clients() > 0 -end - -local has_curent_func = function() - if not has_lsp then - return false - end - local current_function = vim.b.lsp_current_function - return current_function and current_function ~= "" -end -local lsp_current_func = function() - local current_function = vim.b.lsp_current_function - if current_function and current_function ~= "" then - return "(" .. current_function .. ") " - end -end - -gls.right[1] = { - LspText = { - provider = function() - return "" - end, - separator = "", - separator_highlight = { colors.darkblue, colors.bg }, - highlight = { colors.grey, colors.darkblue }, - }, -} -gls.right[2] = { - LspError = { - provider = lsp_diag_error, - condition = has_lsp, - icon = " ", - highlight = { colors.grey, colors.darkblue }, - }, -} -gls.right[3] = { - LspWarning = { - provider = lsp_diag_warn, - condition = has_lsp, - icon = " ", - highlight = { colors.grey, colors.darkblue }, - }, -} -gls.right[4] = { - LspInfo = { - provider = lsp_diag_info, - condition = has_lsp, - icon = " ", - highlight = { colors.grey, colors.darkblue }, - }, -} -gls.right[5] = { - LspCurrentFunc = { - provider = lsp_current_func, - condition = has_current_func, - icon = "𝒇", - highlight = { colors.grey, colors.darkblue }, - }, -} -gls.right[6] = { - FileFormat = { - provider = "FileFormat", - separator = "", - separator_highlight = { colors.darkblue, colors.purple }, - highlight = { colors.grey, colors.purple }, - }, -} -gls.right[7] = { - LineInfo = { - provider = "LineColumn", - separator = " | ", - separator_highlight = { colors.darkblue, colors.purple }, - highlight = { colors.grey, colors.purple }, - }, -} -gls.right[8] = { - PerCent = { - provider = "LinePercent", - separator = "", - separator_highlight = { colors.darkblue, colors.purple }, - highlight = { colors.grey, colors.darkblue }, - }, -} -gls.right[9] = { - ScrollBar = { - provider = "ScrollBar", - highlight = { colors.yellow, colors.purple }, - }, -} diff --git a/nvim/lua/tree_sitter.lua b/nvim/lua/tree_sitter.lua deleted file mode 100644 index 0ca2d48..0000000 --- a/nvim/lua/tree_sitter.lua +++ /dev/null @@ -1,43 +0,0 @@ ---[[ local parser_config = require("nvim-treesitter.parsers").get_parser_configs() -parser_config.rsh = { - install_info = { - url = "https://github.com/traxys/tree-sitter-rsh/", -- local path or git repo - files = { "src/parser.c" }, - }, -} - ]] - -require("nvim-treesitter.configs").setup({ - ensure_installed = { - "rust", - "c", - "cpp", - "json", - "lua", - "python", - "toml", - "latex", - "nix", - "vue", - "javascript", - "dart", - --"rsh", - }, - ident = { - enable = true, - }, - highlight = { - enable = true, -- false will disable the whole extension - disable = { "elixir", "teal" }, -- list of language that will be disabled - }, - refactor = { - highlight_definitions = { enable = true }, - highlight_current_scope = { enable = false }, - smart_rename = { - enable = true, - keymaps = { - smart_rename = "grr", - }, - }, - }, -}) diff --git a/nvim/spell/fr.utf-8.add b/nvim/spell/fr.utf-8.add deleted file mode 100644 index 39fd548..0000000 --- a/nvim/spell/fr.utf-8.add +++ /dev/null @@ -1,9 +0,0 @@ -NVMe -TCP -Portals -InfiniBand -BXI -RDMA -linux -IOPS -blk-mq diff --git a/nvim/spell/fr.utf-8.add.spl b/nvim/spell/fr.utf-8.add.spl deleted file mode 100644 index 765b8dac8a77619fe80b9a4d99262e78cc652e6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmWIZ^erw(&B-zP&%nSC!Jd?vlUGnw!jx0Nn9Zomn9Eqm$iSG%$i%{wm(Q5Sn8}#O zn8}#Ln8=vNn8L`^z*xY@$iN_843;Pbv4txb%NTP(ES*%we8wWi62?Tv9L8csCML!d oh=h0|V=_pAcmV?ggDjJ$A7dWeXeX%A42)rnz92=SsSF?h0C&F~qyPW_ diff --git a/plugins.py b/plugins.py deleted file mode 100644 index e432e39..0000000 --- a/plugins.py +++ /dev/null @@ -1,58 +0,0 @@ -plugins = [ - "aklt/plantuml-syntax", - "kyazdani42/nvim-web-devicons", - "nvim-treesitter/nvim-treesitter", - "neovim/nvim-lspconfig", - "nvim-lua/lsp-status.nvim", - "kosayoda/nvim-lightbulb", - "Yggdroot/indentLine", - "lewis6991/gitsigns.nvim", - "nvim-lua/plenary.nvim", - "bluz71/vim-moonfly-colors", - "hrsh7th/vim-vsnip", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-calc", - "hrsh7th/cmp-path", - "kdheepak/cmp-latex-symbols", - "hrsh7th/nvim-cmp", - "dpelle/vim-Grammalecte", - "dpelle/vim-LanguageTool", - "nvim-lua/lsp_extensions.nvim", - "ray-x/lsp_signature.nvim", - "nvim-telescope/telescope.nvim", - "nvim-lua/popup.nvim", - "NTBBloodbath/galaxyline.nvim", - "drmikehenry/vim-headerguard", - "andymass/vim-matchup", - "b3nj5m1n/kommentary", - "onsails/lspkind-nvim", - "editorconfig/editorconfig-vim", - "jose-elias-alvarez/null-ls.nvim", - "nathom/filetype.nvim", - "tweekmonster/startuptime.vim", - "kyazdani42/nvim-tree.lua", -] - -inputs = "" -nvim_plugins = "nvim-plugins = [\n"; -for plugin in plugins: - repo,plugin = plugin.split('/') - inputs += f'"{plugin}" = {{\n' - inputs += f' url = "github:{repo}/{plugin}";\n' - inputs += f' flake = false;\n' - inputs += "};\n" - - nvim_plugins += " {\n" - nvim_plugins += f' name = "{plugin}";\n' - nvim_plugins += f' path = inputs."{plugin}";\n' - nvim_plugins += " }\n" -nvim_plugins += "];\n" - -with open("flake.nix.in") as f: - flake = f.read() - flake = flake.replace("@inputs@\n", inputs) - flake = flake.replace("@plugins@\n", nvim_plugins) - out = open("flake.nix", "w") - out.write(flake) -