This commit is contained in:
Simon Gardling 2024-09-16 10:06:36 -04:00
parent 610a2e8c3c
commit 0b7f5d0da3
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
5 changed files with 39 additions and 18 deletions

View File

@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726403681, "lastModified": 1726434563,
"narHash": "sha256-G922au3LygfpO+4CsAzQmtlg+KXjx8dSwehDwkCFMjQ=", "narHash": "sha256-RtcOyhSkgGnrPQ/0xCcsbpgo+AZR81fjtR1wj5qXqYU=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "68d822079a1b3e31db3cf1e30e32a69b46e6dfa3", "rev": "93e6cdc6335d9c7652e89466b5e05a3cce836906",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -316,11 +316,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1725885300, "lastModified": 1726454253,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "narHash": "sha256-ikQs0QZGmCfk5cJ2N5nTT6oULMvWgxN6ebk4WsOq9io=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "rev": "b9ab7e57c5d1d456cdeef252d345f3bca9c55851",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -33,11 +33,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726404049, "lastModified": 1726474477,
"narHash": "sha256-RXxrLtYih9jXGYOXKoFWtQRrmtw/HD5cH8FZslFsQYY=", "narHash": "sha256-XJBH15VxAXFqILdoI1pq4p2ShGsiyds6fDvuytAT9Fg=",
"owner": "orhun", "owner": "orhun",
"repo": "binsider", "repo": "binsider",
"rev": "fa152e84907441f64f70e7c97f79d18f6f5c9408", "rev": "29d88dc85ee92f6c42b040cf2dd7a38f1ebf2d6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726357542, "lastModified": 1726440980,
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -153,11 +153,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1726415038, "lastModified": 1726426731,
"narHash": "sha256-7fptKhYd09J570OF6NQxqun21A/dFPAq+hybtbURgEU=", "narHash": "sha256-h3m3ld3Awh8PzBPWV1i7/DtxGVTIjBMxCjPKQTr5W4Q=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "c2f2fb469a999d3334523a157dfca025b9cea5d8", "rev": "fd00de202cc0287f7b34c237b8585e67fe7b85f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -281,11 +281,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726382494, "lastModified": 1726453838,
"narHash": "sha256-T7W+ohiXe1IY0yf/PpS4wQItZ0SyRO+/v8kqNpMXlI4=", "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ff13821613ffe5dbfeb4fe353b1f4bf291d831db", "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -2,6 +2,8 @@
pkgs, pkgs,
inputs, inputs,
lib, lib,
homeDirectory,
config,
... ...
}: }:
{ {
@ -164,6 +166,24 @@
}; };
}; };
age.secrets.gnupg = {
file = ./secrets/gnupg.age;
path = "${homeDirectory}/.secrets/gnupg.tar";
};
home.activation.extractGnuPG =
let
gnupg_dir = "${homeDirectory}/.gnupg";
in
''
#!/bin/sh
rm -fr ${gnupg_dir} || true
mkdir -p ${gnupg_dir}
${pkgs.gnutar}/bin/tar xf ${config.age.secrets.gnupg.path} -C ${gnupg_dir}
find ${gnupg_dir} -type f -exec chmod 600 {} \;
find ${gnupg_dir} -type d -exec chmod 700 {} \;
'';
#fish shell! #fish shell!
programs.fish = import ./progs/fish.nix { inherit pkgs; }; programs.fish = import ./progs/fish.nix { inherit pkgs; };

Binary file not shown.

View File

@ -14,5 +14,6 @@ in
"factorio.age" "factorio.age"
"server-password.age" "server-password.age"
"borg-laptop-password.age" "borg-laptop-password.age"
"gnupg.age"
] ]
)) ))