From 8f2cd4184adf80123f18401d0a835721c9521361 Mon Sep 17 00:00:00 2001
From: John Locke <john@freelock.com>
Date: Sun, 10 Mar 2024 01:00:55 -0800
Subject: [PATCH] Config rearrange

---
 base/README.md                   |  3 +++
 base/default.nix                 | 12 ++++++++++++
 desktop/README.md                |  7 +++++++
 desktop/default.nix              | 17 ++++-------------
 desktop/{ => include}/common.nix |  0
 desktop/{ => include}/compat.nix |  0
 desktop/{ => include}/i18n.nix   |  0
 hosts/README.md                  |  0
 server/README.md                 |  0
 9 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 base/README.md
 create mode 100644 desktop/README.md
 rename desktop/{ => include}/common.nix (100%)
 rename desktop/{ => include}/compat.nix (100%)
 rename desktop/{ => include}/i18n.nix (100%)
 create mode 100644 hosts/README.md
 create mode 100644 server/README.md

diff --git a/base/README.md b/base/README.md
new file mode 100644
index 0000000..8511de9
--- /dev/null
+++ b/base/README.md
@@ -0,0 +1,3 @@
+## Base packages
+
+Packages to install on all systems, desktop and server.
diff --git a/base/default.nix b/base/default.nix
index 90f2850..7e72256 100644
--- a/base/default.nix
+++ b/base/default.nix
@@ -24,4 +24,16 @@
   ];
 
   programs.mtr.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "America/Los_Angeles";
+
+  # Shells
+  programs.zsh.enable = true;
+  programs.fish.enable = true;
+  programs.ssh.startAgent = true;
+  programs.ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
 }
diff --git a/desktop/README.md b/desktop/README.md
new file mode 100644
index 0000000..0a64217
--- /dev/null
+++ b/desktop/README.md
@@ -0,0 +1,7 @@
+# Desktop configs
+
+The default desktop includes the system base and common GUI apps including several browsers, Thunderbird, shell configs, and KDE.
+
+For regular office apps, in your host config include the office.nix file.
+
+For developer tools, include the dev.nix file.
diff --git a/desktop/default.nix b/desktop/default.nix
index d5bda8d..9bc1200 100644
--- a/desktop/default.nix
+++ b/desktop/default.nix
@@ -6,9 +6,9 @@
 
   imports = [
     ../base
-    ./common.nix
-    ./compat.nix
-    ./i18n.nix
+    ./include/common.nix
+    ./include/compat.nix
+    ./include/i18n.nix
   ];
 
   # Bootloader.
@@ -31,14 +31,6 @@
   services.xserver.desktopManager.plasma6.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
 
-  # Set your time zone.
-  time.timeZone = "America/Los_Angeles";
-
-  # Shells
-  programs.zsh.enable = true;
-  programs.fish.enable = true;
-  programs.ssh.startAgent = true;
-  programs.ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
@@ -48,6 +40,7 @@
     master = "salt.freelock.lan";
     location = [ "freelock" ];
   };
+
   # Enable sound with pipewire.
   sound.enable = true;
   hardware.pulseaudio.enable = false;
@@ -76,8 +69,6 @@
     shell = pkgs.fish;
   };
 
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
   nixpkgs.config.permittedInsecurePackages = [
      "electron-25.9.0"
   ];
diff --git a/desktop/common.nix b/desktop/include/common.nix
similarity index 100%
rename from desktop/common.nix
rename to desktop/include/common.nix
diff --git a/desktop/compat.nix b/desktop/include/compat.nix
similarity index 100%
rename from desktop/compat.nix
rename to desktop/include/compat.nix
diff --git a/desktop/i18n.nix b/desktop/include/i18n.nix
similarity index 100%
rename from desktop/i18n.nix
rename to desktop/include/i18n.nix
diff --git a/hosts/README.md b/hosts/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/server/README.md b/server/README.md
new file mode 100644
index 0000000..e69de29