diff --git a/nix/etcnixos/flake.lock b/nix/etcnixos/flake.lock index 7603a49..213f4cc 100644 --- a/nix/etcnixos/flake.lock +++ b/nix/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1726403681, - "narHash": "sha256-G922au3LygfpO+4CsAzQmtlg+KXjx8dSwehDwkCFMjQ=", + "lastModified": 1726434563, + "narHash": "sha256-RtcOyhSkgGnrPQ/0xCcsbpgo+AZR81fjtR1wj5qXqYU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "68d822079a1b3e31db3cf1e30e32a69b46e6dfa3", + "rev": "93e6cdc6335d9c7652e89466b5e05a3cce836906", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1726454253, + "narHash": "sha256-ikQs0QZGmCfk5cJ2N5nTT6oULMvWgxN6ebk4WsOq9io=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "b9ab7e57c5d1d456cdeef252d345f3bca9c55851", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 27ef50d..43fd11f 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1726404049, - "narHash": "sha256-RXxrLtYih9jXGYOXKoFWtQRrmtw/HD5cH8FZslFsQYY=", + "lastModified": 1726474477, + "narHash": "sha256-XJBH15VxAXFqILdoI1pq4p2ShGsiyds6fDvuytAT9Fg=", "owner": "orhun", "repo": "binsider", - "rev": "fa152e84907441f64f70e7c97f79d18f6f5c9408", + "rev": "29d88dc85ee92f6c42b040cf2dd7a38f1ebf2d6a", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1726357542, - "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", + "lastModified": 1726440980, + "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", + "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1726415038, - "narHash": "sha256-7fptKhYd09J570OF6NQxqun21A/dFPAq+hybtbURgEU=", + "lastModified": 1726426731, + "narHash": "sha256-h3m3ld3Awh8PzBPWV1i7/DtxGVTIjBMxCjPKQTr5W4Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c2f2fb469a999d3334523a157dfca025b9cea5d8", + "rev": "fd00de202cc0287f7b34c237b8585e67fe7b85f7", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1726382494, - "narHash": "sha256-T7W+ohiXe1IY0yf/PpS4wQItZ0SyRO+/v8kqNpMXlI4=", + "lastModified": 1726453838, + "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ff13821613ffe5dbfeb4fe353b1f4bf291d831db", + "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", "type": "github" }, "original": { diff --git a/nix/home-manager/no-gui.nix b/nix/home-manager/no-gui.nix index 4279aa5..482a297 100644 --- a/nix/home-manager/no-gui.nix +++ b/nix/home-manager/no-gui.nix @@ -2,6 +2,8 @@ pkgs, inputs, 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! programs.fish = import ./progs/fish.nix { inherit pkgs; }; diff --git a/nix/home-manager/secrets/gnupg.age b/nix/home-manager/secrets/gnupg.age new file mode 100644 index 0000000..6e01960 Binary files /dev/null and b/nix/home-manager/secrets/gnupg.age differ diff --git a/nix/home-manager/secrets/secrets.nix b/nix/home-manager/secrets/secrets.nix index 99d72cc..8d3a8fc 100644 --- a/nix/home-manager/secrets/secrets.nix +++ b/nix/home-manager/secrets/secrets.nix @@ -14,5 +14,6 @@ in "factorio.age" "server-password.age" "borg-laptop-password.age" + "gnupg.age" ] ))