diff --git a/flake.lock b/flake.lock index 6600207..b9baa1d 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740562777, - "narHash": "sha256-2Hr6GRQjbStwM4ASLSOzkJZLNil4foNuuOFPGyopj9w=", + "lastModified": 1741201737, + "narHash": "sha256-bLuBf/K4yGokkrMIvEUy4SCh8UJ0AC+Fpd67yEIabW4=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "1a30818e41b6573389abfe4f1f99086714c0ca6a", + "rev": "e7b93c191080cd8089f6e60124ed822a8366a69a", "type": "github" }, "original": { @@ -242,22 +242,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -361,11 +345,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -552,11 +536,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741035361, - "narHash": "sha256-WSfqkzWUY8FMFnaGm0n9QcoO0cgqJbYcv3ccfkFv7Qw=", + "lastModified": 1741298937, + "narHash": "sha256-kZuqcoVaP+e0wRS2z9y64DXYJYDOputA0BmOlfzj3LY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d7e7a292613a4f20218074ff8299dff099a80098", + "rev": "7753e8ea686ba0aeaa825502f27e5b3f813faade", "type": "github" }, "original": { @@ -800,16 +784,15 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-compat": "flake-compat_3", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1741034032, - "narHash": "sha256-Fm6WqXNsMGNdwabuJrvolToMuLbiBykiVLH/6P76R/I=", + "lastModified": 1741185283, + "narHash": "sha256-Wk+2uWk4WhtB1LtXt3smd0K2JZ5qeZj9LldGTmfEldo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "91f206c23d0f7ce9666da60e3662a9c44760b10e", + "rev": "c7a72aa0e5f72bc6a9d8dfaf33e4de013c960f7b", "type": "github" }, "original": { @@ -911,11 +894,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -952,18 +935,18 @@ }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "3a05eebede89661660945da1f151959900903b6a", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1740932899, - "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", + "lastModified": 1741196730, + "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", + "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", "type": "github" }, "original": { @@ -1014,11 +997,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1741120322, - "narHash": "sha256-U8MPNPzY7zU9VqCRjNh2vq5AOg+f+5sz6cYU3knzBQo=", + "lastModified": 1741322153, + "narHash": "sha256-F2z9+F5Z+iRYPWkJuD5oNnxafYnlFDz3qEOALNmjaOI=", "owner": "nix-community", "repo": "NUR", - "rev": "f7113a4be27771ad3fdf9528f0519c213765e851", + "rev": "9b80b69c4e08880d70a93223f83bb46cce44afab", "type": "github" }, "original": { @@ -1040,11 +1023,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1741120430, - "narHash": "sha256-n+Qeb9qU+olGrGcAPcpTccb0zUQscH69o58ncHg2Ufg=", + "lastModified": 1741294413, + "narHash": "sha256-NZes+PpPz69P2fm1sK0QKH/i6KR5sVhGH9+79rFKmAo=", "owner": "notashelf", "repo": "nvf", - "rev": "27978c7186b26e78c7765de4c093a816617f9f39", + "rev": "4bf2bc9db602fb7ba6e1651e3812b751d725a967", "type": "github" }, "original": { diff --git a/modules/shell/git.nix b/modules/shell/git.nix index 516b46b..2ff9aee 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -9,9 +9,19 @@ enable = true; userEmail = "nickolaj@fireproof.website"; userName = "Nickolaj Jepsen"; + extraConfig = { + gpg.format = "ssh"; + gpg.ssh.program = "op-ssh-sign"; + push.autosetupremote = "true"; + pull.rebase = "true"; + rerere.enabled = true; + init.defaultBranch = "main"; + }; + delta.enable = true; + includes = [ { - condition = "hasconfig:remote.*.url:*Digital-Udvikling*"; + condition = "hasconfig:remote.*.url:git@github.com:Digital-Udvikling/**"; contents = { user.email = "nij@ao.dk"; };