Sh/changes to get working

Makefile

@@ -1,13 +1,13 @@
 # Connectivity info for Linux VM
-NIXADDR ?= unset
+NIXADDR ?= dev.local
 NIXPORT ?= 22
-NIXUSER ?= jonochang
+NIXUSER ?= simon
 
 # Get the path to this Makefile and directory
 MAKEFILE_DIR := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 
 # The name of the nixosConfiguration in the flake
-NIXNAME ?= vm-intel
+NIXNAME ?= vm-aarch64
 
 # SSH options that are used. These aren't meant to be overridden but are
 # reused a lot so we just store them up here.
@@ -121,12 +121,6 @@ vm/secrets:
 	rsync -av -e 'ssh $(SSH_OPTIONS)' \
 		--exclude='environment' \
 		$(HOME)/.aws/ $(NIXUSER)@$(NIXADDR):~/.aws
-	# GPG keyring
-	rsync -av -e 'ssh $(SSH_OPTIONS)' \
-		--exclude='.#*' \
-		--exclude='S.*' \
-		--exclude='*.conf' \
-		$(HOME)/.gnupg/ $(NIXUSER)@$(NIXADDR):~/.gnupg
 	# SSH keys
 	rsync -av -e 'ssh $(SSH_OPTIONS)' \
 		--exclude='environment' \

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "NixOS systems and tools by mitchellh and jonochang";
+  description = "NixOS systems and tools by mitchellh and simon hudson";
 
   inputs = {
     # Pin our primary nixpkgs repository. This is the main nixpkgs repository
@@ -89,7 +89,7 @@
   in {
     nixosConfigurations.vm-aarch64 = mkSystem "vm-aarch64" {
       system = "aarch64-linux";
-      user   = "jonochang";
+      user   = "simon";
     };
 
     # nixosConfigurations.vm-aarch64-prl = mkSystem "vm-aarch64-prl" rec {

machines/vm-shared.nix

@@ -22,9 +22,9 @@
     # this, use your own, or toss it. Its typically safe to use a binary cache
     # since the data inside is checksummed.
     settings = {
-      trusted-substituters = ["ssh-ng://jono@tsuruhashi" "https://mitchellh-nixos-config.cachix.org" "https://cache.nixos.org/"];
+      trusted-substituters = ["ssh-ng://simon@tsuruhashi" "https://mitchellh-nixos-config.cachix.org" "https://cache.nixos.org/"];
       trusted-public-keys = ["silverpond:DvvEdyKZvc86cR1o/a+iJxnb7JxMCBzvSTjjEQIY8+g=" "mitchellh-nixos-config.cachix.org-1:bjEbXJyLrL1HZZHBbO4QALnI5faYZppzkU4D2s0G8RQ=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="];
-      trusted-users = ["jonochang"];
+      trusted-users = ["simon"];
     };
   };
 
@@ -45,6 +45,15 @@
   networking.hostName = "dev";
   networking.nameservers = [ "1.1.1.1" "1.0.0.1" ];
 
+  networking.hosts = {
+    "10.0.0.120" = [ "minio" ];
+  };
+
+  services.avahi.enable = true;
+  services.avahi.nssmdns4 = true;
+  services.avahi.publish.addresses = true;
+  services.avahi.publish.enable = true;
+
   # Set your time zone.
   time.timeZone = "Australia/Melbourne";
 
@@ -165,4 +174,13 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "20.09"; # Did you read the comment?
+
+  services.dnsmasq = {
+    enable = true;
+    settings = {
+      listen-address = "0.0.0.0";
+      bind-interfaces = true;
+      address = "/dev.local/172.16.20.128";  # VM's own IP
+    };
+  };
 }