From fa0e2b5d641e221c580e3b916d5b3a513144e7f5 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Sat, 12 Feb 2022 14:16:05 -0800
Subject: hosts: load services at the host level

These services are not configured at the user level, but at the host
level. We might need a better separation in the future, in case I don't
use xserver for example.
---
 hosts/common/desktop/xserver.nix | 15 +++++++++++++++
 users/fcuny/desktop/default.nix  | 10 +---------
 users/fcuny/desktop/gtk.nix      |  2 --
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/hosts/common/desktop/xserver.nix b/hosts/common/desktop/xserver.nix
index 7537863..b02dc01 100644
--- a/hosts/common/desktop/xserver.nix
+++ b/hosts/common/desktop/xserver.nix
@@ -20,4 +20,19 @@
       i3.enable = true;
     };
   };
+
+  services = {
+    dbus.packages = [ pkgs.gcr ];
+    gnome.gnome-keyring.enable = true;
+    gvfs.enable = true;
+  };
+
+  environment = {
+    # Activate home-manager environment, if not already enabled
+    loginShellInit = ''
+      [ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null
+    '';
+    homeBinInPath = true;
+    localBinInPath = true;
+  };
 }
diff --git a/users/fcuny/desktop/default.nix b/users/fcuny/desktop/default.nix
index 3a1e21a..860daa6 100644
--- a/users/fcuny/desktop/default.nix
+++ b/users/fcuny/desktop/default.nix
@@ -5,7 +5,6 @@
     ./browser.nix
     ./i3.nix
     ./media.nix
-    ./pass.nix
     ./terminal.nix
     ./gtk.nix
     ./xdg.nix
@@ -19,17 +18,10 @@
     pkgs.transmission-remote-gtk
   ];
 
-  environment = {
+  home = {
     sessionVariables = {
       TERMINAL = [ "alacritty" ];
       TERM = [ "xterm-256color" ];
     };
-
-    # Activate home-manager environment, if not already enabled
-    loginShellInit = ''
-      [ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null
-    '';
-    homeBinInPath = true;
-    localBinInPath = true;
   };
 }
diff --git a/users/fcuny/desktop/gtk.nix b/users/fcuny/desktop/gtk.nix
index 8bc11a2..eea9d5e 100644
--- a/users/fcuny/desktop/gtk.nix
+++ b/users/fcuny/desktop/gtk.nix
@@ -31,6 +31,4 @@
       };
     };
   };
-
-  services.gvfs.enable = true;
 }
-- 
cgit 1.4.1