From 201b29c16ea7280a7a46c266a4e86f82ce0e8bc4 Mon Sep 17 00:00:00 2001
From: Jordan Ashurst <ashurstdev@proton.me>
Date: Mon, 14 Sep 2026 20:54:42 -0700
Subject: [PATCH] Adding gitea support

---
 home.nix             | 37 +++++++++++++++++++++++++++----------
 secrets/secrets.yaml |  8 ++++++--
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/home.nix b/home.nix
index 119fcb0..04a49db 100644
--- a/home.nix
+++ b/home.nix
@@ -95,6 +95,29 @@
     syntaxHighlighting.enable = true;
   };
 
+  sops = {
+    age.keyFile = "/home/mask/.config/sops/age/keys.txt";
+    defaultSopsFile = ./secrets/secrets.yaml;
+    secrets = {
+      "github/token" = {};
+      "github/username" = {};
+      "gitlab/token" = {};
+      "gitea/token" = {};
+      "gitea/password" = {};
+      "gitea/username" = {};
+    };
+    templates = {
+      ".git-credentials" = {
+        path = "${config.home.homeDirectory}/.git-credentials";
+        mode = "0600";
+        content = ''
+          https://${config.sops.placeholder."gitea/username"}:${config.sops.placeholder."gitea/token"}@git.centraldogma.site
+          https://${config.sops.placeholder."github/username"}:${config.sops.placeholder."github/token"}@github.com
+        '';
+      };
+    };
+  };
+
   programs.git = {
     enable = true;
     settings = {
@@ -104,8 +127,11 @@
       };
       alias = {
         #Add and commit
-        ac = "!git add $1 && git commit -m '$2'";
+        ac = "!git add $1 && git commit -m $2";
       };
+      # credential-helper = {
+      #
+      # };
     };
   };
 
@@ -128,13 +154,4 @@
   };
 
   programs.home-manager.enable = true;
-
-  sops = {
-    age.keyFile = "/home/mask/.config/sops/age/keys.txt";
-    defaultSopsFile = ./secrets/secrets.yaml;
-    secrets = {
-      "github/token" = {};
-      "gitlab/token" = {};
-    };
-  };
 }
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index 84b4704..05fb96d 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -7,10 +7,12 @@ factorio:
     service_token: ENC[AES256_GCM,data:qydcvSgSdu1G+tGF5/yS8UAxYFxhEMcL2jw1lXyR,iv:Zc4TtArTB0FAcaMcN7pU8o21jdAZdhphwIS9UsbaKpk=,tag:rfTVLNNlXKcvXvEc+c0Hrg==,type:str]
     gamepassword: ENC[AES256_GCM,data:jKfiINlNE5DITQ==,iv:+sAfRJRRgW1Gec59zV0rDue11+OD7CFhM+9Jia2oZI0=,tag:AUiQXhrFuitJyObbZI9umg==,type:str]
 github:
+    username: ENC[AES256_GCM,data:1ad/B9EnHim1vg3Vgw==,iv:c6VVRwYHNtUdERhYj4gk2Azks8iZ4SkXPLsnOyiI8g4=,tag:wLtOtbySOKYv7Aut3j6iNg==,type:str]
     token: ENC[AES256_GCM,data:ke1DF7fhotXL0Grbm1HvqeUhlJcOTFXfSH5PFBf249CUYYz49ZH5eA==,iv:j6Ahz6AsOhujf0K1TMIVdVxUneUtJmmAHimOg9Foy5g=,tag:6B/a/+CQ+qxWPRkGvjqcng==,type:str]
 duplicity:
     passphrase: ENC[AES256_GCM,data:2pja+bXmndi+bSae1B5f3rH0/ZRpIBBgIFKR9Vfgsvo2Vgd4FoI8WhVDYYRqIQ==,iv:AL2vVhM9EAdMyPhic5UV7iPZIG8X37Jtr22+v5AFP/o=,tag:HY9oaQTC2WWKUkqfUUOdlg==,type:str]
 gitlab:
+    username: ENC[AES256_GCM,data:SPDJfn7NJDJP5hQ=,iv:xLAjm+pM8sFT6tiianNDm/D8S8Of8dLxQl4y9I3vWWU=,tag:N0jXEbFFwurQLYUFfjEGxQ==,type:str]
     token: ENC[AES256_GCM,data:od35ZBgqCGZPYZDsTAndK+o5pahEWN7hTSm9FB6hvAr7IguuQvoIiBR+uc+MDe3a0QiSnhpOOaE8hwQo3u0=,iv:Wc1SbSF2G4JZIHYwakdCom1lOHUczxKYYzUjTmIsJKE=,tag:Auv6V2OdWU6rqReMzgEhbg==,type:str]
 github_token: ENC[AES256_GCM,data:G+0yjjphqXiSSi+7YrhIWaRLXJw9c0AHQnmWb3NVCpvBz0xWmXnYHw==,iv:1duT9LC0C+cZA3Xi07NxDsCQiUDv7eoL+bO60lr2tkQ=,tag:57j06/mtQH/pZAeo48al3A==,type:str]
 gitlab_token: ENC[AES256_GCM,data:Eej/KLFtxJ/zotoVlh8wuw14OLR4jInY1vK+ZOYPaa70ZZOJet5M4+in6DI8oulWZvR+a9TbPeRIFCAivSQ=,iv:YKsI/PO5ITT8XBIMo0EslraR/fzl+3I4n7JWoUuJcdg=,tag:kZ0uamAuW+Q6EUzCT1VWrQ==,type:str]
