From 65147a3c7e58f95cc076ff3c2acc74be78553557 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Fri, 17 Apr 2026 08:43:27 +0200 Subject: [PATCH] Regenerated --- Droidnix/README.html | 769 +++++++++--------- Droidnix/README.org | 71 +- Droidnix/generated/.config/hypr/layout.conf | 7 - .../.config/hypr/workspace-rules.conf | 23 +- Droidnix/generated/hosts/traveldroid/boot.nix | 41 +- 5 files changed, 457 insertions(+), 454 deletions(-) diff --git a/Droidnix/README.html b/Droidnix/README.html index f1a1710d1..98a79520b 100644 --- a/Droidnix/README.html +++ b/Droidnix/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Droidnix: A Dendritic NixOS + Home Manager Configuration NixOS Configuration Structure @@ -204,132 +204,132 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -345,25 +345,25 @@

Introduction   intro

-
-

What is Droidnix

-
+
+

What is Droidnix

+

Droidnix is a modular, declarative NixOS + Home Manager configuration system. with configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.

-
-

Installed components:

-
+
+

Installed components:

+
    -
  • Core
    • -
  • Hyprland
    • +
  • Core
    • +
  • Hyprland
-
-

Goals, project Structure, import hierarchy

-
+
+

Goals, project Structure, import hierarchy

+

This project uses a modular NixOS configuration with Hyprland support, designed for literate programming and cross-device reusability. The Droidnix repository is organized into two main parts: @@ -376,9 +376,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -389,16 +389,16 @@ The Droidnix repository is organized into two main parts:
-
-

Generated Structure

-
+
+

Generated Structure

+

The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.

-
-

First Setup

-
+
+

First Setup

+
  1. Clone this repository.
  2. Run the setup script: ./setup_droid.
    3. @@ -419,9 +419,9 @@ The generated/ directory contains all generated configurations, div The .assets/ folder contains all static files, such as configs, scripts, and themes. These files are not generated and can be edited directly.

-
-

generated/assets/2_b_installed.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

@@ -494,9 +494,9 @@ com.todoist.Todoist
-
-

generated/assets/aliases.conf

-
+
+

generated/assets/aliases.conf

+

This is a list of additional apps to install

@@ -538,9 +538,9 @@ keys=hyprctl binds This section contains the Org blocks for tangling Nix code into the generated folders.

-
-

generated/flake.nix

-
+
+

generated/flake.nix

+

The Nix flake definition for Droidnix.

@@ -614,9 +614,9 @@ The Nix flake definition for Droidnix.
-
-

generated/modules/traveldroid/system/colors.nix

-
+
+

generated/modules/traveldroid/system/colors.nix

+

Setting the colors for Droidnix.

@@ -700,12 +700,12 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
-
{ config, pkgs, lib, flakeRoot, ... }:
-
+
# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. ---
+{ config, pkgs, lib, flakeRoot, ... }:
 {
   boot.loader = {
     systemd-boot.enable = true;
@@ -713,16 +713,22 @@ in
     efi.efiSysMountPoint = "/boot";
     timeout = 5;
   };
-
   boot.kernelPackages = pkgs.linuxPackages_latest;
-
   boot.kernelParams = [
     "quiet"
     "splash"
     "udev.log_level=3"
     "rd.systemd.show_status=false"
+    # Sleep / power management
+    "mem_sleep_default=deep"       # Use S3 deep sleep, fixes sleep not working
+    "acpi_osi=Linux"               # Tell ACPI this is a Linux system
+    "acpi_backlight=native"        # Proper backlight control
+    # Intel GPU — fixes screen blinking on sleep/wake
+    "i915.enable_psr=0"
+    "i915.enable_psr2_sel_fetch=0"
+    # Prevent nvme from waking the system
+    "nvme.noacpi=1"
   ];
-
   boot.consoleLogLevel = 0;
   #boot.initrd.systemd.enable = true;
   boot.initrd.availableKernelModules = [
@@ -732,25 +738,38 @@ in
     "sd_mod"
     "rtsx_usb_sdmmc"
   ];
-
   hardware.enableAllFirmware = true;
-
-  boot.kernelModules = [ "kvm-intel" ];
-
+  boot.kernelModules = [
+    "kvm-intel"
+    "asus_wmi"    # Asus-specific power/fan/keyboard control
+  ];
   boot.plymouth = {
-            enable = true;
-          };
-
+    enable = true;
+  };
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  # Power management
+  powerManagement.enable = true;
+  services.thermald.enable = true;   # Intel thermal management daemon
+  services.tlp = {
+    enable = true;
+    settings = {
+      CPU_SCALING_GOVERNOR_ON_AC  = "performance";
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+      PLATFORM_PROFILE_ON_AC  = "performance";
+      PLATFORM_PROFILE_ON_BAT = "low-power";
+    };
+  };
 }
