From 37f55cb80c2f3f070015263a59829f20ddf52ddf Mon Sep 17 00:00:00 2001 From: Tim Keller Date: Mon, 2 Nov 2026 13:45:47 -0600 Subject: add new flake input for helium browser (reorganize old ones) and hostsbyuser for home manager standalone build --- flake.lock | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 41 +++++++++++++++++++---------------- 2 files changed, 95 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 78569cc..aec1039 100644 --- a/flake.lock +++ b/flake.lock @@ -78,6 +78,62 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "helium": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1793392261, + "narHash": "sha256-zUKx9ABhPhtnl0qc3onxfZq27ajnrGJyrWPj9cCdNSc=", + "owner": "AlvaroParker", + "repo": "helium-nix", + "rev": "2c8a5035734f05b54332ce16d2e9c3a263c618a6", + "type": "github" + }, + "original": { + "owner": "AlvaroParker", + "repo": "helium-nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -221,6 +277,7 @@ "arkenfox": "arkenfox", "embedtube": "embedtube", "ff-userchrome": "ff-userchrome", + "helium": "helium", "home-manager": "home-manager", "neovim-vanilla": "neovim-vanilla", "nixpkgs": "nixpkgs", @@ -251,6 +308,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "telemetry": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 11ed1ac..573c008 100644 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,15 @@ rec { nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - sops-nix = { url = "github:Mic92/sops-nix" ; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager = { url = "github:nix-community/home-manager/release-26.05" ; inputs.nixpkgs.follows = "nixpkgs"; }; arkenfox = { url = "github:dwarfmaster/arkenfox-nixos" ; inputs.nixpkgs.follows = "nixpkgs"; }; - reposync = { url = "git://git.tjkeller.xyz/hm-reposync" ; inputs.nixpkgs.follows = "nixpkgs"; }; - open-bamboo = { url = "git://git.tjkeller.xyz/open-bamboo-network-plugin-flake" ; inputs.nixpkgs.follows = "nixpkgs"; }; - neovim-vanilla = { url = "git://git.tjkeller.xyz/neovim-vanilla-wrapped" ; inputs.nixpkgs.follows = "nixpkgs"; }; - ff-userchrome = { url = "git://git.tjkeller.xyz/firefox-chrome" ; inputs.nixpkgs.follows = "nixpkgs"; }; + helium = { url = "github:AlvaroParker/helium-nix" ; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:nix-community/home-manager/release-26.05" ; inputs.nixpkgs.follows = "nixpkgs"; }; + sops-nix = { url = "github:Mic92/sops-nix" ; inputs.nixpkgs.follows = "nixpkgs"; }; embedtube = { url = "git://git.tjkeller.xyz/embedtube" ; inputs.nixpkgs.follows = "nixpkgs"; }; + ff-userchrome = { url = "git://git.tjkeller.xyz/firefox-chrome" ; inputs.nixpkgs.follows = "nixpkgs"; }; + neovim-vanilla = { url = "git://git.tjkeller.xyz/neovim-vanilla-wrapped" ; inputs.nixpkgs.follows = "nixpkgs"; }; + open-bamboo = { url = "git://git.tjkeller.xyz/open-bamboo-network-plugin-flake" ; inputs.nixpkgs.follows = "nixpkgs"; }; + reposync = { url = "git://git.tjkeller.xyz/hm-reposync" ; inputs.nixpkgs.follows = "nixpkgs"; }; telemetry = { url = "git://git.tjkeller.xyz/telemetry-flake" ; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -60,26 +61,28 @@ rec { }) hostsBySystem.${system} ) (builtins.attrNames hostsBySystem) ); - mkHomeConfiguration = user: system: hostname: home-manager.lib.homeManagerConfiguration { + mkHomeConfiguration = userName: system: hostname: home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; extraSpecialArgs = { inherit inputs; lib = extLibHomeManagerStandalone; }; modules = homeManagerModules ++ [ - ./hosts/${hostname}/home-${user}/configuration.nix + ./hosts/${hostname}/home-${userName}/configuration.nix ./archetypes/profiles ./pkgs ./users/default-home.nix ]; }; - mkHomeConfigurations = hostsBySystem: builtins.listToAttrs ( - builtins.concatMap (system: - map (host: { - name = host; - value = mkHomeConfiguration "timmy" system host; # TODO - }) hostsBySystem.${system} - ) (builtins.attrNames hostsBySystem) + mkHomeConfigurations = hostsByUser: builtins.listToAttrs ( + builtins.concatMap (userName: + builtins.concatMap (system: + map (host: { + name = "${host}-${userName}"; + value = mkHomeConfiguration userName system host; + }) hostsByUser.${userName}.${system} + ) (builtins.attrNames hostsByUser.${userName}) + ) (builtins.attrNames hostsByUser) ); in { # Configured system hostnames go here under their respective system architecture @@ -101,9 +104,11 @@ rec { ]; }; homeConfigurations = mkHomeConfigurations { - x86_64-linux = [ - "libreX60" - ]; + timmy = { + x86_64-linux = [ + "libreX60" + ]; + }; }; }; } -- cgit v1.3.1