diff --git a/default.nix b/default.nix index b8e345d..c685d66 100755 --- a/default.nix +++ b/default.nix @@ -31,6 +31,7 @@ in { # do not remove this. # nix is awesome git + neofetch ]; time.timeZone = mkDefault "America/Los_Angeles"; diff --git a/flake.nix b/flake.nix index 5e5f2c7..3d96afd 100755 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ outputs = inputs @ { self, nixpkgs, ... }: let - inherit (lib.my) mapModules mapModulesRec mkHost; + inherit (lib.my) mapModules mapModulesRec mapHosts; system = "aarch64-linux"; mkPkgs = pkgs: extraOverlays: @@ -43,6 +43,6 @@ nixosModules = mapModulesRec ./modules import; - nixosConfigurations = mapModules ./hosts (host: mkHost host { inherit system; }); + nixosConfigurations = mapHosts ./hosts {}; }; } diff --git a/hosts/server/default.nix b/hosts/server/default.nix index 7c50346..cf0c096 100755 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: let - keys = import ./authorizedKeys.nix; - fetchSSH = (host: lib._.getSSH host keys); - fetchSSHKeys = map fetchSSH; + in { imports = [ ./hardware-configuration.nix @@ -53,8 +51,6 @@ in { security.useDoas = true; }; - time.timeZone = "America/Los_Angeles"; - networking = { hostName = "nixos-server-reid"; networkmanager.enable = true; diff --git a/readme.md b/readme.md index 6aa4b26..dabed97 100755 --- a/readme.md +++ b/readme.md @@ -18,5 +18,6 @@ before committing, please run `nix flake check` and make sure everything is ok ## todo -- remove the lua static stuff from nginx -- add a helper for per-host architecture picking, atm it is hardcoded to `aarch64` +- remove the lua static stuff from nginx + the cf ip +- per-host architecture selection, atm it is hardcoded to `aarch64` +- some weird perl error abt locales when building??? it only happened after the big lib update. help me