From 778cf5fd60a680e3e7dfcd1976b54cb078cf3778 Mon Sep 17 00:00:00 2001 From: Christopher James Hayward Date: Tue, 27 Jul 2021 22:21:47 -0400 Subject: [PATCH] Cleanup hosts --- README.org | 42 +----------------------------------------- flake.nix | 22 ++-------------------- 2 files changed, 3 insertions(+), 61 deletions(-) diff --git a/README.org b/README.org index 15f8e19..ef7d60b 100644 --- a/README.org +++ b/README.org @@ -380,15 +380,9 @@ It's helpful to add the machine hostnames to the networking configuration, so I #+BEGIN_SRC nix networking.hosts = { "192.168.3.105" = [ "gamingpc" ]; - "192.168.3.136" = [ "acernitro" ]; - "192.168.3.163" = [ "acernitro_" ]; + "192.168.3.163" = [ "acernitro" ]; "192.168.3.182" = [ "raspberry" ]; - "192.168.3.123" = [ "raspberry_" ]; "192.168.3.183" = [ "homecloud" ]; - # "" = [ "homecloud_" ]; - # "" = [ "zero-one" ]; - # "" = [ "zero-two" ]; - # "" = [ "android" ]; }; #+END_SRC @@ -881,40 +875,6 @@ Deploy this configuration with ~sudo nixos-rebuild switch --flake /etc/dotfiles/ } #+END_SRC -** TODO Zero-One - -TODO: Raspberry Pi Zero/Zero WH - -#+NAME: host-zero-one -#+BEGIN_SRC nix -zero-one = nixpkgs.lib.nixosSystem { - system = "armv7l-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/zero-one - ./modules/ssh.nix - ./modules/flakes.nix - ./modules/cachix.nix - ]; -}; -#+END_SRC - -** TODO Zero-Two - -#+NAME: host-zero-two -#+BEGIN_SRC nix -zero-two = nixpkgs.lib.nixosSystem { - system = "armv7l-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/zero-two - ./modules/ssh.nix - ./modules/flakes.nix - ./modules/cachix.nix - ]; -}; -#+END_SRC - ** TODO Android This is my Samsung Galaxy S10+[fn:27] running Nix On Droid[fn:10] with the experimental support for Flakes being used to manage the configuration. diff --git a/flake.nix b/flake.nix index 8746d4d..0d52da1 100644 --- a/flake.nix +++ b/flake.nix @@ -103,26 +103,8 @@ ./modules/cachix.nix ]; }; - zero-one = nixpkgs.lib.nixosSystem { - system = "armv7l-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/zero-one - ./modules/ssh.nix - ./modules/flakes.nix - ./modules/cachix.nix - ]; - }; - zero-two = nixpkgs.lib.nixosSystem { - system = "armv7l-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/zero-two - ./modules/ssh.nix - ./modules/flakes.nix - ./modules/cachix.nix - ]; - }; + + android = (inputs.nix-on-droid.lib.aarch64-linux.nix-on-droid { config = ./hosts/android/nix-on-droid.nix; }).activationPackage;