From 77175650f6789ae9e64ea66b82c0cf61a30d4f9e Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Mon, 13 Mar 2023 12:13:08 +0100 Subject: [PATCH] feat: use unstable nvim packages --- flake.lock | 31 +++++++++++++++++++++------- flake.nix | 36 ++++++++++++++++++++++++--------- home-manager/neovim/default.nix | 7 ++++--- 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 0cfdeae..596cdaf 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1677757546, - "narHash": "sha256-tA1ukoluctzLVyWRaKtD4KlTwgXbUsGB5vcyni1OJ9I=", + "lastModified": 1678285456, + "narHash": "sha256-2rIk5OFGQmoFX1MWntKGPVCZvy5yQMX3ZCYz7i8+yb0=", "owner": "nix-community", "repo": "home-manager", - "rev": "86bb69b0b1e10d99a30c4352f230f03106dd0f8a", + "rev": "b0be47978de5cfd729a79c3f57ace4c86364ff45", "type": "github" }, "original": { @@ -24,11 +24,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677779205, - "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=", + "lastModified": 1678614274, + "narHash": "sha256-kK9l45n9cQ4mEQeT4NvJ+pK2nwsHhfZGUyRgzI+XFOw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39", + "rev": "970402e6147c49603f4d06defe44d27fe51884ce", "type": "github" }, "original": { @@ -38,10 +38,27 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1678563391, + "narHash": "sha256-fGSVN8pdE8ACraNsbsx1UVL7Jl7Huhz4N+0udFT35XU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e3bac17a6c67dcbef9908bc2977e9449ef499a5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } }, "utils": { diff --git a/flake.nix b/flake.nix index faa79ea..e9ff3c4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,19 +1,41 @@ { inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; + nixpkgs-unstable.url = github:NixOS/nixpkgs/nixos-unstable; home-manager = { url = github:nix-community/home-manager/release-22.11; inputs.nixpkgs.follows = "nixpkgs"; }; + }; - outputs = { self, nixpkgs, home-manager }: + outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, ... }: let user = "mandlm"; theme = "dark"; # dark or light + + overlays = { + unstable-packages = _final: _prev: { + unstable = import nixpkgs-unstable { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + }; + }; + + nixpkgs_config = { + overlays = [ + overlays.unstable-packages + ]; + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + }; + }; in { + nixosConfigurations = { nixos-vm = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -25,11 +47,10 @@ home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit user theme; }; home-manager.users.${user} = { imports = [ ./home-${user}.nix ]; + nixpkgs = nixpkgs_config; }; } ]; @@ -45,14 +66,13 @@ home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit user theme; }; home-manager.users.${user} = { imports = [ ./home-${user}.nix ./machines/apache/home-${user}.nix ]; + nixpkgs = nixpkgs_config; }; } ]; @@ -68,14 +88,13 @@ home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit user theme; }; home-manager.users.${user} = { imports = [ ./home-${user}.nix ./machines/p330/home-${user}.nix ]; + nixpkgs = nixpkgs_config; }; } ]; @@ -91,14 +110,13 @@ home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit user theme; }; home-manager.users.${user} = { imports = [ ./home-${user}.nix ./machines/yoga/home-${user}.nix ]; + nixpkgs = nixpkgs_config; }; } ]; diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index 958786c..ff6f38c 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -45,7 +45,7 @@ let }; in { - home.packages = with pkgs; [ + home.packages = with pkgs.unstable; [ xclip # language servers @@ -68,7 +68,7 @@ in ]; # symlink for a stable path - home.file.".vscode-extensions/vscode-lldb".source = pkgs.vscode-extensions.vadimcn.vscode-lldb; + home.file.".vscode-extensions/vscode-lldb".source = pkgs.unstable.vscode-extensions.vadimcn.vscode-lldb; home.sessionVariables = { EDITOR = "nvim"; @@ -77,7 +77,8 @@ in programs = { neovim = { enable = true; - plugins = with pkgs.vimPlugins; [ + # package = pkgs.unstable.neovim; + plugins = with pkgs.unstable.vimPlugins; [ # theme nvim-solarized-lua