From 447fe2004126de5bca66139fb0263a5eea8e2c75 Mon Sep 17 00:00:00 2001 From: Drew Haven Date: Wed, 21 May 2025 15:47:13 -0700 Subject: [PATCH] [vega] Moves to unstable to fix issues building hy3 --- flake.lock | 38 ++++++++++++++++++++++++++++++++++++++ flake.nix | 13 +++++++++++-- system/hosts/vega/drew.nix | 1 - 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a2bd89d..e6eb6b9 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,26 @@ "type": "github" } }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1747834438, + "narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1747610100, @@ -37,10 +57,28 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", + "home-manager-unstable": "home-manager-unstable", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, diff --git a/flake.nix b/flake.nix index f5fabcd..d94a3b0 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,13 @@ url = "github:nix-community/home-manager?ref=release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-unstable = { + url = "github:nixos/nixpkgs?ref=nixos-unstable"; + }; + home-manager-unstable = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -24,12 +31,12 @@ path, system ? "x86_64-linux", nixpkgs ? inputs.nixpkgs, - homemanager ? inputs.home-manager, + home-manager ? inputs.home-manager, }: nixpkgs.lib.nixosSystem { inherit system; modules = [ - homemanager.nixosModules.home-manager + home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -51,6 +58,8 @@ }; vega = mkNixosConfig { path = ./system/hosts/vega; + nixpkgs = inputs.nixpkgs-unstable; + home-manager = inputs.home-manager-unstable; }; mcp = mkNixosConfig { path = ./system/hosts/mcp; diff --git a/system/hosts/vega/drew.nix b/system/hosts/vega/drew.nix index 161fae7..3e89e7f 100644 --- a/system/hosts/vega/drew.nix +++ b/system/hosts/vega/drew.nix @@ -17,7 +17,6 @@ ]; home.packages = with pkgs; [ - windsurf slack zoom-us ];