From d3220874f41303b5fb196367987fd4b9ef628335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sun, 9 Apr 2023 21:32:37 +0200 Subject: [PATCH] feat(flake): add nixpkgs-unstable input --- flake.lock | 16 ++++++++++++++++ flake.nix | 19 ++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 49873c8..9715108 100644 --- a/flake.lock +++ b/flake.lock @@ -210,6 +210,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1681055105, diff --git a/flake.nix b/flake.nix index 6a1a094..f2dbfed 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,8 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs-glslls.url = "github:felschr/nixpkgs/glsl-language-server"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -38,11 +40,18 @@ flake = false; }; - outputs = { self, nixpkgs, nixos-hardware, flake-utils, home-manager, nur - , agenix, deploy-rs, pre-commit-hooks, nvim-kitty-navigator, nixpkgs-glslls - }@inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils + , home-manager, nur, agenix, deploy-rs, pre-commit-hooks + , nvim-kitty-navigator, nixpkgs-glslls }@inputs: let + nixpkgsConfig.allowUnfree = true; overlays = { + unstable = final: prev: { + unstable = import nixpkgs-unstable { + inherit (prev) system; + config = nixpkgsConfig; + }; + }; neovim = final: prev: let buildVimPlugin = name: input: @@ -73,7 +82,7 @@ homeManagerModules = { git = import ./home/modules/git.nix; }; systemDefaults = { modules = [ nixosModules.flakeDefaults agenix.nixosModules.default ]; - overlays = with overlays; [ nur.overlay neovim deconz glslls ]; + overlays = with overlays; [ unstable nur.overlay neovim deconz glslls ]; }; lib = rec { createSystem = hostName: @@ -187,7 +196,7 @@ let pkgs = import nixpkgs { inherit system; - config.allowUnfree = true; + config = nixpkgsConfig; }; in rec { formatter = pkgs.nixfmt;