From 118300d92f3463711364523447618e366ee69077 Mon Sep 17 00:00:00 2001 From: Alex Maldonado Date: Sat, 6 Jun 2026 23:02:09 -0400 Subject: [PATCH] feat: setup git ssh signing --- flake.lock | 12 ++++++------ home/alex/git.nix | 12 +++++------- home/modules/ssh.nix | 2 +- justfile | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index bad3973..22436cc 100644 --- a/flake.lock +++ b/flake.lock @@ -110,11 +110,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1780633669, - "narHash": "sha256-vfIgceYs5gyJ7VXP+JtaAHWg/ukIecjW0leK93bdytw=", + "lastModified": 1780719019, + "narHash": "sha256-DZCJn3xaUSztvxw8xtbRSBxRQRzAoWvzGFAc0NLZdjw=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "9c81fa6f3809b57af8ba1a8ed36e65555c493ea6", + "rev": "efe7a04bb221089e7ecb0b663441afc2a40eb02d", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1779796641, - "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "lastModified": 1780511130, + "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25f538306313eae3927264466c70d7001dcea1df", + "rev": "535f3e6942cb1cead3929c604320d3db54b542b9", "type": "github" }, "original": { diff --git a/home/alex/git.nix b/home/alex/git.nix index 229f7fc..71b6ea7 100644 --- a/home/alex/git.nix +++ b/home/alex/git.nix @@ -1,10 +1,13 @@ { pkgs, ... }: - { home.packages = [ pkgs.delta ]; - programs.git = { enable = true; + signing = { + format = "ssh"; + key = "~/.ssh/id_signing_git"; + signByDefault = true; + }; settings = { user.name = "Alex Maldonado"; user.email = "alex@scient.ing"; @@ -12,19 +15,15 @@ core.editor = "hx"; core.pager = "delta"; pull.rebase = true; - delta = { navigate = true; side-by-side = true; line-numbers = true; }; - interactive.diffFilter = "delta --color-only"; - merge.conflictstyle = "zdiff3"; diff.algorithm = "histogram"; diff.colorMoved = "default"; - push.autoSetupRemote = true; push.default = "simple"; fetch.prune = true; @@ -32,7 +31,6 @@ help.autocorrect = "prompt"; branch.sort = "-committerdate"; column.ui = "auto"; - transfer.fsckObjects = true; }; lfs.enable = true; diff --git a/home/modules/ssh.nix b/home/modules/ssh.nix index 7640ab5..a1d1910 100644 --- a/home/modules/ssh.nix +++ b/home/modules/ssh.nix @@ -24,7 +24,7 @@ hostname = "git.scient.ing"; port = 22; user = "git"; - identityFile = "~/.ssh/id_scienting_gitea"; + identityFile = "~/.ssh/id_scienting_git"; }; }; diff --git a/justfile b/justfile index c7f0020..c7c6960 100644 --- a/justfile +++ b/justfile @@ -22,7 +22,7 @@ clean: # Generate Ed25519 SSH keys for each named service (default: github gradescope). # Override: just gen-keys gitlab bitbucket -gen-keys *services='github gradescope h2p durrantlab': +gen-keys *services='github gradescope h2p durrantlab signing_git scienting_git': @./scripts/gen-keys.sh {{services}} # Download the latest NixOS installer ISO into iso/.