diff --git a/core/audio.nix b/core/audio.nix index 6ff0b04..9c3353a 100644 --- a/core/audio.nix +++ b/core/audio.nix @@ -1,21 +1,20 @@ ## https://nixos.wiki/PipeWire ## https://github.com/musnix/musnix -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: +{ ... }: { imports = [ ]; + ## Can't remember what this does, + ## recommended to be enabled though security.rtkit.enable = true; + + ## Not using pulse directly hardware.pulseaudio.enable = false; + + ## Using pipewire baybee services.pipewire = { enable = true; ## Uncomment if ypu(g.) want to use JACK applications @@ -25,6 +24,8 @@ enable = true; support32Bit = true; }; + + ## Low latency config extraConfig = { pipewire."92-low-latency" = { @@ -41,16 +42,20 @@ node.latency = "144/48000"; resample.quality = 1; }; + context.modules = [ { - name = "libpipewire-module-protocol-pulse"; - args = { - pulse.min.req = "144/48000"; - pulse.default.req = "144/48000"; - pulse.max.req = "144/48000"; - pulse.min.quantum = "144/48000"; - pulse.max.quantum = "144/48000"; + name = "libpipewire-module-protocol-pulse"; + args = { + pulse = { + default.req = "144/48000"; + min.req = "144/48000"; + max.req = "144/48000"; + min.quantum = "144/48000"; + max.quantum = "144/48000"; + }; }; } ]; + }; }; diff --git a/core/config.nix b/core/config.nix index 249f71e..a62bab4 100644 --- a/core/config.nix +++ b/core/config.nix @@ -77,6 +77,7 @@ systemd-networkd-wait-online.enable = lib.mkForce false; }; + ## https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.11"; diff --git a/core/desktop-misc.nix b/core/desktop-misc.nix index 3a032fc..2e77771 100644 --- a/core/desktop-misc.nix +++ b/core/desktop-misc.nix @@ -1,4 +1,4 @@ -{ self, inputs, outputs, lib, config, pkgs, ... }: +{ pkgs, ... }: { diff --git a/core/gaming.nix b/core/gaming.nix index b903ada..293cb82 100644 --- a/core/gaming.nix +++ b/core/gaming.nix @@ -1,4 +1,4 @@ -{ self, inputs, outputs, lib, config, pkgs, ... }: +{ pkgs, ... }: { @@ -38,7 +38,7 @@ piper # mouse configuration ]; ## These are important apparently :uh: - sessionVariables = rec { + sessionVariables = { XDG_CACHE_HOME = "$HOME/.cache"; XDG_CONFIG_HOME = "$HOME/.config"; XDG_BIN_HOME = "$HOME/.local/bin"; diff --git a/core/packages.nix b/core/packages.nix index 1c8c64d..cc08901 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, lib, config, pkgs, ... }: +{ inputs, lib, config, pkgs, ... }: { diff --git a/core/regreet-config.nix b/core/regreet-config.nix index 743ce4c..abb3e32 100644 --- a/core/regreet-config.nix +++ b/core/regreet-config.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [