From 06edba04c8104afaaabf1cdb1e52945864246f10 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Mon, 21 Oct 2024 15:40:49 +0200
Subject: [PATCH] feat: make configs more uniform?

---
 hosts/sakura/default.nix |  9 +++------
 modules/core/system.nix  | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix
index 5b35dfd..432df40 100644
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@@ -1,17 +1,14 @@
-{ pkgs, config, ... }: 
+{ inputs, lib, pkgs, config, ... }: 
 {
   imports = [
     ./hardware-configuration.nix
     ./../../modules/core
+    inputs.nixos-hardware.nixosModules.framework-13-7040-amd
   ];
 
+  hardware.framework.amd-7040.preventWakeOnAC = true;
   networking.hostName = "sakura";
 
-  nixpkgs.config.permittedInsecurePackages = [
-    "jitsi-meet-1.0.8043"
-    "olm-3.2.16"
-  ];
-
   environment.systemPackages = with pkgs; [
     acpi
     brightnessctl
diff --git a/modules/core/system.nix b/modules/core/system.nix
index b08adba..3ede732 100644
--- a/modules/core/system.nix
+++ b/modules/core/system.nix
@@ -14,20 +14,29 @@
       options = "--delete-older-than 7d";
     };
   };
-  nixpkgs = {
+
+  # nixpkgs = {
+  #   overlays = [
+  #     self.overlays.default
+  #     inputs.nur.overlay
+  #   ];
+  # };
+
+  nixpkgs.config = {
+    allowUnfree = true;
+    permittedInsecurePackages = [
+      "jitsi-meet-1.0.8043"
+      "olm-3.2.16"
+    ];
     overlays = [
       self.overlays.default
       inputs.nur.overlay
     ];
   };
 
-  environment.systemPackages = with pkgs; [
-    wget
-    git
-  ];
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   time.timeZone = "Europe/Amsterdam";
   i18n.defaultLocale = "en_US.UTF-8";
-  nixpkgs.config.allowUnfree = true;
   system.stateVersion = "24.05";
 }