Compare commits

..

2 Commits

Author SHA1 Message Date
f17a35eac8 Fix conflicting audio role config: remove pulseaudio, keep pipewire
Remove services.pulseaudio configuration that conflicted with
services.pipewire. PipeWire replaces PulseAudio and provides
compatibility through pulse.enable.

Also added alsa.enable and alsa.support32Bit for better ALSA support.
2026-01-10 11:00:25 -08:00
009b84656f [john-endesktop] Update migration plan with completed pre-migration items 2026-01-10 10:49:04 -08:00
3 changed files with 13 additions and 23 deletions

View File

@@ -211,16 +211,11 @@
mu4e-headers-time-format "%H:%M") mu4e-headers-time-format "%H:%M")
;; Sending mail via msmtp ;; Sending mail via msmtp
;; NOTE: message-sendmail-f-is-evil and --read-envelope-from are required (setq message-send-mail-function 'message-send-mail-with-sendmail
;; to prevent msmtp from stripping the email body when processing headers. sendmail-program (executable-find "msmtp")
;; Without these, multipart messages (especially from org-msg) may arrive message-sendmail-envelope-from 'header
;; with empty bodies. mail-envelope-from 'header
(setq sendmail-program (executable-find "msmtp") mail-specify-envelope-from t))
send-mail-function #'message-send-mail-with-sendmail
message-send-mail-function #'message-send-mail-with-sendmail
message-sendmail-f-is-evil t
message-sendmail-extra-arguments '("--read-envelope-from")
message-sendmail-envelope-from 'header))
;; Whenever you reconfigure a package, make sure to wrap your config in an ;; Whenever you reconfigure a package, make sure to wrap your config in an
;; `after!' block, otherwise Doom's defaults may override your settings. E.g. ;; `after!' block, otherwise Doom's defaults may override your settings. E.g.

View File

@@ -170,6 +170,7 @@ This document outlines the plan to migrate the john-endesktop server from Arch L
```bash ```bash
blkid /dev/nvme0n1p5 blkid /dev/nvme0n1p5
# Note the UUID for updating hardware-configuration.nix # Note the UUID for updating hardware-configuration.nix
/dev/nvme0n1p5: LABEL="nixos" UUID="5f4ad025-bfab-4aed-a933-6638348059e5" UUID_SUB="4734d820-7b8a-4b7f-853a-026021c1d204" BLOCK_SIZE="4096" TYPE="btrfs" PARTLABEL="data" PARTUUID="9ea025df-cdb7-48fd-b5d4-37cd5d8588eb"
``` ```
8. **Copy your NixOS configuration to the server** 8. **Copy your NixOS configuration to the server**
@@ -388,11 +389,11 @@ After successful migration and 24-48 hours of stable operation:
Pre-migration: Pre-migration:
- [x] nvme0n1p5 removal from media pool complete - [x] nvme0n1p5 removal from media pool complete
- [ ] Recent backup verified (< 24 hours) - [x] Recent backup verified (< 24 hours)
- [ ] Maintenance window scheduled - [x] Maintenance window scheduled
- [ ] NixOS ISO downloaded - [x] NixOS ISO downloaded
- [ ] Bootable USB created - [x] Bootable USB created
- [ ] NixOS config builds successfully - [x] NixOS config builds successfully
During migration: During migration:
- [ ] ZFS pools exported - [ ] ZFS pools exported

View File

@@ -21,17 +21,11 @@ in
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
}; };
services.pulseaudio = {
package = pkgs.pulseaudioFull;
extraConfig = ''
load-module module-combine-sink
load-module module-switch-on-connect
'';
};
services.squeezelite = { services.squeezelite = {
#enable = true; #enable = true;
pulseAudio = true; pulseAudio = true;