From f0e37c6ee283ee0d9dbacf7c54cb7cea23175cef Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Sat, 10 Feb 2024 12:34:59 -0600
Subject: [PATCH] Consolidate some settings, move others.

---
 configuration.nix | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 0cac41f..a47c7f6 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,8 +11,22 @@
     ];
 
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      supportedFilesystems = [ "nfs" ];
+      kernelModules = [ "nfs" ];
+    };
+  };
+
+  # fileSystems."/mnt/xen-backups" = {
+  #   device = "10.1.1.13:/eru/xen-backups";
+  #   fsType = "nfs";
+  # };
+
 
   programs.fish.enable = true;
 
@@ -95,11 +109,11 @@
     packages = with pkgs; [
       firefox
       thunderbird
-      git
       vscode
       vivaldi
       vivaldi-ffmpeg-codecs
       termius
+      talhelper.packages."${pkgs.system}".default
     ];
   };
   environment.variables.EDITOR = "vim";
@@ -111,7 +125,7 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    talhelper.packages."${pkgs.system}".default
+    git
     wget
     curl
     vim
@@ -123,6 +137,7 @@
     ansible
     gparted
     lens
+    nfs-utils
   ];
   services.tailscale.enable = true;