noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-02-21 19:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing hosts

Browse Source
This commit is contained in:
Noah Masur 2025-02-16 16:33:32 -05:00
parent 1062369a78
commit 7de88ba2b6
No known key found for this signature in database
4 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -320,8 +320,8 @@
# Create nixosConfigurations using the different pkgs for each system # Create nixosConfigurations using the different pkgs for each system
# What to do with home config? # What to do with home config?
nixosModules = import ./hosts/nixos nixpkgs; nixosModules = (import ./hosts nixpkgs).nixos-hosts;
darwinModules = import ./hosts/darwin nixpkgs; darwinModules = (import ./hosts nixpkgs).darwin-hosts;
# Contains my full system builds, including home-manager # Contains my full system builds, including home-manager
# nixos-rebuild switch --flake .#tempest # nixos-rebuild switch --flake .#tempest

16
hosts/darwin/default.nix
View File

@ -1,16 +0,0 @@
# Return a list of all nix-darwin hosts
{ lib, ... }:
lib.pipe (lib.filesystem.listFilesRecursive ./.) [
# Get only files ending in default.nix
(builtins.filter (name: lib.hasSuffix "default.nix" name))
# Import each host function
map
(file: {
name = builtins.baseNameOf (builtins.dirOf file);
value = import file;
})
# Convert to an attrset of hostname -> host function
(builtins.listToAttrs)
]

31
hosts/default.nix
View File

@ -1,6 +1,33 @@
# Return a list of all hosts # Return a list of all hosts
nixpkgs:
let
inherit (nixpkgs) lib;
in
{ {
darwin-hosts = import ./darwin; # darwin-hosts = import ./darwin;
linux-hosts = import ./nixos; darwin-hosts = lib.pipe (lib.filesystem.listFilesRecursive ./darwin) [
# Get only files ending in default.nix
(builtins.filter (name: lib.hasSuffix "default.nix" name))
# Import each host function
(map (file: {
name = builtins.baseNameOf (builtins.dirOf file);
value = import file;
}))
# Convert to an attrset of hostname -> host function
(builtins.listToAttrs)
];
nixos-hosts = lib.pipe (lib.filesystem.listFilesRecursive ./nixos) [
# Get only files ending in default.nix
(builtins.filter (name: lib.hasSuffix "default.nix" name))
# Import each host function
(map (file: {
name = builtins.baseNameOf (builtins.dirOf file);
value = import file;
}))
# Convert to an attrset of hostname -> host function
(builtins.listToAttrs)
];
} }

20
hosts/nixos/default.nix
View File

@ -1,20 +0,0 @@
# Return a list of all NixOS hosts
{ nixpkgs, ... }:
let
inherit (nixpkgs) lib;
in
lib.pipe (lib.filesystem.listFilesRecursive ./.) [
# Get only files ending in default.nix
(builtins.filter (name: lib.hasSuffix "default.nix" name))
# Import each host function
map
(file: {
name = builtins.baseNameOf (builtins.dirOf file);
value = import file;
})
# Convert to an attrset of hostname -> host function
(builtins.listToAttrs)
]