From 696c10f7bc16ef9f6c55463a40f4aa024178625a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 29 Mar 2025 11:38:45 -0400 Subject: [PATCH] Agenix + cpufreq --- flake.lock | 139 +++++++++++++++++++++++++------- flake.nix | 1 + modules/common/auto-cpufreq.nix | 2 +- wrappers/common/agenix.nix | 8 +- 4 files changed, 120 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index ea18aee..0b51f66 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,26 @@ "type": "github" } }, + "agenix-cli": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1743199235, + "narHash": "sha256-CBiKi4zWMdY4hBp9vP/zMWoksuKytt/kC8yrR2bRkEA=", + "owner": "cole-h", + "repo": "agenix-cli", + "rev": "2878cdb39dcdc9e584b75c20bee68779483f4fbe", + "type": "github" + }, + "original": { + "owner": "cole-h", + "repo": "agenix-cli", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -131,11 +151,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1742826799, - "narHash": "sha256-v1uYWuOPpXgUxx8WPLtXyLLCBL2/lgMjqyg7K9RPirw=", + "lastModified": 1742930572, + "narHash": "sha256-zOXxXXJ3Fss28gFc8BWijKd25MesO3ViuRq3CRkI6Wg=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "26b99e51e7f15a62eb3f90aea536d9ba55f782df", + "rev": "6cb02d0cb8df67502f2f1daea0b9b1c20df58960", "type": "github" }, "original": { @@ -161,6 +181,21 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -176,7 +211,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -214,6 +249,24 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": [ "stylix", @@ -343,11 +396,11 @@ ] }, "locked": { - "lastModified": 1742871411, - "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", + "lastModified": 1743259333, + "narHash": "sha256-2Fi3K++co4IGbeOLGXdRA6VEfbzQzMgcuBaPTyjfj0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", + "rev": "1f679ed2a2ebe3894bad9f89fb0bd9f141c28a68", "type": "github" }, "original": { @@ -379,16 +432,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", - "owner": "nixos", + "lastModified": 1734435836, + "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "4989a246d7a390a859852baddb1013f825435cee", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -409,6 +462,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -423,7 +492,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -470,11 +539,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1742888184, - "narHash": "sha256-RQcDOflYvsl2BV3q2lFmjY1qnBIv2P1n8FVviVnL9Lo=", + "lastModified": 1743224618, + "narHash": "sha256-O0d520OeSMnM/7V5fjvtEHrpA7jTyXqIj9Y0RREZwmk=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "4ba0fb3ef21aa09b1e951476f785cf746bad019a", + "rev": "9b134b53bb8a9097ff532385a317ae4f80053ee9", "type": "github" }, "original": { @@ -486,9 +555,10 @@ "root": { "inputs": { "agenix": "agenix", + "agenix-cli": "agenix-cli", "firefox-gnome-theme": "firefox-gnome-theme", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "programsdb": "programsdb", "simple-nixos-mailserver": "simple-nixos-mailserver", "stylix": "stylix", @@ -498,8 +568,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2", + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { @@ -523,14 +593,14 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme_2", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_2", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -538,11 +608,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742856759, - "narHash": "sha256-IiHFsSC2xXD/RT4CW5ThaBybFQ+xha7HOTGbdD+TiXQ=", + "lastModified": 1743075971, + "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", "owner": "danth", "repo": "stylix", - "rev": "b4feb69fd2c1b6ef02a6a81761a62af62ac7bf1b", + "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", "type": "github" }, "original": { @@ -581,6 +651,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3712141..dd3604f 100755 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + agenix-cli.url = "github:cole-h/agenix-cli"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; agenix = { url = "github:ryantm/agenix"; diff --git a/modules/common/auto-cpufreq.nix b/modules/common/auto-cpufreq.nix index f4098e1..a03af2d 100644 --- a/modules/common/auto-cpufreq.nix +++ b/modules/common/auto-cpufreq.nix @@ -1,4 +1,4 @@ { services.power-profiles-daemon.enable = false; - # services.auto-cpufreq.enable = true; TODO: Turn back on once https://github.com/NixOS/nixpkgs/pull/392666 is merged + services.auto-cpufreq.enable = true; } diff --git a/wrappers/common/agenix.nix b/wrappers/common/agenix.nix index 3bdbae1..754225e 100644 --- a/wrappers/common/agenix.nix +++ b/wrappers/common/agenix.nix @@ -1,6 +1,10 @@ -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}: { wrappers.agenix = { - basePackage = pkgs.agenix-cli; + basePackage = inputs.agenix-cli.packages.${pkgs.system}.default; env.AGENIX_ROOT.value = let path = ".agenix.toml";