Update old setting names

home/baseline/git.nix

@@ -3,27 +3,14 @@
 {
   programs.git = {
     enable = true;
-    userName = "Greg Hellings";
+    settings = {
-    userEmail = "greg.hellings@gmail.com";
+      alias = {
-    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 = {
       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"
+    ];
+  };
 }

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

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"

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