framework-2024-11-19-16-38-25

machine/desktop/configuration.nix

@@ -53,8 +53,6 @@ in {
     };
   };
 
-  #  stylix.enable = true;
-
   nix.settings = {
     system-features = [
       "nixos-test"
@@ -155,11 +153,18 @@ in {
 
   networking = {
     hostName = "desktop";
-    useDHCP = false;
   };
 
   time.timeZone = "Europe/Berlin";
 
+  programs = {
+    coolercontrol.enable = true;
+    corectrl = {
+      enable = true;
+      gpuOverclock.enable = true;
+    };
+  };
+
   environment = {
     systemPackages = with pkgs; [
       lact
@@ -182,7 +187,6 @@ in {
       directories = [
         "/etc/coolercontrol"
         "/etc/NetworkManager/system-connections"
-        "/etc/nixos"
         "/var/lib/bluetooth"
         "/var/lib/docker"
         "/var/lib/nixos"
@@ -217,14 +221,6 @@ in {
     pulseaudio.enable = false;
   };
 
-  programs = {
-    coolercontrol.enable = true;
-    corectrl = {
-      enable = true;
-      gpuOverclock.enable = true;
-    };
-  };
-
   # powerManagement = {
   #   enable = true;
   #   powertop.enable = true;

machine/framework/configuration.nix

@@ -55,20 +55,35 @@ in {
     };
   };
 
+  nix.settings.system-features = [
+    "nixos-test"
+    "benchmark"
+    "big-parallel"
+    "kvm"
+    "gccarch-alderlake"
+  ];
+
+  # nixpkgs.localSystem = {
+  #   gcc.arch = "alderlake";
+  #   gcc.tune = "alderlake";
+  #   system = "x86_64-linux";
+  # };
+
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
-    # initrd.systemd.enable = true;
     loader = {
       grub = {
         enable = true;
         efiSupport = true;
         device = "nodev";
         configurationLimit = 5;
-        enableCryptodisk = true;
+        # enableCryptodisk = true;
       };
       efi = {canTouchEfiVariables = true;};
     };
+
+    tmp.useTmpfs = false;
     supportedFilesystems = ["btrfs"];
+    kernelPackages = pkgs.linuxPackages_cachyos;
 
     initrd = {
       luks.devices = {
@@ -118,24 +133,8 @@ in {
         umount /mnt
       '';
     };
-
-    tmp.useTmpfs = false;
   };
 
-  # nixpkgs.localSystem = {
-  #   gcc.arch = "alderlake";
-  #   gcc.tune = "alderlake";
-  #   system = "x86_64-linux";
-  # };
-
-  nix.settings.system-features = [
-    "nixos-test"
-    "benchmark"
-    "big-parallel"
-    "kvm"
-    "gccarch-alderlake"
-  ];
-
   networking = {
     hostName = "framework";
   };
@@ -262,7 +261,7 @@ in {
     sessionVariables = {LIBVA_DRIVER_NAME = "iHD";}; # Force intel-media-driver
     systemPackages = with pkgs; [
       # psensor
-      mission-center
+      # mission-center
       resources
 
       gnumake
@@ -307,12 +306,6 @@ in {
     };
   };
 
-  # Set up deep sleep + hibernation
-  # swapDevices = [{
-  #   device = "/swapfile";
-  #   size = 64 * 1024;
-  # }];
-
   # Partition swapfile is on (after LUKS decryption)
   boot.resumeDevice = "/dev/disk/by-uuid/9f90bae0-287b-480c-9aa1-de108b4b4626";