From 3b00c85ad1fee022d87496da895f036280a5a8d1 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Thu, 24 Apr 2025 11:17:44 +0200
Subject: [PATCH] feat: make it so only hosts with gui enabled have
 dbus/gnome-keyring/gvfs :)

---
 hosts/desktop/default.nix |  5 +++--
 hosts/ichiyo/default.nix  | 26 ++++++++++++++++++++------
 hosts/sakura/default.nix  |  1 +
 hosts/violet/default.nix  |  9 +++++----
 hosts/yoshino/default.nix | 20 ++++++++++++++------
 modules/core/services.nix |  5 +----
 roles/gui.nix             | 14 ++++++++++++++
 7 files changed, 58 insertions(+), 22 deletions(-)
 create mode 100644 roles/gui.nix

diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 0555bf0..555e686 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }:
 {
   imports = [
     ./hardware-configuration.nix
@@ -10,5 +10,6 @@
     "olm-3.2.16"
   ];
 
-  liv.desktop = true;
+  liv.desktop.enable = true;
+  liv.gui.enable = true;
 }
diff --git a/hosts/ichiyo/default.nix b/hosts/ichiyo/default.nix
index 596040d..f56d168 100644
--- a/hosts/ichiyo/default.nix
+++ b/hosts/ichiyo/default.nix
@@ -1,4 +1,10 @@
-{ lib, inputs, pkgs, config, ... }: 
+{
+  lib,
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
 {
   imports = [
     ./hardware-configuration.nix
@@ -7,7 +13,7 @@
 
   # Enable fancy boot animations
   boot.plymouth.enable = true;
-  
+
   powerManagement = {
     enable = true;
     # powertop.enable = true;
@@ -15,10 +21,16 @@
   };
 
   liv.laptop.enable = true;
+  liv.gui.enable = true;
 
   # Bootloader stuff
   boot = {
-    kernelParams = [ "quiet" "loglevel=3" "systemd.show_status=false" "splash" ];
+    kernelParams = [
+      "quiet"
+      "loglevel=3"
+      "systemd.show_status=false"
+      "splash"
+    ];
     loader.grub = {
       enable = lib.mkForce true;
       device = lib.mkForce "/dev/sda";
@@ -28,13 +40,15 @@
     initrd.secrets = {
       "/crypto_keyfile.bin" = null;
     };
-    initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".keyFile = lib.mkForce "/crypto_keyfile.bin";
-    extraModulePackages = with config.boot.kernelPackages;
+    initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".keyFile =
+      lib.mkForce "/crypto_keyfile.bin";
+    extraModulePackages =
+      with config.boot.kernelPackages;
       [
         acpi_call
         cpupower
       ]
-      ++ [pkgs.cpupower-gui];
+      ++ [ pkgs.cpupower-gui ];
   };
 
   networking.hostName = "ichiyo";
diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix
index 0cd3f3a..50c0553 100644
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@@ -31,6 +31,7 @@
     desktop.enable = false;
     creative.enable = true;
     amdgpu.enable = true;
+    gui.enable = true;
   };
 
   services.hardware.bolt.enable = true;
diff --git a/hosts/violet/default.nix b/hosts/violet/default.nix
index 44c7b20..98e0510 100644
--- a/hosts/violet/default.nix
+++ b/hosts/violet/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: 
+{ pkgs, config, ... }:
 {
   imports = [
     ./hardware-configuration.nix
@@ -35,12 +35,13 @@
       device = "/dev/sda";
       useOSProber = true;
     };
-    kernelModules = ["acpi_call"];
-    extraModulePackages = with config.boot.kernelPackages;
+    kernelModules = [ "acpi_call" ];
+    extraModulePackages =
+      with config.boot.kernelPackages;
       [
         acpi_call
         cpupower
       ]
-      ++ [pkgs.cpupower-gui];
+      ++ [ pkgs.cpupower-gui ];
   };
 }
diff --git a/hosts/yoshino/default.nix b/hosts/yoshino/default.nix
index f9ae39d..6ff088c 100644
--- a/hosts/yoshino/default.nix
+++ b/hosts/yoshino/default.nix
@@ -1,4 +1,10 @@
-{ inputs, pkgs, config, lib, ... }: 
+{
+  inputs,
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 {
   imports = [
     ./hardware-configuration.nix
@@ -6,7 +12,7 @@
     # ./../../modules/home/nfs.nix
     ./../../modules/core/virtualization.nix
   ];
-  
+
   powerManagement = {
     enable = true;
     # powertop.enable = true;
@@ -18,6 +24,7 @@
     creative.enable = true;
     amdgpu.enable = true;
     wine.enable = true;
+    gui.enable = true;
   };
 
   networking = {
@@ -27,19 +34,20 @@
 
   boot = {
     kernelParams = [ ];
-    kernelModules = ["acpi_call"];
+    kernelModules = [ "acpi_call" ];
     kernelPackages = pkgs.linuxPackages_latest;
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
       systemd-boot.configurationLimit = 10;
     };
-    extraModulePackages = with config.boot.kernelPackages;
+    extraModulePackages =
+      with config.boot.kernelPackages;
       [
         acpi_call
         cpupower
         v4l2loopback
       ]
-      ++ [pkgs.cpupower-gui];
-    };
+      ++ [ pkgs.cpupower-gui ];
+  };
 }
diff --git a/modules/core/services.nix b/modules/core/services.nix
index 5014a54..8ec1b02 100644
--- a/modules/core/services.nix
+++ b/modules/core/services.nix
@@ -1,9 +1,6 @@
-{ ... }: 
+{ ... }:
 {
   services = {
-    gvfs.enable = true;
-    gnome.gnome-keyring.enable = true;
-    dbus.enable = true;
     fstrim.enable = true;
   };
   services.logind.extraConfig = ''
diff --git a/roles/gui.nix b/roles/gui.nix
new file mode 100644
index 0000000..802e168
--- /dev/null
+++ b/roles/gui.nix
@@ -0,0 +1,14 @@
+{ lib, ... }:
+with lib;
+let
+  cfg = config.liv.gui;
+in
+{
+  config = mkIf cfg.enable {
+    services = {
+      gvfs.enable = true;
+      gnome.gnome-keyring.enable = true;
+      dbus.enable = true;
+    };
+  };
+}