From ab79d22dafdb469d0aa0d553a4b8bf26f7d4b307 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Oct 2024 13:04:36 -0400 Subject: [PATCH] misc changes --- etcnixos/flake.lock | 12 +++++------ etcnixos/flake.nix | 21 +++++-------------- etcnixos/system-mreow.nix | 6 +++++- etcnixos/system-nixos.nix | 4 ++++ home-manager/flake.lock | 44 +++++++++++++++++++-------------------- 5 files changed, 42 insertions(+), 45 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 28de1d7..06ab548 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -278,11 +278,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1727792571, + "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 5a96564..75772fb 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -57,22 +57,11 @@ inherit inputs username hostname; }; inherit pkgs; - modules = - [ - ./system-${hostname}.nix - chaotic.nixosModules.default - agenix.nixosModules.default - - ] - ++ ( - if ("${hostname}" == "mreow") then # laptop - [ - nixos-hardware.nixosModules.framework-12th-gen-intel - lanzaboote.nixosModules.lanzaboote - ] - else - [ ] - ); + modules = [ + ./system-${hostname}.nix + chaotic.nixosModules.default + agenix.nixosModules.default + ]; }; }; } diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 04e5ec4..5ba9d3e 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -4,12 +4,16 @@ lib, username, system, + inputs, ... }: { imports = [ ./common.nix ./hardware_laptop.nix + + inputs.nixos-hardware.nixosModules.framework-12th-gen-intel + inputs.lanzaboote.nixosModules.lanzaboote ]; services.tlp = { @@ -27,7 +31,7 @@ CPU_MAX_PERF_ON_BAT = 60; CPU_BOOST_ON_BAT = 0; - START_CHARGE_THRESH_BAT0 = 90; + START_CHARGE_THRESH_BAT0 = 80; STOP_CHARGE_THRESH_BAT0 = 90; RUNTIME_PM_ON_BAT = "auto"; }; diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 1005cf6..9ba0080 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -12,6 +12,10 @@ imports = [ ./common.nix ./hardware_desktop.nix + + inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate + inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower + inputs.nixos-hardware.nixosModules.common-pc-ssd ]; boot = { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 3872f71..b5e451b 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1727724920, - "narHash": "sha256-3dIJstoNLiERwtNIRFIxo1EP4vqizPHagAnoydhNSQs=", + "lastModified": 1727805287, + "narHash": "sha256-sMQP+HesLU40wKPVR55lXyruU1NPbFDfqmaiLDMhVis=", "owner": "orhun", "repo": "binsider", - "rev": "ad7cca36d365d9d0c78d542da2bf533d08580687", + "rev": "aba611285f270eed7a087f437e7d5443e4a4d5b4", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727780469, - "narHash": "sha256-ujDpvGKpYLLFP5qPA4eSV0AAYllWT/J7zqJRFGmZuSo=", + "lastModified": 1727832097, + "narHash": "sha256-XMBkQoRgUGJKdux94mNDE+7PIGIxEk48ol9RcN+HSFg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "72216d18036d31a22791af605b827a2dff64deb4", + "rev": "173d6304db132d8ba75765fe73bf75ed22bbbcc2", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -201,14 +201,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-stable": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1727749966, - "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=", + "lastModified": 1727836133, + "narHash": "sha256-JE0zciM5IGWvK8J/pE2VldNBf7oyMH5WrU8tZArefbg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66", + "rev": "02321540b0c8000b36889b1b974d1fec585b25a4", "type": "github" }, "original": {