From 8b185ee1375a1bed14479b973d6f04601c4cf33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 14 Oct 2024 03:01:25 +0200 Subject: [PATCH 1/3] [chore] flake.lock: update inputs 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/d51c28603def282a24fa034bcb007e2bcb5b5dd0' (2024-10-09) → 'github:NixOS/nixpkgs/a3f9ad65a0bf298ed5847629a57808b97e6e8077' (2024-10-12) • Updated input 'nixvim': 'github:nix-community/nixvim/5cd8c9cf3104027b42ffe531fb68463ecb08ebc9' (2024-10-10) → 'github:nix-community/nixvim/619e24366e8ad34230d65a323d26ca981bfa6927' (2024-10-13) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ce900c9..d5c5661 100644 --- a/flake.lock +++ b/flake.lock @@ -260,11 +260,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1728740863, + "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "type": "github" }, "original": { @@ -292,11 +292,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728603032, - "narHash": "sha256-RAKCcBXqF/xOaf7fR11dnIZwZ8SDyNcK3MyVgD0l1xQ=", + "lastModified": 1728829992, + "narHash": "sha256-722PdOQ4uTTAOyS3Ze4H7LXDNVi9FecKbLEvj3Qu0hM=", "owner": "nix-community", "repo": "nixvim", - "rev": "5cd8c9cf3104027b42ffe531fb68463ecb08ebc9", + "rev": "619e24366e8ad34230d65a323d26ca981bfa6927", "type": "github" }, "original": { From 8b2984be908cbe5c368b39c8e5eff236db590624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 14 Oct 2024 09:31:19 +0200 Subject: [PATCH 2/3] fix(nvim): use unstable pkgset Instead of setting some specific unstable packages, make nixvim always use packages from nixos-unstable. --- flake-modules/nixos-modules.nix | 15 +++++++++++---- flake-modules/nvim.nix | 6 +++++- flake-modules/overlays.nix | 2 -- nvim/default.nix | 4 +++- nvim/plugins.nix | 2 +- nvim/standalone.nix | 32 ++++++++++++++++++++------------ 6 files changed, 40 insertions(+), 21 deletions(-) diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index f390328..2e98ee4 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -2,10 +2,17 @@ { flake.nixosModules = let - nvim-config.imports = [ - inputs.nixvim.homeManagerModules.nixvim - ../nvim - ]; + nvim-config = + { pkgs, ... }: + { + imports = [ + inputs.nixvim.homeManagerModules.nixvim + (import ../nvim { + inherit (inputs) unstable; + inherit (pkgs) system; + }) + ]; + }; homeManagerModuleSandalone = import ../home { inherit nvim-config; inherit (inputs) stylix; diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix index a143ff1..00aadc3 100644 --- a/flake-modules/nvim.nix +++ b/flake-modules/nvim.nix @@ -9,7 +9,11 @@ nixvim = inputs.nixvim.legacyPackages.${system}; module = { inherit pkgs; - module = ../nvim/standalone.nix; + extraSpecialArgs = { + inherit (inputs) unstable; + inherit system; + }; + module = import ../nvim/standalone.nix { standalone = true; }; }; in { diff --git a/flake-modules/overlays.nix b/flake-modules/overlays.nix index 62e46dd..437797c 100644 --- a/flake-modules/overlays.nix +++ b/flake-modules/overlays.nix @@ -17,8 +17,6 @@ inherit (unstablePkgs) gitoxide jujutsu - neovim-unwrapped - ruff # nixpkgs stable version is improperly configured by nixvim # wezterm ; }; diff --git a/nvim/default.nix b/nvim/default.nix index 3e304dd..ce16984 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -1,3 +1,4 @@ +{ system, unstable }: { lib, config, ... }: let cfg = config.jhome.nvim; @@ -6,8 +7,9 @@ in imports = [ ./options.nix ]; config.programs.nixvim = lib.mkMerge [ - ./standalone.nix + (import ./standalone.nix { standalone = false; }) (lib.mkIf cfg.enable { + nixpkgs = lib.mkForce { pkgs = import unstable { inherit system; }; }; enable = true; defaultEditor = lib.mkDefault true; }) diff --git a/nvim/plugins.nix b/nvim/plugins.nix index 3c2f67d..7e5f818 100644 --- a/nvim/plugins.nix +++ b/nvim/plugins.nix @@ -183,7 +183,7 @@ in servers = { bashls = { enable = true; - package = pkgs.unstable.bash-language-server; + package = pkgs.bash-language-server; }; # clangd.enable = true; # Adds ~2GiB # html.enable = true; # Not writing html diff --git a/nvim/standalone.nix b/nvim/standalone.nix index b5f13e8..cc48d20 100644 --- a/nvim/standalone.nix +++ b/nvim/standalone.nix @@ -1,4 +1,11 @@ -{ pkgs, ... }: +{ standalone }: +{ + pkgs, + system, + unstable, + lib, + ... +}: { imports = [ ./options.nix @@ -8,6 +15,7 @@ ]; config = { + nixpkgs = lib.optionalAttrs standalone { pkgs = import unstable { inherit system; }; }; globals.mapleader = " "; # Appearance colorschemes.gruvbox = { @@ -42,8 +50,8 @@ }; extraPlugins = let - plugins = pkgs.unstable.vimPlugins; - extraPlugins = import ./extraPlugins { pkgs = pkgs.unstable; }; + plugins = pkgs.vimPlugins; + extraPlugins = import ./extraPlugins { inherit pkgs; }; in [ plugins.nui-nvim @@ -53,15 +61,15 @@ ]; # Formatting & linters extraPackages = [ - pkgs.unstable.luajitPackages.jsregexp - pkgs.unstable.shfmt - pkgs.unstable.silicon - pkgs.unstable.statix - pkgs.unstable.stylua - pkgs.unstable.taplo - pkgs.unstable.typos - pkgs.unstable.yamlfmt - (pkgs.unstable.python3.withPackages (p: [ p.jupytext ])) + pkgs.luajitPackages.jsregexp + pkgs.shfmt + pkgs.silicon + pkgs.statix + pkgs.stylua + pkgs.taplo + pkgs.typos + pkgs.yamlfmt + (pkgs.python3.withPackages (p: [ p.jupytext ])) ]; extraConfigLuaPre = # lua From 638d8bf81a0c72fb005834cbcd7753a9f5d6529a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 14 Oct 2024 03:01:25 +0200 Subject: [PATCH 3/3] [chore] flake.lock: update inputs 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/d51c28603def282a24fa034bcb007e2bcb5b5dd0' (2024-10-09) → 'github:NixOS/nixpkgs/a3f9ad65a0bf298ed5847629a57808b97e6e8077' (2024-10-12) • Updated input 'nixvim': 'github:nix-community/nixvim/5cd8c9cf3104027b42ffe531fb68463ecb08ebc9' (2024-10-10) → 'github:nix-community/nixvim/619e24366e8ad34230d65a323d26ca981bfa6927' (2024-10-13) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ce900c9..d5c5661 100644 --- a/flake.lock +++ b/flake.lock @@ -260,11 +260,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1728740863, + "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "type": "github" }, "original": { @@ -292,11 +292,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728603032, - "narHash": "sha256-RAKCcBXqF/xOaf7fR11dnIZwZ8SDyNcK3MyVgD0l1xQ=", + "lastModified": 1728829992, + "narHash": "sha256-722PdOQ4uTTAOyS3Ze4H7LXDNVi9FecKbLEvj3Qu0hM=", "owner": "nix-community", "repo": "nixvim", - "rev": "5cd8c9cf3104027b42ffe531fb68463ecb08ebc9", + "rev": "619e24366e8ad34230d65a323d26ca981bfa6927", "type": "github" }, "original": {