From 608d968a0557717396aafb0bba046be67033e14f Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Fri, 4 Aug 2023 15:34:24 +0200 Subject: [PATCH] pinwheel: Add `agenix` --- flake.lock | 92 +++++++++++++++++++++++++++----- flake.nix | 12 +++-- hosts/pinwheel/configuration.nix | 6 ++- 3 files changed, 92 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 8270ed7..71ebc01 100644 --- a/flake.lock +++ b/flake.lock @@ -1,17 +1,82 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", + "owner": "ryantm", + "repo": "agenix", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1690027126, - "narHash": "sha256-DeUhQQxbu41Qn0uHyNazPBiTJ0lNsf26ThFopWBRRnM=", + "lastModified": 1691143977, + "narHash": "sha256-zXHmmghQdDLecVxFedRxSny4FtVH9lig1/BKObsHwfg=", "owner": "nix-community", "repo": "home-manager", - "rev": "76dd6c66190db0d46ac6b3ca816cc17b581df42c", + "rev": "15043a65915bcc16ad207d65b202659e4988066b", "type": "github" }, "original": { @@ -22,11 +87,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1689320556, - "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", + "lastModified": 1690957133, + "narHash": "sha256-0Y4CiOIszhHDDXHFmvHUpmhUotKOIn0m3jpMlm6zUTE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b", + "rev": "24f9162b26f0debd163f6d94752aa2acb9db395a", "type": "github" }, "original": { @@ -38,11 +103,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690031011, - "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", + "lastModified": 1691006197, + "narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12303c652b881435065a98729eb7278313041e49", + "rev": "66aedfd010204949cb225cf749be08cb13ce1813", "type": "github" }, "original": { @@ -70,11 +135,11 @@ }, "nixpkgs2305": { "locked": { - "lastModified": 1689956312, - "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=", + "lastModified": 1690927903, + "narHash": "sha256-D5gCaCROnjEKDOel//8TO/pOP87pAEtT0uT8X+0Bj/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967", + "rev": "bd836ac5e5a7358dea73cb74a013ca32864ccb86", "type": "github" }, "original": { @@ -86,7 +151,8 @@ }, "root": { "inputs": { - "home-manager": "home-manager", + "agenix": "agenix", + "home-manager": "home-manager_2", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs2211": "nixpkgs2211", diff --git a/flake.nix b/flake.nix index d444e8e..92bc16b 100644 --- a/flake.nix +++ b/flake.nix @@ -5,18 +5,24 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs2305.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs2211.url = "github:nixos/nixpkgs/nixos-22.11"; + agenix.url = "github:ryantm/agenix"; + agenix.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:nixos/nixos-hardware/master"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, nixpkgs2305, nixpkgs2211, nixos-hardware, home-manager, ... }: { + outputs = { self, nixpkgs, nixpkgs2305, nixpkgs2211, agenix, nixos-hardware, home-manager, ... }: { nixosConfigurations = { - pinwheel = nixpkgs.lib.nixosSystem { + pinwheel = let system = "x86_64-linux"; + in nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { inherit system agenix; }; modules = [ - nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen ./hosts/pinwheel/configuration.nix + agenix.nixosModules.default + nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix index c69e6f8..2580e48 100644 --- a/hosts/pinwheel/configuration.nix +++ b/hosts/pinwheel/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ system, config, pkgs, agenix, ... }: { imports = @@ -86,7 +86,9 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; []; + environment.systemPackages = with pkgs; [ + agenix.packages."${system}".default + ]; fonts.fonts = with pkgs; [ noto-fonts