From e881d5624cbfd94c87bc9da668bb533db511c81b Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 16 Feb 2025 12:18:25 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 42 +++++++++++----------- modules/shared/development/git/default.nix | 8 +++-- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index c2328816..290ff020 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1739498399, - "narHash": "sha256-OoP1yQztd2XAzaw17uHNWzTJhi/90nRicymIdiS0NjI=", + "lastModified": 1739611442, + "narHash": "sha256-DTpdIprMOm0b2oTJk5uLPDDLMEbj6Y1wiS4ejrQ3hgc=", "owner": "accentor", "repo": "api", - "rev": "2418c0b42b6eaf35f8d9c6aad05b51015f722460", + "rev": "0d7cef16d9d570331987d45ba23e6b1045365225", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1739498617, - "narHash": "sha256-mnKMM5daAwXuJU4CiHUSsu6+ZI4zT00VgQBCha7nTXQ=", + "lastModified": 1739611615, + "narHash": "sha256-koeai/VHpb9TpQqdNXHTGc66vhMYnQ8hOymgPWAkH9w=", "owner": "accentor", "repo": "web", - "rev": "5dcaacf076caf4892384071c02ba42e0a11a917b", + "rev": "878c16cbd222df5f0fa76a5baa4eb726b765ef9a", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739553792, - "narHash": "sha256-W/VqlGtMXv4cQ1V5j1Sbfu59x8DWntEkTJWJNHo9P+Q=", + "lastModified": 1739696390, + "narHash": "sha256-pOAbTputXE8B7JbGQr6o930BIuNOhCvPtRLAroIS6ik=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3a93a0a8f94fd52260b39aefc05e7bc667ded0ab", + "rev": "1d99565768b67e930e80fc8f03acea9860395da2", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1739470101, - "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", + "lastModified": 1739676861, + "narHash": "sha256-X86ptHMNVuu1Z9leL0YV2E/oxD2IgPYrYANPcvFYpNo=", "owner": "nix-community", "repo": "home-manager", - "rev": "5031c6d2978109336637977c165f82aa49fa16a7", + "rev": "eb44c1601ed99896525e983bc9b15eb8b4d5879e", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1739071773, - "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", + "lastModified": 1739676768, + "narHash": "sha256-U1HQ7nzhJyVVXUgjU028UCkbLQLEIkg42+G7iIiBmlU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", + "rev": "ae15068e79e22b76c344f0d7f8aed1bb1c5b0b63", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739484910, + "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "type": "github" }, "original": { @@ -373,11 +373,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739557017, - "narHash": "sha256-S8pgqw8deCjOCB91sqE/yUOV5zPmd3d0ZY9DaPlgMf4=", + "lastModified": 1739695757, + "narHash": "sha256-lgyLxnY4Gml80+FEiUQxr7/eRfCD4uiif62wx0fBQ4I=", "owner": "nix-community", "repo": "NUR", - "rev": "a69f8f0c7c2c9e19046c41570770f90914eb7d56", + "rev": "e1f86baa19ac560266d5e726d512563c5ace1480", "type": "github" }, "original": { diff --git a/modules/shared/development/git/default.nix b/modules/shared/development/git/default.nix index d91cba2f..4645b065 100644 --- a/modules/shared/development/git/default.nix +++ b/modules/shared/development/git/default.nix @@ -68,17 +68,19 @@ in programs.git = { enable = true; lfs.enable = true; + signing = { + format = "ssh"; + key = sshKeyFile; + signByDefault = true; + }; extraConfig = { branch.autosetuprebase = "always"; - commit.gpgSign = true; github.user = "chvp"; - gpg.format = "ssh"; merge.conflictStyle = "diff3"; pull.rebase = true; rebase.autoStash = true; rerere.enabled = true; tag.gpgSign = true; - user.signingKey = sshKeyFile; }; ignores = [ ".DS_Store"