-
-

generated/hosts/traveldroid/hardware-configuration.nix

-
+
+

generated/hosts/traveldroid/hardware-configuration.nix

+
  1. Boot into NixOS Live ISO or your installed system.
  2. Open a terminal.
    3. @@ -808,9 +827,9 @@ in
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -869,13 +888,13 @@ in
-
-

generated/traveldroid/modules/apps

-
+
+

generated/traveldroid/modules/apps

+
-
-

generated/modules/traveldroid/apps/2_b_installed.nix

-
+
+

generated/modules/traveldroid/apps/2_b_installed.nix

+

This installs a list of apps

@@ -983,9 +1002,9 @@ in {
-
-

generated/modules/traveldroid/apps/emacs/emacs.nix

-
+
+

generated/modules/traveldroid/apps/emacs/emacs.nix

+

This installs emacs

@@ -1081,9 +1100,9 @@ in
-
-

generated/modules/traveldroid/apps/flameshot.nix

-
+
+

generated/modules/traveldroid/apps/flameshot.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -1122,9 +1141,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -1182,9 +1201,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1223,9 +1242,9 @@ in
-
-

generated/modules/traveldroid/apps/thunar.nix

-
+
+

generated/modules/traveldroid/apps/thunar.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -1271,9 +1290,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1306,9 +1325,9 @@ in
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1328,9 +1347,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1444,13 +1463,13 @@ in
-
-

generated/modules/traveldroid/desktop

-
+
+

generated/modules/traveldroid/desktop

+
-
-

generated/modules/traveldroid/desktop/fonts.nix

-
+
+

generated/modules/traveldroid/desktop/fonts.nix

+

This file installs and configures fonts

@@ -1468,9 +1487,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -1496,9 +1515,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -1544,9 +1563,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -1633,9 +1652,9 @@ in
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -1734,9 +1753,9 @@ in
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -1803,9 +1822,9 @@ in
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -1835,9 +1854,9 @@ in
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -1891,13 +1910,13 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/audio.nix

-
+
+

generated/modules/traveldroid/system/audio.nix

+
{ lib, config, pkgs, ... }:
 
@@ -1916,9 +1935,9 @@ in
-
-

generated/modules/traveldroid/system/avahi.nix

-
+
+

generated/modules/traveldroid/system/avahi.nix

+

Avahi helps discovering services

@@ -1938,9 +1957,9 @@ Avahi helps discovering services
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+

Installing Bluetooth services and supporting aps

@@ -1967,9 +1986,9 @@ in
-
-

generated/modules/traveldroid/system/copy_scripts.nix

-
+
+

generated/modules/traveldroid/system/copy_scripts.nix

+

This copies any scripts from generated.config/scripts to ~/.config/scripts and makes any .sh files executable.

@@ -2010,9 +2029,9 @@ in
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -2039,9 +2058,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/firewall.nix

-
+
+

generated/modules/traveldroid/system/firewall.nix

+

This sets the firewall.

@@ -2122,9 +2141,9 @@ This sets the firewall.
-
-

generated/modules/traveldroid/system/gnome-keyring.nix

-
+
+

generated/modules/traveldroid/system/gnome-keyring.nix

+

This sets the dbus implementation

@@ -2172,9 +2191,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/login-tuigreet.nix

-
+
+

generated/modules/traveldroid/system/login-tuigreet.nix

+

This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for

@@ -2228,9 +2247,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -2279,9 +2298,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -2297,9 +2316,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -2323,9 +2342,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/quickshell.nix

-
+
+

generated/modules/traveldroid/system/quickshell.nix

+

This sets the dbus implementation

@@ -2378,13 +2397,13 @@ in
-
-

generated/users

-
+
+

generated/users

+
-
-

generated/users/

-
+
+

generated/users/

+

This is the default user, just search and replace henrov another name if you want to change

@@ -2446,9 +2465,9 @@ in

These are all the prepared config files

-
-

generated/.config/emacs/early-init.el

-
+
+

generated/.config/emacs/early-init.el

+

This contaions emacs

@@ -2549,9 +2568,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2961,9 +2980,9 @@ the top of the file."
-
-

generated/.config/hypr/animations.conf

-
+
+

generated/.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2984,9 +3003,9 @@ animations {
-
-

generated/.config/hypr/behaviour.conf

-
+
+

generated/.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -3008,9 +3027,9 @@ input {
-
-

generated/.config/hypr/bindings.conf

-
+
+

generated/.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -3184,9 +3203,9 @@ bind = $mainMod, U, exec, kitty -e bash -lc "$HOME/.config/scripts/update.sh"
-
-

generated/.config/hypr/exec-once.conf

-
+
+

generated/.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -3206,9 +3225,9 @@ exec-once = nextcloud --background
-
-

generated/.config/hypr/hypridle.conf

-
+
+

generated/.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -3233,9 +3252,9 @@ listener {
-
-

generated/.config/hypr/hyprland.conf

-
+
+

generated/.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -3254,9 +3273,9 @@ source = ./workspace-rules.conf
-
-

generated/.config/hypr/layer-rules.conf

-
+
+

generated/.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -3271,22 +3290,15 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-window
-
-

generated/.config/hypr/layout.conf

-
+
+

generated/.config/hypr/layout.conf

+

These settings control Hyprland config 

workspace_layouts = dwindle, master, scrolling, monocle
 
-workspace = 1, layoutopt:hy3:layout:master
-workspace = 2, layoutopt:hy3:layout:monocle
-workspace = 3, layoutopt:hy3:layout:master
-workspace = 4, layoutopt:hy3:layout:scrolling
-workspace = 5, layoutopt:hy3:layout:dwindle
-workspace = 6, layoutopt:hy3:layout:monocle
-
 scrolling {
     fullscreen_on_one_column = true
     column_width = 0.32        # default: 3 windows side by side
@@ -3296,9 +3308,9 @@ scrolling {
-
-

generated/.config/hypr/monitor-rules.conf

-
+
+

generated/.config/hypr/monitor-rules.conf

+

These are config files for .config/hypr

@@ -3309,9 +3321,9 @@ monitor = eDP-1, preferred, auto-left, 1.5
-
-

generated/.config/hypr/theming.conf

-
+
+

generated/.config/hypr/theming.conf

+

These are config files for .config/hypr

@@ -3377,9 +3389,9 @@ misc {
-
-

generated/.config/hypr/window-rules.conf

-
+
+

generated/.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -3443,37 +3455,26 @@ windowrule {
-
-

generated/.config/hypr/workspace-rules.conf

-
+
+

generated/.config/hypr/workspace-rules.conf

+

These setttings configure rules for workspaces

-
-#Load random wallpaper
-
-# Workspace definitions (modern syntax)
-workspace = 1
-workspace = 2
-workspace = 3
-workspace = 4
-workspace = 5
-workspace = 6
-
-workspace = 1, monitor:eDP-1
-workspace = 2, monitor:eDP-1
-workspace = 3, monitor:DP-1
-workspace = 4, monitor:eDP-1
-workspace = 5, monitor:eDP-1
-workspace = 6, monitor:DP-1
+
workspace = 1, monitor:eDP-1, layoutopt:layout:master
+workspace = 2, monitor:eDP-1, layoutopt:layout:monocle
+workspace = 3, monitor:eDP-1, layoutopt:layout:master
+workspace = 4, monitor:DP-1, layoutopt:layout:scrolling
+workspace = 5, monitor:DP-1, layoutopt:layout:dwindle
+workspace = 6, monitor:DP-1, layoutopt:layout:dwindle
-
-

generated/.config/quickshell/media/shell.qml

-
+
+

generated/.config/quickshell/media/shell.qml

+

offers a adio widget

@@ -3867,9 +3868,9 @@ ShellRoot {
-
-

generated/.config/quickshell/powermenu/shell.qml

-
+
+

generated/.config/quickshell/powermenu/shell.qml

+

Provides a powermenu

@@ -4017,9 +4018,9 @@ ShellRoot {
-
-

generated/.config/scripts/media.sh

-
+
+

generated/.config/scripts/media.sh

+

Providing an media

@@ -4119,9 +4120,9 @@ jq -c -n \
-
-

generated/.config/scripts/layout-selector.sh

-
+
+

generated/.config/scripts/layout-selector.sh

+

Choose your layout

@@ -4163,9 +4164,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000
-
-

generated/.config/scripts/hypr-autocolwidth.sh

-
+
+

generated/.config/scripts/hypr-autocolwidth.sh

+

These are config files for .config/scripts

@@ -4219,9 +4220,9 @@ done
-
-

generated/.config/scripts/power.sh

-
+
+

generated/.config/scripts/power.sh

+

Enables a terminal power menu

@@ -4276,9 +4277,9 @@ main
-
-

generated/.config/scripts/update.sh

-
+
+

generated/.config/scripts/update.sh

+

A file containing color variables

@@ -4303,9 +4304,9 @@ flatpak update -y
-
-

generated/.config/scripts/wofi-launcher.sh

-
+
+

generated/.config/scripts/wofi-launcher.sh

+

Providing an media

@@ -4320,9 +4321,9 @@ Providing an media
-
-

generated/.config/shared/Colors.css

-
+
+

generated/.config/shared/Colors.css

+

A file containing color variables

@@ -4362,9 +4363,9 @@ A file containing color variables
-
-

generated/.config/starship.toml

-
+
+

generated/.config/starship.toml

+

These are config files for Starship

@@ -4652,9 +4653,9 @@ crust = "#181926"
-
-

generated/.config/stylix/stylix.conf

-
+
+

generated/.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -4691,9 +4692,9 @@ icons = {
-
-

generated/.config/stylix/palette.json

-
+
+

generated/.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -4723,9 +4724,9 @@ These are config files for .config/stylix
-
-

generated/.config/stylix/palette.html

-
+
+

generated/.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -4803,9 +4804,9 @@ These are config files for .config/stylix
-
-

generated/.config/waybar/config

-
+
+

generated/.config/waybar/config

+

These are config files for waybar

@@ -5045,9 +5046,9 @@ These are config files for waybar
-
-

generated/.config/waybar/style-dark.css

-
+
+

generated/.config/waybar/style-dark.css

+

This file contains all css for waybar

@@ -5276,9 +5277,9 @@ label#custom-windows:not(.active) {
-
-

generated/.config/scripts/bluetooth-status.sh

-
+
+

generated/.config/scripts/bluetooth-status.sh

+

These are config files for waybar

@@ -5303,9 +5304,9 @@ printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip"
-
-

generated/.config/scripts/hypr-workspaces.sh

-
+
+

generated/.config/scripts/hypr-workspaces.sh

+

These are config files for waybar

@@ -5347,9 +5348,9 @@ jq -c -n \
-
-

generated/.config/scripts/hypr-workspacesmenu.sh

-
+
+

generated/.config/scripts/hypr-workspacesmenu.sh

+

These are config files for waybar

@@ -5371,9 +5372,9 @@ hyprctl dispatch focuswindow address:"$addr"
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for waypaper

@@ -5410,9 +5411,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -5448,9 +5449,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/wofi/config

-
+
+

generated/.config/wofi/config

+

These are config files for .config/wofi

@@ -5477,9 +5478,9 @@ prompt = > ...
-
-

generated/.config/wofi/style.css

-
+
+

generated/.config/wofi/style.css

+

This is the default layout for wofi

@@ -5575,9 +5576,9 @@ This is the default layout for wofi
-
-

generated/.config/zed/settings.json

-
+
+

generated/.config/zed/settings.json

+

These are config files for Zed editor

@@ -5613,9 +5614,9 @@ These are config files for Zed editor
-
-

generated/.config/zsh/.zshrc

-
+
+

generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -5652,7 +5653,7 @@ cd() {

Author: Henro Veijer

-

Created: 2026-04-16 do 23:10

+

Created: 2026-04-17 vr 08:43

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 0cf27aad1..67a6af61f 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -322,8 +322,8 @@ in ** =generated/hosts/traveldroid/boot.nix= #+BEGIN_SRC nix :tangle generated/hosts/traveldroid/boot.nix :noweb yes :mkdirp yes :eval never +# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- { config, pkgs, lib, flakeRoot, ... }: - { boot.loader = { systemd-boot.enable = true; @@ -331,16 +331,22 @@ in efi.efiSysMountPoint = "/boot"; timeout = 5; }; - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = [ "quiet" "splash" "udev.log_level=3" "rd.systemd.show_status=false" + # Sleep / power management + "mem_sleep_default=deep" # Use S3 deep sleep, fixes sleep not working + "acpi_osi=Linux" # Tell ACPI this is a Linux system + "acpi_backlight=native" # Proper backlight control + # Intel GPU — fixes screen blinking on sleep/wake + "i915.enable_psr=0" + "i915.enable_psr2_sel_fetch=0" + # Prevent nvme from waking the system + "nvme.noacpi=1" ]; - boot.consoleLogLevel = 0; #boot.initrd.systemd.enable = true; boot.initrd.availableKernelModules = [ @@ -350,17 +356,30 @@ in "sd_mod" "rtsx_usb_sdmmc" ]; - hardware.enableAllFirmware = true; - - boot.kernelModules = [ "kvm-intel" ]; - + boot.kernelModules = [ + "kvm-intel" + "asus_wmi" # Asus-specific power/fan/keyboard control + ]; boot.plymouth = { - enable = true; - }; - + enable = true; + }; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + # Power management + powerManagement.enable = true; + services.thermald.enable = true; # Intel thermal management daemon + services.tlp = { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + PLATFORM_PROFILE_ON_AC = "performance"; + PLATFORM_PROFILE_ON_BAT = "low-power"; + }; + }; } #+END_SRC @@ -2653,13 +2672,6 @@ These settings control Hyprland config #+BEGIN_SRC conf :tangle generated/.config/hypr/layout.conf :noweb yes :mkdirp yes :eval never workspace_layouts = dwindle, master, scrolling, monocle -workspace = 1, layoutopt:hy3:layout:master -workspace = 2, layoutopt:hy3:layout:monocle -workspace = 3, layoutopt:hy3:layout:master -workspace = 4, layoutopt:hy3:layout:scrolling -workspace = 5, layoutopt:hy3:layout:dwindle -workspace = 6, layoutopt:hy3:layout:monocle - scrolling { fullscreen_on_one_column = true column_width = 0.32 # default: 3 windows side by side @@ -2799,23 +2811,12 @@ windowrule { ** =generated/.config/hypr/workspace-rules.conf= These setttings configure rules for workspaces #+BEGIN_SRC conf :tangle generated/.config/hypr/workspace-rules.conf :noweb yes :mkdirp yes :eval never - -#Load random wallpaper - -# Workspace definitions (modern syntax) -workspace = 1 -workspace = 2 -workspace = 3 -workspace = 4 -workspace = 5 -workspace = 6 - -workspace = 1, monitor:eDP-1 -workspace = 2, monitor:eDP-1 -workspace = 3, monitor:DP-1 -workspace = 4, monitor:eDP-1 -workspace = 5, monitor:eDP-1 -workspace = 6, monitor:DP-1 +workspace = 1, monitor:eDP-1, layoutopt:layout:master +workspace = 2, monitor:eDP-1, layoutopt:layout:monocle +workspace = 3, monitor:eDP-1, layoutopt:layout:master +workspace = 4, monitor:DP-1, layoutopt:layout:scrolling +workspace = 5, monitor:DP-1, layoutopt:layout:dwindle +workspace = 6, monitor:DP-1, layoutopt:layout:dwindle #+END_SRC ** =generated/.config/quickshell/media/shell.qml= diff --git a/Droidnix/generated/.config/hypr/layout.conf b/Droidnix/generated/.config/hypr/layout.conf index 6088da4f3..9326f5baf 100644 --- a/Droidnix/generated/.config/hypr/layout.conf +++ b/Droidnix/generated/.config/hypr/layout.conf @@ -1,13 +1,6 @@ # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- workspace_layouts = dwindle, master, scrolling, monocle -workspace = 1, layoutopt:hy3:layout:master -workspace = 2, layoutopt:hy3:layout:monocle -workspace = 3, layoutopt:hy3:layout:master -workspace = 4, layoutopt:hy3:layout:scrolling -workspace = 5, layoutopt:hy3:layout:dwindle -workspace = 6, layoutopt:hy3:layout:monocle - scrolling { fullscreen_on_one_column = true column_width = 0.32 # default: 3 windows side by side diff --git a/Droidnix/generated/.config/hypr/workspace-rules.conf b/Droidnix/generated/.config/hypr/workspace-rules.conf index e046b2980..e785b4c39 100644 --- a/Droidnix/generated/.config/hypr/workspace-rules.conf +++ b/Droidnix/generated/.config/hypr/workspace-rules.conf @@ -1,18 +1,7 @@ # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- - -#Load random wallpaper - -# Workspace definitions (modern syntax) -workspace = 1 -workspace = 2 -workspace = 3 -workspace = 4 -workspace = 5 -workspace = 6 - -workspace = 1, monitor:eDP-1 -workspace = 2, monitor:eDP-1 -workspace = 3, monitor:DP-1 -workspace = 4, monitor:eDP-1 -workspace = 5, monitor:eDP-1 -workspace = 6, monitor:DP-1 +workspace = 1, monitor:eDP-1, layoutopt:layout:master +workspace = 2, monitor:eDP-1, layoutopt:layout:monocle +workspace = 3, monitor:eDP-1, layoutopt:layout:master +workspace = 4, monitor:DP-1, layoutopt:layout:scrolling +workspace = 5, monitor:DP-1, layoutopt:layout:dwindle +workspace = 6, monitor:DP-1, layoutopt:layout:dwindle diff --git a/Droidnix/generated/hosts/traveldroid/boot.nix b/Droidnix/generated/hosts/traveldroid/boot.nix index 142f19183..860f90be0 100644 --- a/Droidnix/generated/hosts/traveldroid/boot.nix +++ b/Droidnix/generated/hosts/traveldroid/boot.nix @@ -1,6 +1,6 @@ # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- +# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- { config, pkgs, lib, flakeRoot, ... }: - { boot.loader = { systemd-boot.enable = true; @@ -8,16 +8,22 @@ efi.efiSysMountPoint = "/boot"; timeout = 5; }; - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = [ "quiet" "splash" "udev.log_level=3" "rd.systemd.show_status=false" + # Sleep / power management + "mem_sleep_default=deep" # Use S3 deep sleep, fixes sleep not working + "acpi_osi=Linux" # Tell ACPI this is a Linux system + "acpi_backlight=native" # Proper backlight control + # Intel GPU — fixes screen blinking on sleep/wake + "i915.enable_psr=0" + "i915.enable_psr2_sel_fetch=0" + # Prevent nvme from waking the system + "nvme.noacpi=1" ]; - boot.consoleLogLevel = 0; #boot.initrd.systemd.enable = true; boot.initrd.availableKernelModules = [ @@ -27,15 +33,28 @@ "sd_mod" "rtsx_usb_sdmmc" ]; - hardware.enableAllFirmware = true; - - boot.kernelModules = [ "kvm-intel" ]; - + boot.kernelModules = [ + "kvm-intel" + "asus_wmi" # Asus-specific power/fan/keyboard control + ]; boot.plymouth = { - enable = true; - }; - + enable = true; + }; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + # Power management + powerManagement.enable = true; + services.thermald.enable = true; # Intel thermal management daemon + services.tlp = { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + PLATFORM_PROFILE_ON_AC = "performance"; + PLATFORM_PROFILE_ON_BAT = "low-power"; + }; + }; }