@@ -22,6 +24,8 @@ postgres:
     pgmasterpass: ENC[AES256_GCM,data:KYlzLRIV9jkbtbb8O8EiTXXYP+cPwYkV+WEse1T+grd5kPpl/xxAqAOIc44UcfQ8+FJMFpBe,iv:kWHbvoeLznuESsvKx5ADrPGGxVYVRMlRL3XUjr92+fU=,tag:dK2gii+lxVM7+Y++1eR5ZA==,type:str]
 pgmasterpass: ENC[AES256_GCM,data:s3KOZiag7h3iFYxBxXnhyYQ6ZG9jdav4uM9bQHgXdpYZW4yircOgoI1YiuciDoF1RhdOjbNh,iv:KzblpETo/wQtYUJUALAyvPRDlbuxXPiGOBhgJpVJd/8=,tag:Z5f7UhWNtn060UUm+/owqg==,type:str]
 gitea:
+    username: ENC[AES256_GCM,data:LEcU7zX0w16D,iv:4WDBdArQstkg4fRAgEFYIqKIZ1Kdyt21PrHP4pvvFqM=,tag:1t7a2bGHW6LKLeSiUmsjGA==,type:str]
+    token: ENC[AES256_GCM,data:y5Wzuti/kjK10auc3jlddoWKnudfRA1UosfKzeD8IWljauhfCUCMKw==,iv:ygFxVBm5gQjDX4oIjeWpzrLsJ/ts6Po1+n9bDf3nNHY=,tag:8BsOUvwvSNi/Zo2T2jbjAA==,type:str]
     database: ENC[AES256_GCM,data:AiYQyrsmFVlWSYO+YFFgrCSTGTn3nl2tH+YcXlQKsLGJeNtTt1WV0/VvNuo=,iv:XZhZi183po9Mp8hAvSpti5qWec5+Rwu+UFPEUplZv0I=,tag:IFT/oP9Unwk+RE9sBLjJGg==,type:str]
     password: ENC[AES256_GCM,data:6GKcqsdLXaHVJODuuz2sZSZDn/0U1vT9NTfeuNlhwGO6MrQ9QYaOlpU3AI8=,iv:TL1EQnLXgXeenp0CqNAOajq4g66Spl1JLgPP3i4OpQc=,tag:9jPCAGR6zxKl0tzMeXWsGA==,type:str]
 caddy:
@@ -50,7 +54,7 @@ sops:
             OXJfnqQIRsiwQJFNLDjB4hNZ5r9iupVj66BAbadO3pwlHWOFt6+PaQ==
             -----END AGE ENCRYPTED FILE-----
           recipient: age1xgfxwt7488dkpksgjawc53ewsc4p94jy6kdvnpd5r0jv5a5yr9tqzxy8x2
-    lastmodified: "2026-09-14T10:21:43Z"
-    mac: ENC[AES256_GCM,data:rCIlQV0lfuJl+E0t4Y5IvOFxToL4+47IfMzIm7V7eq3aoj13nv8g+2k2yZncV22shjJppasvyis7u6KtFsvDNkmc+VdduiuB3vBKNkBOr3IRwtOhvzqIHyvTeN9xsy/cGmrASr661jnM8aruMOMoevsyF1LMO/f15QzS/grUOlc=,iv:dZnCqRSXMeDvv/f4vekEqu9hPvl62Vzid0HZfXTRs2k=,tag:ie90n1/kQGNZB98/5cNaRQ==,type:str]
+    lastmodified: "2026-09-15T03:25:07Z"
+    mac: ENC[AES256_GCM,data:JwzWMCMi/AzcLWEHOXgP545J12+DQ6/Sc6EG5fq3kLzvlYJL8t94ol0qWwUhhghA1UMZ9Kow9WAcnVuur/FUhKdTMUrQthReGK6QJklxgRH9CQwJ3bem6BwD1uhlZG4ZwwwQdftb2NGDZaIlI4kt9ouDFyhQbWgZeiOdyJvYqX0=,iv:czwqLA25eD0D1lemAXMtljcRAD+94Mzp0Yc55x2StAA=,tag:Znr5TTgRCesbkJa0+KcNbg==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.13.3