winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

chore: update & tweak git for macOS

Browse source
This commit is contained in:
winston 2023-11-24 18:34:50 +01:00
parent e54e458805
commit 00a1cfeb9d
Signed by: winston
GPG key ID: 3786770EDBC2B481
4 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
flake.lock
View file

@ -25,11 +25,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699867978, "lastModified": 1700795494,
"narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,11 +138,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699783872, "lastModified": 1700814342,
"narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "280721186ab75a76537713ec310306f0eba3e407", "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -158,11 +158,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1699859020, "lastModified": 1700723013,
"narHash": "sha256-W9hXcB9wGYVq80JA+4PXHUTFnrs6T0RyLKTqeWUwZIQ=", "narHash": "sha256-hXrDDHmG4Z2ih3LDkBRII0oVFw0nCzI42KptXvxosww=",
"owner": "nekowinston", "owner": "nekowinston",
"repo": "nur", "repo": "nur",
"rev": "3c36451baa8312e89419567a2eb5261ebb8f0d7e", "rev": "0355e9653cd1a2a6c7b1ed5f19c658ca0aec543f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +178,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699760693, "lastModified": 1700363379,
"narHash": "sha256-u/gkNUHQR/q23voqE5J4xmEWQIAqR+g3lUnCtzn0k7Y=", "narHash": "sha256-fBEVPFwSZ6AmBE1s1oT7E9WVuqRghruxTnSQ8UUlMkw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "8aff4ca3dee60d1422489fe8d52c2f837b3ad113", "rev": "27920146e671a0d565aaa7452907383be14d8d82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +202,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699839003, "lastModified": 1700788670,
"narHash": "sha256-YnerX7gKKd2C/95rSkr5MS1EyXBaEowhTefLyJ23NQk=", "narHash": "sha256-0GKDTQV1MxKaFtbyifkD/BEcF6rqXAsCnTUuzgq3EXQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "24886c2d4fee033a89e10b0c84eaee2e06892d54", "rev": "e58be34b0eed81fe51594473b65a700a499f2310",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +267,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1699099776, "lastModified": 1700204040,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -283,11 +283,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1699099776, "lastModified": 1700612854,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -315,11 +315,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1699880405, "lastModified": 1700844319,
"narHash": "sha256-245U6zatNdFsPOkh4K047I9lTRMmeVvAU5NwrU8mBDs=", "narHash": "sha256-AUs6NJC7HXGW2oCG9NlBKH9C+hPvVbc9DnvmpZXhlvw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "9c4835e5bcb05f0c40f4d54ccec7199f9050fde3", "rev": "3b34dcf501cf8490dd94c7b8303aae0260d280be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -337,11 +337,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1699271226, "lastModified": 1700064067,
"narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=", "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "ea758da1a6dcde6dc36db348ed690d09b9864128", "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -379,11 +379,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699755324, "lastModified": 1700360261,
"narHash": "sha256-DJBtQB5VIUXJZwVrhgkKOH8g2wTJFHe+5Dc2oJjpcNs=", "narHash": "sha256-8fRSHx5osjDELHSL7OHEfj/cOh8q+B7M9EF/yPR3bw8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d15b1b2be8daba77c80ee6716616e5c841d3ab14", "rev": "45066cb0b2505d8da581be8432a16238c867f199",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
home/apps/git.nix
View file

@ -48,8 +48,11 @@
".envrc" ".envrc"
]; ];
# disable the macOS keychain, only use gopass package = pkgs.symlinkJoin {
package = pkgs.git.override {osxkeychainSupport = false;}; name = "git";
paths = [pkgs.git];
postBuild = "rm $out/etc/gitconfig";
};
extraConfig = { extraConfig = {
credential.helper = "gopass"; credential.helper = "gopass";

2
home/apps/gpg.nix
View file

@ -10,8 +10,6 @@
}; };
in { in {
home.packages = with pkgs; [ home.packages = with pkgs; [
gnupg-pkcs11-scd
pcsclite
pinentry pinentry
git-credential-gopass git-credential-gopass
gopass gopass

2
home/apps/vscode/settings.json
View file

@ -47,7 +47,7 @@
"workbench.colorTheme": "Catppuccin Frappé", "workbench.colorTheme": "Catppuccin Frappé",
"workbench.iconTheme": "catppuccin-frappe", "workbench.iconTheme": "catppuccin-frappe",
"workbench.layoutControl.enabled": false, "workbench.layoutControl.enabled": false,
"workbench.preferredDarkColorTheme": "Catppuccin Mocha", "workbench.preferredDarkColorTheme": "Catppuccin Frappé",
"workbench.preferredLightColorTheme": "Catppuccin Latte", "workbench.preferredLightColorTheme": "Catppuccin Latte",
"workbench.productIconTheme": "icons-carbon", "workbench.productIconTheme": "icons-carbon",