From a8264c3573e4f3c3e40a15ceb8d97c268e57c89b Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 5 Aug 2021 15:35:43 +0200
Subject: [PATCH 1/2] add dog dns

---
 roles/admin.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/admin.nix b/roles/admin.nix
index 6955ebb..b3d397a 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -6,8 +6,9 @@ in {
   environment.systemPackages = with pkgs; [
     cryptsetup
     dnsutils
-    kubectl
+    dogdns
     k9s
+    kubectl
     pwgen
     whois
     unstable.argocd

From f3f41f22466d116cfb8db44e8ffbbd853fd9ea55 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Fri, 6 Aug 2021 08:48:32 +0200
Subject: [PATCH 2/2] move gvfs to base

---
 roles/base.nix    | 4 ++++
 roles/desktop.nix | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/roles/base.nix b/roles/base.nix
index 179530d..f3c6766 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -117,6 +117,10 @@ in {
     Defaults env_keep+=SSH_AUTH_SOCK
   '';
 
+  services.gvfs = {
+    enable = true;
+    package = lib.mkForce pkgs.gnome3.gvfs;
+  };
   services.resolved.enable = true;
   services.lorri.enable = true;
 
diff --git a/roles/desktop.nix b/roles/desktop.nix
index bd0ae20..4858459 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -154,8 +154,6 @@ in {
     )
   ];
 
-  services.gvfs.enable = true;
-
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;