Merge branch 'master' of ssh://bosco:/srv/git/.flake

7 files changed, 62 insertions, 4 deletions

diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix
index b37887e..bb2867f 100644
--- a/machines/bosco/default.nix
+++ b/machines/bosco/default.nix
@@ -8,6 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ./reverse-proxy.nix
 
       ../../modules/nixos/nix-common.nix
       ../../modules/nixos/environment.nix
diff --git a/machines/bosco/reverse-proxy.nix b/machines/bosco/reverse-proxy.nix
new file mode 100644
index 0000000..9d3e382
--- /dev/null
+++ b/machines/bosco/reverse-proxy.nix
@@ -0,0 +1,11 @@
+{ config, ... }: {
+  services.caddy = {
+    enable = true;
+    virtualHosts."foolcreekwireless.com" = {
+      serverAliases = [ "www.foolcreekwireless.com" ];
+      extraConfig = ''
+        reverse_proxy http://doretta
+      '';
+    };
+  };
+}
diff --git a/machines/iso/configuration.nix b/machines/iso/configuration.nix
index ee400d3..29b429a 100644
--- a/machines/iso/configuration.nix
+++ b/machines/iso/configuration.nix
@@ -1,4 +1,7 @@
 { ... }: {
+  imports = [
+    ./hardware-configuration.nix
+  ];
   nixpkgs = {
     config.allowUnfree = true;
   };
diff --git a/machines/iso/hardware-configuration.nix b/machines/iso/hardware-configuration.nix
new file mode 100644
index 0000000..78601ad
--- /dev/null
+++ b/machines/iso/hardware-configuration.nix
@@ -0,0 +1,35 @@
+# hardware-configuration.nix
+
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/NIXOS_SD"; # this is important!
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.end0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}
diff --git a/machines/khad/default.nix b/machines/khad/default.nix
index f28fdbe..cd6f22f 100644
--- a/machines/khad/default.nix
+++ b/machines/khad/default.nix
@@ -33,6 +33,7 @@
     };
     kernelPackages = pkgs.linuxPackages_latest; # use latest kernel
   };
+  boot.binfmt.emulatedSystems = ["aarch64-linux"];
   hardware.onlykey.enable = true;
 
   networking.hostName = "khad"; # Define your hostname.
diff --git a/machines/picast/default.nix b/machines/picast/default.nix
index 827045f..ff10ad5 100644
--- a/machines/picast/default.nix
+++ b/machines/picast/default.nix
@@ -28,7 +28,11 @@
   # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
   # Set your time zone.
+<<<<<<< HEAD
   time.timeZone = "US/Mountain";
+=======
+  time.timeZone = "America/Denver";
+>>>>>>> 7d7f5905769c488d2129b2ec0ade6451f0765d84
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
@@ -69,7 +73,7 @@
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
-  # programs.mtr.enable = true;
+  programs.mtr.enable = true;
   # programs.gnupg.agent = {
   #   enable = true;
   #   enableSSHSupport = true;
diff --git a/machines/picast/hardware-configuration.nix b/machines/picast/hardware-configuration.nix
index 3f13493..78601ad 100644
--- a/machines/picast/hardware-configuration.nix
+++ b/machines/picast/hardware-configuration.nix
@@ -1,3 +1,5 @@
+# hardware-configuration.nix
+
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
@@ -8,14 +10,15 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+    { device = "/dev/disk/by-label/NIXOS_SD"; # this is important!
       fsType = "ext4";
+      options = [ "noatime" ];
     };
 
   swapDevices = [ ];
@@ -25,7 +28,7 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enu1u1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.end0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";