meow

config/hosts/aspects/doloro-desktop/home.nix

@@ -38,8 +38,6 @@
           shell = pkgs.fish;
           hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
         };
-        boot.kernelPackage =
-          inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-lts-lto;
       };
     homeManager =
       { home, pkgs, ... }:

config/hosts/aspects/doloro-desktop/host.nix

@@ -2,6 +2,7 @@
   den,
   modules,
   pkgs,
+  inputs,
   __findFile,
   ...
 }:
@@ -24,7 +25,8 @@
         boot.loader.grub.efiInstallAsRemovable = true;
         networking.hostName = "doloroo-main"; # Define your hostname.
 
-        boot.kernelPackages = pkgs.linuxPackages_latest;
+        boot.kernelPackages =
+          inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-lts-lto;
         boot.initrd.verbose = false;
         boot.kernelParams = [
           "boot.shell_on_fail"

config/hosts/aspects/doloro-laptop/home.nix

@@ -20,6 +20,7 @@
       modules.kitty
       modules.stylix
       modules.quickshell
+      modules.lavd
     ];
     nixos =
       { config, pkgs, ... }:

config/hosts/aspects/doloro-laptop/host.nix

@@ -2,6 +2,7 @@
   den,
   modules,
   __findFile,
+  inputs,
   lib,
   ...
 }:
@@ -34,7 +35,9 @@
         boot.loader.systemd-boot.enable = true;
         boot.loader.efi.canTouchEfiVariables = true;
         # boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest
-        boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often
+        # boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often
+        boot.kernelPackages =
+          inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-lts-lto;
         networking.hostName = "doloro-nixos-laptop"; # Define your hostname.
         security.rtkit.enable = true;
 
@@ -140,14 +143,17 @@
 
         boot.kernelParams = [
           # "mem_sleep_default=deep"
-          # "i915.fastboot=1"
+          "i915.fastboot=1"
           "ahci.mobile_lpm_policy=1"
           "intel_idle.max_cstate=11"
+          "i915.modeset=1"
+          "quiet"
+          "splash"
           # "idle=halt"
         ];
 
         services.logind.settings.Login = {
-          HandleLidSwitch = "suspend";
+          HandleLidSwitch = "hibernate";
           HandleLidSwitchExternalPower = "suspend";
           HandleLidSwitchDocked = "ignore";
         };

config/modules/power-management/common.nix

@@ -7,7 +7,6 @@
         modules.battery-ac-targets
         modules.intel-mgm
         modules.tlp
-        modules.lavd
         # modules.ppd
       ];
       nixos = {

config/modules/power-management/flash.nix

@@ -0,0 +1,22 @@
+{ modules, den, ... }:
+{
+  modules.flash = {
+    nixos = {
+      services.scx = {
+        enable = true;
+        ## Commented out because the service impl is bugged and doesnt actually set these
+        # scheduler = "scx_lavd";
+        # extraArgs = [
+        #   "--cpu-pref-order 20-21,12-19,0-11"
+        #   "--autopilot"
+        # ];
+      };
+      # Most energy efficent scheduler setup..
+      systemd.services.scx.environment = {
+        SCX_SCHEDULER_OVERRIDE = "scx_flash";
+        # Flags are from cachyos sched-ext tutorial
+        SCX_FLAGS_OVERRIDE = "-m powersave -I 10000 -t 1000 -s 10000 -S 1000";
+      };
+    };
+  };
+}

flake.lock

@@ -101,6 +101,38 @@
         "type": "github"
       }
     },
+    "cachyos-kernel": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773637879,
+        "narHash": "sha256-hFKu2SaRoqt6+zbmcFW6A0AbBENIX8XooJLXQWa3sLc=",
+        "owner": "CachyOS",
+        "repo": "linux-cachyos",
+        "rev": "fa09a5bc69d3e7feeed9b1402c7df06c8170402a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "repo": "linux-cachyos",
+        "type": "github"
+      }
+    },
+    "cachyos-kernel-patches": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773635524,
+        "narHash": "sha256-JErpxWTdoHq4JuDerfsbPA60FmWOxK4oX9UL9CcsP/Q=",
+        "owner": "CachyOS",
+        "repo": "kernel-patches",
+        "rev": "5544a0679fd6f6fb714e275514449c4ab9db2a53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "repo": "kernel-patches",
+        "type": "github"
+      }
+    },
     "den": {
       "locked": {
         "lastModified": 1773802746,
@@ -181,6 +213,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-file": {
       "locked": {
         "lastModified": 1773637821,
@@ -217,6 +265,24 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -237,7 +303,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -800,6 +866,29 @@
         "type": "github"
       }
     },
+    "nix-cachyos-kernel": {
+      "inputs": {
+        "cachyos-kernel": "cachyos-kernel",
+        "cachyos-kernel-patches": "cachyos-kernel-patches",
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1773804995,
+        "narHash": "sha256-LL6EG35pbxgjsqYIpwUnpHGDmKFYttE+BILBNhsEaJk=",
+        "owner": "xddxdd",
+        "repo": "nix-cachyos-kernel",
+        "rev": "3286b7ecf1d864e2be050af78aa633d4e3ae8fdb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "xddxdd",
+        "ref": "release",
+        "repo": "nix-cachyos-kernel",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1772771118,
@@ -816,6 +905,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1773705440,
@@ -862,6 +966,22 @@
       }
     },
     "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1773738184,
+        "narHash": "sha256-zWRjT5oPabNCiC1A3QkFXpfnsgUjyg6fUZWC+IiiZH0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "41a2715cc472025a19bc0eb9dc4ee8b7406bfa6f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1773628058,
         "narHash": "sha256-YgVQzPaKa5eVf/rGA5Rn7BWJcP0T98JkE+2KuKVTyzA=",
@@ -874,7 +994,7 @@
         "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1736061677,
         "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
@@ -892,7 +1012,7 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -964,7 +1084,7 @@
       "inputs": {
         "libcamera-src": "libcamera-src",
         "libpisp-src": "libpisp-src",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
         "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
         "rpi-firmware-src": "rpi-firmware-src",
@@ -1000,7 +1120,8 @@
         "hyprland": "hyprland",
         "import-tree": "import-tree",
         "niri-flake": "niri-flake",
-        "nixpkgs": "nixpkgs_4",
+        "nix-cachyos-kernel": "nix-cachyos-kernel",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-lib": [
           "nixpkgs"
         ],
@@ -1157,7 +1278,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"

flake.nix

@@ -26,6 +26,7 @@
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
     nixpkgs-lib.follows = "nixpkgs";
     nixvim = {