diff --git a/modules/audio/default.nix b/modules/audio/default.nix index ab05378..5655048 100644 --- a/modules/audio/default.nix +++ b/modules/audio/default.nix @@ -1,12 +1,9 @@ { lib, config, ... }: lib.mkIf(config.withAudio) { - # Enable sound with pipewire. - sound.enable = false; - hardware.pulseaudio.enable = false; services.pipewire = { enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - #jack.enable = true; + jack.enable = true; }; } diff --git a/modules/default.nix b/modules/default.nix index 8c236eb..8f3c2f6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - { inputs, pkgs, ... }: { imports = [ ./audio @@ -90,6 +86,4 @@ programs.fish.enable = true; users.defaultUserShell = pkgs.fish; - - security.pam.services.swaylock = {}; } diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix index 3dcd13c..09faf78 100644 --- a/modules/gnome/default.nix +++ b/modules/gnome/default.nix @@ -1,7 +1,6 @@ { pkgs, lib, config, ... }: lib.mkIf (config.withGnome) { - # Enable the GNOME Desktop Environment. services.xserver.desktopManager.gnome.enable = true; - # Don't install unnecessary packages + services.gnome.core-utilities.enable = false; environment.gnome.excludePackages = [ pkgs.gnome-tour ]; diff --git a/modules/nvidia/default.nix b/modules/nvidia/default.nix index c3b9b41..9b35c0d 100644 --- a/modules/nvidia/default.nix +++ b/modules/nvidia/default.nix @@ -1,5 +1,4 @@ { lib, config, ... }: lib.mkIf (config.withNvidia) { - # Load nvidia driver services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = {