diff --git a/modules/fonts.nix b/modules/fonts.nix
index b84b9f3..7ccdaeb 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -10,7 +10,8 @@ delib.module {
   nixos.always = {
     fonts = {
       packages = [
-        pkgs.ubuntu_font_family
+        pkgs.ubuntu-classic
+        pkgs.ubuntu-sans
         pkgs.inter
         # Only needed for one specific thing and now can't download from sourceforge for some reason
         # pkgs.corefonts
diff --git a/modules/graphics.nix b/modules/graphics.nix
index bb7f39d..17173e7 100644
--- a/modules/graphics.nix
+++ b/modules/graphics.nix
@@ -20,7 +20,7 @@ delib.module {
       opencl.enable = true;
     };
 
-    environment.systemPackages = with pkgs; [amdgpu_top lact nvtopPackages.full];
+    environment.systemPackages = with pkgs; [amdgpu_top lact];
 
     systemd.services.lactd = {
       description = "AMDGPU Control Daemon";
diff --git a/modules/programs/core-cli.nix b/modules/programs/core-cli.nix
index 92885db..8bf0aee 100644
--- a/modules/programs/core-cli.nix
+++ b/modules/programs/core-cli.nix
@@ -65,7 +65,7 @@ delib.module {
   home.always = {
     home.packages = with pkgs; [
       curlie
-      du-dust
+      dust
       duf
       fd
       jq
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index aa7e9b2..293e411 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -15,9 +15,6 @@ delib.module {
 
     programs.git = {
       enable = true;
-      userName = userfullname;
-      userEmail = useremail;
-      delta.enable = true;
 
       signing = {
         signByDefault = true;
@@ -25,7 +22,12 @@ delib.module {
         key = "~/.ssh/id_ed25519_sk_rk";
       };
 
-      extraConfig = {
+      settings = {
+        user = {
+          name = userfullname;
+          email = useremail;
+        };
+
         # TODO: custom pretty stuff?
         blame.showEmail = true;
         init.defaultBranch = "main";
@@ -89,7 +91,7 @@ delib.module {
           default-command = "log";
           show-cryptographic-signatures = true;
           conflict-marker-style = "git";
-          diff-formatter = "delta";
+          # diff-formatter = "delta";
           editor = "codium -w";
           merge-editor = "vscodium";
         };
@@ -132,6 +134,12 @@ delib.module {
       };
     };
 
+    programs.delta = {
+      enable = true;
+      enableGitIntegration = true;
+      enableJujutsuIntegration = true;
+    };
+
     programs.mergiraf.enable = true;
   };
 }
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index e9f0ee6..c79a39b 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -4,6 +4,8 @@ delib.module {
 
   home.always.programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
+
     matchBlocks = {
       "*" = {
         identitiesOnly = true;