From c6e9553f89dd01e4fd9f9b81e1cd72afee815cdf Mon Sep 17 00:00:00 2001
From: nydragon <conctact@ccnlc.eu>
Date: Fri, 21 Mar 2025 20:38:53 +0100
Subject: [PATCH] chore: move git to hjem-rum

---
 flake.lock                    |  6 ++---
 home/terminal/default.nix     |  1 -
 home/terminal/git/default.nix | 34 ----------------------------
 users/ny/default.nix          |  1 -
 users/ny/programs/default.nix |  1 +
 users/ny/programs/git.nix     | 42 +++++++++++++++++++++++++++++++++++
 6 files changed, 46 insertions(+), 39 deletions(-)
 delete mode 100644 home/terminal/git/default.nix
 create mode 100644 users/ny/programs/git.nix

diff --git a/flake.lock b/flake.lock
index 8e54ef4..77ea97c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -204,11 +204,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742231203,
-        "narHash": "sha256-pnYUjLfx61IKmg9+So8BdSkZCjb69ynpLlKqy7ba9s0=",
+        "lastModified": 1742584474,
+        "narHash": "sha256-cUw2nyUn+2Ii/70D8sJXnAVkRxyrvH2DwfVHdphzx1Y=",
         "owner": "nydragon",
         "repo": "hjem-rum",
-        "rev": "7cd095c4064072c603bc3b02eaa33d11735c1cf4",
+        "rev": "f321c4709fe9dea794cb886d4a3cb689d9b6546a",
         "type": "github"
       },
       "original": {
diff --git a/home/terminal/default.nix b/home/terminal/default.nix
index 52a7b9c..80a02c1 100644
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./neovim
     ./ssh
-    ./git
     ./fish
     ./btop.nix
     ./beets.nix
diff --git a/home/terminal/git/default.nix b/home/terminal/git/default.nix
deleted file mode 100644
index 4ee2724..0000000
--- a/home/terminal/git/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.git = {
-    enable = true;
-    userName = "nydragon";
-    userEmail = "contact@ccnlc.eu";
-    extraConfig = {
-      gpg.format = "ssh";
-      push = {
-        autoSetupRemote = true;
-      };
-      pull = {
-        rebase = true;
-      };
-      core = {
-        editor = "${pkgs.neovim}/bin/nvim";
-      };
-      init = {
-        defaultBranch = "main";
-      };
-      merge = {
-        conflictstyle = "diff3";
-      };
-      diff = {
-        colorMoved = "default";
-      };
-    };
-    signing = {
-      signByDefault = true;
-      key = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvPqWPXEUOSMGMIRmirQfbrzq//NkPlEI2TmFpIkSfw";
-    };
-    delta.enable = true;
-  };
-}
diff --git a/users/ny/default.nix b/users/ny/default.nix
index 187789e..f33a059 100644
--- a/users/ny/default.nix
+++ b/users/ny/default.nix
@@ -41,7 +41,6 @@ in
       loupe
       pwvucontrol
       thunderbird
-      keepassxc
       protonmail-bridge-gui
       signal-desktop
       tagger
diff --git a/users/ny/programs/default.nix b/users/ny/programs/default.nix
index dd95288..4b78660 100644
--- a/users/ny/programs/default.nix
+++ b/users/ny/programs/default.nix
@@ -3,5 +3,6 @@
     ./foot.nix
     ./fuzzel.nix
     ./keepassxc.nix
+    ./git.nix
   ];
 }
diff --git a/users/ny/programs/git.nix b/users/ny/programs/git.nix
new file mode 100644
index 0000000..ff20bbf
--- /dev/null
+++ b/users/ny/programs/git.nix
@@ -0,0 +1,42 @@
+{ pkgs, libmy, ... }:
+let
+  inherit (libmy) getExe;
+in
+{
+  rum.programs.git = {
+    enable = true;
+    settings = {
+      user = {
+        email = "contact@ccnlc.eu";
+        name = "nydragon";
+        signingKey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvPqWPXEUOSMGMIRmirQfbrzq//NkPlEI2TmFpIkSfw";
+      };
+      gpg.format = "ssh";
+      push = {
+        autoSetupRemote = true;
+      };
+      pull = {
+        rebase = true;
+      };
+      core = {
+        editor = "${getExe pkgs.neovim}";
+        pager = "${getExe pkgs.delta}";
+      };
+      interactive = {
+        diffFilter = "${getExe pkgs.delta} --color-only";
+      };
+      init = {
+        defaultBranch = "main";
+      };
+      merge = {
+        conflictstyle = "diff3";
+      };
+      diff = {
+        colorMoved = "default";
+      };
+      tag.gpgSign = true;
+      commit.gpgSign = true;
+    };
+    destination = ".config/git/config";
+  };
+}