qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

base-graphical: init with pipewire config

Browse source
This commit is contained in:
Katherina Walshe-Grey 2024-09-11 05:43:35 +01:00
parent 3fc4efab9c
commit aeab801602
6 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/base-graphical/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.qenya.base-graphical;
in
{
imports = [
./sound.nix
];
options.qenya.base-graphical.enable = mkEnableOption "Base configuration for graphical environments";
config = mkIf cfg.enable {
services.xserver.enable = true;
};
}

20
common/base-graphical/sound.nix Normal file
View file

@ -0,0 +1,20 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.qenya.base-graphical;
in
{
config = mkIf cfg.enable {
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
hardware.pulseaudio.enable = false; # this theoretically defaults to false but something else seems to be flipping it
environment.systemPackages = with pkgs; [ helvum ]; # patchbay
};
}

1
common/default.nix
View file

@ -1,5 +1,6 @@
{ {
imports = [ imports = [
./base-graphical
./base-server ./base-server
./users ./users
./environment.nix ./environment.nix

4
hosts/kilgharrah/default.nix
View file

@ -6,7 +6,6 @@
./filesystems.nix ./filesystems.nix
./hardware.nix ./hardware.nix
./networking.nix ./networking.nix
./sound.nix
]; ];
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
@ -17,12 +16,13 @@
targetHost = null; # disallow remote deployment targetHost = null; # disallow remote deployment
}; };
qenya.base-graphical.enable = true;
time.timeZone = "Europe/London"; time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
console.keyMap = "uk"; console.keyMap = "uk";
services.xserver.enable = true;
services.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true; services.displayManager.sddm.wayland.enable = true;
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;

13
hosts/kilgharrah/sound.nix
View file

@ -1,13 +0,0 @@
{ config, lib, pkgs, ... }:
{
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
environment.systemPackages = with pkgs; [ helvum ]; # patchbay
}

10
hosts/tohru/default.nix
View file

@ -18,25 +18,19 @@
targetHost = null; # disallow remote deployment targetHost = null; # disallow remote deployment
}; };
qenya.base-graphical.enable = true;
time.timeZone = "Europe/London"; time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
console.keyMap = "uk"; console.keyMap = "uk";
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.xkb.layout = "gb"; services.xserver.xkb.layout = "gb";
services.printing.enable = true; services.printing.enable = true;
sound.enable = true;
hardware.pulseaudio.enable = true;
# services.pipewire = {
# enable = true;
# pulse.enable = true;
# };
age.secrets.user-password-tohru-qenya.file = ../../secrets/user-password-tohru-qenya.age; age.secrets.user-password-tohru-qenya.file = ../../secrets/user-password-tohru-qenya.age;
users.users.qenya.hashedPasswordFile = config.age.secrets.user-password-tohru-qenya.path; users.users.qenya.hashedPasswordFile = config.age.secrets.user-password-tohru-qenya.path;
users.users.qenya.extraGroups = [ users.users.qenya.extraGroups = [