From 1c7c2a269265bb5a00c19bc6945872ceed2f3d5b Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 4 Jul 2026 22:39:10 +0800 Subject: [PATCH] feat(pkgs): Remove nixvim and its configuration --- flake.lock | 288 ++++++++++----------------- flake.nix | 5 - flake/perSystem.nix | 4 - nixos/modules/top-level/default.nix | 1 - overlays/additions/default.nix | 1 - overlays/additions/nixvim.nix | 5 - pkgs/nixvim/.stylua.toml | 5 - pkgs/nixvim/autocmds.nix | 1 - pkgs/nixvim/coding/blink-cmp.nix | 60 ------ pkgs/nixvim/coding/lazydev.nix | 15 -- pkgs/nixvim/coding/mini-ai.nix | 121 ----------- pkgs/nixvim/coding/mini-pairs.nix | 71 ------- pkgs/nixvim/coding/ts-comments.nix | 3 - pkgs/nixvim/editor.nix | 13 -- pkgs/nixvim/editor/gitsigns.nix | 119 ----------- pkgs/nixvim/editor/trouble.nix | 33 --- pkgs/nixvim/editor/which-key.nix | 17 -- pkgs/nixvim/formatting.nix | 105 ---------- pkgs/nixvim/keymaps.nix | 1 - pkgs/nixvim/lang/c.nix | 31 --- pkgs/nixvim/lang/cxx.nix | 31 --- pkgs/nixvim/lang/idris2.nix | 9 - pkgs/nixvim/lang/json.nix | 30 --- pkgs/nixvim/lang/lua.nix | 34 ---- pkgs/nixvim/lang/markdown.nix | 30 --- pkgs/nixvim/lang/nix.nix | 61 ------ pkgs/nixvim/lang/python.nix | 53 ----- pkgs/nixvim/lang/rust.nix | 31 --- pkgs/nixvim/lang/toml.nix | 32 --- pkgs/nixvim/lang/yaml.nix | 30 --- pkgs/nixvim/linting.nix | 1 - pkgs/nixvim/lsp.nix | 35 ---- pkgs/nixvim/module.nix | 53 ----- pkgs/nixvim/neovide.nix | 33 --- pkgs/nixvim/options.nix | 102 ---------- pkgs/nixvim/package.nix | 36 ---- pkgs/nixvim/treesitter.nix | 16 -- pkgs/nixvim/ui/bufferline.nix | 69 ------- pkgs/nixvim/ui/colorschemes.nix | 7 - pkgs/nixvim/ui/lualine.nix | 21 -- pkgs/nixvim/util/lazy-load.nix | 38 ---- pkgs/nixvim/util/snacks.nix | 85 -------- pkgs/nixvim/util/vim-startuptime.nix | 13 -- 43 files changed, 107 insertions(+), 1642 deletions(-) delete mode 100644 overlays/additions/nixvim.nix delete mode 100644 pkgs/nixvim/.stylua.toml delete mode 100644 pkgs/nixvim/autocmds.nix delete mode 100644 pkgs/nixvim/coding/blink-cmp.nix delete mode 100644 pkgs/nixvim/coding/lazydev.nix delete mode 100644 pkgs/nixvim/coding/mini-ai.nix delete mode 100644 pkgs/nixvim/coding/mini-pairs.nix delete mode 100644 pkgs/nixvim/coding/ts-comments.nix delete mode 100644 pkgs/nixvim/editor.nix delete mode 100644 pkgs/nixvim/editor/gitsigns.nix delete mode 100644 pkgs/nixvim/editor/trouble.nix delete mode 100644 pkgs/nixvim/editor/which-key.nix delete mode 100644 pkgs/nixvim/formatting.nix delete mode 100644 pkgs/nixvim/keymaps.nix delete mode 100644 pkgs/nixvim/lang/c.nix delete mode 100644 pkgs/nixvim/lang/cxx.nix delete mode 100644 pkgs/nixvim/lang/idris2.nix delete mode 100644 pkgs/nixvim/lang/json.nix delete mode 100644 pkgs/nixvim/lang/lua.nix delete mode 100644 pkgs/nixvim/lang/markdown.nix delete mode 100644 pkgs/nixvim/lang/nix.nix delete mode 100644 pkgs/nixvim/lang/python.nix delete mode 100644 pkgs/nixvim/lang/rust.nix delete mode 100644 pkgs/nixvim/lang/toml.nix delete mode 100644 pkgs/nixvim/lang/yaml.nix delete mode 100644 pkgs/nixvim/linting.nix delete mode 100644 pkgs/nixvim/lsp.nix delete mode 100644 pkgs/nixvim/module.nix delete mode 100644 pkgs/nixvim/neovide.nix delete mode 100644 pkgs/nixvim/options.nix delete mode 100644 pkgs/nixvim/package.nix delete mode 100644 pkgs/nixvim/treesitter.nix delete mode 100644 pkgs/nixvim/ui/bufferline.nix delete mode 100644 pkgs/nixvim/ui/colorschemes.nix delete mode 100644 pkgs/nixvim/ui/lualine.nix delete mode 100644 pkgs/nixvim/util/lazy-load.nix delete mode 100644 pkgs/nixvim/util/snacks.nix delete mode 100644 pkgs/nixvim/util/vim-startuptime.nix diff --git a/flake.lock b/flake.lock index c63c087..e9fc0b9 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1781883168, - "narHash": "sha256-raAojJGk0aWdscfFn/9ikZ6V5oUuAZcAz5kjAZ2QN3E=", + "lastModified": 1783066786, + "narHash": "sha256-py6+fS8Qjqvt0lu92XfDTK7k2AlMNde8vsJ9ls6vWQE=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "daed450e9b1a4fadfef68fb4fa5e2f3391fedb34", + "rev": "8087687279f4c8b1b807b3cec91ca8f6842cb5b9", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1781953785, - "narHash": "sha256-YgEE1a5QdKd47AfRoU5G8nm0gGzeCuPN2emupNDMQcc=", + "lastModified": 1782814529, + "narHash": "sha256-YGYe7cy8vUFguQzdCt6FP1B/viF53cJdFZhNJ8Rpp5Y=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "e8e9d325eea25f5664e045787c19baac661828de", + "rev": "f98908d8b5cacc4c24a6039ffd9f41f6a0de4ba2", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1782125445, - "narHash": "sha256-dhhRbow5hVisqkZSmr4k9QXUsCR74AGKHShfb/lf9l4=", + "lastModified": 1783093997, + "narHash": "sha256-oIZAGdY1EYMWUyuHMSlLGk9Zv5iEYXigZ4v3bSgdr6c=", "owner": "doomemacs", "repo": "core", - "rev": "0012109e82f55299c38df7444daf0470f716e023", + "rev": "8e4fbbae048a9abe897bf1878cbd32732a6d41d7", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "doomemacs-modules": { "flake": false, "locked": { - "lastModified": 1781422387, - "narHash": "sha256-OpcKPDoguGnpgElNa9hAktV025UvGt4BSPa1NFMo7IY=", + "lastModified": 1782931200, + "narHash": "sha256-jzC96RZXEVuGD+qdoTmuzd8PcrqnH+38B7jc6kVfTeQ=", "owner": "doomemacs", "repo": "modules", - "rev": "5a44cf7bdb74ffccd0e61921803d5fba51a4df10", + "rev": "7a3c5a14ec18b088183166dfab560000078e4bea", "type": "github" }, "original": { @@ -216,11 +216,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1782138215, - "narHash": "sha256-ttpP+5uCnpTvR78J2/kuZyO0KmLDTmsB0U6RuTyGK/4=", + "lastModified": 1783162655, + "narHash": "sha256-ZrgaXb1OPAcDU3QJMLlNfT52dF2wBWuX8O2Txbi/4lo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a75ed1b52ce01aa12107d2ceee7e5a92dc06d8e0", + "rev": "37c0aa1964dfa3e8b224d8d692ff5468efafa0eb", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1782135403, - "narHash": "sha256-+JakcxKQnp0tbHMUJdiFGNZbUBzbbpaQ+lE0JJoXHHo=", + "lastModified": 1783159924, + "narHash": "sha256-VP3EBFYtVa6Kz9kxgZgVyk5zPGKCTkde7PEGUdgcHFQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0aabf2cb457b222dc348c3e6c5b691711ddce4b9", + "rev": "2eeddeceb43a18a712988529fbb97a8347dcb3d9", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -358,27 +358,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nur", @@ -499,11 +478,11 @@ ] }, "locked": { - "lastModified": 1782154529, - "narHash": "sha256-mVdyS2SxbPGNHTJX4n4EUMT/S2BPyZJ/ZR2UhkJcSF4=", + "lastModified": 1783134515, + "narHash": "sha256-qMoZazubXlXUD9k/syJ/aiWC4X4g73mwVmZ7Z4+rdpM=", "owner": "nix-community", "repo": "home-manager", - "rev": "af11a877f238208676b596a5b6c3f3d8dcf5a86b", + "rev": "b885baad531fa3d3beae2ba9a0712d22974d8016", "type": "github" }, "original": { @@ -541,11 +520,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1782086674, - "narHash": "sha256-GuN06EDWFefs6MJnGTKsjd1GRWy3r5xYzDIQs4+aqZ0=", + "lastModified": 1783123404, + "narHash": "sha256-BBsmLKFfNbudBSDM1ydfiidz6IVtE/mtxzg+ymmKSrI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "80fa93450cf3f0062cae52f107e66b1a7db2e8f1", + "rev": "98d7df41f23ac6acb631104ddba2ab5587e74abc", "type": "github" }, "original": { @@ -557,11 +536,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1782084642, - "narHash": "sha256-vqBemsQl1c6Bp0+zsti/wgGZDBFWGmbNF3LP2j2FY/U=", + "lastModified": 1783120669, + "narHash": "sha256-TmGkWeHBGg/QzbkUpWtVZOziUNiLy07nixIVcdrLdbM=", "owner": "neovim", "repo": "neovim", - "rev": "2dd5e3eb4fdf2d7711778246617a2435b131cb09", + "rev": "b5fd22e771aa01f3057d449fcde1d1a9e9c45dae", "type": "github" }, "original": { @@ -582,11 +561,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1781795508, - "narHash": "sha256-VKrApQ3WCkEe9D8DbaeFjGqLAh7zqYGYjbQYtY5ikxc=", + "lastModified": 1783123561, + "narHash": "sha256-A4XJC5qR19bBJ3KO3oE1cK4e98bPrO5QYcSNPVZuUas=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "493ce1e33e72f86312584f331c8cf52b3432ec99", + "rev": "62b5feade147800f4e49503ae6fb643892689d65", "type": "github" }, "original": { @@ -639,11 +618,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1782099009, - "narHash": "sha256-fC/xSFANAxsbLUr/BQdfMrJFm22SEZ04em3uNAQpq60=", + "lastModified": 1783104700, + "narHash": "sha256-EM0ZtZZnxcuQhLaFH2C3vrX/DgLeLjK6kFm7K9sS4cs=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "d2e6bb747a4ab16167bd4bbc1eddf0c6ab18c7f1", + "rev": "6b59eff5f5d8ed081357da666d8f5ff59b02ae92", "type": "github" }, "original": { @@ -663,11 +642,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1782135883, - "narHash": "sha256-3/XqkF5Q3eLuY7pgskZvAas0RGhoTu2GZuiIaljlF7U=", + "lastModified": 1783160885, + "narHash": "sha256-l1xCEgpUPiMYFlrmp2MdOO13kEX2JaoDmIaWulUlO2s=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "0f7867c04dbc20201865db74b1e65a3615cd4aa7", + "rev": "1d122450adecd567d21ace6a46334e0c409a020e", "type": "github" }, "original": { @@ -687,11 +666,11 @@ ] }, "locked": { - "lastModified": 1781363098, - "narHash": "sha256-uhidFg3n92Lh9JKQJQExEPNRe+fTzhC7/G9XebdzSYU=", + "lastModified": 1782181777, + "narHash": "sha256-l6Jy/ImzYOx9paTKhrWaPJ2w8oxVoRUe56iTaEKd2Qc=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "55d95057021c5d285d95c5f254006f4fa9c3084b", + "rev": "875fd6c5a8c417d3b0a80297b3753bb3ff5a2093", "type": "github" }, "original": { @@ -705,11 +684,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1781622756, - "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", + "lastModified": 1782562157, + "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", + "rev": "a9cf7546a938c737b079e738de73934a13de9784", "type": "github" }, "original": { @@ -764,11 +743,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1781808408, - "narHash": "sha256-0sOb6OIaD/K1zHxBhpmlKvkADfe0n8+l4Jj2e1Q0r3w=", + "lastModified": 1782999065, + "narHash": "sha256-5Dgj5+pIQYZKrXUGaLCk7CKfN3MmpwIhO94++WVxvng=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8210c649915deed7080033cdbabcc19e40bb899", + "rev": "80d591ed473cfc46329932c2aadac9b435342c7c", "type": "github" }, "original": { @@ -780,11 +759,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1781509190, - "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", + "lastModified": 1782847189, + "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", + "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", "type": "github" }, "original": { @@ -796,34 +775,18 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1781577229, - "narHash": "sha256-rcUHdUtJEvMdNEl2Wq+YpHraHKfcer3KsBscpZEF2Yg=", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "lastModified": 1782467914, + "narHash": "sha256-inDx/w70OSJoJPqtKh0BrzAsbZZhpya7YgS43jHnhwg=", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1017464.567a49d1913c/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1022855.e73de5be04e0/nixexprs.tar.xz" }, "original": { "type": "tarball", "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1770107345, "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", @@ -841,11 +804,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1782959384, + "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", "type": "github" }, "original": { @@ -889,11 +852,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1781607440, - "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", + "lastModified": 1782948114, + "narHash": "sha256-AXmz9ho4Lud5CsbrZsuSVwpQZ4o5FgZ1chxBn5cJ8+0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", + "rev": "9e92285f211dad236540fd617d7e30e0b99bc0e1", "type": "github" }, "original": { @@ -905,11 +868,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1782014548, - "narHash": "sha256-zYKx9xcbPvk4zOzkny3w2/AkuKhJqGwRD+piA3urkx8=", + "lastModified": 1783089885, + "narHash": "sha256-02ary8OtZROV9b1sqlNaU2NEhzA706qmTBfX8Alvyk0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72349305fb839e27697873de7a4ce3a98c378f48", + "rev": "04b4e759e84353279524e23661cd1622f76df6ed", "type": "github" }, "original": { @@ -934,11 +897,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1782959384, + "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", "type": "github" }, "original": { @@ -950,40 +913,20 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1781607440, - "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", - "owner": "NixOS", + "lastModified": 1782959384, + "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_9", - "systems": "systems_4" - }, - "locked": { - "lastModified": 1782145918, - "narHash": "sha256-xYx+9aM7JzFSy7F5xCnbMgDlzjRFxoXbRl+eL4rcfMQ=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "7f813fc7a6a2f92103208a69a98d6afa24f5bb23", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -992,11 +935,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1780949817, - "narHash": "sha256-2oJuPyt+4dd+ZzO7TFqpmkSAAYpRg9SF4eV8kJGl6Tk=", + "lastModified": 1783017890, + "narHash": "sha256-bAzrtN0GDMH0dOZkgeI3zSxfFs2rdD3pMuzOxvTF0bs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "f816591afc2f2f606d1f0cf70b51e95c04a7a8aa", + "rev": "a48885b9fec485c903c955749a7da6e30147cd38", "type": "github" }, "original": { @@ -1012,7 +955,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1031,15 +974,15 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_10" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1782151680, - "narHash": "sha256-IEELhqTnlCiAmND09HADfdz4Fa5uxVT5oi8JZq3nh/g=", + "lastModified": 1783174895, + "narHash": "sha256-Q6R76y1iN3WWjJMKIl8Sa4L7h5mEYbieEGIRlwZJtLs=", "owner": "nix-community", "repo": "NUR", - "rev": "05c357e255f33c637a5001b638b4ee3f585bd7ea", + "rev": "f658a5a156740003d4f23fde9b827c78679ea70f", "type": "github" }, "original": { @@ -1131,7 +1074,6 @@ "nixpkgs": "nixpkgs_8", "nixpkgs-patch-rqbit-bump": "nixpkgs-patch-rqbit-bump", "nixpkgs-patcher": "nixpkgs-patcher", - "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", "nvchad-starter": "nvchad-starter", @@ -1192,11 +1134,11 @@ ] }, "locked": { - "lastModified": 1781943681, - "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=", + "lastModified": 1783174389, + "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca", + "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", "type": "github" }, "original": { @@ -1208,11 +1150,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1781976347, - "narHash": "sha256-KglrxymoUAKnfMzmezK1LTqEe/BOwcdrkRQy+xw83Ws=", + "lastModified": 1782449399, + "narHash": "sha256-4nF8LMfAwN66a5JAgC2inhFgzW3m/oHFATlm1F6f+tE=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "7ee024bd93d7737c8c4e40dd04934d15e3ff87b9", + "rev": "a34310ecbbb85fa9a125caee8fba227af1f94fcf", "type": "github" }, "original": { @@ -1223,15 +1165,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_11", - "systems": "systems_6" + "nixpkgs": "nixpkgs_10", + "systems": "systems_5" }, "locked": { - "lastModified": 1782031037, - "narHash": "sha256-a7oWSyS7SN81UOqVt481yIEMDsMpaJ7GNdV6Eaz5Yqg=", + "lastModified": 1782898510, + "narHash": "sha256-7QVN7ijsXbIBRrI9LdXfeoFktTS0I6HZya9tu6+STrs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "9cb27462cfd20edac174353f1e95bc03aa888863", + "rev": "9cabea6f5973ec01f60080ea50f54f8f6d74dc95", "type": "github" }, "original": { @@ -1255,18 +1197,18 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_7", + "systems": "systems_6", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1781997134, - "narHash": "sha256-muBZG4O/agq/ljgHr6c3AsobIWgODAS6vf50xIS7o+Q=", + "lastModified": 1783101802, + "narHash": "sha256-/Ti+wDco0f3C9s94RxyBKJyc0BklwYh0a/jFWKeHNYw=", "owner": "nix-community", "repo": "stylix", - "rev": "a6a493119e492e15874caf6f7f8c7e572e64c655", + "rev": "718c14e8ecba215a65ff955c187fadb9732ddd01", "type": "github" }, "original": { @@ -1321,22 +1263,6 @@ } }, "systems_4": { - "locked": { - "lastModified": 1774449309, - "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", - "owner": "nix-systems", - "repo": "default", - "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "ref": "future-26.11", - "repo": "default", - "type": "github" - } - }, - "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1351,7 +1277,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1366,7 +1292,7 @@ "type": "github" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1469,7 +1395,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1780220602, @@ -1546,11 +1472,11 @@ ] }, "locked": { - "lastModified": 1782144240, - "narHash": "sha256-RgCWSv7AJZCwPhCzz+J0lvwp1WBz9ouvCnnlmvu0xfw=", + "lastModified": 1783146259, + "narHash": "sha256-wWlTBOy/Q6mfqamF+Z/KE1NRwoGwX+iKHusxdc2qNs8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d1693556428967f8b4eef128feb090421ddcaf15", + "rev": "45617befee3b74b806f7a4f0e1f48e3b2abc91f3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index be918a5..d6f01ff 100644 --- a/flake.nix +++ b/flake.nix @@ -173,11 +173,6 @@ repo = "NUR"; }; - nixvim = { - type = "github"; - owner = "nix-community"; - repo = "nixvim"; - }; neovim-nightly = { type = "github"; owner = "nix-community"; diff --git a/flake/perSystem.nix b/flake/perSystem.nix index 3134e47..4976ec9 100644 --- a/flake/perSystem.nix +++ b/flake/perSystem.nix @@ -44,7 +44,6 @@ inputsScope = lib.makeScope pkgs.newScope (self: { inherit inputs rootPath; srcs = self.callPackage (rootPath + "/_sources/generated.nix") {}; - inherit (inputs'.nixvim.legacyPackages) makeNixvim makeNixvimWithModule; neovim_git = inputs'.neovim-nightly.packages.default; }); in @@ -73,9 +72,6 @@ "rootPath" - "makeNixvim" - "makeNixvimWithModule" - "newScope" "overrideScope" "packages" diff --git a/nixos/modules/top-level/default.nix b/nixos/modules/top-level/default.nix index 9561fa5..3eef415 100644 --- a/nixos/modules/top-level/default.nix +++ b/nixos/modules/top-level/default.nix @@ -9,7 +9,6 @@ sops-nix.nixosModules.sops stylix.nixosModules.stylix disko.nixosModules.disko - nixvim.nixosModules.nixvim dae-flake.nixosModules.dae ./.. diff --git a/overlays/additions/default.nix b/overlays/additions/default.nix index d5c5a72..bb4afd5 100644 --- a/overlays/additions/default.nix +++ b/overlays/additions/default.nix @@ -9,7 +9,6 @@ in ./editor-runtime.nix ./wallpapers.nix ./rime-all.nix - ./nixvim.nix ./doom-emacs.nix ./iosevka-serif_fixed.nix diff --git a/overlays/additions/nixvim.nix b/overlays/additions/nixvim.nix deleted file mode 100644 index 43cd9ae..0000000 --- a/overlays/additions/nixvim.nix +++ /dev/null @@ -1,5 +0,0 @@ -{outputs, ...}: _final: prev: let - inherit (prev.stdenv.hostPlatform) system; -in { - inherit (outputs.packages.${system}) nixvim; -} diff --git a/pkgs/nixvim/.stylua.toml b/pkgs/nixvim/.stylua.toml deleted file mode 100644 index febcadb..0000000 --- a/pkgs/nixvim/.stylua.toml +++ /dev/null @@ -1,5 +0,0 @@ -column_width = 120 -indent_type = "Spaces" -indent_width = 2 -[sort_requires] -enabled = true diff --git a/pkgs/nixvim/autocmds.nix b/pkgs/nixvim/autocmds.nix deleted file mode 100644 index 6462967..0000000 --- a/pkgs/nixvim/autocmds.nix +++ /dev/null @@ -1 +0,0 @@ -{...}: {} diff --git a/pkgs/nixvim/coding/blink-cmp.nix b/pkgs/nixvim/coding/blink-cmp.nix deleted file mode 100644 index b34c4b8..0000000 --- a/pkgs/nixvim/coding/blink-cmp.nix +++ /dev/null @@ -1,60 +0,0 @@ -{...}: { - youthlic.plugins.blink-cmp = { - enable = true; - setupLspCapabilities = true; - settings = { - snippets = { - expand = { - __raw = - #lua - '' - function(snippet, _) - return {} - end - ''; - }; - }; - appearance = { - # use_nvim_cmp_as_default = false; - }; - completion = { - accept = { - auto_brackets = { - enabled = true; - }; - }; - menu = { - draw = { - treesitter = ["lsp"]; - }; - }; - documentation = { - auto_show = true; - auto_show_delay_ms = 200; - }; - ghost_text = { - enabled = { - __raw = - #lua - ''vim.g.ai_cmp''; - }; - }; - }; - sources = { - compat = []; - default = [ - "lsp" - "path" - "snippets" - "buffer" - ]; - }; - cmdline = { - enabled = false; - }; - keymap = { - preset = "enter"; - }; - }; - }; -} diff --git a/pkgs/nixvim/coding/lazydev.nix b/pkgs/nixvim/coding/lazydev.nix deleted file mode 100644 index 2432afc..0000000 --- a/pkgs/nixvim/coding/lazydev.nix +++ /dev/null @@ -1,15 +0,0 @@ -{...}: { - youthlic.plugins = { - lazydev = { - enable = true; - settings = { - library = [ - { - path = "$''{3rd}/luv/library"; - words = ["vim%.uv"]; - } - ]; - }; - }; - }; -} diff --git a/pkgs/nixvim/coding/mini-ai.nix b/pkgs/nixvim/coding/mini-ai.nix deleted file mode 100644 index 6644fc2..0000000 --- a/pkgs/nixvim/coding/mini-ai.nix +++ /dev/null @@ -1,121 +0,0 @@ -{...}: { - youthlic.plugins.mini-ai = { - enable = true; - luaConfig.pre = - #lua - '' - do - local ai = require("mini.ai") - _M.__coding_plugin_mini_ai_opts = { - n_lines = 500, - custom_textobjects = { - o = ai.gen_spec.treesitter({ -- code block - a = { "@block.outer", "@conditional.outer", "@loop.outer" }, - i = { "@block.inner", "@conditional.inner", "@loop.inner" }, - }), - f = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }), -- function - c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }), -- class - t = { "<([%p%w]-)%f[^<%w][^<>]->.-", "^<.->().*()$" }, -- tags - d = { "%f[%d]%d+" }, -- digits - e = { -- Word with case - { "%u[%l%d]+%f[^%l%d]", "%f[%S][%l%d]+%f[^%l%d]", "%f[%P][%l%d]+%f[^%l%d]", "^[%l%d]+%f[^%l%d]" }, - "^().*()$", - }, - g = function(ai_type) - local start_line, end_line = 1, vim.fn.line("$") - if ai_type == "i" then - local first_nonblank, last_nonblank = vim.fn.nextnonblank(start_line), vim.fn.prevnonblank(end_line) - if first_nonblank == 0 or last_nonblank == 0 then - return { from = { line = start_line, col = 1 } } - end - start_line, end_line = first_nonblank, last_nonblank - end - - local to_col = math.max(vim.fn.getline(end_line):len(), 1) - return { - from = { - line = start_line, - col = 1, - }, - to = { - line = end_line, - col = to_col, - }, - } - end, -- buffer - u = ai.gen_spec.function_call(), -- u for "Usage" - U = ai.gen_spec.function_call({ name_pattern = "[%w_]" }), -- without dot in function name - }, - } - end - ''; - settings = { - __raw = - #lua - "_M.__coding_plugin_mini_ai_opts"; - }; - luaConfig.post = - #lua - '' - _M.on_load("which-key", function() - local opts = _M.__coding_plugin_mini_ai_opts - local objects = { - { " ", desc = "whitespace" }, - { '"', desc = '" string' }, - { "'", desc = "' string" }, - { "(", desc = "() block" }, - { ")", desc = "() block with ws" }, - { "<", desc = "<> block" }, - { ">", desc = "<> block with ws" }, - { "?", desc = "user prompt" }, - { "U", desc = "use/call without dot" }, - { "[", desc = "[] block" }, - { "]", desc = "[] block with ws" }, - { "_", desc = "underscore" }, - { "`", desc = "` string" }, - { "a", desc = "argument" }, - { "b", desc = ")]} block" }, - { "c", desc = "class" }, - { "d", desc = "digit(s)" }, - { "e", desc = "CamelCase / snake_case" }, - { "f", desc = "function" }, - { "g", desc = "entire file" }, - { "i", desc = "indent" }, - { "o", desc = "block, conditional, loop" }, - { "q", desc = "quote `\"'" }, - { "t", desc = "tag" }, - { "u", desc = "use/call" }, - { "{", desc = "{} block" }, - { "}", desc = "{} with ws" }, - } - - ---@type wk.Spec[] - local ret = { mode = { "o", "x" } } - ---@type table - local mappings = vim.tbl_extend("force", {}, { - around = "a", - inside = "i", - around_next = "an", - inside_next = "in", - around_last = "al", - inside_last = "il", - }, opts.mappings or {}) - mappings.goto_left = nil - mappings.goto_right = nil - - for name, prefix in pairs(mappings) do - name = name:gsub("^around_", ""):gsub("^inside_", "") - ret[#ret + 1] = { prefix, group = name } - for _, obj in ipairs(objects) do - local desc = obj.desc - if prefix:sub(1, 1) == "i" then - desc = desc:gsub(" with ws", "") - end - ret[#ret + 1] = { prefix .. obj[1], desc = obj.desc } - end - end - require("which-key").add(ret, { notify = false }) - end) - ''; - }; -} diff --git a/pkgs/nixvim/coding/mini-pairs.nix b/pkgs/nixvim/coding/mini-pairs.nix deleted file mode 100644 index d991b1b..0000000 --- a/pkgs/nixvim/coding/mini-pairs.nix +++ /dev/null @@ -1,71 +0,0 @@ -{...}: { - youthlic.plugins.mini-pairs = { - enable = true; - settings = { - modes = { - insert = true; - command = true; - terminal = false; - }; - }; - luaConfig.post = - #lua - '' - do - local opts = { - skip_next = [=[[%w%%'%[%"%.%`%$]]=], - skip_ts = { "string" }, - skip_unbalanced = true, - markdown = true, - } - _M.on_load("snacks", function() - vim.schedule(function() - Snacks.toggle({ - name = "Mini Pairs", - get = function() - return not vim.g.minipairs_disable - end, - set = function(state) - vim.g.minipairs_disable = not state - end, - }):map("up") - end) - end) - local pairs = require("mini.pairs") - local open = pairs.open - pairs.open = function(pair, neigh_pattern) - if vim.fn.getcmdline() ~= "" then - return open(pair, neigh_pattern) - end - local o, c = pair:sub(1, 1), pair:sub(2, 2) - local line = vim.api.nvim_get_current_line() - local cursor = vim.api.nvim_win_get_cursor(0) - local next = line:sub(cursor[2] + 1, cursor[2] + 1) - local before = line:sub(1, cursor[2]) - if opts.markdown and o == "`" and vim.bo.filetype == "markdown" and before:match("^%s*``") then - return "`\n``" .. vim.api.nvim_replace_termcodes("", true, true, true) - end - if opts.skip_next and next ~= "" and next:match(opts.skip_next) then - return o - end - if opts.skip_ts and #opts.skip_ts > 0 then - local ok, captures = pcall(vim.treesitter.get_captures_at_pos, 0, cursor[1] - 1, math.max(cursor[2] - 1, 0)) - for _, capture in ipairs(ok and captures or {}) do - if vim.tbl_contains(opts.skip_ts, capture.capture) then - return o - end - end - end - if opts.skip_unbalanced and next == c and c ~= o then - local _, count_open = line:gsub(vim.pesc(pair:sub(1, 1)), "") - local _, count_close = line:gsub(vim.pesc(pair:sub(2, 2)), "") - if count_close > count_open then - return o - end - end - return open(pair, neigh_pattern) - end - end - ''; - }; -} diff --git a/pkgs/nixvim/coding/ts-comments.nix b/pkgs/nixvim/coding/ts-comments.nix deleted file mode 100644 index 1507e17..0000000 --- a/pkgs/nixvim/coding/ts-comments.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - youthlic.plugins.ts-comments.enable = true; -} diff --git a/pkgs/nixvim/editor.nix b/pkgs/nixvim/editor.nix deleted file mode 100644 index e78f273..0000000 --- a/pkgs/nixvim/editor.nix +++ /dev/null @@ -1,13 +0,0 @@ -{...}: { - youthlic.plugins = { - # grug-far = { - # enable = true; - # }; - # flash = { - # enable = true; - # }; - # todo-comments = { - # enable = true; - # }; - }; -} diff --git a/pkgs/nixvim/editor/gitsigns.nix b/pkgs/nixvim/editor/gitsigns.nix deleted file mode 100644 index 504cecc..0000000 --- a/pkgs/nixvim/editor/gitsigns.nix +++ /dev/null @@ -1,119 +0,0 @@ -{...}: { - youthlic.plugins.gitsigns = { - enable = true; - luaConfig.post = - #lua - '' - _M.on_load("snacks", function() - vim.schedule(function() - Snacks.toggle({ - name = "Git Signs", - get = function() - return require("gitsigns.config").config.signcolumn - end, - set = function(state) - require("gitsigns").toggle_signs(state) - end, - }):map("uG") - end) - end) - ''; - settings = { - current_line_blame = true; - signcolumn = true; - numhl = true; - linehl = false; - signs = { - add = { - text = "┃"; - }; - change = { - text = "┃"; - }; - delete = { - text = ""; - }; - topdelete = { - text = ""; - }; - changedelete = { - text = "┃"; - }; - untracked = { - text = "┃"; - }; - }; - signs_staged = { - add = { - text = "┃"; - }; - change = { - text = "┃"; - }; - delete = { - text = ""; - }; - topdelete = { - text = ""; - }; - changedelete = { - text = "┃"; - }; - }; - on_attach = { - __raw = - #lua - '' - function(buffer) - local gs = package.loaded.gitsigns - - local map = function(mode, l, r, desc) - vim.keymap.set(mode, l, r, { - buffer = buffer, - desc = desc, - }) - end - - map("n", "]h", function() - if vim.wo.diff then - vim.cmd.normal({ "]c", bang = true }) - else - gs.nav_hunk("next") - end - end, "Next Hunk") - map("n", "[h", function() - if vim.wo.diff then - vim.cmd.normal({ "[c", bang = true }) - else - gs.nav_hunk("prev") - end - end, "Prev Hunk") - map("n", "]H", function() - gs.nav_hunk("last") - end, "Last Hunk") - map("n", "[H", function() - gs.nav_hunk("first") - end, "First Hunk") - map({ "n", "v" }, "ghs", ":Gitsigns stage_hunk", "Stage Hunk") - map({ "n", "v" }, "ghr", ":Gitsigns reset_hunk", "Reset Hunk") - map("n", "ghS", gs.stage_buffer, "Stage Buffer") - map("n", "ghu", gs.undo_stage_hunk, "Undo Stage Hunk") - map("n", "ghR", gs.reset_buffer, "Reset Buffer") - map("n", "ghp", gs.preview_hunk_inline, "Preview Hunk Inline") - map("n", "ghb", function() - gs.blame_line({ full = true }) - end, "Blame Line") - map("n", "ghB", function() - gs.blame() - end, "Blame Buffer") - map("n", "ghd", gs.diffthis, "Diff This") - map("n", "ghD", function() - gs.diffthis("~") - end, "Diff This ~") - map({ "o", "x" }, "ih", ":Gitsigns select_hunk", "GitSigns Select Hunk") - end - ''; - }; - }; - }; -} diff --git a/pkgs/nixvim/editor/trouble.nix b/pkgs/nixvim/editor/trouble.nix deleted file mode 100644 index 2e59177..0000000 --- a/pkgs/nixvim/editor/trouble.nix +++ /dev/null @@ -1,33 +0,0 @@ -{...}: { - youthlic.plugins.trouble = { - enable = true; - settings = { - modes = { - lsp = { - win = { - position = "right"; - }; - }; - preview_float = { - mode = "diagnostics"; - preview = { - type = "float"; - relative = "editor"; - border = "rounded"; - title = "Preview"; - title_pos = "center"; - position = [ - 0 - (-2) - ]; - size = { - width = 0.3; - height = 0.3; - }; - zindex = 200; - }; - }; - }; - }; - }; -} diff --git a/pkgs/nixvim/editor/which-key.nix b/pkgs/nixvim/editor/which-key.nix deleted file mode 100644 index 57d19dc..0000000 --- a/pkgs/nixvim/editor/which-key.nix +++ /dev/null @@ -1,17 +0,0 @@ -{...}: { - youthlic.plugins = { - which-key = { - enable = true; - settings = { - preset = "helix"; - win = { - no_overlap = false; - }; - show_help = false; - }; - }; - web-devicons = { - enable = true; - }; - }; -} diff --git a/pkgs/nixvim/formatting.nix b/pkgs/nixvim/formatting.nix deleted file mode 100644 index aef4e45..0000000 --- a/pkgs/nixvim/formatting.nix +++ /dev/null @@ -1,105 +0,0 @@ -{...}: { - userCommands = let - formatCmd = { - desc = "Format all the buffer"; - # conform.format function can deal with range by itself - range = "%"; - bang = true; - bar = true; - nargs = "?"; - complete = { - __raw = - #lua - '' - function(ArgLead, CmdLine, CursorPos) - return vim.iter(require("conform").list_all_formatters()):filter(function(val) - return val.available - end):map(function(val) - return val.name - end):filter(function(name) - return string.match(name, "^" .. ArgLead) ~= nil - end):totable() - end - ''; - }; - command = { - __raw = - #lua - '' - function(opts) - local format = require("conform").format - if #(opts.fargs) == 0 then - return format() - else - return format({ formatters = { opts.fargs[1] } }) - end - end - ''; - }; - }; - in { - Format = formatCmd; - Fmt = formatCmd; - Formatter = { - desc = "Show config of formatter"; - nargs = "?"; - bar = true; - complete = { - __raw = - #lua - '' - function(ArgLead, CmdLine, CursorPos) - return vim.iter(require("conform").list_all_formatters()):map(function(val) - return val.name - end):filter(function(name) - return string.match(name, "^" .. ArgLead) ~= nil - end):totable() - end - ''; - }; - command = { - __raw = - #lua - '' - function(opts) - local conform = require("conform") - if #(opts.fargs) == 0 then - local formatters = conform.list_all_formatters() - print(vim.inspect(formatters)) - return formatters - else - local config = conform.get_formatter_config(opts.fargs[1]) - print(vim.inspect(config)) - return config - end - end - ''; - }; - }; - }; - keymaps = [ - { - action = { - __raw = - #lua - '' - function(opts) - return require("conform").format() - end - ''; - }; - key = "="; - mode = [ - "n" - "v" - ]; - options = { - desc = "Format with conform"; - }; - } - ]; - youthlic.plugins.conform-nvim = { - enable = true; - settings.formatters.injected.options.ignore_errors = true; - }; -} diff --git a/pkgs/nixvim/keymaps.nix b/pkgs/nixvim/keymaps.nix deleted file mode 100644 index 6462967..0000000 --- a/pkgs/nixvim/keymaps.nix +++ /dev/null @@ -1 +0,0 @@ -{...}: {} diff --git a/pkgs/nixvim/lang/c.nix b/pkgs/nixvim/lang/c.nix deleted file mode 100644 index 4681dbc..0000000 --- a/pkgs/nixvim/lang/c.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.c = { - __unkeyed-1 = "clang-format"; - lsp_format = "fallback"; - }; - formatters.clang-format = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.clang-format") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("clang-format") - if exe ~= "" then - return exe - else - return "${lib.getExe' pkgs.clang-tools "clang-format"}" - end - end - }) - end - ''; - }; - }; -} diff --git a/pkgs/nixvim/lang/cxx.nix b/pkgs/nixvim/lang/cxx.nix deleted file mode 100644 index 5fd866b..0000000 --- a/pkgs/nixvim/lang/cxx.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.cpp = { - __unkeyed-1 = "clang-format"; - lsp_format = "fallback"; - }; - formatters.clang-format = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.clang-format") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("clang-format") - if exe ~= "" then - return exe - else - return "${lib.getExe' pkgs.clang-tools "clang-format"}" - end - end - }) - end - ''; - }; - }; -} diff --git a/pkgs/nixvim/lang/idris2.nix b/pkgs/nixvim/lang/idris2.nix deleted file mode 100644 index 53e6fa8..0000000 --- a/pkgs/nixvim/lang/idris2.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, ...}: { - extraPackagesAfter = with pkgs; [idris2Packages.idris2Lsp]; - lsp.servers.idris2 = { - enable = true; - }; - youthlic.plugins.idris2 = { - enable = true; - }; -} diff --git a/pkgs/nixvim/lang/json.nix b/pkgs/nixvim/lang/json.nix deleted file mode 100644 index f740749..0000000 --- a/pkgs/nixvim/lang/json.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.json = { - __unkeyed-1 = "deno_fmt"; - }; - formatters.deno_fmt = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.deno_fmt") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("deno") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.deno}" - end - end - }) - end - ''; - }; - }; -} diff --git a/pkgs/nixvim/lang/lua.nix b/pkgs/nixvim/lang/lua.nix deleted file mode 100644 index b66574f..0000000 --- a/pkgs/nixvim/lang/lua.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - lsp.servers.lua_ls = { - enable = true; - }; - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.lua = { - __unkeyed-1 = "stylua"; - lsp_format = "fallback"; - }; - formatters.stylua = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.stylua") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("stylua") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.stylua}" - end - end - }) - end - ''; - }; - }; -} diff --git a/pkgs/nixvim/lang/markdown.nix b/pkgs/nixvim/lang/markdown.nix deleted file mode 100644 index cae1834..0000000 --- a/pkgs/nixvim/lang/markdown.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.markdown = { - __unkeyed-1 = "deno_fmt"; - }; - formatters.deno_fmt = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.deno_fmt") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("deno") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.deno}" - end - end - }) - end - ''; - }; - }; -} diff --git a/pkgs/nixvim/lang/nix.nix b/pkgs/nixvim/lang/nix.nix deleted file mode 100644 index 2155082..0000000 --- a/pkgs/nixvim/lang/nix.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - lsp.servers = { - nixd = { - enable = true; - }; - nil_ls = { - enable = true; - }; - }; - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.nix = { - __unkeyed-1 = "alejandra"; - __unkeyed-2 = "injected"; - lsp_format = "fallback"; - }; - formatters = { - alejandra = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.alejandra") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("alejandra") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.alejandra}" - end - end - }) - end - ''; - }; - nixfmt = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.nixfmt") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("nixfmt") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.nixfmt}" - end - end - }) - end - ''; - }; - }; - }; -} diff --git a/pkgs/nixvim/lang/python.nix b/pkgs/nixvim/lang/python.nix deleted file mode 100644 index 67f08c7..0000000 --- a/pkgs/nixvim/lang/python.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.python = { - __unkeyed-1 = "ruff_format"; - __unkeyed-2 = "ruff_organize_imports"; - lsp_format = "fallback"; - }; - formatters = { - ruff_organize_imports = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.ruff_organize_imports") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("ruff") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.ruff}" - end - end - }) - end - ''; - }; - ruff_format = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.ruff_format") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("ruff") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.ruff}" - end - end - }) - end - ''; - }; - }; - }; -} diff --git a/pkgs/nixvim/lang/rust.nix b/pkgs/nixvim/lang/rust.nix deleted file mode 100644 index bcbf89b..0000000 --- a/pkgs/nixvim/lang/rust.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.rust = { - __unkeyed-1 = "rustfmt"; - lsp_format = "fallback"; - }; - formatters.rustfmt = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.rustfmt") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("rustfmt") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.rustfmt}" - end - end - }) - end - ''; - }; - }; -} diff --git a/pkgs/nixvim/lang/toml.nix b/pkgs/nixvim/lang/toml.nix deleted file mode 100644 index b674308..0000000 --- a/pkgs/nixvim/lang/toml.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.toml = { - __unkeyed-1 = "taplo"; - lsp_format = "fallback"; - }; - formatters.taplo = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.taplo") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("taplo") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.taplo}" - end - end, - args = { "format", "-o", "reorder_keys=true", "-o", "reorder_inline_tables=true", "-" }, - }) - end - ''; - }; - }; -} diff --git a/pkgs/nixvim/lang/yaml.nix b/pkgs/nixvim/lang/yaml.nix deleted file mode 100644 index d04f189..0000000 --- a/pkgs/nixvim/lang/yaml.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - youthlic.plugins.conform-nvim.settings = { - formatters_by_ft.yaml = { - __unkeyed-1 = "deno_fmt"; - }; - formatters.deno_fmt = { - __raw = - #lua - '' - function() - local defaultFormatter = require("conform.formatters.deno_fmt") - return vim.tbl_extend("force", defaultFormatter, { - command = function() - local exe = vim.fn["exepath"]("deno") - if exe ~= "" then - return exe - else - return "${lib.getExe pkgs.deno}" - end - end - }) - end - ''; - }; - }; -} diff --git a/pkgs/nixvim/linting.nix b/pkgs/nixvim/linting.nix deleted file mode 100644 index 6462967..0000000 --- a/pkgs/nixvim/linting.nix +++ /dev/null @@ -1 +0,0 @@ -{...}: {} diff --git a/pkgs/nixvim/lsp.nix b/pkgs/nixvim/lsp.nix deleted file mode 100644 index bc2e419..0000000 --- a/pkgs/nixvim/lsp.nix +++ /dev/null @@ -1,35 +0,0 @@ -{...}: { - youthlic.plugins.lspconfig.enable = true; - lsp = { - inlayHints.enable = true; - luaConfig.post = - #lua - '' - do - vim.diagnostic.config({ - underline = true, - virtual_lines = { - current_line = true, - }, - signs = true, - severity_sort = true, - float = { - scope = "cursor", - source = "if_many", - }, - jump = { - on_jump = function(diagnostic, bufnr) - vim.diagnostic.open_float({ - scope = "cursor", - severity_sort = true, - source = "if_many", - bufnr = bufnr, - }) - end, - wrap = true, - }, - }) - end - ''; - }; -} diff --git a/pkgs/nixvim/module.nix b/pkgs/nixvim/module.nix deleted file mode 100644 index decf51f..0000000 --- a/pkgs/nixvim/module.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - config, - options, - ... -}: let - cfg = config.youthlic; -in { - options = { - youthlic.plugins = lib.mkOption { - type = lib.types.attrsOf ( - lib.types.submodule ( - { - name, - lib, - ... - }: { - freeformType = lib.types.anything; - options = { - enable = lib.mkEnableOption "nvimPlugins.${name}"; - }; - } - ) - ); - default = {}; - }; - }; - config = let - enabledPlugins = lib.filterAttrs (_name: value: value.enable) cfg.plugins; - in - lib.mkMerge [ - { - plugins = enabledPlugins; - } - { - plugins = lib.pipe enabledPlugins [ - builtins.attrNames - (lib.filter (name: options.plugins.${name} ? luaConfig)) - (map ( - name: - lib.nameValuePair name { - luaConfig.post = - #lua - '' - _M.load("${name}") - ''; - } - )) - lib.listToAttrs - ]; - } - ]; -} diff --git a/pkgs/nixvim/neovide.nix b/pkgs/nixvim/neovide.nix deleted file mode 100644 index 0202c70..0000000 --- a/pkgs/nixvim/neovide.nix +++ /dev/null @@ -1,33 +0,0 @@ -{...}: { - extraConfigLua = - #lua - '' - if vim.g.neovide then - vim.o.guifont = [[MonoLisa,Source Han Sans SC,Noto Color Emoji:h16]] - vim.g.neovide_opacity = 0.9 - vim.g.linespace = 0.2 - vim.g.neovide_text_gamma = 0.8 - vim.g.neovide_text_contrast = 0.1 - - vim.g.neovide_floating_shadow = true - vim.g.neovide_floating_z_height = 10 - vim.g.neovide_light_angle_degrees = 45 - vim.g.neovide_light_radius = 5 - - vim.g.neovide_position_animation_length = 0.1 - vim.g.neovide_scroll_animation_length = 0.2 - vim.g.neovide_scroll_animation_far_lines = 5 - vim.g.neovide_hide_mouse_when_typing = true - vim.g.neovide_refresh_rate = 120 - vim.g.neovide_confirm_quit = true - vim.g.neovide_input_ime = true - - vim.g.neovide_cursor_animation_length = 0.1 - vim.g.neovide_cursor_short_animation_length = 0.04 - vim.g.neovide_cursor_antialiasing = true - vim.g.neovide_cursor_animate_in_insert_mode = true - vim.g.neovide_cursor_animate_command_line = true - vim.g.neovide_cursor_unfocused_outline_width = 0.125 - end - ''; -} diff --git a/pkgs/nixvim/options.nix b/pkgs/nixvim/options.nix deleted file mode 100644 index 1858b4e..0000000 --- a/pkgs/nixvim/options.nix +++ /dev/null @@ -1,102 +0,0 @@ -{...}: { - globals = { - mapleader = { - __raw = - #lua - '' - vim.keycode("") - ''; - }; - }; - opts = { - autoindent = true; - autoread = true; - backspace = [ - "indent" - "eol" - "start" - ]; - backup = false; - - breakindent = true; - breakindentopt = "sbr"; - showbreak = "↪"; - - cdhome = true; - cedit = ""; - cmdheight = 1; - completeopt = [ - "fuzzy" - "menuone" - "noselect" - "popup" - ]; - concealcursor = "v"; - confirm = true; - cursorline = true; - diffopt = [ - "algorithm:minimal" - "closeoff" - "context:20" - "followwrap" - "internal" - "linematch:40" - ]; - errorbells = true; - expandtab = true; - exrc = true; - foldcolumn = "auto"; - fsync = true; - gdefault = false; - helplang = [ - "zh" - "en" - ]; - history = 10000; - hlsearch = true; - - ignorecase = true; - smartcase = true; - - inccommand = "split"; - list = true; - listchars = "tab:--→,trail:·,multispace: ,nbsp:⍽,space:·"; # eol:⏎ - magic = true; - more = true; - mouse = "a"; - - number = true; - numberwidth = 4; - relativenumber = true; - - scrollback = 100000; - scrolloff = 5; - shiftround = true; - shiftwidth = 2; - showmode = false; - signcolumn = "auto"; - smoothscroll = true; - splitbelow = true; - splitright = true; - startofline = true; - swapfile = false; - tabclose = "uselast"; - tabstop = 2; - termguicolors = true; - undofile = true; - undolevels = 100000; - virtualedit = [ - "block" - "onemore" - ]; - whichwrap = "b,s,<,>"; - wildmenu = true; - wildmode = ["full"]; - wildoptions = [ - "fuzzy" - "pum" - ]; - winborder = "rounded"; - wrap = true; - }; -} diff --git a/pkgs/nixvim/package.nix b/pkgs/nixvim/package.nix deleted file mode 100644 index 19dcb2b..0000000 --- a/pkgs/nixvim/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - makeNixvimWithModule, - pkgs, - lib, - nixvimPlugins, - neovim_git, -}: -makeNixvimWithModule { - inherit pkgs; - extraSpecialArgs = { - inherit nixvimPlugins; - }; - module = { - imports = with lib; - youthlic.loadImports' ./. (filter (name: !hasSuffix "/package.nix" (toString name))); - enableMan = true; - enablePrintInit = true; - package = neovim_git; - performance = { - # combinePlugins = { - # enable = true; - # standalonePlugins = []; - # }; - byteCompileLua = { - enable = true; - configs = true; - initLua = true; - luaLib = true; - nvimRuntime = true; - plugins = true; - }; - }; - wrapRc = true; - luaLoader.enable = true; - }; -} diff --git a/pkgs/nixvim/treesitter.nix b/pkgs/nixvim/treesitter.nix deleted file mode 100644 index 95b46aa..0000000 --- a/pkgs/nixvim/treesitter.nix +++ /dev/null @@ -1,16 +0,0 @@ -{...}: { - youthlic.plugins = { - treesitter = { - enable = true; - # folding = true; - nixvimInjections = true; - settings = { - highlight = { - enable = true; - additional_vim_regex_highlighting = true; - }; - indent.enable = true; - }; - }; - }; -} diff --git a/pkgs/nixvim/ui/bufferline.nix b/pkgs/nixvim/ui/bufferline.nix deleted file mode 100644 index 109272a..0000000 --- a/pkgs/nixvim/ui/bufferline.nix +++ /dev/null @@ -1,69 +0,0 @@ -{...}: { - youthlic.plugins.bufferline = { - enable = true; - settings = { - options = { - close_command = { - __raw = - #lua - '' - function(n) - Snacks.bufdelete(n) - end - ''; - }; - right_mouse_command = { - __raw = - #lua - '' - function(n) - Snacks.bufdelete(n) - end - ''; - }; - diagnostics = "nvim_lsp"; - always_show_bufferline = false; - diagnostics_indicator = { - __raw = - #lua - '' - function(_, _, diag) - local icons = { - Error = " ", - Warn = " ", - Hint = " ", - Info = " ", - } - local ret = (diag.error and icons.Error .. diag.error .. " " or "") - .. (diag.warning and icons.Warn .. diag.warning or "") - return vim.trim(ret) - end - ''; - }; - offsets = [ - { - filetype = "neo-tree"; - text = "Neo-tree"; - highlight = "Directory"; - text_align = "left"; - } - { - filetype = "snacks_layout_box"; - } - ]; - get_element_icon = { - __raw = - #lua - '' - function(opts) - local icons = { - octo = "", - } - return icons[opts.filetype] - end - ''; - }; - }; - }; - }; -} diff --git a/pkgs/nixvim/ui/colorschemes.nix b/pkgs/nixvim/ui/colorschemes.nix deleted file mode 100644 index 81523cf..0000000 --- a/pkgs/nixvim/ui/colorschemes.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - colorschemes.gruvbox = { - enable = true; - settings = { - }; - }; -} diff --git a/pkgs/nixvim/ui/lualine.nix b/pkgs/nixvim/ui/lualine.nix deleted file mode 100644 index 4925ee2..0000000 --- a/pkgs/nixvim/ui/lualine.nix +++ /dev/null @@ -1,21 +0,0 @@ -{...}: { - youthlic.plugins.lualine = { - enable = true; - luaConfig.pre = - #lua - '' - do - vim.g.lualine_laststatus = vim.o.laststatus - if vim.fn.argc(-1) > 0 then - vim.o.statusline = " " - else - vim.o.laststatus = 0 - end - end - do - vim.o.laststatus = vim.g.lualine_laststatus - end - ''; - settings = {}; - }; -} diff --git a/pkgs/nixvim/util/lazy-load.nix b/pkgs/nixvim/util/lazy-load.nix deleted file mode 100644 index 4b515c3..0000000 --- a/pkgs/nixvim/util/lazy-load.nix +++ /dev/null @@ -1,38 +0,0 @@ -{...}: { - extraConfigLuaPre = - #lua - '' - do - _M.plugins = {} - _M.load = function(name) - _M.plugins = vim.tbl_deep_extend("force", _M.plugins, { - name = { - loaded = true, - }, - }) - vim.schedule(function() - vim.api.nvim_exec_autocmds("User", { pattern = "LazyLoad", modeline = false, data = name }) - end) - end - _M._is_loaded = function(name) - local plugins = _M.plugins - return plugins[name] and plugins[name].loaded - end - _M.on_load = function(name, fn) - if _M._is_loaded(name) then - fn(name) - else - vim.api.nvim_create_autocmd("User", { - pattern = "LazyLoad", - callback = function(event) - if event.data == name then - fn(name) - return true - end - end, - }) - end - end - end - ''; -} diff --git a/pkgs/nixvim/util/snacks.nix b/pkgs/nixvim/util/snacks.nix deleted file mode 100644 index 0d653b1..0000000 --- a/pkgs/nixvim/util/snacks.nix +++ /dev/null @@ -1,85 +0,0 @@ -{...}: { - youthlic.plugins.snacks = { - enable = true; - luaConfig.content = - #lua - '' - -- Terminal Mappings - _M.__util_plugin_snacks_term_nav = function(direction) - ---@param self snacks.terminal - return function(self) - return self:is_floating() and "" - or vim.schedule(function() - vim.cmd.wincmd(direction) - end) - end - end - ''; - settings = { - bigfile = { - enabled = true; - }; - quickfile = { - enabled = true; - }; - terminal = { - win = { - keys = { - nav_h = { - __unkeyed-1 = "h"; - __unkeyed-2 = { - __raw = - #lua - '' - _M.__util_plugin_snacks_term_nav("h") - ''; - }; - desc = "Go to Left Window"; - expr = true; - mode = "t"; - }; - nav_j = { - __unkeyed-1 = "j"; - __unkeyed-2 = { - __raw = - #lua - '' - _M.__util_plugin_snacks_term_nav("j") - ''; - }; - desc = "Go to Lower Window"; - expr = true; - mode = "t"; - }; - nav_k = { - __unkeyed-1 = "k"; - __unkeyed-2 = { - __raw = - #lua - '' - _M.__util_plugin_snacks_term_nav("k") - ''; - }; - desc = "Go to Upper Window"; - expr = true; - mode = "t"; - }; - nav_l = { - __unkeyed-1 = "l"; - __unkeyed-2 = { - __raw = - #lua - '' - _M.__util_plugin_snacks_term_nav("l") - ''; - }; - desc = "Go to Right Window"; - expr = true; - mode = "t"; - }; - }; - }; - }; - }; - }; -} diff --git a/pkgs/nixvim/util/vim-startuptime.nix b/pkgs/nixvim/util/vim-startuptime.nix deleted file mode 100644 index 5430c38..0000000 --- a/pkgs/nixvim/util/vim-startuptime.nix +++ /dev/null @@ -1,13 +0,0 @@ -{nixvimPlugins, ...}: { - extraPlugins = [ - { - config = - #vim - '' - lua << EOF - EOF - ''; - plugin = nixvimPlugins.vim-startuptime; - } - ]; -}