From db20afcf6830f0e2083f45327e52e45327098a49 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 10 Oct 2024 01:47:33 -0700 Subject: [PATCH] pkgs: switch to new neovim configuration --- flake.lock | 922 ++++++++++++++++++++++++--------- flake.nix | 2 +- modules/linux/core/default.nix | 1 - 3 files changed, 675 insertions(+), 250 deletions(-) diff --git a/flake.lock b/flake.lock index da78f1c..13b3d58 100755 --- a/flake.lock +++ b/flake.lock @@ -38,6 +38,30 @@ "type": "github" } }, + "blink-cmp": { + "inputs": { + "devenv": "devenv", + "fenix": "fenix", + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "viminal", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728515881, + "narHash": "sha256-D+drVzciZ1yY2QH6GcpafAgDI6Bwap7SpfQmZn8ZMu4=", + "owner": "Saghen", + "repo": "blink.cmp", + "rev": "88f71b16ecd650775516bd2b30ab808283b7242c", + "type": "github" + }, + "original": { + "owner": "Saghen", + "repo": "blink.cmp", + "type": "github" + } + }, "brew-src": { "flake": false, "locked": { @@ -55,6 +79,84 @@ "type": "github" } }, + "cachix": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "viminal", + "blink-cmp", + "devenv", + "flake-compat" + ], + "git-hooks": [ + "viminal", + "blink-cmp", + "devenv", + "pre-commit-hooks" + ], + "nixpkgs": [ + "viminal", + "blink-cmp", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726520618, + "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", + "owner": "cachix", + "repo": "cachix", + "rev": "695525f9086542dfb09fde0871dbf4174abbf634", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": "devenv_3", + "flake-compat": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "locked": { "lastModified": 1727910534, @@ -70,22 +172,6 @@ "type": "github" } }, - "cellular-automaton": { - "flake": false, - "locked": { - "lastModified": 1719777869, - "narHash": "sha256-nIv7ISRk0+yWd1lGEwAV6u1U7EFQj/T9F8pU6O0Wf0s=", - "owner": "Eandrju", - "repo": "cellular-automaton.nvim", - "rev": "11aea08aa084f9d523b0142c2cd9441b8ede09ed", - "type": "github" - }, - "original": { - "owner": "Eandrju", - "repo": "cellular-automaton.nvim", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -107,25 +193,127 @@ "type": "github" } }, - "devshell": { + "devenv": { "inputs": { - "nixpkgs": [ - "viminal", - "nixvim", - "nixpkgs" - ] + "cachix": "cachix", + "flake-compat": "flake-compat_5", + "nix": "nix_3", + "nixpkgs": "nixpkgs_5", + "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", - "owner": "numtide", - "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "lastModified": 1728113618, + "narHash": "sha256-oJj1d2VlFksl/45nBUtoM+lxxaWD3Z6yXBLR9vOp+2E=", + "owner": "cachix", + "repo": "devenv", + "rev": "a8495abab31ce52cd45d343caa760046c0c7ee74", "type": "github" }, "original": { - "owner": "numtide", - "repo": "devshell", + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "git-hooks" + ] + }, + "locked": { + "lastModified": 1723156315, + "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", + "owner": "cachix", + "repo": "devenv", + "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_3": { + "inputs": { + "flake-compat": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs_3", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "viminal", + "blink-cmp", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1728196311, + "narHash": "sha256-JoDDlmjPj0sGo1beOo3bRh7BDppm0Kuet7I7BqTmSl4=", + "owner": "nix-community", + "repo": "fenix", + "rev": "26971356e387b5ec0578f52be1bbd82ecf6dbad4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", "type": "github" } }, @@ -177,17 +365,35 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", "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" + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-parts": { @@ -213,14 +419,20 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "viminal", + "blink-cmp", + "devenv", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -231,11 +443,7 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": [ - "viminal", - "nixvim", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1727826117, @@ -328,11 +536,26 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -356,39 +579,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "viminal", - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "viminal", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "viminal", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -415,8 +605,9 @@ "inputs": { "nixpkgs": [ "viminal", - "nixvim", - "git-hooks", + "blink-cmp", + "devenv", + "pre-commit-hooks", "nixpkgs" ] }, @@ -434,22 +625,6 @@ "type": "github" } }, - "haskell-tools": { - "flake": false, - "locked": { - "lastModified": 1728323645, - "narHash": "sha256-vjzTrqkiVmDUwUfzjzjRC/dFBP8MSMnNymgvxZ15lUw=", - "owner": "mrcjkb", - "repo": "haskell-tools.nvim", - "rev": "bacbf122d82e70b9000f36d6322d5de1a524ea3c", - "type": "github" - }, - "original": { - "owner": "mrcjkb", - "repo": "haskell-tools.nvim", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -470,28 +645,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "viminal", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "homebrew-cask": { "flake": false, "locked": { @@ -551,6 +704,22 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -586,19 +755,33 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" } }, - "lsp-progress": { - "flake": false, + "nix": { + "inputs": { + "flake-compat": "flake-compat_4", + "nixpkgs": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, "locked": { - "lastModified": 1721008335, - "narHash": "sha256-OafRT5AnxRTOh7MYofRFjti0+pobKQihymZs/kr5w0A=", - "owner": "linrongbin16", - "repo": "lsp-progress.nvim", - "rev": "d5f4d28efe75ce636bfbe271eb45f39689765aab", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { - "owner": "linrongbin16", - "repo": "lsp-progress.nvim", + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", "type": "github" } }, @@ -640,25 +823,31 @@ "type": "github" } }, - "nix-darwin_3": { + "nix-github-actions": { "inputs": { "nixpkgs": [ "viminal", - "nixvim", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "poetry2nix", "nixpkgs" ] }, "locked": { - "lastModified": 1727999297, - "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", "type": "github" }, "original": { - "owner": "lnl7", - "repo": "nix-darwin", + "owner": "nix-community", + "repo": "nix-github-actions", "type": "github" } }, @@ -685,6 +874,88 @@ "type": "github" } }, + "nixCats": { + "locked": { + "dir": "nix", + "lastModified": 1727835465, + "narHash": "sha256-Sj/eP/K/MHxp6K/ZqAYGY7cT+iyebf3P5HTnS/mLFCM=", + "owner": "BirdeeHub", + "repo": "nixCats-nvim", + "rev": "b02e9655894c402e9398369b94fab57d2bf5f359", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "BirdeeHub", + "repo": "nixCats-nvim", + "type": "github" + } + }, + "nix_2": { + "inputs": { + "flake-compat": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "viminal", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "flake-compat": [ + "viminal", + "blink-cmp", + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_4", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1687274257, @@ -698,6 +969,22 @@ "type": "indirect" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1727825735, @@ -710,6 +997,54 @@ "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -726,6 +1061,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1728241625, @@ -742,55 +1093,156 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin_3", - "nixpkgs": [ - "viminal", - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, + "nixpkgs_3": { "locked": { - "lastModified": 1728321376, - "narHash": "sha256-pEx+lat5gK59sdWn4zt7XW8s9GQC+BbOk2Qw3LY/O+0=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "cb3c1bfcaf44fd6f0043d916f3a14f666c3364a4", + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixvim", + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, - "nuschtosSearch": { + "nixpkgs_4": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1716977621, + "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "plugins-lsp-progress": { + "flake": false, + "locked": { + "lastModified": 1721008335, + "narHash": "sha256-OafRT5AnxRTOh7MYofRFjti0+pobKQihymZs/kr5w0A=", + "owner": "linrongbin16", + "repo": "lsp-progress.nvim", + "rev": "d5f4d28efe75ce636bfbe271eb45f39689765aab", + "type": "github" + }, + "original": { + "owner": "linrongbin16", + "repo": "lsp-progress.nvim", + "type": "github" + } + }, + "plugins-typst-preview": { + "flake": false, + "locked": { + "lastModified": 1727642175, + "narHash": "sha256-n0TfcXJLlRXdS6S9dwYHN688IipVSDLVXEqyYs+ROG8=", + "owner": "chomosuke", + "repo": "typst-preview.nvim", + "rev": "0354cc1a7a5174a2e69cdc21c4db9a3ee18bb20a", + "type": "github" + }, + "original": { + "owner": "chomosuke", + "repo": "typst-preview.nvim", + "type": "github" + } + }, + "poetry2nix": { "inputs": { "flake-utils": "flake-utils_5", + "nix-github-actions": "nix-github-actions", "nixpkgs": [ "viminal", - "nixvim", + "blink-cmp", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", "nixpkgs" ] }, "locked": { - "lastModified": 1728017046, - "narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=", - "owner": "NuschtOS", - "repo": "search", - "rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629", + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", "type": "github" }, "original": { - "owner": "NuschtOS", - "repo": "search", + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "viminal", + "blink-cmp", + "devenv", + "nix" + ], + "flake-utils": "flake-utils_6", + "gitignore": [ + "viminal", + "blink-cmp", + "devenv", + "nix" + ], + "nixpkgs": [ + "viminal", + "blink-cmp", + "devenv", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "viminal", + "blink-cmp", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", "type": "github" } }, @@ -821,19 +1273,34 @@ "type": "github" } }, - "render-markdown": { - "flake": false, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": [ + "viminal", + "blink-cmp", + "devenv", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "viminal", + "blink-cmp", + "devenv", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, "locked": { - "lastModified": 1728331543, - "narHash": "sha256-+tpNIQOBDlSkeCNcoTcjmnK+ms5OHBtwr0+4k1tweNk=", - "owner": "MeanderingProgrammer", - "repo": "render-markdown.nvim", - "rev": "d20d19fa54965f6eb94558c0b84fe9a942169fb4", + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "type": "github" }, "original": { - "owner": "MeanderingProgrammer", - "repo": "render-markdown.nvim", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", "type": "github" } }, @@ -857,6 +1324,23 @@ "zen-browser": "zen-browser" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1728064742, + "narHash": "sha256-tFvUGvqUZjES1yxYT2zEFiTAE0iQKYd+eWKX/6ZqeVw=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "5982d9c420d0dc90739171829f0d2e9c80d98979", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "flake": false, "locked": { @@ -898,22 +1382,6 @@ "type": "github" } }, - "satellite": { - "flake": false, - "locked": { - "lastModified": 1727707770, - "narHash": "sha256-WVOYouiEFeLkQBe1Ptazw/mIfzxmaQmOuEK8KlfMYoQ=", - "owner": "lewis6991", - "repo": "satellite.nvim", - "rev": "ea0a2e92bbb57981043fca334f5b274c0f279238", - "type": "github" - }, - "original": { - "owner": "lewis6991", - "repo": "satellite.nvim", - "type": "github" - } - }, "spicetify": { "inputs": { "flake-compat": "flake-compat_3", @@ -1010,44 +1478,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "viminal", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "typst-preview": { - "flake": false, - "locked": { - "lastModified": 1727642175, - "narHash": "sha256-n0TfcXJLlRXdS6S9dwYHN688IipVSDLVXEqyYs+ROG8=", - "owner": "chomosuke", - "repo": "typst-preview.nvim", - "rev": "0354cc1a7a5174a2e69cdc21c4db9a3ee18bb20a", - "type": "github" - }, - "original": { - "owner": "chomosuke", - "repo": "typst-preview.nvim", - "type": "github" - } - }, "vesktop-bin": { "inputs": { "flake-utils": "flake-utils_4", @@ -1071,30 +1501,26 @@ }, "viminal": { "inputs": { - "cellular-automaton": "cellular-automaton", - "flake-parts": "flake-parts_2", - "haskell-tools": "haskell-tools", - "lsp-progress": "lsp-progress", + "blink-cmp": "blink-cmp", + "nixCats": "nixCats", "nixpkgs": [ "nixpkgs" ], - "nixvim": "nixvim", - "render-markdown": "render-markdown", - "satellite": "satellite", - "typst-preview": "typst-preview" + "plugins-lsp-progress": "plugins-lsp-progress", + "plugins-typst-preview": "plugins-typst-preview" }, "locked": { - "lastModified": 1728371200, - "narHash": "sha256-bkq8ncSaICBKKhaFjWj8oBEQw88T9dwT+YLWmDfGJLY=", - "owner": "youwen5", - "repo": "viminal", - "rev": "6cdb83a7722007499fba016f8771379044bcf187", - "type": "github" + "lastModified": 1728549700, + "narHash": "sha256-VN3Y01+/M/nGNXN6X1nYBKyVQFo/xpOk18Aoo+9L+HE=", + "ref": "refs/heads/main", + "rev": "c0b2ec9e0153789f125f838ba60710488960452b", + "revCount": 7, + "type": "git", + "url": "https://code.youwen.dev/youwen5/viminal2" }, "original": { - "owner": "youwen5", - "repo": "viminal", - "type": "github" + "type": "git", + "url": "https://code.youwen.dev/youwen5/viminal2" } }, "wallpapers": { diff --git a/flake.nix b/flake.nix index 8e53e53..206e2a1 100755 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,7 @@ }; viminal = { - url = "github:youwen5/viminal"; + url = "git+https://code.youwen.dev/youwen5/viminal2"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/linux/core/default.nix b/modules/linux/core/default.nix index ed56bfe..0c25828 100644 --- a/modules/linux/core/default.nix +++ b/modules/linux/core/default.nix @@ -6,7 +6,6 @@ { environment.systemPackages = [ inputs.viminal.packages.${pkgs.system}.default - inputs.viminal.packages.${pkgs.system}.vimg ]; security.sudo.enable = false;