pumpkin: signal: install

[julm/julm-nix.git] / nixos / profiles / graphical.nix

diff --git a/nixos/profiles/graphical.nix b/nixos/profiles/graphical.nix
index 324397917109ab7a80a2ef711f4244eae8f88b74..de8b0176a3237ee78537d6dd7514945cfb589bdd 100644 (file)
--- a/nixos/profiles/graphical.nix
+++ b/nixos/profiles/graphical.nix
@@ -1,23 +1,20 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 with lib;
 {
+  imports = [
+    ./pipewire.nix
+  ];
   console.useXkbConfig = mkDefault true;
   environment.systemPackages = [
     pkgs.gdk-pixbuf.dev # for gdk-pixbuf-query-loaders
     pkgs.paprefs
-    pkgs.pulseaudio # for pactl when using pipewire
   ];
 
-  # rtkit is optional but recommended
-  security.rtkit.enable = mkDefault config.services.pipewire.enable;
-  hardware.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = mkDefault true;
-    alsa.support32Bit = mkDefault true;
-    pulse.enable = mkDefault true;
-  };
-
   # Allow members of the "adbusers" group to mount Android devices via MTP.
   programs.adb.enable = true;
   programs.dconf.enable = true;
@@ -25,9 +22,9 @@ with lib;
   services.gvfs.enable = mkDefault true;
   services.avahi.enable = mkDefault true;
 
+  services.libinput.enable = mkDefault true;
   services.xserver = {
     enable = mkDefault true;
-    libinput.enable = mkDefault true;
     exportConfiguration = mkDefault true; # link /usr/share/X11/ properly
     desktopManager = {
       session = [
@@ -42,8 +39,11 @@ with lib;
       ];
       xterm.enable = mkDefault false;
     };
-    displayManager.autoLogin.enable = mkDefault true;
   };
 
-  services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
+  services.displayManager = {
+    autoLogin.enable = mkDefault true;
+  };
+
+  programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
 }