From 6997ef919f0e56981f518f226d215c627993dedf Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Thu, 14 Apr 2022 09:57:36 -0400
Subject: [PATCH] refactor(infinidoge): move common elements to core/global

---
 modules/modules/global.nix   | 10 ++++++++--
 users/infinidoge/default.nix | 36 ++++++++++++------------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/modules/modules/global.nix b/modules/modules/global.nix
index faa6a17..9557222 100644
--- a/modules/modules/global.nix
+++ b/modules/modules/global.nix
@@ -20,8 +20,14 @@ with lib.hlissner;
     cleanTmpDir = mkDefault (!config.boot.tmpOnTmpfs);
   };
 
-  # Allow non-root users to allow other users to access mount point
-  programs.fuse.userAllowOther = mkDefault true;
+
+  programs = {
+    # Allow non-root users to allow other users to access mount point
+    fuse.userAllowOther = mkDefault true;
+
+    # Enable dconf for programs that need it
+    dconf.enable = true;
+  };
 
   services = {
     # Ensure certain necessary directories always exist
diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index 66562a0..359d92c 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -63,30 +63,18 @@ in
     ];
   };
 
-  environment = {
-    systemPackages = with pkgs; [
-      ffmpeg
-    ];
-
-    shellAliases = { };
-
-    variables.EDITOR =
-      let
-        editorScript = pkgs.writeScriptBin "emacseditor" ''
-          #!${pkgs.runtimeShell}
-          if [ -z "$1" ]; then
-            exec ${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor ${pkgs.emacs}/bin/emacs
-          else
-            exec ${pkgs.emacs}/bin/emacsclient --alternate-editor ${pkgs.emacs}/bin/emacs "$@"
-          fi
-        '';
-      in
-      (lib.mkOverride 900 "${editorScript}/bin/emacseditor");
-  };
-
-  programs = {
-    dconf.enable = true;
-  };
+  environment.variables.EDITOR =
+    let
+      editorScript = pkgs.writeScriptBin "emacseditor" ''
+        #!${pkgs.runtimeShell}
+        if [ -z "$1" ]; then
+          exec ${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor ${pkgs.emacs}/bin/emacs
+        else
+          exec ${pkgs.emacs}/bin/emacsclient --alternate-editor ${pkgs.emacs}/bin/emacs "$@"
+        fi
+      '';
+    in
+    (lib.mkOverride 900 "${editorScript}/bin/emacseditor");
 
   modules = {
     locale.fonts = {