From 096ea286fe8c287bc33f2de759727971be066cf9 Mon Sep 17 00:00:00 2001
From: cnst <adam@cnst.dev>
Date: Thu, 3 Jul 2025 11:07:01 +0200
Subject: [PATCH] add user options and remove dead code

---
 users/cnst/git.nix               | 51 --------------------------------
 users/cnstlab/modules/home.nix   |  3 ++
 users/toothpick/modules/home.nix |  6 ++++
 3 files changed, 9 insertions(+), 51 deletions(-)
 delete mode 100644 users/cnst/git.nix

diff --git a/users/cnst/git.nix b/users/cnst/git.nix
deleted file mode 100644
index 1b420aa1..00000000
--- a/users/cnst/git.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  home.packages = [pkgs.gh];
-  programs.git = {
-    enable = true;
-    userName = config.accounts.username;
-    userEmail = config.accounts.mail;
-    delta = {
-      enable = true;
-      options.dark = true;
-    };
-    extraConfig = {
-      # user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
-      user.signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
-      signing = {
-        format = lib.mkDefault "ssh";
-        key = "${config.home.homeDirectory}/.ssh/id_ed25519";
-        signByDefault = true;
-      };
-      gpg = {
-        # format = lib.mkDefault "ssh";
-        ssh.allowedSignersFile = config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
-      };
-      commit = {
-        verbose = true;
-        gpgSign = false;
-      };
-      init.defaultBranch = "main";
-      merge.conflictStyle = "diff3";
-      diff.algorithm = "histogram";
-      log.date = "iso";
-      column.ui = "auto";
-      branch.sort = "committerdate";
-      push.autoSetupRemote = true;
-      rerere.enabled = true;
-    };
-    lfs.enable = true;
-    ignores = [
-      ".direnv"
-      "result"
-      ".jj"
-    ];
-  };
-  xdg.configFile."git/allowed_signers".text = ''
-    ${config.accounts.mail} namespaces="git" ${config.accounts.sshKey}
-  '';
-}
diff --git a/users/cnstlab/modules/home.nix b/users/cnstlab/modules/home.nix
index 08b98bc6..3e04c427 100644
--- a/users/cnstlab/modules/home.nix
+++ b/users/cnstlab/modules/home.nix
@@ -34,6 +34,9 @@
       fuzzel = {
         enable = false;
       };
+      git = {
+        enable = true;
+      };
       ghostty = {
         enable = false;
       };
diff --git a/users/toothpick/modules/home.nix b/users/toothpick/modules/home.nix
index 254cbf2b..28e26677 100644
--- a/users/toothpick/modules/home.nix
+++ b/users/toothpick/modules/home.nix
@@ -25,6 +25,12 @@
       fuzzel = {
         enable = true;
       };
+      git = {
+        enable = true;
+      };
+      ghostty = {
+        enable = false;
+      };
       helix = {
         enable = true;
       };