From 2fa6b8e9643d4631a355c1cb00e99cf92dfc4e6f Mon Sep 17 00:00:00 2001 From: quirinecker Date: Sun, 30 Aug 2026 18:23:42 +0200 Subject: [PATCH] added neovim as a package wrap as well --- flake.lock | 171 ++++++-------------------------------- flake.nix | 1 + modules/editor/neovim.nix | 12 ++- modules/options.nix | 6 ++ 4 files changed, 44 insertions(+), 146 deletions(-) create mode 100644 modules/options.nix diff --git a/flake.lock b/flake.lock index 10b2106..7489a5e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "elephant": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1784365424, - "narHash": "sha256-kJO1Tww/GkvLq5amrV4BKidYGr5YumM+cH/xYALAiw4=", - "owner": "abenz1267", - "repo": "elephant", - "rev": "23f37238367355cf46843015ad5e94706200176a", - "type": "github" - }, - "original": { - "owner": "abenz1267", - "repo": "elephant", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -39,24 +18,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -93,28 +54,6 @@ "type": "github" } }, - "nix-options-doc": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1785802329, - "narHash": "sha256-ePPqSuA/v01VMGPM8rUHxJMWcPwB06QZbtjWZn1WNLQ=", - "owner": "Thunderbottom", - "repo": "nix-options-doc", - "rev": "e5a248fdf130377f1c915a00d448d8f85f63a4d1", - "type": "github" - }, - "original": { - "owner": "Thunderbottom", - "repo": "nix-options-doc", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1787736819, @@ -146,104 +85,46 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1787498568, + "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { - "elephant": "elephant", "flake-parts": "flake-parts", "import-tree": "import-tree", - "nix-options-doc": "nix-options-doc", "nixpkgs": "nixpkgs", - "walker": "walker", + "wrappers": "wrappers", "zen-browser": "zen-browser" } }, - "rust-overlay": { + "wrappers": { "inputs": { - "nixpkgs": [ - "nix-options-doc", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1785648791, - "narHash": "sha256-4wZa7NDOxbcm9pTNNcg88nvvPb9uVcWsJ+Ncil8eB1I=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "32346a8154e65fa10bac36f7b476a5294cb8b150", + "lastModified": 1787911509, + "narHash": "sha256-F8vfQczEtESerlUxkQbhNQrDrD6zrIyDOWlItl7UxPY=", + "owner": "lassulus", + "repo": "wrappers", + "rev": "81c751c7c3d8b9763949939f5d1cd5557cc151d2", "type": "github" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "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" - } - }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "walker": { - "inputs": { - "elephant": [ - "elephant" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1784217994, - "narHash": "sha256-gxHJsrJZo2qbKK47Kf/9ho3i/HhRwkL8XvPnczGPd9E=", - "owner": "abenz1267", - "repo": "walker", - "rev": "42b3ed88abf50bc52638fb2835b7f17e3ea3ac4c", - "type": "github" - }, - "original": { - "owner": "abenz1267", - "repo": "walker", + "owner": "lassulus", + "repo": "wrappers", "type": "github" } }, diff --git a/flake.nix b/flake.nix index f54498b..2403950 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; + wrappers.url = "github:lassulus/wrappers"; zen-browser = { url = "github:0xc000022070/zen-browser-flake"; diff --git a/modules/editor/neovim.nix b/modules/editor/neovim.nix index e4f19ef..ed1d0fb 100644 --- a/modules/editor/neovim.nix +++ b/modules/editor/neovim.nix @@ -1,4 +1,4 @@ -{ ... }: +{ inputs, ... }: { flake.modules.homeManager.neovim = { pkgs, config, lib, ... }: let @@ -66,4 +66,14 @@ # nix-shell -p nodejs --run "cd ${configHome}/.npm_global && npm install" # ''; }; + + perSystem = { pkgs, ... }: { + packages.neovim = inputs.wrappers.lib.wrapPackage { + inherit pkgs; + package = pkgs.neovim; + flags = { + "-u" = ./neovim/init.lua; + }; + }; + }; } diff --git a/modules/options.nix b/modules/options.nix new file mode 100644 index 0000000..865d362 --- /dev/null +++ b/modules/options.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + systems = [ + "x86_64-linux" + ]; +}