Merge branch 'nixops' of ssh://git.fudo.org:2222/fudosys/NixOS into nixops

config/hardware/clunk.nix

@@ -48,11 +48,6 @@
         interface = "enp2s0";
         mode = "bridge";
       };
-
-      extif0 = {
-        interface = "enp1s0";
-        mode = "bridge";
-      };
     };
 
     interfaces = {
@@ -60,11 +55,6 @@
         # output of: echo clunk-intif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
         macAddress = "02:44:d1:eb:c3:6b";
       };
-
-      extif0 = {
-        # output of: echo clunk-extif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
-        macAddress = "02:5e:ff:e4:83:e4";
-      };
     };
   };
 }

config/hosts/clunk.nix

@@ -1,5 +1,6 @@
 { config, lib, pkgs, ... }:
 
+with lib;
 let
   primary-ip = "10.0.0.1";
   dns-proxy-ip = "10.0.0.2";
@@ -8,6 +9,9 @@ let
   site = config.fudo.site.${site-name};
 
 in {
+  # Don't do unsupervised upgrades...
+  system.autoUpgrade.enable = mkForce false;
+
   fudo.local-network = let
     host-config = config.fudo.hosts.${config.instance.hostname};
     site-name = host-config.site;
@@ -42,7 +46,8 @@ in {
     };
 
     interfaces = {
-      # enp1s0.useDHCP = false;
+      enp1s0.useDHCP = true;
+
       enp2s0.useDHCP = false;
       enp3s0.useDHCP = false;
       enp4s0.useDHCP = false;
@@ -60,13 +65,11 @@ in {
           }
         ];
       };
-
-      extif0 = { useDHCP = true; };
     };
 
     nat = {
       enable = true;
-      externalInterface = "extif0";
+      externalInterface = "enp1s0";
       internalInterfaces = [ "intif0" ];
     };
   };

config/networks/rus.selby.ca.nix

@@ -25,6 +25,11 @@ in {
       mac-address = "70:3a:cb:c0:3b:09";
     };
 
+    plato = {
+      ipv4-address = "10.0.0.102";
+      mac-address = "00:e3:5c:68:79:a2";
+    };
+
     pselby-work = {
       ipv4-address = "10.0.0.151";
       mac-address = "00:50:b6:aa:bd:b3";

config/profiles/common.nix

@@ -3,7 +3,7 @@
 with lib;
 let
   # Available to all users on the system. Keep it minimal.
-  global-packages = with pkgs; [ openssh_gssapi vim wget ];
+  global-packages = with pkgs; [ bind git openssh_gssapi vim wget ];
 
 in {
   environment = {

home-manager/niten.nix

@@ -18,7 +18,6 @@ let
     enca
     file
     fortune
-    git
     gnupg
     guile
     imagemagick
@@ -63,11 +62,7 @@ in {
       userName = name;
       userEmail = email;
       ignores = [ "*~" ];
-      extraConfig = {
-        pull = {
-          rebase = false;
-        };
-      };
+      extraConfig = { pull = { rebase = false; }; };
     };
   };