diff --git a/flake.nix b/flake.nix index 0942d9d..6f6127b 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,6 @@ modules = [ ./hosts/slab/configuration.nix ./hosts/slab/nvidia-optimus.nix - ./roles/base.nix - ./roles/me.nix ./roles/remote.nix ./roles/desktop.nix ]; diff --git a/fragments/multimedia.nix b/fragments/multimedia.nix new file mode 100644 index 0000000..a8043ca --- /dev/null +++ b/fragments/multimedia.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ...}: +{ + environment.systemPackages = with pkgs; [ + mpv + gimp-with-plugins + ]; +} diff --git a/fragments/sound.nix b/fragments/sound.nix new file mode 100644 index 0000000..a4e606a --- /dev/null +++ b/fragments/sound.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ...}: +{ + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + jack.enable = true; + }; + + environment.systemPackages = with pkgs; [ + qpwgraph + pavucontrol + ncpamixer + pulsemixer + easyeffects + ]; +} diff --git a/roles/base.nix b/roles/base.nix new file mode 100644 index 0000000..4b203b3 --- /dev/null +++ b/roles/base.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ...}: +{ + imports = [ + ../fragments/base.nix + ../fragments/me.nix + ]; +} diff --git a/roles/desktop.nix b/roles/desktop.nix index 2f09742..411ed7c 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -1,6 +1,11 @@ { config, lib, pkgs, ...}: { + imports = [ + ./base.nix + ../fragments/sound.nix + ]; + # Enable the X11 windowing system. services.xserver.enable = true; @@ -13,18 +18,6 @@ # Enable CUPS to print documents. services.printing.enable = true; - # Enable sound. - # sound.enable = true; - # hardware.pulseaudio.enable = true; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; - users.users.nullbite = { packages = with pkgs; [ firefox