From d6c5c9a76708aa1fb93c71309513a2b343cc4146 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Thu, 4 May 2023 21:18:47 -0500
Subject: [PATCH] refactoring! pt 2

---
 hosts/eve/configuration.nix | 7 +++----
 workstation/default.nix     | 9 +++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hosts/eve/configuration.nix b/hosts/eve/configuration.nix
index 8fcaf34..33f7f93 100644
--- a/hosts/eve/configuration.nix
+++ b/hosts/eve/configuration.nix
@@ -5,10 +5,9 @@
     [ 
       <nixos-hardware/google/pixelbook>
       /etc/nixos/hardware-configuration.nix
-      /home/don/nixos/workstation/configuration.nix
-      /home/don/nixos/workstation/home
-      /home/don/nixos/workstation/sway.nix
-      /home/don/nixos/workstation/systemd.nix
+      /home/don/nixos/workstation
+      /home/don/nixos/home
+      /home/don/nixos/dm/sway
     ];
   networking.hostName = "eve";
 }
diff --git a/workstation/default.nix b/workstation/default.nix
index b5609bb..d8d6dda 100644
--- a/workstation/default.nix
+++ b/workstation/default.nix
@@ -11,6 +11,11 @@ let
   python-with-my-packages = pkgs.python311Full.withPackages my-python-packages;
 in
 {
+  imports = 
+    [
+      ./detect-reboot-needed.nix
+      ./systemd.nix
+    ];
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -22,10 +27,6 @@ in
   networking.enableIPv6 = false; # FIXME this is to test connectivity @ the office via wireguard
   networking.networkmanager.wifi.powersave = true;
   networking.useDHCP = false;
-#  networking.extraHosts =
-#   ''
-#     100.75.7.116	 harper.tail harper bandwidth.duckland.org bandwidth2.duckland.org cal.duckland.org cloud.duckland.org dash.duckland.org git.duckland.org jelly.duckland.org music.duckland.org photos.duckland.org plex.duckland.org rss.duckland.org smart.duckland.org vault.duckland.org webhook.home.duckland.org
-#   '';
 
   # Set your time zone.
   time.timeZone = "America/Chicago";