From e53e3e37882b0190eedb0816672eb38183afc199 Mon Sep 17 00:00:00 2001 From: rocketcamel Date: Sat, 15 Feb 2025 10:41:42 +0000 Subject: [PATCH] feat: use new option for commit signing --- .config/nvim/lazy-lock.json | 14 +++++++------- nix/flake.lock | 32 ++++++++++++++++---------------- nix/users/luca/git.nix | 8 +++++--- nix/users/luca/home.nix | 2 +- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 2ae776a..e1c5c08 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,17 +1,17 @@ { "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, - "fidget.nvim": { "branch": "main", "commit": "a0abbf18084b77d28bc70e24752e4f4fd54aea17" }, + "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, + "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" }, "luau-lsp.nvim": { "branch": "main", "commit": "f81c6c713e4598abc484cbeabca918475d176c54" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "7a75a970d0bae09ef579e41dbb20551bdf596f31" }, - "nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" }, - "nvim-treesitter": { "branch": "master", "commit": "f3d7c0dafcbc86c4d63f765649c884a03bc1360a" }, + "mini.nvim": { "branch": "main", "commit": "d479cf109eeff8a7e0bf978079ea1dd2171648a0" }, + "nvim-lspconfig": { "branch": "master", "commit": "75edb91a3d2deabe76a9911cde2c13d411b3b097" }, + "nvim-treesitter": { "branch": "master", "commit": "62911c78a868bac24c8a86f2c1c412d0b799f885" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "rose-pine": { "branch": "main", "commit": "42f0724e0bca9f57f0bcfa688787c37b8d4befe8" }, + "rose-pine": { "branch": "main", "commit": "20c7940da844aa4f162a64e552ae3c7e9fdc3b93" }, "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" } } diff --git a/nix/flake.lock b/nix/flake.lock index 4812144..3455b69 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1739298825, - "narHash": "sha256-q9CzTY7n8n9RK9mKUQ4VbaKdydhXQqzphahEG5Wt8sI=", + "lastModified": 1739571712, + "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f0a31d38e6de48970ce1fe93e6ea343e20a9c80a", + "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", "type": "github" }, "original": { @@ -42,11 +42,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1736095716, - "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", + "lastModified": 1739577062, + "narHash": "sha256-u/trdPzJO8UotNq48RbG7m6Pe8761IEMCOY0QidNjY4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", + "rev": "0b2b8b31f69f24e9a75b4b18a32c771a48612d5e", "type": "github" }, "original": { @@ -58,27 +58,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733384649, - "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1739232879, - "narHash": "sha256-x4vB+yZlZCXajUNjA1DOKKHbr83C5ocdiT4VsBRExAs=", + "lastModified": 1739615309, + "narHash": "sha256-5SboZp6r/Mi0rwKZzCpNGB9ye/8LhXZYtHo4wNSeZ/A=", "owner": "rocketcamel", "repo": "pesde-nix", - "rev": "8e69f5e0b991520f81df51d499809e1a711eaec8", + "rev": "3ee40fcc82f694a3b6bb9bc7e49ef563d32d87ac", "type": "github" }, "original": { diff --git a/nix/users/luca/git.nix b/nix/users/luca/git.nix index 2ccd69f..521879b 100644 --- a/nix/users/luca/git.nix +++ b/nix/users/luca/git.nix @@ -2,12 +2,14 @@ enable = true; userName = "rocketcamel"; userEmail = "luca_lise@icloud.com"; + signing = { + signByDefault = true; + format = "ssh"; + key = "~/.ssh/commits.id_rsa.pub"; + }; extraConfig = { init = { defaultBranch = "main"; }; - commit.gpgsign = true; - gpg.format = "ssh"; - user.signingkey = "~/.ssh/commits.id_rsa.pub"; }; } diff --git a/nix/users/luca/home.nix b/nix/users/luca/home.nix index 24c8a7e..b7efa07 100644 --- a/nix/users/luca/home.nix +++ b/nix/users/luca/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { home.username = "luca";