profiles/workstation: moved more things around

7 files changed, 18 insertions, 51 deletions

diff --git a/hosts/aptos/default.nix b/hosts/aptos/default.nix
index acfc64b..d6f68fa 100644
--- a/hosts/aptos/default.nix
+++ b/hosts/aptos/default.nix
@@ -10,9 +10,6 @@
     "${self}/profiles/laptop.nix"
   ];
 
-  # Allow setting GTK configuration using home-manager
-  programs.dconf.enable = true;
-
   # install and configure the fonts
   my.systems.fonts.enable = true;
 
diff --git a/hosts/aptos/hardware.nix b/hosts/aptos/hardware.nix
index 990ab60..4635e69 100644
--- a/hosts/aptos/hardware.nix
+++ b/hosts/aptos/hardware.nix
@@ -41,9 +41,6 @@
   swapDevices =
     [{ device = "/dev/disk/by-uuid/24041034-ff39-44bf-a04c-8fd8318b554d"; }];
 
-  # Install tools related to the scanner (scanimage etc)
-  hardware.sane.enable = true;
-
   my.hardware.intel.enable = true;
   my.hardware.bluetooth.enable = true;
 
diff --git a/hosts/aptos/services.nix b/hosts/aptos/services.nix
index 379ce78..4e9e8ae 100644
--- a/hosts/aptos/services.nix
+++ b/hosts/aptos/services.nix
@@ -5,17 +5,7 @@ let
 in
 {
   my.services = {
-    # enable a few services related to the gnome desktop
-    gnome.enable = true;
-
-    # we need avahi in order to use the printer/scanner
-    avahi.enable = true;
-
     syncthing.enable = true;
-
-    # for the yubikeys
-    pcscd.enable = true;
-
     backup = {
       enable = true;
       repository = "sftp:192.168.6.40:/aptos";
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 9c0fc3c..457d86a 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -7,11 +7,9 @@
     ./cgit
     ./fwupd
     ./gitolite
-    ./gnome
     ./monitoring
     ./navidrome
     ./nginx
-    ./pcscd
     ./samba
     ./sendsms
     ./ssh-server
diff --git a/modules/services/gnome/default.nix b/modules/services/gnome/default.nix
deleted file mode 100644
index 46619eb..0000000
--- a/modules/services/gnome/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, lib, ... }:
-let cfg = config.my.services.gnome;
-in
-{
-  options.my.services.gnome = with lib; { enable = mkEnableOption "gnome"; };
-
-  config = lib.mkIf cfg.enable {
-    services = {
-      dbus = {
-        enable = true;
-        packages = with pkgs; [ gcr dconf ];
-      };
-
-      udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ];
-
-      gvfs = {
-        enable = true;
-        package = pkgs.gnome.gvfs;
-      };
-    };
-  };
-}
diff --git a/modules/services/pcscd/default.nix b/modules/services/pcscd/default.nix
deleted file mode 100644
index 84a588e..0000000
--- a/modules/services/pcscd/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# PCSCD management
-{ config, lib, ... }:
-let cfg = config.my.services.pcscd;
-in
-{
-  options.my.services.pcscd = {
-    enable = lib.mkEnableOption "pcscd configuration (for yubikeys)";
-  };
-
-  config = lib.mkIf cfg.enable { services.pcscd.enable = true; };
-}
diff --git a/profiles/workstation.nix b/profiles/workstation.nix
index 484d110..e860389 100644
--- a/profiles/workstation.nix
+++ b/profiles/workstation.nix
@@ -3,4 +3,22 @@
   virtualisation.docker.enable = false;
   virtualisation.podman.enable = true;
   virtualisation.podman.dockerCompat = true;
+
+  services.dbus.enable = true;
+  services.dbus.packages = with pkgs; [ gcr dconf gnome.sushi ];
+  services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ];
+
+  services.gvfs.enable = true;
+
+  programs.dconf.enable = true;
+
+  services.avahi.enable = true;
+  services.avahi.nssmdns = true;
+  services.avahi.openFirewall = true;
+
+  # for the yubikeys
+  services.pcscd.enable = true;
+
+  # Install tools related to the scanner (scanimage etc)
+  hardware.sane.enable = true;
 }