From 0b5c058bacb6fe4d75603c30fc4cdc2257e7e6f6 Mon Sep 17 00:00:00 2001 From: Andreas <49288593+asamonik@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:57:32 +0200 Subject: [PATCH 01/18] feat(lsp): added LaTeX support (#25) Signed-off-by: Andreas --- config/plugins/lsp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix index 1499d2b..39f19ef 100644 --- a/config/plugins/lsp.nix +++ b/config/plugins/lsp.nix @@ -19,6 +19,7 @@ pyright.enable = true; # Python tailwindcss.enable = true; # TailwindCSS tsserver.enable = true; # TS/JS + texlab.enable = true; # LaTex }; }; From 359e4783dedc38cdc4bfdf6a4cb1fa82a35f9ca2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:58:08 +0200 Subject: [PATCH 02/18] flake.lock: Update (#24) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/567b938d64d4b4112ee253b9274472dc3a346eb6?narHash=sha256-%2Bebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y%3D' (2024-09-01) → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a?narHash=sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U%3D' (2024-09-12) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/1355a0cbfeac61d785b7183c0caaec1f97361b43?narHash=sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE%3D' (2024-09-10) → 'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059?narHash=sha256-sjiGsMh%2B1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I%3D' (2024-09-13) • Updated input 'nixvim': 'github:nix-community/nixvim/4697b96a0124944929ecefa09d488c7997419e43?narHash=sha256-5Q7Io0J98z7UOswrruOuO/jJNduSB3PKFw/sDz0NX1A%3D' (2024-09-12) → 'github:nix-community/nixvim/95b322a5220744a5cac725e62fa4e612851edbc2?narHash=sha256-WGZuGGjWq4Rac3MwdnXaojvTOMo2HjqXEWughqCYMAk%3D' (2024-09-15) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d?narHash=sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC%2Bx4%3D' (2024-08-01) → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a?narHash=sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U%3D' (2024-09-12) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/4509ca64f1084e73bc7a721b20c669a8d4c5ebe6?narHash=sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk%3D' (2024-08-28) → 'github:cachix/git-hooks.nix/7570de7b9b504cfe92025dd1be797bf546f66528?narHash=sha256-tyMUA6NgJSvvQuzB7A1Sf8%2B0XCHyfSPRx/b00o6K0uo%3D' (2024-09-05) • Updated input 'nixvim/home-manager': 'github:nix-community/home-manager/c2cd2a52e02f1dfa1c88f95abeb89298d46023be?narHash=sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM%3D' (2024-08-23) → 'github:nix-community/home-manager/e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f?narHash=sha256-p4OrJL2weh0TRtaeu1fmNYP6%2BTOp/W2qdaIJxxQay4c%3D' (2024-09-14) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/ac5694a0b855a981e81b4d9f14052e3ff46ca39e?narHash=sha256-zv8C9RNa86CIpyHwPIVO/k%2B5TfM8ZbjGwOOpTe1grls%3D' (2024-08-25) → 'github:lnl7/nix-darwin/21fe31f26473c180390cfa81e3ea81aca0204c80?narHash=sha256-Vop/VRi6uCiScg/Ic%2BYlwsdIrLabWUJc57dNczp0eBc%3D' (2024-09-13) • Updated input 'nixvim/nixpkgs': 'github:NixOS/nixpkgs/71e91c409d1e654808b2621f28a327acfdad8dc2?narHash=sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w%3D' (2024-08-28) → 'github:NixOS/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059?narHash=sha256-sjiGsMh%2B1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I%3D' (2024-09-13) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/5a08d691de30b6fc28d58ce71a5e420f2694e087?narHash=sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM%3D' (2024-08-25) → 'github:NuschtOS/search/97d34b70deed4878fcb2449ac89dab717d72efa1?narHash=sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7%2Bzb3tAgTiHDM%3D' (2024-09-15) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/3ffd842a5f50f435d3e603312eefa4790db46af5?narHash=sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos%3D' (2024-08-28) → 'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd?narHash=sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE%3D' (2024-09-02) Co-authored-by: github-actions[bot] Co-authored-by: yolofanhd <76175017+yolofanhd@users.noreply.github.com> --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index a2d38c4..73ad97e 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1725513492, + "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1726357542, + "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726133505, - "narHash": "sha256-5Q7Io0J98z7UOswrruOuO/jJNduSB3PKFw/sDz0NX1A=", + "lastModified": 1726441328, + "narHash": "sha256-WGZuGGjWq4Rac3MwdnXaojvTOMo2HjqXEWughqCYMAk=", "owner": "nix-community", "repo": "nixvim", - "rev": "4697b96a0124944929ecefa09d488c7997419e43", + "rev": "95b322a5220744a5cac725e62fa4e612851edbc2", "type": "github" }, "original": { @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1724584782, - "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "lastModified": 1726392886, + "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", "owner": "NuschtOS", "repo": "search", - "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": { From 976ff3b2f186ccd90eb5f74efd33d5de34abd657 Mon Sep 17 00:00:00 2001 From: Andreas <49288593+asamonik@users.noreply.github.com> Date: Wed, 18 Sep 2024 20:34:03 +0200 Subject: [PATCH 03/18] fix: ts-ls lsp (#26) Signed-off-by: Andreas --- config/plugins/lsp.nix | 2 +- flake.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix index 39f19ef..7b154b7 100644 --- a/config/plugins/lsp.nix +++ b/config/plugins/lsp.nix @@ -18,7 +18,7 @@ nil-ls.enable = true; # Nix pyright.enable = true; # Python tailwindcss.enable = true; # TailwindCSS - tsserver.enable = true; # TS/JS + ts-ls.enable = true; # TS/JS texlab.enable = true; # LaTex }; }; diff --git a/flake.lock b/flake.lock index 73ad97e..26747bd 100644 --- a/flake.lock +++ b/flake.lock @@ -188,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726441328, - "narHash": "sha256-WGZuGGjWq4Rac3MwdnXaojvTOMo2HjqXEWughqCYMAk=", + "lastModified": 1726676531, + "narHash": "sha256-i8Pbd7JszwuCb0HqzAPypv2ytdcsFeAMFqbrmLaN4BE=", "owner": "nix-community", "repo": "nixvim", - "rev": "95b322a5220744a5cac725e62fa4e612851edbc2", + "rev": "9307b201a3dc57d5b71ded4f897ea9d096544877", "type": "github" }, "original": { From 5679daa1f2e7ae30fb8e977fc910502decb200c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:19:45 +0200 Subject: [PATCH 04/18] flake.lock: Update (#27) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a?narHash=sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U%3D' (2024-09-12) → 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1?narHash=sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0%3D' (2024-10-01) • Updated input 'flake-parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz?narHash=sha256-Ss8QWLXdr2JCBPcYChJhz4xJm%2Bh/xjl4G0c0XlP6a74%3D' (2024-09-01) → 'https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz?narHash=sha256-0xHYkMkeLVQAMa7gvkddbPqpxph%2BhDzdu1XdGPJR%2BOs%3D' (2024-10-01) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172?narHash=sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c%3D' (2024-09-16) → 'github:nixos/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04) • Updated input 'nixvim': 'github:nix-community/nixvim/9307b201a3dc57d5b71ded4f897ea9d096544877?narHash=sha256-i8Pbd7JszwuCb0HqzAPypv2ytdcsFeAMFqbrmLaN4BE%3D' (2024-09-18) → 'github:nix-community/nixvim/33d030d23c9b88bb29e300d702aade58c3734612?narHash=sha256-bulK/Z%2BSEJaHM2PPk7W/kRvO51Ag9bTebcaWai9EEJc%3D' (2024-10-06) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a?narHash=sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U%3D' (2024-09-12) → 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1?narHash=sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0%3D' (2024-10-01) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/7570de7b9b504cfe92025dd1be797bf546f66528?narHash=sha256-tyMUA6NgJSvvQuzB7A1Sf8%2B0XCHyfSPRx/b00o6K0uo%3D' (2024-09-05) → 'github:cachix/git-hooks.nix/1211305a5b237771e13fcca0c51e60ad47326a9a?narHash=sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM%3D' (2024-10-05) • Updated input 'nixvim/home-manager': 'github:nix-community/home-manager/e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f?narHash=sha256-p4OrJL2weh0TRtaeu1fmNYP6%2BTOp/W2qdaIJxxQay4c%3D' (2024-09-14) → 'github:nix-community/home-manager/509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e?narHash=sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK%2Bo%3D' (2024-10-04) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/21fe31f26473c180390cfa81e3ea81aca0204c80?narHash=sha256-Vop/VRi6uCiScg/Ic%2BYlwsdIrLabWUJc57dNczp0eBc%3D' (2024-09-13) → 'github:lnl7/nix-darwin/8c8388ade72e58efdeae71b4cbb79e872c23a56b?narHash=sha256-LTJuQPCsSItZ/8TieFeP30iY%2BuaLoD0mT0tAj1gLeyQ%3D' (2024-10-03) • Updated input 'nixvim/nixpkgs': 'github:NixOS/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059?narHash=sha256-sjiGsMh%2B1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I%3D' (2024-09-13) → 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/97d34b70deed4878fcb2449ac89dab717d72efa1?narHash=sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7%2Bzb3tAgTiHDM%3D' (2024-09-15) → 'github:NuschtOS/search/ba81d9c1eae20fc3a1cd066062a05ac2e799e629?narHash=sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d%2BEaJ8c%3D' (2024-10-04) • Updated input 'nixvim/nuschtosSearch/flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a?narHash=sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ%3D' (2024-09-17) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd?narHash=sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE%3D' (2024-09-02) → 'github:numtide/treefmt-nix/4446c7a6fc0775df028c5a3f6727945ba8400e64?narHash=sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc%3D' (2024-10-03) Co-authored-by: github-actions[bot] --- flake.lock | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 26747bd..831cb24 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1726357542, - "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1727999297, + "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -204,23 +204,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726676531, - "narHash": "sha256-i8Pbd7JszwuCb0HqzAPypv2ytdcsFeAMFqbrmLaN4BE=", + "lastModified": 1728245494, + "narHash": "sha256-bulK/Z+SEJaHM2PPk7W/kRvO51Ag9bTebcaWai9EEJc=", "owner": "nix-community", "repo": "nixvim", - "rev": "9307b201a3dc57d5b71ded4f897ea9d096544877", + "rev": "33d030d23c9b88bb29e300d702aade58c3734612", "type": "github" }, "original": { @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1726392886, - "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", + "lastModified": 1728017046, + "narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=", "owner": "NuschtOS", "repo": "search", - "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", + "rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1725271838, - "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { From c81e21a9bff2845f134da7f0bc567fd16d6d5b6f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 7 Dec 2024 23:19:40 +0100 Subject: [PATCH 05/18] flake.lock: Update (#29) --- flake.lock | 109 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 69 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 831cb24..d307e6b 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -40,11 +40,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -165,6 +165,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -173,11 +201,11 @@ ] }, "locked": { - "lastModified": 1727999297, - "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", + "lastModified": 1733105089, + "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", + "rev": "c6b65d946097baf3915dd51373251de98199280d", "type": "github" }, "original": { @@ -188,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -204,23 +232,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -243,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728245494, - "narHash": "sha256-bulK/Z+SEJaHM2PPk7W/kRvO51Ag9bTebcaWai9EEJc=", + "lastModified": 1733355056, + "narHash": "sha256-EOldkOLdgUVIa8ZJiHkqjD6yaW+AZiZwd94aBqfZERY=", "owner": "nix-community", "repo": "nixvim", - "rev": "33d030d23c9b88bb29e300d702aade58c3734612", + "rev": "277dbeb607210f6a6db656ac7eee9eef3143070c", "type": "github" }, "original": { @@ -259,17 +287,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728017046, - "narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=", + "lastModified": 1733006402, + "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", "owner": "NuschtOS", "repo": "search", - "rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629", + "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", "type": "github" }, "original": { @@ -308,11 +337,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { From ba8721ad9eadcb3e3ac1365a26a121190d84fa96 Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Sun, 8 Dec 2024 02:07:38 +0100 Subject: [PATCH 06/18] fix: fixed deprecation warnings --- config/plugins/lsp.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix index 7b154b7..cd5d5b8 100644 --- a/config/plugins/lsp.nix +++ b/config/plugins/lsp.nix @@ -9,23 +9,23 @@ servers = { bashls.enable = true; # Bash clangd.enable = true; # C/C++ - csharp-ls.enable = true; # C# + csharp_ls.enable = true; # C# cssls.enable = true; # CSS dockerls.enable = true; # Docker gopls.enable = true; # Go html.enable = true; # HTML marksman.enable = true; # Markdown - nil-ls.enable = true; # Nix + nil_ls.enable = true; # Nix pyright.enable = true; # Python tailwindcss.enable = true; # TailwindCSS - ts-ls.enable = true; # TS/JS + ts_ls.enable = true; # TS/JS texlab.enable = true; # LaTex }; }; # Extra configuration for lsp servers lsp.servers = { - lua-ls = { + lua_ls = { enable = true; settings.telemetry.enable = false; }; From bd161b7c05da971466609fc0b54b5e76c2ee4e5d Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Sun, 8 Dec 2024 02:14:31 +0100 Subject: [PATCH 07/18] fix: fixed deprecation warnings --- config/plugins.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/plugins.nix b/config/plugins.nix index a39aded..b16ce11 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -41,6 +41,7 @@ in trouble.enable = true; ts-autotag.enable = true; undotree.enable = true; + web-devicons.enable = true; which-key.enable = true; }; From b6b8a5cf9cc967dc48fcc885ccdd5b8f4d7f40b6 Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Fri, 3 Jan 2025 14:44:03 +0100 Subject: [PATCH 08/18] feat: added vimtex to plugins (#31) --- config/plugins.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/plugins.nix b/config/plugins.nix index b16ce11..aaf5dff 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -41,6 +41,7 @@ in trouble.enable = true; ts-autotag.enable = true; undotree.enable = true; + vimtex.enable = true; web-devicons.enable = true; which-key.enable = true; }; From 272f230b5f8175148db9d324538857eee655fa75 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2025 14:44:19 +0100 Subject: [PATCH 09/18] flake.lock: Update (#30) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04) → 'github:hercules-ci/flake-parts/f2f7418ce0ab4a5309a4596161d154cfc877af66?narHash=sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq%2BraipRI%3D' (2025-01-01) • Updated input 'flake-parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz?narHash=sha256-1qRH7uAUsyQI7R1Uwl4T%2BXvdNv778H0Nb5njNrqvylY%3D' (2024-12-01) → 'https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz?narHash=sha256-CewEm1o2eVAnoqb6Ml%2BQi9Gg/EfNAxbRx1lANGVyoLI%3D' (2025-01-01) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03) → 'github:nixos/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4?narHash=sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs%3D' (2024-12-29) • Updated input 'nixvim': 'github:nix-community/nixvim/277dbeb607210f6a6db656ac7eee9eef3143070c?narHash=sha256-EOldkOLdgUVIa8ZJiHkqjD6yaW%2BAZiZwd94aBqfZERY%3D' (2024-12-04) → 'github:nix-community/nixvim/87ee660991fa0e1b7b4e3f43a6dd1d126e64f3fa?narHash=sha256-g2kXpnAHXpwDfz/4Q2Kwzmee%2BQQKIhmo4DC6JXA8d18%3D' (2025-01-01) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90?narHash=sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS%2Bb4tfNFCwE%3D' (2024-11-01) → 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/3308484d1a443fc5bc92012435d79e80458fe43c?narHash=sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE%3D' (2024-11-19) → 'github:cachix/git-hooks.nix/f0f0dc4920a903c3e08f5bdb9246bb572fcae498?narHash=sha256-ulZN7ps8nBV31SE%2BdwkDvKIzvN6hroRY8sYOT0w%2BE28%3D' (2024-12-21) • Updated input 'nixvim/home-manager': 'github:nix-community/home-manager/bf23fe41082aa0289c209169302afd3397092f22?narHash=sha256-zFOtOaqjzZfPMsm1mwu98syv3y%2BjziAq5DfWygaMtLg%3D' (2024-12-02) → 'github:nix-community/home-manager/10e99c43cdf4a0713b4e81d90691d22c6a58bdf2?narHash=sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4%3D' (2024-12-28) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/c6b65d946097baf3915dd51373251de98199280d?narHash=sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s%2BvG6ENM%3D' (2024-12-02) → 'github:lnl7/nix-darwin/71a3a075e3229a7518d76636bb762aef2bcb73ac?narHash=sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A%3D' (2024-12-29) • Updated input 'nixvim/nixpkgs': 'github:NixOS/nixpkgs/ac35b104800bff9028425fec3b6e8a41de2bbfff?narHash=sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE%2Bcrk%3D' (2024-12-01) → 'github:NixOS/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4?narHash=sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs%3D' (2024-12-29) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/16307548b7a1247291c84ae6a12c0aacb07dfba2?narHash=sha256-BC1CecAQISV5Q4LZK72Gx0%2BfaemOwaChiD9rMVfDPoA%3D' (2024-11-30) → 'github:NuschtOS/search/3051be7f403bff1d1d380e4612f0c70675b44fc9?narHash=sha256-Y47y%2BLesOCkJaLvj%2BdI/Oa6FAKj/T9sKVKDXLNsViPw%3D' (2024-12-09) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/6209c381904cab55796c5d7350e89681d3b2a8ef?narHash=sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII%2BoAc%3D' (2024-11-29) → 'github:numtide/treefmt-nix/9e09d30a644c57257715902efbb3adc56c79cf28?narHash=sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q%2BT0BVeZE%3D' (2024-12-25) Co-authored-by: github-actions[bot] --- flake.lock | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index d307e6b..3d271f4 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1735478292, + "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -232,23 +232,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733355056, - "narHash": "sha256-EOldkOLdgUVIa8ZJiHkqjD6yaW+AZiZwd94aBqfZERY=", + "lastModified": 1735772847, + "narHash": "sha256-g2kXpnAHXpwDfz/4Q2Kwzmee+QQKIhmo4DC6JXA8d18=", "owner": "nix-community", "repo": "nixvim", - "rev": "277dbeb607210f6a6db656ac7eee9eef3143070c", + "rev": "87ee660991fa0e1b7b4e3f43a6dd1d126e64f3fa", "type": "github" }, "original": { @@ -294,11 +294,11 @@ ] }, "locked": { - "lastModified": 1733006402, - "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -337,11 +337,11 @@ ] }, "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "lastModified": 1735135567, + "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", "type": "github" }, "original": { From 6c0bc5023094bace0fda1a44b3f776efb988ca95 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:29:16 +0100 Subject: [PATCH 10/18] flake.lock: Update (#32) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/f2f7418ce0ab4a5309a4596161d154cfc877af66?narHash=sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq%2BraipRI%3D' (2025-01-01) → 'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764?narHash=sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo%3D' (2025-03-01) • Updated input 'flake-parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz?narHash=sha256-CewEm1o2eVAnoqb6Ml%2BQi9Gg/EfNAxbRx1lANGVyoLI%3D' (2025-01-01) → 'https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz?narHash=sha256-3wHafybyRfpUCLoE8M%2BuPVZinImg3xX%2BNm6gEfN3G8I%3D' (2025-03-01) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4?narHash=sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs%3D' (2024-12-29) → 'github:nixos/nixpkgs/303bd8071377433a2d8f76e684ec773d70c5b642?narHash=sha256-cjbHI%2BzUzK5CPsQZqMhE3npTyYFt9tJ3%2BohcfaOF/WM%3D' (2025-03-01) • Updated input 'nixvim': 'github:nix-community/nixvim/87ee660991fa0e1b7b4e3f43a6dd1d126e64f3fa?narHash=sha256-g2kXpnAHXpwDfz/4Q2Kwzmee%2BQQKIhmo4DC6JXA8d18%3D' (2025-01-01) → 'github:nix-community/nixvim/6f8d8f7aee84f377f52c8bb58385015f9168a666?narHash=sha256-TpZMYjOre%2B6GhKDVHFwoW2iBWqpNQppQTuqIAo%2BOBV8%3D' (2025-02-25) • Removed input 'nixvim/devshell' • Removed input 'nixvim/devshell/nixpkgs' • Removed input 'nixvim/flake-compat' • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04) → 'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd?narHash=sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm%2BzmZ7vxbJdo%3D' (2025-02-01) • Removed input 'nixvim/git-hooks' • Removed input 'nixvim/git-hooks/flake-compat' • Removed input 'nixvim/git-hooks/gitignore' • Removed input 'nixvim/git-hooks/gitignore/nixpkgs' • Removed input 'nixvim/git-hooks/nixpkgs' • Removed input 'nixvim/git-hooks/nixpkgs-stable' • Removed input 'nixvim/home-manager' • Removed input 'nixvim/home-manager/nixpkgs' • Removed input 'nixvim/nix-darwin' • Removed input 'nixvim/nix-darwin/nixpkgs' • Updated input 'nixvim/nixpkgs': 'github:NixOS/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4?narHash=sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs%3D' (2024-12-29) → 'github:NixOS/nixpkgs/1da52dd49a127ad74486b135898da2cef8c62665?narHash=sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R%2B7kIbGa%2B2s%3D' (2025-02-05) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/3051be7f403bff1d1d380e4612f0c70675b44fc9?narHash=sha256-Y47y%2BLesOCkJaLvj%2BdI/Oa6FAKj/T9sKVKDXLNsViPw%3D' (2024-12-09) → 'github:NuschtOS/search/86e2038290859006e05ca7201425ea5b5de4aecb?narHash=sha256-4DaDrQDAIxlWhTjH6h/%2BxfG05jt3qDZrZE/7zDLQaS4%3D' (2025-02-02) • Removed input 'nixvim/treefmt-nix' • Removed input 'nixvim/treefmt-nix/nixpkgs' Co-authored-by: github-actions[bot] --- flake.lock | 204 +++++++---------------------------------------------- 1 file changed, 24 insertions(+), 180 deletions(-) diff --git a/flake.lock b/flake.lock index 3d271f4..69f47c6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,50 +1,15 @@ { "nodes": { - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -61,11 +26,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -92,79 +57,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -193,34 +85,13 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735478292, - "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1740828860, + "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "type": "github" }, "original": { @@ -232,50 +103,44 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "lastModified": 1740872140, + "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "home-manager": "home-manager", - "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1735772847, - "narHash": "sha256-g2kXpnAHXpwDfz/4Q2Kwzmee+QQKIhmo4DC6JXA8d18=", + "lastModified": 1740520037, + "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", "owner": "nix-community", "repo": "nixvim", - "rev": "87ee660991fa0e1b7b4e3f43a6dd1d126e64f3fa", + "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", "type": "github" }, "original": { @@ -294,11 +159,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -328,27 +193,6 @@ "repo": "default", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735135567, - "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", From a755d128b1d60ffffc8b274edb20431515affa0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 9 Mar 2025 14:41:57 +0100 Subject: [PATCH 11/18] flake.lock: Update (#33) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/303bd8071377433a2d8f76e684ec773d70c5b642?narHash=sha256-cjbHI%2BzUzK5CPsQZqMhE3npTyYFt9tJ3%2BohcfaOF/WM%3D' (2025-03-01) → 'github:nixos/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246?narHash=sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM%3D' (2025-03-03) • Updated input 'nixvim': 'github:nix-community/nixvim/6f8d8f7aee84f377f52c8bb58385015f9168a666?narHash=sha256-TpZMYjOre%2B6GhKDVHFwoW2iBWqpNQppQTuqIAo%2BOBV8%3D' (2025-02-25) → 'github:nix-community/nixvim/03065fd4708bfdf47dd541d655392a60daa25ded?narHash=sha256-gXDSXDr6tAb%2BJgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q%3D' (2025-03-04) Co-authored-by: github-actions[bot] --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 69f47c6..4df2388 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740520037, - "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", + "lastModified": 1741098523, + "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", + "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "type": "github" }, "original": { From dd227ad0176ca212ac3c4d9ca43e6c8ddbf437a5 Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Sun, 9 Mar 2025 14:54:32 +0100 Subject: [PATCH 12/18] fix: fixed warnings --- config/plugins.nix | 2 +- config/plugins/dap.nix | 24 ++++++++++-------------- config/plugins/notify.nix | 12 +++++++----- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/config/plugins.nix b/config/plugins.nix index aaf5dff..17f8b18 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -23,7 +23,7 @@ in # Plugins used within a single line plugins = { commentary.enable = true; - crates-nvim.enable = true; + crates.enable = true; diffview.enable = true; flash.enable = true; floaterm.enable = true; diff --git a/config/plugins/dap.nix b/config/plugins/dap.nix index afb0c9e..4b39f20 100644 --- a/config/plugins/dap.nix +++ b/config/plugins/dap.nix @@ -16,20 +16,6 @@ texthl = "DapLogPoint"; }; }; - extensions = { - dap-python = { - enable = true; - }; - dap-ui = { - enable = true; - floating.mappings = { - close = [ "" "q" ]; - }; - }; - dap-virtual-text = { - enable = true; - }; - }; configurations = { java = [ { @@ -42,5 +28,15 @@ ]; }; }; + dap-python.enable = true; + dap-virtual-text.enable = true; + dap-ui = { + enable = true; + settings = { + floating.mappings = { + close = [ "" "q" ]; + }; + }; + }; }; } diff --git a/config/plugins/notify.nix b/config/plugins/notify.nix index 7b4cb6f..30d0972 100644 --- a/config/plugins/notify.nix +++ b/config/plugins/notify.nix @@ -2,11 +2,13 @@ plugins = { notify = { enable = true; - backgroundColour = "#1e1e2e"; - fps = 60; - render = "default"; - timeout = 500; - topDown = false; + settings = { + backgroundColour = "#1e1e2e"; + fps = 60; + render = "default"; + timeout = 500; + topDown = false; + }; }; }; } From 39510a8a5046853709098435fa154fc6939beab1 Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Sun, 9 Mar 2025 15:10:38 +0100 Subject: [PATCH 13/18] feat: added basic lazy loading --- config/default.nix | 1 + config/plugins.nix | 3 ++- config/plugins/dap.nix | 22 ++++++++++++++++++++++ config/plugins/markdown-preview.nix | 1 + config/plugins/vim-tex.nix | 8 ++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 config/plugins/vim-tex.nix diff --git a/config/default.nix b/config/default.nix index 1da92bf..d24a328 100644 --- a/config/default.nix +++ b/config/default.nix @@ -8,6 +8,7 @@ colorschemes.gruvbox = { enable = true; + lazyLoad.enable = true; settings = { transparent_mode = true; terima_colors = true; diff --git a/config/plugins.nix b/config/plugins.nix index 17f8b18..2e97717 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -18,6 +18,7 @@ in (prefix + /startup.nix) (prefix + /telescope.nix) (prefix + /todo-comments.nix) + (prefix + /vim-tex.nix) ]; # Plugins used within a single line @@ -31,6 +32,7 @@ in fugitive.enable = true; git-conflict.enable = true; lualine.enable = true; + lz-n.enable = true; neogen.enable = true; neotest.enable = true; nix.enable = true; @@ -41,7 +43,6 @@ in trouble.enable = true; ts-autotag.enable = true; undotree.enable = true; - vimtex.enable = true; web-devicons.enable = true; which-key.enable = true; }; diff --git a/config/plugins/dap.nix b/config/plugins/dap.nix index 4b39f20..cb327b3 100644 --- a/config/plugins/dap.nix +++ b/config/plugins/dap.nix @@ -2,6 +2,9 @@ plugins = { dap = { enable = true; + lazyLoad.settings = { + event = "BufEnter"; + }; signs = { dapBreakpoint = { text = "●"; @@ -32,6 +35,25 @@ dap-virtual-text.enable = true; dap-ui = { enable = true; + lazyLoad.settings = { + before.__raw = '' + function() + require('lz.n').trigger_load('nvim-dap') + end + ''; + keys = [ + { + __unkeyed-1 = "du"; + __unkeyed-2.__raw = '' + function() + require('dap.ext.vscode').load_launchjs(nil, {}) + require("dapui").toggle() + end + ''; + desc = "Toggle Debugger UI"; + } + ]; + }; settings = { floating.mappings = { close = [ "" "q" ]; diff --git a/config/plugins/markdown-preview.nix b/config/plugins/markdown-preview.nix index f6416ec..55fdcda 100644 --- a/config/plugins/markdown-preview.nix +++ b/config/plugins/markdown-preview.nix @@ -2,6 +2,7 @@ plugins = { markdown-preview = { enable = true; + # lazyLoad.settings.ft = "markdown"; settings.theme = "dark"; }; }; diff --git a/config/plugins/vim-tex.nix b/config/plugins/vim-tex.nix new file mode 100644 index 0000000..89b0686 --- /dev/null +++ b/config/plugins/vim-tex.nix @@ -0,0 +1,8 @@ +{ + plugins = { + vimtex = { + enable = true; + # lazyLoad.settings.ft = "tex"; + }; + }; +} From 18c7307df53dc5bed8f5c068dd9dd2bf79784461 Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Fri, 23 May 2025 17:42:12 +0200 Subject: [PATCH 14/18] Fix/warnings (#36) * fix: fixed warnings * feat: added basic lazy loading * feat: added snacks and auto-session, updated keybinds and readme --- README.md | 19 +++- config/mappings.nix | 176 +++++++++++++++++++++++--------- config/plugins.nix | 21 +++- config/plugins/none-ls.nix | 15 +-- config/plugins/rustaceanvim.nix | 72 +++++++++++++ config/plugins/snacks.nix | 19 ++++ config/plugins/telescope.nix | 16 +++ flake.lock | 77 ++++++++------ 8 files changed, 322 insertions(+), 93 deletions(-) create mode 100644 config/plugins/rustaceanvim.nix create mode 100644 config/plugins/snacks.nix diff --git a/README.md b/README.md index 28bc1ea..9ad656e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ If you add a new configuration file, remember to add it to the To test your configuration simply run the following command -``` +```bash nix run . ``` @@ -51,8 +51,17 @@ For more information look at: [NixOS docs](https://nixos.wiki/wiki/flakes) | n | fb | find buffers | | n | ft | treesitter | | n | fg | git commits | -| n | fh | file history | -| n | fh | file history | +| n | fB | git branches | +| n | fo | old files | +| n | fu | undo history | +| n | fd | diagnostics | +| n | fe | todos | + +### Auto-Session + +| Mode | Keybind | Action | +| ---- | ------- | ------------- | +| n | fs | View Sessions | ### LSP @@ -62,7 +71,7 @@ For more information look at: [NixOS docs](https://nixos.wiki/wiki/flakes) | n | gd | go to definition | | n | gD | go to declaration | | n | gi | go to implementation | -| n | go | go to tyoe definition | +| n | go | go to type definition | | n | gr | go to references | | n | gd | go to definition | | n | \ | rename | @@ -71,7 +80,7 @@ For more information look at: [NixOS docs](https://nixos.wiki/wiki/flakes) | Mode | Keybind | Action | | ---- | ------- | ----------------------------- | -| n | gl | Show diagnostics in telescope | +| n | gl | Show current line diagnostics | | n | [d | go to previous diagnostics | | n | ]d | go to next diagnostics | diff --git a/config/mappings.nix b/config/mappings.nix index 9a7a614..9b6155a 100644 --- a/config/mappings.nix +++ b/config/mappings.nix @@ -5,6 +5,9 @@ action = "NvimTreeToggle"; mode = "n"; key = "n"; + options = { + desc = "Toggle NvimTree"; + }; } # Commentary bindings @@ -12,47 +15,111 @@ action = "Commentary"; mode = "n"; key = "cl"; + options = { + desc = "Toggle comment line"; + }; } - # Telescope bindings - + # Snacks (Telescope) bindings { - action = "Telescope live_grep"; + action = "lua Snacks.picker.grep()"; mode = "n"; key = "fw"; + options = { + desc = "live grep"; + }; } { - action = "Telescope find_files"; + action = "lua Snacks.picker.smart()"; mode = "n"; key = "ff"; + options = { + desc = "Smart find files"; + }; } { - action = "Telescope buffers"; + action = "lua Snacks.picker.buffers()"; mode = "n"; key = "fb"; + options = { + desc = "List buffers"; + }; } - { - action = "Telescope treesitter"; + action = "lua Snacks.picker.git_log()"; mode = "n"; - key = "ft"; + key = "fg"; + options = { + desc = "List git commits"; + }; } { - action = "Telescope git_commits"; mode = "n"; - key = "fg"; + key = "fB"; + action = ''lua Snacks.picker.git_branches()''; + options = { + desc = "Find git branches"; + }; + } + { + mode = "n"; + key = "fD"; + action = ''lua Snacks.picker.git_diff()''; + options = { + desc = "Git Diff (Hunks)"; + }; + } + { + action = "lua Snacks.picker.recent()"; + mode = "n"; + key = "fo"; + options = { + desc = "View old files"; + }; + } + { + action = "lua Snacks.picker.undo()"; + mode = "n"; + key = "fu"; + options = { + desc = "List undo history"; + }; + } + { + action = "lua Snacks.picker.diagnostics()"; + mode = "n"; + key = "fd"; + options = { + desc = "View diagnostics"; + }; } { - action = "Telescope oldfiles"; + action = "lua Snacks.picker.todo_comments()"; mode = "n"; - key = "fh"; + key = "fe"; + options = { + desc = "View ToDos"; + }; } - # Floatterm toggle + # Auto-Session bindings + { + action = "SessionSearch"; + mode = "n"; + key = "fs"; + options = { + desc = "View Sessions"; + }; + } + + # Floatterm bindings { action = "FloatermToggle"; mode = "n"; key = "t"; + options = { + desc = "Toggle FloatTerm"; + }; } { action = "FloatermToggle"; @@ -60,63 +127,80 @@ key = ""; } - # Hover information + # LSP bindings { mode = "n"; key = "K"; action = "lua vim.lsp.buf.hover()"; + options = { + desc = "View lsp hover information"; + }; } - - # Jump to the definition { mode = "n"; key = "gd"; action = "lua vim.lsp.buf.definition()"; + options = { + desc = "Jump to definition"; + }; } - - # Jump to declaration { mode = "n"; key = "gD"; action = "lua vim.lsp.buf.declaration()"; + options = { + desc = "Jump to declaration"; + }; } - - # Lists all the implementations for the symbol under the cursor { mode = "n"; key = "gi"; action = "lua vim.lsp.buf.implementation()"; + options = { + desc = "Jump to implementation"; + }; } - - # Jumps to the definition of the type symbol { mode = "n"; key = "go"; action = "lua vim.lsp.buf.type_definition()"; + options = { + desc = "Jump to type definition"; + }; } - - # Lists all the references { mode = "n"; key = "gr"; action = "lua vim.lsp.buf.references()"; + options = { + desc = "List all references"; + }; } - # Displays a function's signature information { mode = "n"; - key = "gs"; - action = "lua vim.lsp.buf.signature_help()"; + key = "gl"; + action = "lua vim.diagnostic.open_float()"; + options = { + desc = "Show diagnostics of current line"; + }; } - - # Renames all references to the symbol under the cursor { mode = "n"; - key = ""; - action = "lua vim.lsp.buf.rename()"; + key = "[d"; + action = "lua vim.diagnostic.goto_prev()"; + options = { + desc = "Move to previous diagnostic"; + }; + } + { + mode = "n"; + key = "]d"; + action = "lua vim.diagnostic.goto_next()"; + options = { + desc = "Move to next diagnostic"; + }; } - - # Selects a code action available at the current cursor position { mode = "n"; key = ""; @@ -127,30 +211,24 @@ key = ""; action = "lua vim.lsp.buf.range_code_action()"; } - - # Show diagnostics in a floating window { mode = "n"; - key = "gl"; - action = "lua vim.diagnostic.open_float()"; - } - - # Move to the previous diagnostic - { - mode = "n"; - key = "[d"; - action = "lua vim.diagnostic.goto_prev()"; + key = ""; + action = "lua vim.lsp.buf.rename()"; + options = { + desc = "Rename"; + }; } - - # Move to the next diagnostic { mode = "n"; - key = "]d"; - action = "lua vim.diagnostic.goto_next()"; + key = "gs"; + action = "lua vim.lsp.buf.signature_help()"; + options = { + desc = "Show signature information"; + }; } # Notify bindings - { mode = "n"; key = "dn"; diff --git a/config/plugins.nix b/config/plugins.nix index 2e97717..fc11df4 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -19,11 +19,17 @@ in (prefix + /telescope.nix) (prefix + /todo-comments.nix) (prefix + /vim-tex.nix) + (prefix + /snacks.nix) + (prefix + /rustaceanvim.nix) ]; # Plugins used within a single line plugins = { - commentary.enable = true; + auto-session.enable = true; + commentary = { + enable = true; + autoLoad = true; + }; crates.enable = true; diffview.enable = true; flash.enable = true; @@ -33,18 +39,25 @@ in git-conflict.enable = true; lualine.enable = true; lz-n.enable = true; - neogen.enable = true; + neogen = { + enable = true; + languages = { + c.template = { + annotation_convention = "doxygen"; + }; + cpp.template.annotation_convention = "doxygen"; + }; + }; neotest.enable = true; nix.enable = true; nvim-autopairs.enable = true; - persistence.enable = true; - rustaceanvim.enable = true; treesitter.enable = true; trouble.enable = true; ts-autotag.enable = true; undotree.enable = true; web-devicons.enable = true; which-key.enable = true; + markview.enable = true; }; # Plugins not contained within nixvim diff --git a/config/plugins/none-ls.nix b/config/plugins/none-ls.nix index 7ed21b1..c578525 100644 --- a/config/plugins/none-ls.nix +++ b/config/plugins/none-ls.nix @@ -19,6 +19,7 @@ }; formatting = { alejandra.enable = true; + stylua.enable = true; shfmt.enable = true; nixpkgs_fmt.enable = true; @@ -27,13 +28,15 @@ enable = true; disableTsServerFormatter = true; }; - black = { + clang_format = { enable = true; - settings = '' - { - extra_args = { "--fast" }, - } - ''; + }; + black = { + settings = { + extra_args = [ + "--fast" + ]; + }; }; }; completion = { diff --git a/config/plugins/rustaceanvim.nix b/config/plugins/rustaceanvim.nix new file mode 100644 index 0000000..81080f2 --- /dev/null +++ b/config/plugins/rustaceanvim.nix @@ -0,0 +1,72 @@ +{ lib +, pkgs +, ... +}: { + # Needed for RustPlay + extraPlugins = with pkgs.vimPlugins; [ webapi-vim ]; + + plugins = { + rustaceanvim = { + enable = true; + settings = { + dap = { + adapter = { + command = lib.getExe' pkgs.lldb "lldb-dap"; + type = "executable"; + }; + autoloadConfigurations = true; + }; + + server = { + default_settings = { + rust-analyzer = { + cargo = { + buildScripts.enable = true; + features = "all"; + }; + + diagnostics = { + enable = true; + styleLints.enable = true; + }; + + checkOnSave = true; + check = { + command = "clippy"; + features = "all"; + }; + + files = { + excludeDirs = [ + ".cargo" + ".direnv" + ".git" + "node_modules" + "target" + ]; + }; + + inlayHints = { + bindingModeHints.enable = true; + closureStyle = "rust_analyzer"; + closureReturnTypeHints.enable = "always"; + discriminantHints.enable = "always"; + expressionAdjustmentHints.enable = "always"; + implicitDrops.enable = true; + lifetimeElisionHints.enable = "always"; + rangeExclusiveHints.enable = true; + }; + + procMacro = { + enable = true; + }; + + rustc.source = "discover"; + }; + }; + }; + tools.enable_clippy = true; + }; + }; + }; +} diff --git a/config/plugins/snacks.nix b/config/plugins/snacks.nix new file mode 100644 index 0000000..a2efa0d --- /dev/null +++ b/config/plugins/snacks.nix @@ -0,0 +1,19 @@ +{ + plugins = { + snacks = { + enable = true; + settings = { + animate.enabled = false; + scroll.enabled = false; + + bigfile.enabled = true; + image.enabled = true; + indent.enabled = true; + statuscolumn.enabled = true; + input.enabled = true; + scope.enabled = true; + quickfile.enabled = true; + }; + }; + }; +} diff --git a/config/plugins/telescope.nix b/config/plugins/telescope.nix index 43a8e17..98aba3c 100644 --- a/config/plugins/telescope.nix +++ b/config/plugins/telescope.nix @@ -5,6 +5,16 @@ extensions = { file-browser.enable = true; fzf-native.enable = true; + undo = { + enable = true; + settings = { + side_by_side = true; + layout_strategy = "vertical"; + layout_config = { + preview_height = 0.8; + }; + }; + }; }; settings = { defaults = { @@ -18,6 +28,12 @@ "^build/" "%.ipynb" ]; + set_env.COLORTERM = "truecolor"; + }; + pickers = { + colorscheme = { + enable_preview = true; + }; }; }; }; diff --git a/flake.lock b/flake.lock index 4df2388..3bcc63a 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -71,27 +71,27 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -103,23 +103,26 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1740872140, - "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1747467164, + "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec", "type": "github" }, "original": { @@ -133,14 +136,15 @@ "inputs": { "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_2" }, "locked": { - "lastModified": 1741098523, - "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", + "lastModified": 1747683610, + "narHash": "sha256-Jis9/4lnr3pn1AIRgCnoeiReKs2MGy6COWc6JtAEESo=", "owner": "nix-community", "repo": "nixvim", - "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", + "rev": "14c7f5f8968940d1730b5e935dd1d9f3e461a2d3", "type": "github" }, "original": { @@ -159,11 +163,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { @@ -193,6 +197,21 @@ "repo": "default", "type": "github" } + }, + "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" + } } }, "root": "root", From b452d4ca7c3b1f77d05d23c3895840f9a9b1246d Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Wed, 18 Jun 2025 17:41:07 +0200 Subject: [PATCH 15/18] feat: increased column line to 90 char --- config/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/options.nix b/config/options.nix index 3e5f611..83a844d 100644 --- a/config/options.nix +++ b/config/options.nix @@ -59,7 +59,7 @@ cmdheight = 0; # Place a column line - colorcolumn = "80"; + colorcolumn = "90"; # Decrease updatetime updatetime = 50; # faster completion (4000ms default) From 49c44146d35da21195440137dd2433392399d31c Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Thu, 10 Jul 2025 17:43:31 +0200 Subject: [PATCH 16/18] feat: added persistence --- config/plugins.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/plugins.nix b/config/plugins.nix index fc11df4..bd5ee10 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -51,6 +51,7 @@ in neotest.enable = true; nix.enable = true; nvim-autopairs.enable = true; + persistence.enable = true; treesitter.enable = true; trouble.enable = true; ts-autotag.enable = true; From b79d19ba991faf81c633ce2de6dada0abd8c09ca Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Tue, 11 Nov 2025 20:57:42 +0100 Subject: [PATCH 17/18] feat: added lsp --- config/plugins.nix | 5 ++++- config/plugins/lsp.nix | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/plugins.nix b/config/plugins.nix index bd5ee10..de01d62 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -51,7 +51,10 @@ in neotest.enable = true; nix.enable = true; nvim-autopairs.enable = true; - persistence.enable = true; + persistence = { + enable = true; + autoLoad = true; + }; treesitter.enable = true; trouble.enable = true; ts-autotag.enable = true; diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix index cd5d5b8..42c8892 100644 --- a/config/plugins/lsp.nix +++ b/config/plugins/lsp.nix @@ -20,6 +20,7 @@ tailwindcss.enable = true; # TailwindCSS ts_ls.enable = true; # TS/JS texlab.enable = true; # LaTex + verible.enable = true; # Verilog }; }; From b9fb2e6193359841e8da422d4ecb45e1972a68a3 Mon Sep 17 00:00:00 2001 From: yolofanhd <76175017+yolofanhd@users.noreply.github.com> Date: Tue, 11 Nov 2025 21:55:35 +0100 Subject: [PATCH 18/18] chore: updated flake.nix and fixed minor related issues --- config/default.nix | 5 ++ config/plugins.nix | 3 +- config/plugins/markdown-preview.nix | 9 --- config/plugins/nvim-tree.nix | 8 +- config/plugins/snacks.nix | 1 + config/plugins/startup.nix | 120 ++++++++++++++-------------- flake.lock | 50 ++++++------ 7 files changed, 97 insertions(+), 99 deletions(-) delete mode 100644 config/plugins/markdown-preview.nix diff --git a/config/default.nix b/config/default.nix index d24a328..c2aaaef 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { imports = [ ./auto_cmd.nix @@ -39,4 +40,8 @@ clipboard.providers.wl-copy.enable = true; performance.combinePlugins.enable = true; + performance.combinePlugins.standalonePlugins = [ + pkgs.vimPlugins.snacks-nvim + pkgs.vimPlugins.markview-nvim + ]; } diff --git a/config/plugins.nix b/config/plugins.nix index de01d62..bfb036b 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -11,7 +11,6 @@ in (prefix + /lint.nix) (prefix + /lsp.nix) (prefix + /luasnip.nix) - (prefix + /markdown-preview.nix) (prefix + /none-ls.nix) (prefix + /notify.nix) (prefix + /nvim-tree.nix) @@ -41,7 +40,7 @@ in lz-n.enable = true; neogen = { enable = true; - languages = { + settings.languages = { c.template = { annotation_convention = "doxygen"; }; diff --git a/config/plugins/markdown-preview.nix b/config/plugins/markdown-preview.nix deleted file mode 100644 index 55fdcda..0000000 --- a/config/plugins/markdown-preview.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - plugins = { - markdown-preview = { - enable = true; - # lazyLoad.settings.ft = "markdown"; - settings.theme = "dark"; - }; - }; -} diff --git a/config/plugins/nvim-tree.nix b/config/plugins/nvim-tree.nix index 503147a..00f5f9d 100644 --- a/config/plugins/nvim-tree.nix +++ b/config/plugins/nvim-tree.nix @@ -2,10 +2,10 @@ plugins = { nvim-tree = { enable = true; - openOnSetup = true; - openOnSetupFile = true; - autoReloadOnWrite = true; - diagnostics.enable = true; + settings = { + autoReloadOnWrite = true; + diagnostics.enable = true; + }; }; }; } diff --git a/config/plugins/snacks.nix b/config/plugins/snacks.nix index a2efa0d..7a3e5a1 100644 --- a/config/plugins/snacks.nix +++ b/config/plugins/snacks.nix @@ -13,6 +13,7 @@ input.enabled = true; scope.enabled = true; quickfile.enabled = true; + words.enabled = true; }; }; }; diff --git a/config/plugins/startup.nix b/config/plugins/startup.nix index c7cf245..c79b155 100644 --- a/config/plugins/startup.nix +++ b/config/plugins/startup.nix @@ -1,65 +1,67 @@ { plugins = { startup = { - enable = true; - parts = [ - "header" - "body" - ]; - sections = { - header = { - align = "center"; - content = [ - " _ _ ____ __ _ __ _ _ _ _ __ _ _ " - " ( \\/ )( __) ( ( \\( )( \\/ )/ )( \\( )( \\/ ) " - " ) / ) _) / / )( ) ( \\ \\/ / )( / \\/ \\ " - " (__/ (__) \\_)__)(__)(_/\\_) \\__/ (__)\\_)(_/ " - "" - ]; - defaultColor = ""; - foldSection = false; - highlight = "Statement"; - margin = 5; - oldfilesAmount = 0; - title = "Header"; - type = "text"; - }; - body = { - align = "center"; - content = [ - [ - " Find File" - "Telescope find_files" - "ff" - ] - [ - "󰍉 Find Word" - "Telescope live_grep" - "fw" - ] - [ - " File History" - "Telescope oldfiles" - "fh" - ] - [ - " File Browser" - "NvimTreeToggle" - "n" - ] - [ - " New File" - "lua require'startup'.new_file()" - "nf" - ] - ]; - defaultColor = ""; - foldSection = false; - highlight = "String"; - margin = 5; - oldfilesAmount = 0; - title = "Basic Commands"; - type = "mapping"; + enable = false; + settings = { + parts = [ + "header" + "body" + ]; + sections = { + header = { + align = "center"; + content = [ + " _ _ ____ __ _ __ _ _ _ _ __ _ _ " + " ( \\/ )( __) ( ( \\( )( \\/ )/ )( \\( )( \\/ ) " + " ) / ) _) / / )( ) ( \\ \\/ / )( / \\/ \\ " + " (__/ (__) \\_)__)(__)(_/\\_) \\__/ (__)\\_)(_/ " + "" + ]; + defaultColor = ""; + foldSection = false; + highlight = "Statement"; + margin = 5; + oldfilesAmount = 0; + title = "Header"; + type = "text"; + }; + body = { + align = "center"; + content = [ + [ + " Find File" + "Telescope find_files" + "ff" + ] + [ + "󰍉 Find Word" + "Telescope live_grep" + "fw" + ] + [ + " File History" + "Telescope oldfiles" + "fh" + ] + [ + " File Browser" + "NvimTreeToggle" + "n" + ] + [ + " New File" + "lua require'startup'.new_file()" + "nf" + ] + ]; + defaultColor = ""; + foldSection = false; + highlight = "String"; + margin = 5; + oldfilesAmount = 0; + title = "Basic Commands"; + type = "mapping"; + }; }; }; }; diff --git a/flake.lock b/flake.lock index 3bcc63a..8d6558c 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1762810396, + "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", "type": "github" }, "original": { @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1762810396, + "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", "type": "github" }, "original": { @@ -71,27 +71,27 @@ ] }, "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "owner": "NuschtOS", "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.7", + "ref": "v0.1.1", "repo": "ixx", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747467164, - "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", + "lastModified": 1762482733, + "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec", + "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1747683610, - "narHash": "sha256-Jis9/4lnr3pn1AIRgCnoeiReKs2MGy6COWc6JtAEESo=", + "lastModified": 1762865386, + "narHash": "sha256-2hkqfvY2wH+78M85X/ZApyZURnFc926b2mAHiyHcGDE=", "owner": "nix-community", "repo": "nixvim", - "rev": "14c7f5f8968940d1730b5e935dd1d9f3e461a2d3", + "rev": "9e556e752505263eef8c0d0f982e2ab9029cc512", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", + "lastModified": 1761730856, + "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "owner": "NuschtOS", "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", + "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "type": "github" }, "original": {