hamano againvulcan

3 files changed, 62 insertions, 7 deletions

diff --git a/hosts/hardware-configurations/knuth.nix b/hosts/hardware-configurations/knuth.nix
new file mode 100644
index 0000000..918ed86
--- /dev/null
+++ b/hosts/hardware-configurations/knuth.nix
@@ -0,0 +1,47 @@
+# 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 + "/profiles/qemu-guest.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "uhci_hcd"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/09759176-834c-4c87-ada7-7092adcb1320";
+    fsType = "ext4";
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/7c0dd096-b1dd-4a12-bdd0-cc212ac541e6"; }
+  ];
+
+  # 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.ens3.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens4.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens5.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
diff --git a/hosts/hamano.nix b/hosts/knuth.nix
index 2056d70..9685d51 100644
--- a/hosts/hamano.nix
+++ b/hosts/knuth.nix
@@ -1,23 +1,30 @@
 { ... }:
 
 let
-  host = import ../host.nix;
+  host = import ../hosts.nix;
 in
 {
   imports = [
-    ../hardware-configuration.nix
     ../modules/dns.nix
     ../modules/caddy.nix
+    ../modules/gitsrv.nix
     ../modules/tailscale.nix
     ../modules/users.nix
   ];
+  nix.settings.trusted-users = [
+  "root"
+  "grace"
+];
 
   nix.settings.experimental-features = [
     "nix-command"
     "flakes"
   ];
 
-  boot.loader.systemd-boot.enable = true;
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/vda";
+  };
   networking.hostName = host.name;
 
   services.openssh = {
diff --git a/hosts/turing.nix b/hosts/turing.nix
index c54c9ac..436b105 100755
--- a/hosts/turing.nix
+++ b/hosts/turing.nix
@@ -1,10 +1,11 @@
 { config, ... }:
 
 let
-  home-manager = builtins.fetchTarball
-    "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+
+  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
 in
 {
+  nixpkgs.config.allowUnfree = true;
   nix.settings.experimental-features = [
     "nix-command"
     "flakes"
@@ -16,13 +17,13 @@ in
   ];
 
   home-manager = {
-    useGlobalPkgs = true;
+    useGlobalPkgs = false;
     useUserPackages = true;
     backupFileExtension = "backup";
     users.${config.system.primaryUser} = {
       imports = [ ../home.nix ];
       home.username = config.system.primaryUser;
-      home.homeDirectory = "/Users/${config.system.primaryUser}";
+      home.homeDirectory = config.users.users.${config.system.primaryUser}.home;
     };
   };
 }