diff --git a/flake.lock b/flake.lock index fdbf8a5..65872db 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1696775529, + "lastModified": 1695384796, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1696674829, - "narHash": "sha256-t+BQGAghYqDaTE2UdU2t8/oYmebBJ2DRi2GAva5agFw=", + "lastModified": 1695299795, + "narHash": "sha256-rl6WSgyXTbSLXL3ItpbfToSPAS4+rftojSzFWxNuHU4=", "owner": "arkenfox", "repo": "user.js", - "rev": "f54d632da585a08185c6164017d79315c331181f", + "rev": "56f51203bf4fea8aa778b792269205d275a62665", "type": "github" }, "original": { @@ -71,6 +71,29 @@ "type": "github" } }, + "codeium-nvim": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1695327957, + "narHash": "sha256-UsofTHPG8K7UqO0rJGHS2Ecbv+oVOYQ23Zk6SnshfOs=", + "owner": "jcdickinson", + "repo": "codeium.nvim", + "rev": "b65443d114d3c3c9dcc59ecd8a7dbb3a35320607", + "type": "github" + }, + "original": { + "owner": "jcdickinson", + "repo": "codeium.nvim", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -99,11 +122,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1695973661, - "narHash": "sha256-BP2H4c42GThPIhERtTpV1yCtwQHYHEKdRu7pjrmQAwo=", + "lastModified": 1695195896, + "narHash": "sha256-pq9q7YsGXnQzJFkR5284TmxrLNFc0wo4NQ/a5E93CQU=", "owner": "numtide", "repo": "devshell", - "rev": "cd4e2fda3150dd2f689caeac07b7f47df5197c31", + "rev": "05d40d17bf3459606316e3e9ec683b784ff28f16", "type": "github" }, "original": { @@ -117,11 +140,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1696814493, - "narHash": "sha256-1qArVsJGG2RHbV2iKFpAmM5os3myvwpXMOdFy5nh54M=", + "lastModified": 1695380190, + "narHash": "sha256-v1TwBU/mKroZZPWYXujAfOHfIaQw44swa50Jgdkr7OE=", "owner": "nix-community", "repo": "disko", - "rev": "32ce057c183506cecb0b84950e4eaf39f37e8c75", + "rev": "98a6ab9b52f8b06db9c3116b1761bbeaf9484408", "type": "github" }, "original": { @@ -133,11 +156,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -183,11 +206,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -204,11 +227,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -258,15 +281,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_2" - }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -277,7 +297,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1685518550, @@ -295,7 +315,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1685518550, @@ -377,11 +397,11 @@ ] }, "locked": { - "lastModified": 1695684520, - "narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=", + "lastModified": 1689397210, + "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7", + "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce", "type": "github" }, "original": { @@ -434,11 +454,11 @@ ] }, "locked": { - "lastModified": 1696737557, - "narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=", + "lastModified": 1695550077, + "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d", + "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091", "type": "github" }, "original": { @@ -452,11 +472,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1696339530, - "narHash": "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA=", + "lastModified": 1695455081, + "narHash": "sha256-AtAMze2J5Maol28OLQoCFgppRWEy06Mn9RhduXNmhiI=", "owner": "hyprwm", "repo": "contrib", - "rev": "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542", + "rev": "33663f663e07b4ca52c9165f74e3d793f08b15e7", "type": "github" }, "original": { @@ -469,16 +489,16 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs_4", - "systems": "systems_3", + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1696891919, - "narHash": "sha256-h7/lmKV5zfJz/4m/oLib7iTqQ7fpfB599AzW2QRoGtg=", + "lastModified": 1695558936, + "narHash": "sha256-KcSkwSDlrt3Xwtit+NTu2aToiRm5Aho9joj2r6nb19w=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8abb6e1cee3e967ff414af0d6a1a31ebced95f5b", + "rev": "352ceb1117b79cd0bc3fa86ebe435b6909512ddb", "type": "github" }, "original": { @@ -517,11 +537,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1696724955, - "narHash": "sha256-7CczVKotC1RJuSyJMxgzUP11Y1txku9JAga5eFxpA+4=", + "lastModified": 1694600309, + "narHash": "sha256-d9LcB+D0bfMu+8UhnUVJ/DX5OVTX6o5dIntdVqEeQDA=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "72735ae6352085ef842f6ed496889115afd76ce4", + "rev": "e5a18a171d5d6e7c6b9ffdfb9e86fb09055964a1", "type": "github" }, "original": { @@ -563,11 +583,11 @@ }, "master": { "locked": { - "lastModified": 1696923230, - "narHash": "sha256-Evn8vdETCSxQH6txfwYIN7N69RKSfZLkN7dSqfnRYRw=", + "lastModified": 1695566498, + "narHash": "sha256-pitC2KSFFQr0VVWTWrhOYM3JkHMTGJ+n2f3swZNRjq8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "906535b6191830a247e004f53d74359a60883ba4", + "rev": "46338210c41bbb92502517cccbb2223973a17a62", "type": "github" }, "original": { @@ -608,11 +628,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1696892794, - "narHash": "sha256-KQ1X1CLjabnnLItHb2zlrSZzj4lQNkdZMx84QWcU9qA=", + "lastModified": 1695509205, + "narHash": "sha256-nV3opNLzLMfzL0yI+xnIeNIOnvOI467CiABxHTQUrwY=", "owner": "neovim", "repo": "neovim", - "rev": "43f22853fecf312713deed983b9cde1a6bda6ebd", + "rev": "bc0bf9d030bbcb01db69c44cf88b95ca41dd3065", "type": "github" }, "original": { @@ -631,11 +651,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1696896059, - "narHash": "sha256-GLJJRb2PSI9Hq1J4D0YVMV6lxHPP2QilEAWeIrEQSEI=", + "lastModified": 1695513850, + "narHash": "sha256-tzhm05TH22eI+ePzuPHrMgq2sjLkEW1q1E515+VRVuw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4ea129658fe3e7ecaebe574093ed3fe9673b5f6c", + "rev": "07c3b00574cb6645d92786c5a5531cb20426785d", "type": "github" }, "original": { @@ -722,11 +742,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1693471703, + "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "type": "github" }, "original": { @@ -805,11 +825,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696725822, - "narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=", + "lastModified": 1694948089, + "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5aabb5780a11c500981993d49ee93cfa6df9307b", + "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", "type": "github" }, "original": { @@ -885,11 +905,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1696757521, - "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", + "lastModified": 1695318763, + "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", "type": "github" }, "original": { @@ -901,11 +921,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1696757521, - "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", + "lastModified": 1695318763, + "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", "type": "github" }, "original": { @@ -931,6 +951,22 @@ "type": "github" } }, + "none-ls-nvim": { + "flake": false, + "locked": { + "lastModified": 1696658105, + "narHash": "sha256-4+B2F4ZweWTqXlhSs0jiBaKSv52G4X7p37KHfYl6sPo=", + "owner": "nvimtools", + "repo": "none-ls.nvim", + "rev": "ae339f45590cc421a68de885fc5a3261cc247362", + "type": "github" + }, + "original": { + "owner": "nvimtools", + "repo": "none-ls.nvim", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1696923989, @@ -949,11 +985,11 @@ "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1696572942, - "narHash": "sha256-i3lDsFwoMddpN1I4t3Fj+Dthyxq7twCgpYuNtlvfI5Y=", + "lastModified": 1695699913, + "narHash": "sha256-9uH3ZpZ7zk/84agbagNxUZL49h+P5j7gew+2h04psvg=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "2b361e043810d5587d9af0787f8ce40da92ec5e9", + "rev": "bfdf2e91e7297a54bcc09d3e092a12bff69a1cf4", "type": "github" }, "original": { @@ -965,11 +1001,11 @@ "nvim-puppeteer": { "flake": false, "locked": { - "lastModified": 1696887151, - "narHash": "sha256-voQru65IC5OM5JVwa1v62O7tmsIdGZJ6BS75lHt0Pxo=", + "lastModified": 1695758417, + "narHash": "sha256-rkaQUOXxNfkib0kPv+z8ncZiwgSP26+jwNtN9ydcvLQ=", "owner": "chrisgrieser", "repo": "nvim-puppeteer", - "rev": "4a2c68b93366eca5bca9e6b71e6cc8d643cfdca5", + "rev": "9cd2d2e2630db6377538f5f0dccdea3517db2ce1", "type": "github" }, "original": { @@ -1004,11 +1040,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1696846637, - "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", + "lastModified": 1694364351, + "narHash": "sha256-oadhSCqopYXxURwIA6/Anpe5IAG11q2LhvTJNP5zE6o=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", + "rev": "4f883a76282bc28eb952570afc3d8a1bf6f481d7", "type": "github" }, "original": { @@ -1020,11 +1056,11 @@ "rofi-wayland": { "flake": false, "locked": { - "lastModified": 1695649959, + "lastModified": 1695513431, "narHash": "sha256-WG1EyBYTbDsK4RsPgp8K/PlscvRSNthQSyN3cqxuXcc=", "owner": "lbonn", "repo": "rofi", - "rev": "9d11a2b4a9095b3f0a092155f749900f7eb8e047", + "rev": "b8dedc8836b552a0bba5f4702be63dd8521c6fbb", "type": "github" }, "original": { @@ -1040,6 +1076,7 @@ "agenix": "agenix", "arkenfox-userjs": "arkenfox-userjs", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", + "codeium-nvim": "codeium-nvim", "devshell": "devshell", "disko": "disko", "flake-parts": "flake-parts", @@ -1056,6 +1093,7 @@ "nix-lazy-nvim": "nix-lazy-nvim", "nix-super": "nix-super", "nixpkgs": "nixpkgs_8", + "none-ls-nvim": "none-ls-nvim", "nur": "nur", "nvim-lspconfig": "nvim-lspconfig", "nvim-puppeteer": "nvim-puppeteer", @@ -1087,11 +1125,11 @@ }, "stable": { "locked": { - "lastModified": 1696697597, - "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=", + "lastModified": 1695416179, + "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a237aecb57296f67276ac9ab296a41c23981f56", + "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", "type": "github" }, "original": { @@ -1117,21 +1155,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1146,6 +1169,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_4": { "locked": { "lastModified": 1681028828, @@ -1176,21 +1214,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "telekasten-nvim": { "flake": false, "locked": { @@ -1210,11 +1233,11 @@ "telescope-nvim": { "flake": false, "locked": { - "lastModified": 1696709104, - "narHash": "sha256-v68sId4cWHneUaaYp2neVtBobNZo8lsxKoBhRF4yZrI=", + "lastModified": 1695500955, + "narHash": "sha256-Sy4cDVL9HdIj8/UkCnusxACuzA6PKQiuf5Otwtlf8HA=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "5a747a9587e4bfc4ae086a38cc679fe54f983b69", + "rev": "ed9574dd6dde143d009b2528ea6d79bd34bbe6c8", "type": "github" }, "original": { @@ -1245,7 +1268,7 @@ }, "utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1692799911, @@ -1265,18 +1288,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1696410538, - "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", + "lastModified": 1695277534, + "narHash": "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM=", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "98a745d926d8048bc30aef11b421df207a01c279", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "98a745d926d8048bc30aef11b421df207a01c279", "type": "gitlab" } }, diff --git a/flake.nix b/flake.nix index 8c553e0..1d8f87f 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,11 @@ # Neovim actions-preview-nvim.flake = false; actions-preview-nvim.url = "github:aznhe21/actions-preview.nvim"; + codeium-nvim = { + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + url = "github:jcdickinson/codeium.nvim"; + }; hmts-nvim.flake = false; hmts-nvim.url = "github:calops/hmts.nvim"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; @@ -46,6 +51,8 @@ telekasten-nvim.url = "github:renerocksai/telekasten.nvim"; telescope-nvim.flake = false; telescope-nvim.url = "github:nvim-telescope/telescope.nvim"; + none-ls-nvim.flake = false; + none-ls-nvim.url = "github:nvimtools/none-ls.nvim"; # Hyprland hypr-contrib.url = "github:hyprwm/contrib"; diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index 8904931..7bfc800 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -123,6 +123,8 @@ in "|" = "split-window -h"; "C-l" = "send-keys C-l"; "R" = "source-file $XDG_CONFIG_HOME/tmux/tmux.conf \\; display-message 'Reloaded tmux.conf'"; + "f" = "new-window ts"; + "a" = "new-window ta"; }; copy-mode-vi = { "v" = "send -X begin-selection"; diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 96e7683..a7fdfcd 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -30,12 +30,17 @@ in [ alejandra black + checkmake deadnix + dotenv-linter + fish isort jq nixd nixpkgs-fmt nodePackages.bash-language-server + nodePackages.jsonlint + ruff-lsp rustfmt shellcheck shfmt @@ -46,6 +51,7 @@ in typst typst-lsp yamlfmt + yamllint ]; extraLuaConfig = readFile ./options.lua; lazy.enable = true; diff --git a/modules/programs/nvim/plugins/coding.nix b/modules/programs/nvim/plugins/coding.nix index fc4d22a..d0c0856 100644 --- a/modules/programs/nvim/plugins/coding.nix +++ b/modules/programs/nvim/plugins/coding.nix @@ -86,26 +86,13 @@ with builtins; { plugin = cmp-cmdline; } { plugin = cmp-nvim-lsp; } { plugin = cmp_luasnip; } + { + plugin = codeium-nvim; + opts = { }; + } { plugin = friendly-snippets; } { plugin = lspkind-nvim; } { plugin = luasnip; } - { - plugin = copilot-cmp; - opts = { }; - dependencies = [ - { - plugin = copilot-lua; - opts = { - suggestion = { enabled = false; }; - panel = { enabled = false; }; - }; - conf = /* lua */ '' - require("copilot").setup(opts) - vim.cmd("Copilot disable") - ''; - } - ]; - } ]; } { @@ -117,7 +104,6 @@ with builtins; event = [ "BufRead" "BufNewFile" ]; conf = readFile ./lua/nvim-lspconfig.lua; dependencies = [ - { plugin = lsp_signature-nvim; } { plugin = null-ls-nvim; conf = readFile ./lua/null-ls-nvim.lua; diff --git a/modules/programs/nvim/plugins/lua/null-ls-nvim.lua b/modules/programs/nvim/plugins/lua/null-ls-nvim.lua index 6701630..32a1f7e 100644 --- a/modules/programs/nvim/plugins/lua/null-ls-nvim.lua +++ b/modules/programs/nvim/plugins/lua/null-ls-nvim.lua @@ -8,9 +8,15 @@ null_ls.setup({ -- Completion null_ls.builtins.completion.spell, -- Diagnostics + null_ls.builtins.diagnostics.checkmake, null_ls.builtins.diagnostics.deadnix, + null_ls.builtins.diagnostics.dotenv_linter, + null_ls.builtins.diagnostics.fish, + null_ls.builtins.diagnostics.jsonlint, null_ls.builtins.diagnostics.shellcheck, null_ls.builtins.diagnostics.statix, + null_ls.builtins.diagnostics.trail_space, + null_ls.builtins.diagnostics.yamllint, }, }) diff --git a/modules/programs/nvim/plugins/lua/nvim-cmp.lua b/modules/programs/nvim/plugins/lua/nvim-cmp.lua index c48297b..975d84a 100644 --- a/modules/programs/nvim/plugins/lua/nvim-cmp.lua +++ b/modules/programs/nvim/plugins/lua/nvim-cmp.lua @@ -17,7 +17,7 @@ cmp.setup({ maxwidth = 50, -- prevent the popup from showing more than provided characters ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead symbol_map = { - Copilot = "", + Codeium = "", }, }), }, @@ -56,8 +56,8 @@ cmp.setup({ { name = "async_path", priority = 1 }, { name = "buffer", priority = 1 }, { name = "luasnip", priority = 2 }, - { name = "copilot", group_index = 3 }, - { name = "nvim_lsp", priority = 4 }, + { name = "codeium", priority = 3 }, + { name = "nvim_lsp", priority = 3 }, }, }) diff --git a/modules/programs/tmux/default.nix b/modules/programs/tmux/default.nix index 6469f96..67a4d5f 100644 --- a/modules/programs/tmux/default.nix +++ b/modules/programs/tmux/default.nix @@ -19,14 +19,14 @@ let tmux-sessionizer = pkgs.writeFishApplication { name = "ts"; - runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd fzf1 tmux-switch ]; + runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-switch gawk ]; text = readFile ./tmux-sessionizer/script.fish; completions = readFile ./tmux-sessionizer/completions.fish; }; tmux-attach = pkgs.writeFishApplication { name = "ta"; - runtimeInputs = with pkgs; [ tmux fzf1 tmux-switch ]; + runtimeInputs = with pkgs; [ tmux tmux-switch ]; text = readFile ./tmux-attach/script.fish; completions = readFile ./tmux-attach/completions.fish; }; @@ -97,7 +97,7 @@ in if ! fish_is_root_user && test "$TERM_PROGRAM" != 'vscode' && ${insideVariableMissing} if test -z $tmux_autostarted set -x tmux_autostarted true - ts + tmux new -A -s home end end ''; diff --git a/modules/programs/tmux/tmux-attach/script.fish b/modules/programs/tmux/tmux-attach/script.fish index 442dec2..6d1ab79 100644 --- a/modules/programs/tmux/tmux-attach/script.fish +++ b/modules/programs/tmux/tmux-attach/script.fish @@ -1,4 +1,4 @@ -set selected (tmux list-sessions -F '#{session_name}' 2>/dev/null | fzf1 $argv) +set selected (tmux list-sessions -F '#{session_name}' 2>/dev/null | fzf --query "$argv") if not test -n "$selected" exit 1 end diff --git a/modules/programs/tmux/tmux-sessionizer/script.fish b/modules/programs/tmux/tmux-sessionizer/script.fish old mode 100644 new mode 100755 index d0ca484..a5e957b --- a/modules/programs/tmux/tmux-sessionizer/script.fish +++ b/modules/programs/tmux/tmux-sessionizer/script.fish @@ -1,4 +1,11 @@ -set selected (fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | fzf1 $argv) +#!/usr/bin/env fish +set pipe (mktemp --dry-run) +mkfifo $pipe + +fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec-batch dirname {} | tee $pipe >/dev/null & +fd . ~/ --min-depth 1 --max-depth 3 --type d --exec-batch realpath {} | tee $pipe >/dev/null & +set selected (cat $pipe | awk '!seen[$0]++' | fzf --query "$argv") +rm -f "$pipe" set selected_name (basename $selected 2>/dev/null | string replace "." "_") diff --git a/overlays/packages.nix b/overlays/packages.nix index df04332..98b5fb4 100644 --- a/overlays/packages.nix +++ b/overlays/packages.nix @@ -12,20 +12,6 @@ final: prev: timers = inputs.timers.packages.${prev.system}.default; hyprland = inputs.hyprland.packages.${prev.system}.default; - fzf1 = final.writeShellApplication { - name = "fzf1"; - runtimeInputs = with final; [ coreutils fzf fd ]; - text = '' - #!/usr/bin/env bash - selected=$(fzf --query="$*" -1 < /dev/stdin) - - if [[ -z $selected ]]; then - exit 0 - fi - - echo "$selected" - ''; - }; xorg = prev.xorg // { lndir = prev.xorg.lndir.overrideAttrs (_: { meta.mainProgram = "lndir"; diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix index b7b6b8e..401de8b 100644 --- a/overlays/vimPlugins.nix +++ b/overlays/vimPlugins.nix @@ -4,6 +4,8 @@ _: prev: with lib.my; { vimPlugins = prev.vimPlugins // { + inherit (inputs.codeium-nvim.packages.${prev.system}.vimPlugins) codeium-nvim; + smartcolumn-nvim = prev.vimUtils.buildVimPlugin { pname = "smartcolumn-nvim"; version = mkVersionInput inputs.smartcolumn-nvim; @@ -49,5 +51,10 @@ with lib.my; version = mkVersionInput inputs.nvim-puppeteer; src = inputs.nvim-puppeteer; }; + + null-ls-nvim = prev.vimPlugins.null-ls-nvim.overrideAttrs (a: { + version = mkVersionInput inputs.none-ls-nvim; + src = inputs.none-ls-nvim; + }); }; }