chore: update flake.lock & adjust for changes

This commit is contained in:
winston 2024-03-23 06:16:54 +01:00
parent b938ac504e
commit 43d678c932
Signed by: winston
GPG key ID: 3786770EDBC2B481
3 changed files with 49 additions and 53 deletions

View file

@ -37,11 +37,11 @@
]
},
"locked": {
"lastModified": 1707747706,
"narHash": "sha256-rUT4kar5oCgkvwzuADjSmewNG+Hfps14BbN+kgx4c60=",
"lastModified": 1710248394,
"narHash": "sha256-Bj6XxMXWSFDxSGG2MvrPmMb9spc7ckdC/A3SW43dsys=",
"owner": "caarlos0",
"repo": "nur",
"rev": "8d7d6496e98f49edb5097ceebe55c99506a6876c",
"rev": "440df6b32462d6f6dbb7ee830c7135371b1eb468",
"type": "github"
},
"original": {
@ -57,11 +57,11 @@
]
},
"locked": {
"lastModified": 1710153923,
"narHash": "sha256-aCaHueh0QkFoAMnhfYwrG9LTx/fCCsicPzjgPMLjByc=",
"lastModified": 1710544781,
"narHash": "sha256-nkxihb3D85k1nZV1CzlB3seMKtTEeKb688sblIGp/Bs=",
"owner": "catppuccin",
"repo": "vscode",
"rev": "91851ec881a99541355ad4d665f775ee0e15dfcc",
"rev": "d7b96ccac36fd29929bd97bc9357413cc4e0240c",
"type": "github"
},
"original": {
@ -77,11 +77,11 @@
]
},
"locked": {
"lastModified": 1709771483,
"narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
"lastModified": 1710717205,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
"type": "github"
},
"original": {
@ -154,11 +154,11 @@
]
},
"locked": {
"lastModified": 1703887061,
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
@ -174,11 +174,11 @@
]
},
"locked": {
"lastModified": 1710062421,
"narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=",
"lastModified": 1710974515,
"narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a",
"rev": "1c2acec99933f9835cc7ad47e35303de92d923a4",
"type": "github"
},
"original": {
@ -194,11 +194,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1710140598,
"narHash": "sha256-YwiHPdShrkLohaRf6KbNjKdVEtM6Cu5cPsJiwDWuhCs=",
"lastModified": 1711090992,
"narHash": "sha256-ZNvaIYxLTzyn6IH4sjvyTVrsTqVT/2qWlI7TqZh72X0=",
"owner": "nekowinston",
"repo": "nur",
"rev": "2314f07618e56701525cbc44289145375f6b08d1",
"rev": "6df03d938e3713c1693540e295b6fe00a4ced2f9",
"type": "github"
},
"original": {
@ -234,11 +234,11 @@
]
},
"locked": {
"lastModified": 1710120787,
"narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
"lastModified": 1710644923,
"narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
"rev": "e25efda85e39fcdc845e371971ac4384989c4295",
"type": "github"
},
"original": {
@ -258,11 +258,11 @@
]
},
"locked": {
"lastModified": 1710119770,
"narHash": "sha256-WKUrnOtFBEGCSgmMQn9Utaaf514WZD/7dAJDbmVULKs=",
"lastModified": 1711070085,
"narHash": "sha256-qrvSvaIKZGThRwmZMDpcdtbjwXY4dh1AdtkaL7WjhFs=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "b25f888a82dbe5a45094746940f10ff5438936c4",
"rev": "c969bafb141eb5736083e832ad218bb14bbdc182",
"type": "github"
},
"original": {
@ -289,11 +289,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1709961763,
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"lastModified": 1710806803,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
"type": "github"
},
"original": {
@ -305,11 +305,11 @@
},
"nur": {
"locked": {
"lastModified": 1710158865,
"narHash": "sha256-3wJnmZ7YtMoRGr/Vmn/nUj12C+4Q4zmkKI8h0zau/8U=",
"lastModified": 1711092983,
"narHash": "sha256-118UpeLFzci+wExtczemejzoq1a8tBL2lThJdEVWBhM=",
"owner": "nix-community",
"repo": "nur",
"rev": "ff19513c66ec904c1380afb85e81f8213d79f515",
"rev": "9f089669076311a9645caa01ab5c103a916bf33e",
"type": "github"
},
"original": {
@ -333,11 +333,11 @@
]
},
"locked": {
"lastModified": 1708018599,
"narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"lastModified": 1710923068,
"narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
"type": "github"
},
"original": {
@ -477,11 +477,11 @@
]
},
"locked": {
"lastModified": 1709980437,
"narHash": "sha256-rp1MwfRaZl7TPM4E5i1HxQGJCCfMcIa7dOzTX3SW7ro=",
"lastModified": 1710519878,
"narHash": "sha256-0dbc10OBFUVYyXC+C+N6vRUd8xyBSRxkcZ4Egipbx0M=",
"owner": "nix-community",
"repo": "nixos-wsl",
"rev": "e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9",
"rev": "aef95bdb6800a3a2af7aa7083d6df03067da6592",
"type": "github"
},
"original": {

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: let
{pkgs, ...}: let
inherit (pkgs.stdenv.hostPlatform) isLinux isDarwin;
key = "0x0B89BC45007EE9CC";
mailvelopeConfig = builtins.toJSON {
@ -13,13 +9,13 @@
allowed_extensions = ["jid1-AQqSMBYb0a8ADg@jetpack"];
};
in {
home.packages = with pkgs; [
pinentry
git-credential-gopass
gopass
gopass-jsonapi
yubikey-personalization
];
home.packages = with pkgs; ([
git-credential-gopass
gopass
gopass-jsonapi
yubikey-personalization
]
++ lib.optionals isDarwin [pinentry_mac]);
# two amazing examples of glorious XDG compliance
home.file = {
@ -101,9 +97,9 @@ in {
enable = isLinux;
enableExtraSocket = true;
enableSshSupport = true;
pinentryFlavor =
if config.isGraphical
then "gnome3"
else "curses";
# pinentryPackage =
# if config.isGraphical
# then pkgs.pinentry-gnome3
# else pkgs.pinentry-curses;
};
}

View file

@ -165,7 +165,7 @@ in {
zsh = {
enable = true;
enableAutosuggestions = true;
autosuggestion.enable = true;
enableCompletion = true;
initExtraFirst = ''