diff --git a/flake.lock b/flake.lock
index e798e788..58a6393b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -380,22 +380,6 @@
         "type": "github"
       }
     },
-    "gitui": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696228836,
-        "narHash": "sha256-jlP+BnNa7vWteLKeNm2woXaSPsAu7RTNgiu9VZMKkw4=",
-        "owner": "extrawurst",
-        "repo": "gitui",
-        "rev": "b7772e63e4a5ba42ff3b09548debe7be5776f520",
-        "type": "github"
-      },
-      "original": {
-        "owner": "extrawurst",
-        "repo": "gitui",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -676,7 +660,6 @@
       "inputs": {
         "anyrun": "anyrun",
         "doom-emacs": "doom-emacs",
-        "gitui": "gitui",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "stylix": "stylix",
diff --git a/flake.nix b/flake.nix
index a77771d6..40b5e3cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,10 +25,6 @@
       url = "github:doomemacs/doomemacs";
       flake = false;
     };
-    gitui = {
-      url = "github:extrawurst/gitui";
-      flake = false;
-    };
     tokyonight-folke = {
       url = "github:folke/tokyonight.nvim";
       flake = false;
@@ -72,7 +68,7 @@
             inherit (inputs) anyrun watershot;
           };
           extraSpecialArgs = specialArgs // {
-            inherit (inputs) doom-emacs gitui tokyonight-folke;
+            inherit (inputs) doom-emacs tokyonight-folke;
           };
         in nixpkgs.lib.nixosSystem {
           inherit system specialArgs;
diff --git a/home/default.nix b/home/default.nix
index 66eff39a..f9ea6b31 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,6 +1,8 @@
-{ config, lib, pkgs, tokyonight-folke, gitui, ... }:
+{ config, lib, pkgs, tokyonight-folke, ... }:
 
 {
+  xdg.configFile."bat/themes/tokyonight_night.tmTheme".source =
+    "${tokyonight-folke}/extras/sublime/tokyonight_night.tmTheme";
   programs = {
     bash.enable = true;
     readline = {
@@ -21,6 +23,7 @@
       enableBashIntegration = true;
       enableZshIntegration = true;
     };
+    bat.enable = true;
     git = {
       enable = true;
       package = pkgs.gitFull;
@@ -29,26 +32,21 @@
       delta = {
         enable = true;
         options = {
-          blame-code-style = "syntax";
           line-numbers = true;
+          hyprlinks = true;
           navigate = true;
           side-by-side = true;
-          zero-style = "dim syntax";
+          syntax-theme = "base16-stylix";
         };
       };
       extraConfig = {
         pull.rebase = false;
         init.defaultBranch = "main";
+        merge.conflictstyle = "diff3";
+        diff.colorMoved = "default";
         credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret";
       };
     };
-    gitui = {
-      enable = true;
-      keyConfig = builtins.readFile "${gitui}/vim_style_key_config.ron";
-      theme = builtins.readFile
-        "${tokyonight-folke}/extras/gitui/tokyonight_night.ron";
-    };
-    bat.enable = true;
     ssh = {
       enable = true;
       forwardAgent = true;
@@ -61,10 +59,7 @@
         SetEnv TERM=xterm-256color
       '';
       matchBlocks = {
-        "vanguard" = {
-          user = "xenia";
-          hostname = "192.168.1.166";
-        };
+        "git*".user = "git";
         "legion" = {
           user = "xenia";
           hostname = "192.168.1.230";
@@ -73,22 +68,18 @@
           user = "root";
           hostname = "77.68.67.133";
         };
-        "freia".hostname = "freia020.hpc.l";
-        "freia???" =
-          lib.hm.dag.entryAfter [ "freia" ] { hostname = "%h.hpc.l"; };
-        "heimdall".hostname = "heimdall003.jet.uk";
-        "heimdall???" =
-          lib.hm.dag.entryAfter [ "heimdall" ] { hostname = "%h.jet.uk"; };
-        "freia* heimdall*" = lib.hm.dag.entryAfter [
-          "freia"
-          "freia???"
-          "heimdall"
-          "heimdall???"
-        ] {
+        "freia" = {
           user = "elitherl";
+          hostname = "freia020.hpc.l";
           compression = true;
+          localForwards = [{
+            bind.port = 6702;
+            host = {
+              address = "127.0.0.1";
+              port = 6702;
+            };
+          }];
         };
-        "git*".user = "git";
       };
     };
     starship = {
diff --git a/home/emacs/doom/config.el b/home/emacs/doom/config.el
index d83d4988..5019e010 100644
--- a/home/emacs/doom/config.el
+++ b/home/emacs/doom/config.el
@@ -67,11 +67,7 @@
         +workspaces-switch-project-function 'doom-project-browse
         +workspaces-on-switch-project-behavior t))
 
-(after! magit
-  (require 'magit-delta)
-  (setq magit-clone-default-directory "~/Projects/")
-  (after! magit-delta
-    (add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))))
+(after! magit (setq magit-clone-default-directory "~/Projects/"))
 
 ;; mail settings
 (after! mu4e
diff --git a/home/emacs/doom/packages.el b/home/emacs/doom/packages.el
index 6eff5117..0e5dd961 100644
--- a/home/emacs/doom/packages.el
+++ b/home/emacs/doom/packages.el
@@ -3,5 +3,3 @@
 
 (package! pdf-tools :built-in 'prefer)
 (package! pocket-reader)
-(package! magit-delta)
-(package! yuck-mode)