From 7e681511177e612a6a3a3e984948cb8aa436c60f Mon Sep 17 00:00:00 2001
From: David Lick <david@dvdt.dev>
Date: Sat, 12 Aug 2023 17:03:50 -0400
Subject: [PATCH] add backup and syncing software

---
 machines/configuration.nix                 | 93 ++++++++++++++++------
 machines/laptop/default.nix                | 15 +---
 machines/laptop/hardware-configuration.nix | 12 +--
 3 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/machines/configuration.nix b/machines/configuration.nix
index 0fa73e9..b46d370 100644
--- a/machines/configuration.nix
+++ b/machines/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, username, ... }:
+{ config, lib, pkgs, inputs, outputs, username, ... }:
 
 {
 	imports = [ ../modules/services/gpg.nix ];
@@ -11,20 +11,66 @@
 		isNormalUser = true;
 		extraGroups = [ "networkmanager" "wheel" ];
 		shell = pkgs.zsh;
+		packages = with pkgs; [
+			firefox
+			thunderbird
+			sparrow
+			freecad
+			element-desktop
+			timeshift
+			unison
+		];
 	};
 
-	environment.systemPackages = with pkgs; [
-		git
-		htop
-		lsof
-		tree
-		unzip
-		wget
-		zip
-	];
+	fileSystems = {
+		"/backup" = {
+			device = "10.0.10.2:/volume1/system-backups";
+			fsType = "nfs";
+		};
+	};
+
+	environment = {
+		gnome.excludePackages = (with pkgs; [
+			gnome-tour
+		]) ++ (with pkgs.gnome; [
+			cheese
+			gnome-music
+			epiphany
+			geary
+			tali
+			iagno
+			hitori
+			atomix
+		]);
+		systemPackages = with pkgs; [
+			git
+			htop
+			lsof
+			tree
+			unzip
+			vim
+			wget
+			zip
+			gnome.gnome-tweaks
+			gnomeExtensions.appindicator
+		];
+	};
 
 	time.timeZone = "America/New_York";
-	i18n.defaultLocale = "en_US.utf8";
+	i18n = {
+		defaultLocale = "en_US.utf8";
+		extraLocaleSettings = {
+			LC_ADDRESS = "en_US.UTF-8";
+			LC_IDENTIFICATION = "en_US.UTF-8";
+			LC_MEASUREMENT = "en_US.UTF-8";
+			LC_MONETARY = "en_US.UTF-8";
+			LC_NAME = "en_US.UTF-8";
+			LC_NUMERIC = "en_US.UTF-8";
+			LC_PAPER = "en_US.UTF-8";
+			LC_TELEPHONE = "en_US.UTF-8";
+			LC_TIME = "en_US.UTF-8"; 
+		};
+	};
 
 	nix = {
 		package = pkgs.nixFlakes;
@@ -36,6 +82,9 @@
 	};
 
 	services = {
+		printing = {
+			enable = true;
+		};
 		pipewire = {
 			enable = true;
 			alsa = {
@@ -44,28 +93,26 @@
 			};
 			pulse.enable = true;
 		};
-
+		udev.packages = with pkgs; [
+			gnome.gnome-settings-daemon
+		];
 		xserver = {
 			enable = true;
 			layout = "us";
 			xkbVariant = "";
 			libinput.enable = true;
-
-			displayManager = {
-				defaultSession = "xsession";
 			
-				session = [{
-					manage = "desktop";
-					name = "xsession";
-					start = ''
-						exec $HOME/.xsession &
-						waitPID=$!
-					'';
-				}];
+			desktopManager = {
+				gnome.enable = true;
+				xterm.enable = false;
 			};
+			displayManager.gdm.enable = true;
+
+			excludePackages = [ pkgs.xterm ];
 		};
 	};
 
+	security.rtkit.enable = true;
 	fonts.packages = [ pkgs.corefonts ];
 
 	sound.enable = true;
diff --git a/machines/laptop/default.nix b/machines/laptop/default.nix
index 624dbd6..aec1e7b 100644
--- a/machines/laptop/default.nix
+++ b/machines/laptop/default.nix
@@ -16,19 +16,10 @@
 		systemd-boot.enable = true;
 		efi = {
 			canTouchEfiVariables = true;
-			efiSysMountPoint = "/boot/efi";
+			efiSysMountPoint = "/boot";
 		};
 	};
 		
-	boot.initrd = {
-		secrets."/crypto_keyfile.bin" = null;
-		luks.devices."luks-ff01c3e8-9da4-42d8-8be9-e92713f1bebf" = {
-			device = "/dev/disk/by-uuid/dff01c3e8-9da4-42d8-8be9-e92713f1bebf";
-			keyFile = "/crypto_keyfile.bin";
-		};
-		luks.devices."luks-7e6d719a-de54-44fe-a70b-6077a8a78003" = {
-			device = "/dev/disk/by-uuid/7e6d719a-de54-44fe-a70b-6077a8a78003";
-			keyFile = "/root/swap.key";
-		};
-	};
+	boot.initrd.secrets."/crypto_keyfile.bin" = null;
+
 }
diff --git a/machines/laptop/hardware-configuration.nix b/machines/laptop/hardware-configuration.nix
index f7d8a74..bb18b1b 100644
--- a/machines/laptop/hardware-configuration.nix
+++ b/machines/laptop/hardware-configuration.nix
@@ -8,24 +8,24 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d4974532-75bd-468d-9128-a340ae38c6d5";
+    { device = "/dev/disk/by-uuid/99ac3f1e-e178-4e52-be17-4669476ed652";
       fsType = "ext4";
     };
 
+  boot.initrd.luks.devices."luks-300dbb06-4573-4a20-9842-e83d572fd003".device = "/dev/disk/by-uuid/300dbb06-4573-4a20-9842-e83d572fd003";
+
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/ADC9-9731";
+    { device = "/dev/disk/by-uuid/43E8-BD26";
       fsType = "vfat";
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/fdcdd6df-b1d5-45e2-9e2a-8249473868b3"; }
-    ];
+  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