Config rearrange

base/README.md

@@ -0,0 +1,3 @@
+## Base packages
+
+Packages to install on all systems, desktop and server.

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;
 }

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.

desktop/default.nix

@@ -6,9 +6,9 @@
 
   imports = [
     ../base
-    ./common.nix
+    ./include/common.nix
-    ./compat.nix
+    ./include/compat.nix
-    ./i18n.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"
   ];