From 5f99274ae514756a4920a6714873b843b9ffc57f Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 26 Dec 2023 15:06:20 -0500
Subject: [PATCH] New git config

---
 home-manager.nix                    |  2 --
 home-manager/btop.nix               |  8 --------
 home-manager/git.nix                |  9 ---------
 modules/common-desktop/packages.nix |  1 +
 modules/common/git.nix              | 11 +++++++++++
 5 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100755 home-manager/btop.nix
 delete mode 100755 home-manager/git.nix
 create mode 100644 modules/common/git.nix

diff --git a/home-manager.nix b/home-manager.nix
index bad37a3..3718e4c 100755
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -12,8 +12,6 @@
     sharedModules = [
       {home.stateVersion = "23.11";}
       ./home-manager/gtk.nix
-      ./home-manager/git.nix
-      ./home-manager/btop.nix
       ./home-manager/vscode.nix
       ./home-manager/firefox.nix
       ./home-manager/mangohud.nix
diff --git a/home-manager/btop.nix b/home-manager/btop.nix
deleted file mode 100755
index 7f563eb..0000000
--- a/home-manager/btop.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  programs.btop = {
-    enable = true;
-    settings = {
-      theme_background = false;
-    };
-  };
-}
diff --git a/home-manager/git.nix b/home-manager/git.nix
deleted file mode 100755
index c7078db..0000000
--- a/home-manager/git.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-    userName = "Henry Hiles";
-    userEmail = "henry@henryhiles.com";
-  };
-
-  programs.gh.enable = true;
-}
diff --git a/modules/common-desktop/packages.nix b/modules/common-desktop/packages.nix
index bd1ffdf..3a1c384 100644
--- a/modules/common-desktop/packages.nix
+++ b/modules/common-desktop/packages.nix
@@ -25,6 +25,7 @@
     protontricks
     prismlauncher
     android-studio
+    mission-center
     hunspellDicts.en_CA-large
     inputs.nix-gaming.packages.${system}.wine-ge
   ];
diff --git a/modules/common/git.nix b/modules/common/git.nix
new file mode 100644
index 0000000..31d0d75
--- /dev/null
+++ b/modules/common/git.nix
@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  programs.git = {
+    enable = true;
+    config.user = {
+      name = "Henry-Hiles";
+      email = "henry@henryhiles.com";
+    };
+  };
+
+  environment.systemPackages = [pkgs.gh];
+}