From ac122420606a5e969e2deb3a8aaf94e47bb7fb5e Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 6 Mar 2026 19:31:03 -0600 Subject: [PATCH] update aurora --- flake.lock | 71 ++++++++++++++----- .../home-manager/programs/aurora/default.nix | 6 +- system/users/default.nix | 12 ++-- 3 files changed, 64 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 4f6617a..dd393b1 100644 --- a/flake.lock +++ b/flake.lock @@ -36,15 +36,16 @@ "aurora": { "inputs": { "flake-parts": "flake-parts", + "home-manager": "home-manager", "import-tree": "import-tree", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1772805975, - "narHash": "sha256-h+Ifi8IdFp/MFrquO4F20c/gPzD7CN5ybyjekeJkwcE=", + "lastModified": 1772846957, + "narHash": "sha256-BkqU3uaQCMGWnUVAfCX8JJH12Ts7nBmpsQ1CjlzS9Ag=", "ref": "refs/heads/master", - "rev": "93c1b00adcf1baff37ec99337691438915797d85", - "revCount": 1, + "rev": "b506d77decdd56a95abb84c9a810d7a82ef3d4f7", + "revCount": 2, "type": "git", "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora" }, @@ -210,6 +211,24 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -299,7 +318,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -583,15 +602,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772433332, - "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", - "owner": "nixos", + "lastModified": 1772542754, + "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -659,6 +678,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1772198003, "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", @@ -674,7 +709,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1772598333, "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", @@ -690,7 +725,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1769461804, "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", @@ -706,7 +741,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1768875095, "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", @@ -725,7 +760,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim_2" }, "locked": { @@ -745,7 +780,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "systems": "systems_2" }, "locked": { @@ -791,10 +826,10 @@ "disko": "disko", "firefox-addons": "firefox-addons", "flake-parts": "flake-parts_2", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hyprland": "hyprland", "import-tree": "import-tree_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-us": "nixpkgs-us", "nixvim": "nixvim", "sops-nix": "sops-nix" diff --git a/homes/nathan/home-manager/programs/aurora/default.nix b/homes/nathan/home-manager/programs/aurora/default.nix index 6e4a1d7..976be75 100644 --- a/homes/nathan/home-manager/programs/aurora/default.nix +++ b/homes/nathan/home-manager/programs/aurora/default.nix @@ -1,7 +1,11 @@ -{ ... }: { +{ inputs, ... }: { flake.homeModules.nathan = { config, lib, ... }: { + imports = [ + inputs.aurora.homeModules.default + ]; + options.homeconfig.aurora.enable = with lib; mkOption { type = with types; bool; default = false; diff --git a/system/users/default.nix b/system/users/default.nix index d1a12b5..5da9447 100644 --- a/system/users/default.nix +++ b/system/users/default.nix @@ -113,19 +113,19 @@ useUserPackages = true; sharedModules = []; users = builtins.listToAttrs (builtins.map - (x: { + (x: { name = x; value = (lib.mkMerge ([ - (if self.homeModules ? ${x} then self.homeModules.${x} else {}) + (lib.mkIf (self.homeModules ? ${x}) self.homeModules.${x}) ] ++ config.sysconfig.users.${x}.home-manager.extraModules)); - }) - (builtins.filter + }) + (builtins.filter (y: (config.sysconfig.users.${y}.home-manager.enable && !config.sysconfig.users.${y}.home-manager.standalone)) (builtins.attrNames config.sysconfig.users) - ) - ); + ) + ); }; };