From 00a1cfeb9d1dfa5438ff85739fa589e1cc2b6b92 Mon Sep 17 00:00:00 2001 From: winston Date: Fri, 24 Nov 2023 18:34:50 +0100 Subject: [PATCH] chore: update & tweak git for macOS --- flake.lock | 60 +++++++++++++++++----------------- home/apps/git.nix | 7 ++-- home/apps/gpg.nix | 2 -- home/apps/vscode/settings.json | 2 +- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 3cc2335..e608bf6 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1699867978, - "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700814342, + "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1699859020, - "narHash": "sha256-W9hXcB9wGYVq80JA+4PXHUTFnrs6T0RyLKTqeWUwZIQ=", + "lastModified": 1700723013, + "narHash": "sha256-hXrDDHmG4Z2ih3LDkBRII0oVFw0nCzI42KptXvxosww=", "owner": "nekowinston", "repo": "nur", - "rev": "3c36451baa8312e89419567a2eb5261ebb8f0d7e", + "rev": "0355e9653cd1a2a6c7b1ed5f19c658ca0aec543f", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1699760693, - "narHash": "sha256-u/gkNUHQR/q23voqE5J4xmEWQIAqR+g3lUnCtzn0k7Y=", + "lastModified": 1700363379, + "narHash": "sha256-fBEVPFwSZ6AmBE1s1oT7E9WVuqRghruxTnSQ8UUlMkw=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "8aff4ca3dee60d1422489fe8d52c2f837b3ad113", + "rev": "27920146e671a0d565aaa7452907383be14d8d82", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1699839003, - "narHash": "sha256-YnerX7gKKd2C/95rSkr5MS1EyXBaEowhTefLyJ23NQk=", + "lastModified": 1700788670, + "narHash": "sha256-0GKDTQV1MxKaFtbyifkD/BEcF6rqXAsCnTUuzgq3EXQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "24886c2d4fee033a89e10b0c84eaee2e06892d54", + "rev": "e58be34b0eed81fe51594473b65a700a499f2310", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nur": { "locked": { - "lastModified": 1699880405, - "narHash": "sha256-245U6zatNdFsPOkh4K047I9lTRMmeVvAU5NwrU8mBDs=", + "lastModified": 1700844319, + "narHash": "sha256-AUs6NJC7HXGW2oCG9NlBKH9C+hPvVbc9DnvmpZXhlvw=", "owner": "nix-community", "repo": "nur", - "rev": "9c4835e5bcb05f0c40f4d54ccec7199f9050fde3", + "rev": "3b34dcf501cf8490dd94c7b8303aae0260d280be", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699271226, - "narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=", + "lastModified": 1700064067, + "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ea758da1a6dcde6dc36db348ed690d09b9864128", + "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", "type": "github" }, "original": { @@ -379,11 +379,11 @@ ] }, "locked": { - "lastModified": 1699755324, - "narHash": "sha256-DJBtQB5VIUXJZwVrhgkKOH8g2wTJFHe+5Dc2oJjpcNs=", + "lastModified": 1700360261, + "narHash": "sha256-8fRSHx5osjDELHSL7OHEfj/cOh8q+B7M9EF/yPR3bw8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d15b1b2be8daba77c80ee6716616e5c841d3ab14", + "rev": "45066cb0b2505d8da581be8432a16238c867f199", "type": "github" }, "original": { diff --git a/home/apps/git.nix b/home/apps/git.nix index 07bcd64..c7ba7d5 100644 --- a/home/apps/git.nix +++ b/home/apps/git.nix @@ -48,8 +48,11 @@ ".envrc" ]; - # disable the macOS keychain, only use gopass - package = pkgs.git.override {osxkeychainSupport = false;}; + package = pkgs.symlinkJoin { + name = "git"; + paths = [pkgs.git]; + postBuild = "rm $out/etc/gitconfig"; + }; extraConfig = { credential.helper = "gopass"; diff --git a/home/apps/gpg.nix b/home/apps/gpg.nix index 2e8ba29..03c1b84 100644 --- a/home/apps/gpg.nix +++ b/home/apps/gpg.nix @@ -10,8 +10,6 @@ }; in { home.packages = with pkgs; [ - gnupg-pkcs11-scd - pcsclite pinentry git-credential-gopass gopass diff --git a/home/apps/vscode/settings.json b/home/apps/vscode/settings.json index acf791b..06770d0 100644 --- a/home/apps/vscode/settings.json +++ b/home/apps/vscode/settings.json @@ -47,7 +47,7 @@ "workbench.colorTheme": "Catppuccin Frappé", "workbench.iconTheme": "catppuccin-frappe", "workbench.layoutControl.enabled": false, - "workbench.preferredDarkColorTheme": "Catppuccin Mocha", + "workbench.preferredDarkColorTheme": "Catppuccin Frappé", "workbench.preferredLightColorTheme": "Catppuccin Latte", "workbench.productIconTheme": "icons-carbon",