cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

chore(git): fix deprecated settings

Browse Source
This commit is contained in:
cnst
2025-10-23 19:13:12 +02:00
parent ec9a3bd845
commit 1dd06ef3f5
3 changed files with 87 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
flake.lock generated
View File

@@ -29,11 +29,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1760083914,
"narHash": "sha256-I9IMO9d+z71oeqOz6gOre07tK2Du3vp2FcOW3x4FDXw=",
"lastModified": 1761238850,
"narHash": "sha256-WGoqR+ULsh1w7yDNAtJiE27HX6zSlGPR4I2pgjAU/SA=",
"owner": "anyrun-org",
"repo": "anyrun",
"rev": "3050aa30e25957bbb9e1ac91a44d3979eccadf59",
"rev": "ae3c499316e9aa568acb3832566a1978ca665748",
"type": "github"
},
"original": {
@@ -153,11 +153,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1760747305,
"narHash": "sha256-SsuuyaFp4TbJ+ofti9EXot9gIOk4vZqccat/zERVQN4=",
"lastModified": 1760986121,
"narHash": "sha256-ilwuwZDPh0pNPTUYKUQQarAnwJwsggr60lQyae5R1vc=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "9838e14b30857ac0a50dbe98a5ba2233d6ccb2de",
"rev": "45286364d2570149037013a4fa098709776bdb41",
"type": "github"
},
"original": {
@@ -212,11 +212,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1760942671,
"narHash": "sha256-LyO+TwzM7C8TJJkgbqC+BMnPiJX8XHQJmssTWS2Ze9k=",
"lastModified": 1761201787,
"narHash": "sha256-RQG899vzsoRIMQ6ZR5bi1W9HOomUgID7tk3COQf/OaY=",
"owner": "nix-community",
"repo": "fenix",
"rev": "b5e669194d67dbd4c659c40bb67476d9285b9a13",
"rev": "1ab39eca6ce37b1db23b595c2a754c81ebf49507",
"type": "github"
},
"original": {
@@ -590,11 +590,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1760970177,
"narHash": "sha256-wV9ecNQTN1UDg2YPZGAZAU+E/KnO8eECsCbP1mT0PC8=",
"lastModified": 1761141169,
"narHash": "sha256-5IZjbTvP5dNTD8CbEYlNbicdGcbCN9SC9ksMm2ZEXH0=",
"owner": "helix-editor",
"repo": "helix",
"rev": "2abefacad1cc18010bcc29093642e0ec082fe4ae",
"rev": "d79cce4e4bfc24dd204f1b294c899ed73f7e9453",
"type": "github"
},
"original": {
@@ -610,11 +610,11 @@
]
},
"locked": {
"lastModified": 1760973044,
"narHash": "sha256-Ij3H0qkzZ66X9934kH0JYoI3b/F2vamrDD9abT5Pi70=",
"lastModified": 1761235135,
"narHash": "sha256-cux9xeceLIER1lBxUa1gMafkz7gg5ntcUmJBynWdBWI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c3a5e5f0df6f53aa4b51adc0107796cc407c641c",
"rev": "0adf9ba3f567da2d53af581a857aacf671aaa547",
"type": "github"
},
"original": {
@@ -652,11 +652,11 @@
]
},
"locked": {
"lastModified": 1760662441,
"narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=",
"lastModified": 1760929667,
"narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "722792af097dff5790f1a66d271a47759f477755",
"rev": "189c21cf879669008ccf06e78a553f17e88d8ef0",
"type": "github"
},
"original": {
@@ -803,11 +803,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1760959370,
"narHash": "sha256-tqZWNOZg9P1gpWiHNGtZTTb/UK+2E5LFmFpfEIArTqE=",
"lastModified": 1761129162,
"narHash": "sha256-vJYlThaqdSYRKn1HcaMbkHeB95bXQwgG1ugrlSKQjHg=",
"owner": "hyprwm",
"repo": "hyprland",
"rev": "46dab01bcc47b2e29f36cd4d35d04091e4134a67",
"rev": "057695bc3f7de5e8841c15252fc51029590895e4",
"type": "github"
},
"original": {
@@ -1278,11 +1278,11 @@
]
},
"locked": {
"lastModified": 1760942919,
"narHash": "sha256-/CoMM0vhhihs5/9QLXgL/kkyALBa9XyVTSkN9Htxtjc=",
"lastModified": 1761184286,
"narHash": "sha256-yK/XQSwkOlgljcxNhlu08Zyp96DzF4eIU1leyWjyNZE=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "6fa7d37d878cceeaa3c88e2606dbadf15c8022ad",
"rev": "8ac5469d67b8c197832575db87f6bde38032a947",
"type": "github"
},
"original": {
@@ -1363,11 +1363,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1760703608,
"narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=",
"owner": "PedroHLC",
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github"
},
"original": {
@@ -1443,11 +1443,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"lastModified": 1761114652,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github"
},
"original": {
@@ -1482,11 +1482,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1760153667,
"narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=",
"lastModified": 1761112426,
"narHash": "sha256-fa3fIyXP3xQhsPaZX4WsFwPM9g64EMOucfDEC4o8Nwc=",
"owner": "notashelf",
"repo": "nvf",
"rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d",
"rev": "9b3e7bcf68ace2f07eb7478c40e45ce79332482b",
"type": "github"
},
"original": {
@@ -1626,11 +1626,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1760898410,
"narHash": "sha256-bTMk3D0V+6t3qOjXUfWSwjztEuLoAsgtAtqp6/wwfOc=",
"lastModified": 1761178311,
"narHash": "sha256-M5VeAtfip2zdqHKG9Su+5vlDG8AhtTk1ktxUGXdARc8=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "c7e7eb9dc42df01016d795b0fd3a9ae87b7ada1c",
"rev": "f362735f822fe66ed2e357db53717b3db69dc6c9",
"type": "github"
},
"original": {
@@ -1648,11 +1648,11 @@
]
},
"locked": {
"lastModified": 1760668505,
"narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=",
"lastModified": 1760927964,
"narHash": "sha256-+TjujgwBpeN0aaQ/lZQ8UPsWl9oEaihgbt6FvxTlpZk=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858",
"rev": "6b1e691089a62d0852f9d3fd6693ee027bc98ac3",
"type": "github"
},
"original": {
@@ -1923,11 +1923,11 @@
]
},
"locked": {
"lastModified": 1759969704,
"narHash": "sha256-T7f/invcFIKHrBqD+FLf/C/HOGmpYfbZUzTDxFscpOA=",
"lastModified": 1761179366,
"narHash": "sha256-uH/qjlISL4oXjuFTMvOScsPBQPZG1wVEQCFyY3pNZNE=",
"ref": "refs/heads/main",
"rev": "1173c777dc8daddcc4959260a7b00fd8abc884c5",
"revCount": 137,
"rev": "772796d1e5d05e9f2f443f61eb0da70391788053",
"revCount": 139,
"type": "git",
"url": "https://git.sr.ht/~canasta/zen-browser-flake"
},

79
modules/home/programs/git/default.nix
View File

@@ -15,47 +15,54 @@ in
};
config = mkIf cfg.enable {
home.packages = [ pkgs.gh ];
programs.git = {
enable = true;
userName = osConfig.settings.accounts.username;
userEmail = osConfig.settings.accounts.mail;
programs = {
git = {
enable = true;
settings = {
# user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
user = {
name = osConfig.settings.accounts.username;
email = osConfig.settings.accounts.mail;
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"
];
};
delta = {
enableGitIntegration = true;
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 = ''
${osConfig.settings.accounts.mail} namespaces="git" ${osConfig.settings.accounts.sshKey}
'';

1
modules/nixos/programs/pkgs/default.nix
View File

@@ -82,7 +82,6 @@ in
]
(mkIf cfg.common.enable [
qt6.full
swappy
wayfreeze
imagemagick