From 3fd51428c3933da5fa300f22a8c2dfc064693015 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Tue, 13 Jan 2026 13:11:31 -0500 Subject: [PATCH] add unstable nixpkgs --- flake.lock | 17 +++++++++++++++++ flake.nix | 26 +++++++++++++++++++++++++- home/hosts/alien/default.nix | 7 +++++-- system/default.nix | 2 -- 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 09248a8..b8a15fd 100644 --- a/flake.lock +++ b/flake.lock @@ -373,6 +373,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1767799921, @@ -509,6 +525,7 @@ "niri": "niri", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs_2", + "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", diff --git a/flake.nix b/flake.nix index 7884e0e..8f09afe 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; @@ -59,6 +60,7 @@ outputs = { nixpkgs, + nixpkgs-unstable, nix-cachyos-kernel, catppuccin, catppuccin-palette, @@ -73,9 +75,15 @@ ... }: let # All systems we want to support for the generic VM - supportedSystems = ["x86_64-linux" "aarch64-linux"]; # to run the vm: # nixos-rebuild build-vm --flake ~/nix#$(nix eval --raw --impure --expr 'builtins.currentSystem') + supportedSystems = ["x86_64-linux" "aarch64-linux"]; + + # Shared config for all package sets + pkgConfig = { + allowUnfree = true; + }; + mkNixosSystem = { hostname, system, @@ -87,11 +95,16 @@ specialArgs = { inherit catppuccin system; + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config = pkgConfig; + }; } // extraSpecialArgs; modules = [ { + nixpkgs.config = pkgConfig; nixpkgs.overlays = [ catppuccin-palette.overlays.default niri.overlays.niri @@ -142,6 +155,10 @@ ]; home-manager.extraSpecialArgs = { inherit spicetify-nix; + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config = pkgConfig; + }; }; } ] @@ -156,6 +173,7 @@ home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { inherit system; + config = pkgConfig; }; home.username = user; home.homeDirectory = "/home/${user}"; @@ -169,6 +187,12 @@ noctalia.homeModules.noctalia nixvim.homeModules.nixvim ]; + extraSpecialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config = pkgConfig; + }; + }; }; in { diff --git a/home/hosts/alien/default.nix b/home/hosts/alien/default.nix index 2022182..7d17545 100644 --- a/home/hosts/alien/default.nix +++ b/home/hosts/alien/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + pkgs-unstable, spicetify-nix, ... }: { @@ -9,9 +10,11 @@ flavor = "mocha"; }; - home.packages = with pkgs; [ + home.packages = [ # steam gtk theming - adwsteamgtk + pkgs.adwsteamgtk + + pkgs-unstable.ckan ]; programs.noctalia-shell.settings.brightness = { diff --git a/system/default.nix b/system/default.nix index f8be213..95c2342 100755 --- a/system/default.nix +++ b/system/default.nix @@ -159,8 +159,6 @@ hashedPassword = "$6$bvwRUFaJNMpH8rm3$FGDWFN6tBScJ/2DynAjnlZE8JRfyADN78d6c4GawxpAjyNLNE/AjQzMA09tLRqpKX7WnN5PIUZLAm2bT9/RbG0"; }; - nixpkgs.config.allowUnfree = true; - environment = { systemPackages = with pkgs; [ git