From 8f3bfef11dcddb7f48406ea12cc7a66efdfdd6e9 Mon Sep 17 00:00:00 2001
From: root <root@fudo.org>
Date: Thu, 16 Jul 2020 14:41:06 -0700
Subject: [PATCH] Fixed GUI after merge

---
 config/fudo/common.nix      |  2 ++
 fudo/profiles/common-ui.nix | 61 ++++++++++++++++---------------------
 fudo/profiles/default.nix   |  1 +
 hosts/zbox.nix              |  1 +
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/config/fudo/common.nix b/config/fudo/common.nix
index 9cc235a..78f3fd8 100644
--- a/config/fudo/common.nix
+++ b/config/fudo/common.nix
@@ -52,5 +52,7 @@ with lib;
       description = "Email for administrator of this system.";
       default = "admin@fudo.org";
     };
+
+    enable-gui = mkEnableOption "Install desktop GUI software.";
   };
 }
diff --git a/fudo/profiles/common-ui.nix b/fudo/profiles/common-ui.nix
index b937ad7..60989ce 100644
--- a/fudo/profiles/common-ui.nix
+++ b/fudo/profiles/common-ui.nix
@@ -4,14 +4,22 @@ with lib;
 let
   profile = config.fudo.common.profile;
 
-in mkIf ((profile == "desktop") || (profile == "laptop")) {
-  environment.systemPackages = with pkgs; [
+  common-packages = with pkgs; [
+    ffmpeg-full
+    libfixposix
+    mono
+    nomacs
+    python37Packages.youtube-dl
+    sqlite
+    system-config-printer
+  ];
+
+  gui-packages = with pkgs; [
     cool-retro-term
     corefonts
     chrome-gnome-shell
     chromium
     evince
-    ffmpeg-full
     firefox
     gimp
     glxinfo
@@ -23,31 +31,13 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
     gtk3
     gtkimageview
     i3lock
-    libfixposix
-    #minecraft-current
-    mono
     mplayer
     mpv
-    nomacs
-    openssl_1_1
     pdftk
-    python37Packages.youtube-dl
     redshift
     rhythmbox
     shotwell
     spotify
-    sqlite
-    (steam.override {
-      nativeOnly = true;
-      extraPkgs = pkgs: [
-        mono
-        gtk3
-        gtk3-x11
-        libgdiplus
-        zlib
-      ];
-      withJava = true;
-    })
     (steam.override {
       nativeOnly = true;
       extraPkgs = pkgs: [
@@ -60,15 +50,18 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
       ];
       withJava = true;
     }).run
-    # steam-run
-    # steam-run-native
-    system-config-printer
     virtmanager
     xorg.xev
     xzgv
     virtmanager-qt
   ];
 
+  cfg = config.fudo.common;
+
+in mkIf ((profile == "desktop") || (profile == "laptop")) {
+  environment.systemPackages =
+    common-packages ++ (if cfg.enable-gui then gui-packages else []);
+
   nixpkgs.config.allowBroken = true;
 
   # Splash screen
@@ -82,8 +75,8 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
 
   boot.tmpOnTmpfs = true;
 
-  services.xserver = {
-    # enable = true;
+  services.xserver = if cfg.enable-gui then {
+    enable = true;
 
     layout = "us";
     xkbVariant = "dvp";
@@ -102,24 +95,24 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
         waidPID=$!
       '';
     };
+  } else {
+    layout = "us";
+    xkbVariant = "dvp";
+    xkbOptions = "ctrl:nocaps";
   };
 
-  services.gnome3 = {
+  services.gnome3 = mkIf cfg.enable-gui {
     evolution-data-server.enable = pkgs.lib.mkForce false;
     gnome-user-share.enable = pkgs.lib.mkForce false;
   };
 
   services.dbus.socketActivated = true;
 
-  #services.openssh.forwardX11 = true;
-
-  #programs.ssh.forwardX11 = true;
-
   sound.enable = true;
 
-  hardware.pulseaudio.enable = true;
+  hardware.pulseaudio.enable = cfg.enable-gui;
 
-  fonts = {
+  fonts = mkIf cfg.enable-gui {
     enableFontDir = true;
     #fontconfig.antialias = true;
     fontconfig.enable = true;
@@ -182,4 +175,4 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
       xlibs.fontxfree86type1
     ];
   };
-}
\ No newline at end of file
+}
diff --git a/fudo/profiles/default.nix b/fudo/profiles/default.nix
index fc70616..a4c5892 100644
--- a/fudo/profiles/default.nix
+++ b/fudo/profiles/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./common-ui.nix
     ./desktop.nix
     ./laptop.nix
     ./server.nix
diff --git a/hosts/zbox.nix b/hosts/zbox.nix
index a8d0790..aab9ea9 100644
--- a/hosts/zbox.nix
+++ b/hosts/zbox.nix
@@ -29,6 +29,7 @@ in {
   fudo.common = {
     profile = "desktop";
     site = "seattle";
+    enable-gui = true;
   };
 
   fudo.slynk = {