nix/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed for deploy again

Browse Source
This commit is contained in:
Niten 2021-08-18 10:00:18 -07:00
parent 05ba61cb4e
commit c71b07a903
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/hosts/spark.nix
View File

@ -14,4 +14,5 @@
profile = "desktop"; profile = "desktop";
domain = "sea.fudo.org"; domain = "sea.fudo.org";
site = "seattle"; site = "seattle";
android-dev = true;
} }

1
config/hosts/system3.nix
View File

@ -14,4 +14,5 @@
profile = "desktop"; profile = "desktop";
domain = "sea.fudo.org"; domain = "sea.fudo.org";
site = "seattle"; site = "seattle";
android-dev = true;
} }

1
config/hosts/zbox.nix
View File

@ -14,4 +14,5 @@
profile = "desktop"; profile = "desktop";
domain = "sea.fudo.org"; domain = "sea.fudo.org";
site = "seattle"; site = "seattle";
android-dev = true;
} }

2
initialize.nix
View File

@ -9,7 +9,7 @@ in {
./config ./config
./packages ./packages
"${home-manager-package}/nixos" "${home-manager-package}/nixos"
] ++ pkgs.lib.optional host-config.nixos-system [ ] ++ [
(./. + "/config/hardware/${hostname}.nix") (./. + "/config/hardware/${hostname}.nix")
(./. + "/config/host-config/${hostname}.nix") (./. + "/config/host-config/${hostname}.nix")
(./. + "/config/profile-config/${host-config.profile}.nix") (./. + "/config/profile-config/${host-config.profile}.nix")

9
lib/fudo/hosts.nix
View File

@ -149,9 +149,13 @@ let
description = "System architecture of the system."; description = "System architecture of the system.";
default = "x86_64-linux"; default = "x86_64-linux";
}; };
android-dev = mkEnableOption "Enable ADB on the host.";
}; };
}; };
system = import ../system.nix { inherit config lib; };
in { in {
options.fudo.hosts = with types; options.fudo.hosts = with types;
mkOption { mkOption {
@ -246,6 +250,11 @@ in {
user = "root"; user = "root";
}; };
programs.adb.enable = host-cfg.android-dev;
users.groups.adbusers = mkIf host-cfg.android-dev {
members = system.local-admins;
};
programs.ssh.knownHosts = let programs.ssh.knownHosts = let
keyed-hosts = keyed-hosts =
filterAttrs (host: opts: opts.ssh-pubkey != null) config.fudo.hosts; filterAttrs (host: opts: opts.ssh-pubkey != null) config.fudo.hosts;