diff options
| -rw-r--r-- | config/common.nix | 1 | ||||
| -rw-r--r-- | config/gaming.nix | 81 | ||||
| -rw-r--r-- | machines/firelink.nix | 37 |
3 files changed, 69 insertions, 50 deletions
diff --git a/config/common.nix b/config/common.nix index 18c10bf..0972b52 100644 --- a/config/common.nix +++ b/config/common.nix @@ -24,6 +24,7 @@ pass silver-searcher whois + unzip ]; time.timeZone = "America/New_York"; diff --git a/config/gaming.nix b/config/gaming.nix index 7699085..7273324 100644 --- a/config/gaming.nix +++ b/config/gaming.nix @@ -7,54 +7,55 @@ let withJava = true; extraPkgs = p: with pkgs; let xorgdeps = with xorg; [ - libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp - libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite - ]; - in [ - samba - tdb - glib-networking - libxkbcommon - fluidsynth hidapi mesa libdrm - perl which p7zip gnused gnugrep psmisc opencl-headers - cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap ocl-icd utillinux - fribidi - libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio - libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l - libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio - libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib - alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils - readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls libbsd - openldap - xorg.xrandr - xorg.xinput - gnome3.gtk - zlib - dbus - freetype - glib - atk - cairo - gdk_pixbuf - pango - fontconfig - xorg.libxcb - libkrb5 - nss - qt4 - pkgs_unstable.qt514.full - ] ++ xorgdeps; + libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp + libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite + ]; + in [ + samba + tdb + glib-networking + libxkbcommon + fluidsynth hidapi mesa libdrm + perl which p7zip gnused gnugrep psmisc opencl-headers + cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap ocl-icd utillinux + fribidi + libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio + libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l + libjpeg libxkbcommon libass libcdio libsamplerate libzip libmad libaio + libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib + alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils + readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd + vulkan-loader xdg_utils sqlite gnutls libbsd + openldap + xorg.xrandr + xorg.xinput + gnome3.gtk + zlib + dbus + freetype + glib + atk + cairo + gdk_pixbuf + pango + fontconfig + xorg.libxcb + libkrb5 + nss + qt4 + pkgs_unstable.qt514.full + libjack2 jack2 jack2Full jack_capture + ] ++ xorgdeps; }; }; in { nixpkgs.overlays = [ my_steam ]; nixpkgs.config.allowBroken = true; - + programs.steam.enable = true; hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; - + environment.systemPackages = with pkgs; [ wineWowPackages.staging steam diff --git a/machines/firelink.nix b/machines/firelink.nix index 013bf92..34a6016 100644 --- a/machines/firelink.nix +++ b/machines/firelink.nix @@ -47,11 +47,6 @@ in }; nixpkgs.overlays = [ my-overlay ]; - hardware.bluetooth.config = { - General = { - Privacy = "device"; - }; - }; # hardware.xpadneo.enable = true; systemd.services.xow.wantedBy = ["multi-user.target"]; systemd.services.xow.serviceConfig.Group = "input"; @@ -64,6 +59,11 @@ in enable = true; extraModules = [ pkgs.pulseaudio-modules-bt ]; package = lib.mkForce pkgs.pulseaudioFull; + extraConfig = '' + load-module module-dbus-protocol + load-module module-jack-sink channels=2 + load-module module-jack-source channels=1 + ''; systemWide = true; # configFile = pkgs.writeText "default.pa" '' # load-module module-bluetooth-policy @@ -75,7 +75,15 @@ in # # load-module module-bluez5-discover # ''; }; + systemd.services.pulseaudio = { + environment."JACK_PROMISCUOUS_SERVER" = "jackaudio"; + serviceConfig = { + LimitMEMLOCK = "infinity"; + }; + }; + users.extraUsers.pulse.extraGroups = [ "jackaudio" ]; + networking.firewall.allowedTCPPorts = [ 22 4713 ]; networking.networkmanager.enable = true; networking.networkmanager.wifi.powersave = false; networking.vlans = { @@ -101,6 +109,15 @@ in # virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.enableExtensionPack = true; + services.jack = { + jackd.enable = true; + jackd.extraOptions = [ "-dalsa" "-dhw:M2" ]; + alsa.enable = false; + loopback.enable = true; + }; + users.extraUsers.guest.extraGroups = [ "jackaudio" ]; + users.extraUsers.orbekk.extraGroups = [ "jackaudio" ]; + # Streaming test # services.nginx.enable = true; # services.nginx.appendConfig = '' @@ -156,11 +173,11 @@ in # https://bugzilla.kernel.org/show_bug.cgi?id=203709 boot.extraModprobeConfig = '' - # options iwlwifi power_save=0 - # options iwlwifi swcrypto=1 - # options iwlwifi disable_11ax=1 - # options iwlwifi bt_coex_active=0 - # options iwlmvm power_scheme=1 + options iwlwifi power_save=0 + options iwlwifi swcrypto=1 + options iwlwifi disable_11ax=1 + options iwlwifi bt_coex_active=0 + options iwlmvm power_scheme=1 # options bluetooth disable_ertm=1 # For xpadneo |