From 0e012eb9e0a4dc0e24d72604101b2af696dfbf58 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sat, 8 Nov 2025 20:40:04 -0600
Subject: [PATCH] Update old setting names

---
 home/baseline/git.nix   | 44 +++++++++++++++++++++--------------------
 hosts/hosea/default.nix |  3 ---
 modules/hm/gnome.nix    |  1 +
 modules/hm/gui.nix      |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/home/baseline/git.nix b/home/baseline/git.nix
index 262e4c1..e25693b 100644
--- a/home/baseline/git.nix
+++ b/home/baseline/git.nix
@@ -3,27 +3,14 @@
 {
   programs.git = {
     enable = true;
-    userName = "Greg Hellings";
-    userEmail = "greg.hellings@gmail.com";
-    aliases = {
-      st = "status";
-      ci = "commit";
-      co = "checkout";
-      ups = "push -u origin HEAD";
-      amend = "commit --amend";
-    };
-    ignores = [
-      ".*.swp"
-      ".*.swo"
-      ".*.swn" # vim
-      ".idea" # IntelliJ
-      ".DS_Store" # Macs
-      "Thumbs.db" # Windows
-      ".tox" # Tox temp directory
-      ".eclipse" # These next two are created by VSCodium plugins
-      ".bazelproject"
-    ];
-    extraConfig = {
+    settings = {
+      alias = {
+        st = "status";
+        ci = "commit";
+        co = "checkout";
+        ups = "push -u origin HEAD";
+        amend = "commit --amend";
+      };
       branch.sort = "-committerdate";
       column.ui = "auto";
       commit.verbose = "true";
@@ -45,6 +32,21 @@
         enabled = "true";
       };
       tag.sort = "version:refname";
+      user = {
+        name = "Greg Hellings";
+        email = "greg.hellings@gmail.com";
+      };
     };
+    ignores = [
+      ".*.swp"
+      ".*.swo"
+      ".*.swn" # vim
+      ".idea" # IntelliJ
+      ".DS_Store" # Macs
+      "Thumbs.db" # Windows
+      ".tox" # Tox temp directory
+      ".eclipse" # These next two are created by VSCodium plugins
+      ".bazelproject"
+    ];
   };
 }
diff --git a/hosts/hosea/default.nix b/hosts/hosea/default.nix
index bf70e13..077a8dd 100644
--- a/hosts/hosea/default.nix
+++ b/hosts/hosea/default.nix
@@ -53,9 +53,6 @@ in
     enableRedistributableFirmware = true;
     graphics = {
       enable = true;
-    };
-    opengl = {
-      enable = true;
       extraPackages = with pkgs; [
         intel-media-driver
         intel-vaapi-driver
diff --git a/modules/hm/gnome.nix b/modules/hm/gnome.nix
index 3425691..84f9077 100644
--- a/modules/hm/gnome.nix
+++ b/modules/hm/gnome.nix
@@ -76,6 +76,7 @@ in
           favorite-apps = [
             "org.gnome.Calendar.desktop"
             "org.gnome.Nautilus.desktop"
+            "com.mitchellh.ghostty.desktop"
             "org.gnome.Terminal.desktop"
             "firefox.desktop"
             "vlc.desktop"
diff --git a/modules/hm/gui.nix b/modules/hm/gui.nix
index 9f68b0b..a8e8bc1 100644
--- a/modules/hm/gui.nix
+++ b/modules/hm/gui.nix
@@ -47,7 +47,7 @@ in
               "aarch64-linux"
             ]
             [
-              bitwarden
+              bitwarden-desktop
               endeavour
               # Is removed because it depends on qt5-qtwebengine
               # jellyfin-media-player