diff --git a/Droidnix/README.html b/Droidnix/README.html index 1c12b5692..5aae53d92 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,146 +204,146 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -359,25 +359,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: @@ -390,9 +390,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • = is the entry point and imports:
      @@ -403,16 +403,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. @@ -433,9 +433,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

@@ -515,9 +515,9 @@ com.logseq.Logseq
-
-

generated/assets/aliases.conf

-
+
+

generated/assets/aliases.conf

+

This is a list of additional apps to install

@@ -559,9 +559,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.

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

generated/modules/traveldroid/system/colors.nix

-
+
+

generated/modules/traveldroid/system/colors.nix

+

Setting the colors for Droidnix.

@@ -731,9 +731,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 {
@@ -758,12 +758,10 @@ in
     "i915.enable_psr2_sel_fetch=0"
     # Prevent nvme from waking the system
     "nvme.noacpi=1"
-    # Getting speakers to work
-    "snd-intel-dspcfg.dsp_driver=0"
-    "snd_hda_intel.model=generic"
-    "snd_hda_intel.enable_msi=0"
-    "snd_hda_intel.power_save=0"
   ];
+  boot.extraModprobeConfig = ''
+    options snd_hda_intel power_save=0
+  '';
   boot.consoleLogLevel = 0;
   #boot.initrd.systemd.enable = true;
   boot.initrd.availableKernelModules = [
@@ -806,9 +804,9 @@ in
 
-
-

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. @@ -866,9 +864,9 @@ in
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -928,13 +926,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

@@ -1042,9 +1040,9 @@ in {
-
-

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

-
+
+

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

+

This installs emacs

@@ -1139,9 +1137,9 @@ in
-
-

generated/modules/traveldroid/apps/kdeconnect.nix

-
+
+

generated/modules/traveldroid/apps/kdeconnect.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

@@ -1169,9 +1167,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -1223,9 +1221,9 @@ in
-
-

generated/modules/traveldroid/apps/stackstorage.nix

-
+
+

generated/modules/traveldroid/apps/stackstorage.nix

+

Installs the TransIP Stackstorage Appimage

@@ -1249,9 +1247,9 @@ in {
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1290,9 +1288,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

@@ -1338,9 +1336,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1375,9 +1373,9 @@ in
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1397,9 +1395,9 @@ in
-
-

generated/modules/traveldroid/apps/zeditor.nix

-
+
+

generated/modules/traveldroid/apps/zeditor.nix

+

This sets Zed Editor

@@ -1454,9 +1452,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1570,13 +1568,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

@@ -1594,9 +1592,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -1622,9 +1620,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -1669,9 +1667,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -1758,9 +1756,9 @@ in
 
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -1852,9 +1850,9 @@ in
-
-

generated/.config/awww/scripts/randomizeWallpapers.sh

-
+
+

generated/.config/awww/scripts/randomizeWallpapers.sh

+

Numbers all pictures in ~/Wallpapers/pictures in random order

@@ -1916,9 +1914,9 @@ randomize_and_rename_wallpapers
-
-

generated/.config/awww/scripts/ws-daemon.sh

-
+
+

generated/.config/awww/scripts/ws-daemon.sh

+

Little daemon that sets a workspace when user switches to a different workspace

@@ -1939,9 +1937,9 @@ done
-
-

generated/.config/awww/scripts/ws-wallpaper.sh

-
+
+

generated/.config/awww/scripts/ws-wallpaper.sh

+

The script that actually sets wallpaper per workspace

@@ -1984,9 +1982,9 @@ esac
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -2032,9 +2030,9 @@ in
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -2064,9 +2062,9 @@ in
 
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -2137,36 +2135,47 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/audio.nix

-
+
+

generated/modules/traveldroid/system/audio.nix

+
{ lib, config, pkgs, ... }:
-
 {
   ############################
   # Audio system
   ############################
+
+  # Disable PulseAudio (PipeWire replaces it)
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;       # PulseAudio compatibility layer
+    jack.enable = true;
+  };
+
   environment.systemPackages = with pkgs; [
-    pulseaudio       # PulseAudio daemon
     pavucontrol      # GUI mixer
     pamixer          # CLI mixer
     playerctl        # Player controls
-    alsa-utils       # Sound utils
-    inxi
+    alsa-utils       # aplay, amixer etc.
+    pwvucontrol      # PipeWire volume control (optional but useful)
   ];
 }
 
-
-

generated/modules/traveldroid/system/avahi.nix

-
+
+

generated/modules/traveldroid/system/avahi.nix

+

Avahi helps discovering services

@@ -2186,9 +2195,9 @@ Avahi helps discovering services
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+

Installing Bluetooth services and supporting aps

@@ -2215,9 +2224,9 @@ in
-
-

generated/modules/traveldroid/system/copy_scripts.nix

-
+
+

generated/modules/traveldroid/system/copy_scripts.nix

+

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

@@ -2258,9 +2267,9 @@ in
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -2287,9 +2296,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/firewall.nix

-
+
+

generated/modules/traveldroid/system/firewall.nix

+

This sets the firewall.

@@ -2370,9 +2379,9 @@ This sets the firewall.
-
-

generated/modules/traveldroid/system/hypridle.nix

-
+
+

generated/modules/traveldroid/system/hypridle.nix

+

This installs hypridle

@@ -2428,9 +2437,9 @@ in
-
-

generated/modules/traveldroid/system/hyprlock.nix

-
+
+

generated/modules/traveldroid/system/hyprlock.nix

+

This installs hyprlock

@@ -2487,9 +2496,9 @@ in
-
-

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

-
+
+

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

+

This sets the dbus implementation

@@ -2537,9 +2546,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 imho fits the aesthetic I am aiming for

@@ -2587,9 +2596,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -2638,9 +2647,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/numlock-check.nix

-
+
+

generated/modules/traveldroid/system/numlock-check.nix

+
{ lib, config, pkgs, flakeRoot, ... }:
 let
@@ -2683,9 +2692,9 @@ in
 
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 {
@@ -2708,9 +2717,9 @@ in
 
-
-

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -2734,9 +2743,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/quickshell.nix

-
+
+

generated/modules/traveldroid/system/quickshell.nix

+

This sets the quickshell implementation

@@ -2782,9 +2791,9 @@ in
-
-

generated/modules/traveldroid/system/swaync.nix

-
+
+

generated/modules/traveldroid/system/swaync.nix

+

This sets the dbus implementation

@@ -2833,13 +2842,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

@@ -2901,9 +2910,9 @@ in

These are all the prepared config files

-
-

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

-
+
+

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

+

This contaions emacs

@@ -3004,9 +3013,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -3416,9 +3425,9 @@ the top of the file."
-
-

generated/.config/hypr/animations.conf

-
+
+

generated/.config/hypr/animations.conf

+

These settings decide animations

@@ -3461,9 +3470,9 @@ These settings decide animations
-
-

generated/.config/hypr/behaviour.conf

-
+
+

generated/.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -3484,9 +3493,9 @@ input {
-
-

generated/.config/hypr/bindings.conf

-
+
+

generated/.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -3653,9 +3662,9 @@ bind = $mainMod, U, exec, qs -c updater
-
-

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

-
+
+

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

+

What is executed after startup, when hyprland is running?

@@ -3677,9 +3686,9 @@ exec-once = waybar
-
-

generated/.config/hypr/hypridle.conf

-
+
+

generated/.config/hypr/hypridle.conf

+

These are config files for hypridle

@@ -3710,9 +3719,9 @@ listener {
-
-

generated/.config/hypr/hyprlock.conf

-
+
+

generated/.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -3742,9 +3751,9 @@ input-field {
-
-

generated/.config/hypr/hyprland.conf

-
+
+

generated/.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -3763,9 +3772,9 @@ source = ./workspace-rules.conf
-
-

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

-
+
+

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

+

These are config files for .config/hypr

@@ -3778,9 +3787,9 @@ layerrule = xray 1, match:namespace swaync-control-center
-
-

generated/.config/hypr/layout.conf

-
+
+

generated/.config/hypr/layout.conf

+

These settings control Hyprland config

@@ -3795,9 +3804,9 @@ scrolling {
-
-

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

-
+
+

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

+

These are config files for .config/hypr

@@ -3808,9 +3817,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

@@ -3876,9 +3885,9 @@ misc {
-
-

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

-
+
+

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

+

These are config files for .config/hypr

@@ -3988,9 +3997,9 @@ windowrule {
-
-

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

-
+
+

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

+

These setttings configure rules for workspaces

@@ -4005,9 +4014,9 @@ workspace = 6, monitor:DP-1 #, layout:dwindle
-
-

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

-
+
+

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

+

offers a audio widget

@@ -4401,9 +4410,9 @@ ShellRoot {
-
-

generated/.config/quickshell/powermgmt/shell.qml

-
+
+

generated/.config/quickshell/powermgmt/shell.qml

+

Provides powermanagement settings

@@ -5124,9 +5133,9 @@ ShellRoot {
-
-

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

-
+
+

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

+

Provides a powermenu

@@ -5274,9 +5283,9 @@ ShellRoot {
-
-

generated/.config/quickshell/updater/shell.qml

-
+
+

generated/.config/quickshell/updater/shell.qml

+

Updates the system

@@ -5583,9 +5592,9 @@ ShellRoot {
-
-

generated/.config/quickshell/layoutswitcher/shell.qml

-
+
+

generated/.config/quickshell/layoutswitcher/shell.qml

+

Provides a layout menu

@@ -5732,9 +5741,9 @@ ShellRoot {
-
-

generated/.config/waybar/scripts/batterywarn.sh

-
+
+

generated/.config/waybar/scripts/batterywarn.sh

+

Providing an media

@@ -5751,9 +5760,9 @@ fi
-
-

generated/.config/waybar/scripts/media.sh

-
+
+

generated/.config/waybar/scripts/media.sh

+

Providing an media

@@ -5852,9 +5861,9 @@ jq -c -n \
-
-

generated/.config/shared/scripts/numlock-check.sh

-
+
+

generated/.config/shared/scripts/numlock-check.sh

+

Count keyboards and enable numlock if more then 1, else disable

@@ -5875,9 +5884,9 @@ fi
-
-

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

-
+
+

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

+

Providing an media

@@ -5892,9 +5901,9 @@ Providing an media
-
-

generated/.config/shared/css/colors.css

-
+
+

generated/.config/shared/css/colors.css

+

A file containing color variables

@@ -5935,9 +5944,9 @@ A file containing color variables
-
-

generated/.config/starship.toml

-
+
+

generated/.config/starship.toml

+

These are config files for Starship

@@ -6225,9 +6234,9 @@ crust = "#181926"
-
-

generated/.config/stylix/stylix.conf

-
+
+

generated/.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -6263,9 +6272,9 @@ icons = {
-
-

generated/.config/stylix/palette.json

-
+
+

generated/.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -6295,9 +6304,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

@@ -6374,9 +6383,9 @@ These are config files for .config/stylix
-
-

generated/.config/swaync/config.json

-
+
+

generated/.config/swaync/config.json

+

These are config files for waybar

@@ -6437,9 +6446,9 @@ These are config files for waybar
-
-

generated/.config/swaync/style.css

-
+
+

generated/.config/swaync/style.css

+

These are config files for waybar

@@ -6632,9 +6641,9 @@ These are config files for waybar
-
-

generated/.config/waybar/config.jsonc

-
+
+

generated/.config/waybar/config.jsonc

+

These are config files for waybar

@@ -6982,9 +6991,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

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

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

-
+
+

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

+

These are config files for waybar

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

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

-
+
+

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

+

These are config files for waybar

@@ -7315,9 +7324,9 @@ jq -c -n \
-
-

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

-
+
+

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

+

These are config files for waybar

@@ -7339,9 +7348,9 @@ hyprctl dispatch focuswindow address:"$addr"
-
-

generated/.config/waybar/scripts/kdeconnect-status.sh

-
+
+

generated/.config/waybar/scripts/kdeconnect-status.sh

+

These are config files for waybar

@@ -7365,9 +7374,9 @@ fi
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for waypaper

@@ -7404,9 +7413,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -7442,9 +7451,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/wofi/config

-
+
+

generated/.config/wofi/config

+

These are config files for .config/wofi

@@ -7471,9 +7480,9 @@ prompt = > ...
-
-

generated/.config/wofi/style.css

-
+
+

generated/.config/wofi/style.css

+

This is the default layout for wofi

@@ -7569,9 +7578,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

@@ -7609,9 +7618,9 @@ These are config files for Zed editor
-
-

generated/.config/zsh/.zshrc

-
+
+

generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -7648,7 +7657,7 @@ cd() {

Author: Henro Veijer

-

Created: 2026-05-01 vr 20:22

+

Created: 2026-05-03 zo 15:31

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 6fd24382f..be201afb8 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -363,12 +363,10 @@ in "i915.enable_psr2_sel_fetch=0" # Prevent nvme from waking the system "nvme.noacpi=1" - # Getting speakers to work - "snd-intel-dspcfg.dsp_driver=0" - "snd_hda_intel.model=generic" - "snd_hda_intel.enable_msi=0" - "snd_hda_intel.power_save=0" ]; + boot.extraModprobeConfig = '' + options snd_hda_intel power_save=0 + ''; boot.consoleLogLevel = 0; #boot.initrd.systemd.enable = true; boot.initrd.availableKernelModules = [ @@ -1607,18 +1605,29 @@ in ** =generated/modules/traveldroid/system/audio.nix= #+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/audio.nix :noweb yes :mkdirp yes :eval never { lib, config, pkgs, ... }: - { ############################ # Audio system ############################ + + # Disable PulseAudio (PipeWire replaces it) + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; # PulseAudio compatibility layer + jack.enable = true; + }; + environment.systemPackages = with pkgs; [ - pulseaudio # PulseAudio daemon pavucontrol # GUI mixer pamixer # CLI mixer playerctl # Player controls - alsa-utils # Sound utils - inxi + alsa-utils # aplay, amixer etc. + pwvucontrol # PipeWire volume control (optional but useful) ]; } #+END_SRC diff --git a/Droidnix/generated/hosts/traveldroid/boot.nix b/Droidnix/generated/hosts/traveldroid/boot.nix index ba4a3b8ef..9333a1b32 100644 --- a/Droidnix/generated/hosts/traveldroid/boot.nix +++ b/Droidnix/generated/hosts/traveldroid/boot.nix @@ -22,12 +22,10 @@ "i915.enable_psr2_sel_fetch=0" # Prevent nvme from waking the system "nvme.noacpi=1" - # Getting speakers to work - "snd-intel-dspcfg.dsp_driver=0" - "snd_hda_intel.model=generic" - "snd_hda_intel.enable_msi=0" - "snd_hda_intel.power_save=0" ]; + boot.extraModprobeConfig = '' + options snd_hda_intel power_save=0 + ''; boot.consoleLogLevel = 0; #boot.initrd.systemd.enable = true; boot.initrd.availableKernelModules = [ diff --git a/Droidnix/generated/modules/traveldroid/system/audio.nix b/Droidnix/generated/modules/traveldroid/system/audio.nix index 39f549479..42aab91ae 100644 --- a/Droidnix/generated/modules/traveldroid/system/audio.nix +++ b/Droidnix/generated/modules/traveldroid/system/audio.nix @@ -1,16 +1,27 @@ # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- { lib, config, pkgs, ... }: - { ############################ # Audio system ############################ + + # Disable PulseAudio (PipeWire replaces it) + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; # PulseAudio compatibility layer + jack.enable = true; + }; + environment.systemPackages = with pkgs; [ - pulseaudio # PulseAudio daemon pavucontrol # GUI mixer pamixer # CLI mixer playerctl # Player controls - alsa-utils # Sound utils - inxi + alsa-utils # aplay, amixer etc. + pwvucontrol # PipeWire volume control (optional but useful) ]; }