diff --git a/hosts/IROH/default.nix b/hosts/IROH/default.nix index c765ed7..191b599 100755 --- a/hosts/IROH/default.nix +++ b/hosts/IROH/default.nix @@ -18,7 +18,10 @@ flavour = [ "i3" ]; }; nvidia.enable = true; - audio.enable = true; + audio = { + enable = true; + pipewire-wine-fix.enable = true; + }; bluetooth.enable = false; printing.enable = true; vpn.enable = true; diff --git a/hosts/T430/default.nix b/hosts/T430/default.nix index f14d737..69008bf 100755 --- a/hosts/T430/default.nix +++ b/hosts/T430/default.nix @@ -18,7 +18,10 @@ flavour = [ "sway" ]; }; nvidia.enable = false; - audio.enable = true; + audio = { + enable = true; + pipewire-wine-fix.enable = false; + }; bluetooth.enable = true; printing.enable = true; vpn.enable = true; diff --git a/hosts/W530/default.nix b/hosts/W530/default.nix index b60e18c..c1ca0f2 100644 --- a/hosts/W530/default.nix +++ b/hosts/W530/default.nix @@ -17,7 +17,10 @@ flavour = [ "sway" ]; }; nvidia.enable = false; - audio.enable = true; + audio = { + enable = true; + pipewire-wine-fix.enable = false; + }; bluetooth.enable = true; printing.enable = true; vpn.enable = true; diff --git a/modules/arr.nix b/modules/arr.nix index 28f0301..78a48ae 100644 --- a/modules/arr.nix +++ b/modules/arr.nix @@ -1,5 +1,4 @@ { - services.jackett = { enable = true; }; @@ -10,12 +9,12 @@ flare-solvarr = { image = "ghcr.io/flaresolverr/flaresolverr:latest"; autoStart = true; - ports = ["127.0.0.1:8191:8191"]; + ports = [ "127.0.0.1:8191:8191" ]; environment = { LOG_LEVEL = "info"; LOG_HTML = "false"; CAPTCHA_SOLVER = "hcaptcha-solver"; - TZ="Europe/Berlin"; + TZ = "Europe/Berlin"; }; }; }; diff --git a/modules/audio.nix b/modules/audio.nix index 1a9001a..4032360 100644 --- a/modules/audio.nix +++ b/modules/audio.nix @@ -1,5 +1,4 @@ { pkgs, config, lib, ... }: lib.mkIf config.bchmnn.audio.enable { - # Enable pipewire - audio services.pipewire = lib.mkIf (!builtins.elem "gnome" config.bchmnn.gui.flavour) { enable = true; audio.enable = true; @@ -8,11 +7,29 @@ jack.enable = true; pulse.enable = true; wireplumber.enable = true; + extraConfig.pipewire = lib.mkIf config.bchmnn.audio.pipewire-wine-fix.enable { + "90-wine-config" = { + "context.properties" = { + # "default.clock.rate" = 48000; + # "default.clock.allowed-rates" = [ 48000 ]; + # "default.clock.quantum" = 2048; + "default.clock.min-quantum" = 1024; + }; + }; + }; + extraConfig.pipewire-pulse = lib.mkIf config.bchmnn.audio.pipewire-wine-fix.enable { + "90-wine-config" = { + "pulse.properties" = { + "pulse.min.req" = "1024/48000"; + "pulse.min.frag" = "1024/48000"; + "pulse.min.quantum" = "1024/48000"; + }; + }; + }; }; environment.systemPackages = with pkgs; [ alsa-utils pulseaudio ]; - } diff --git a/modules/default.nix b/modules/default.nix index 747ebc6..4a74790 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -24,6 +24,9 @@ audio = { enable = mkEnableOption "audio"; + pipewire-wine-fix = { + enable = mkEnableOption "pipewire-wine-fix"; + }; }; bluetooth = { diff --git a/users/gandalf/modules/gui/i3/default.nix b/users/gandalf/modules/gui/i3/default.nix index 73c08e1..9edd08a 100644 --- a/users/gandalf/modules/gui/i3/default.nix +++ b/users/gandalf/modules/gui/i3/default.nix @@ -56,6 +56,7 @@ in { command = "${nextcloud-client}/bin/nextcloud"; } { command = "${plasma5Packages.kdeconnect-kde}/bin/kdeconnect-indicator"; } { command = "${system-config-printer}/bin/system-config-printer-applet"; } + { command = "${alacritty}/bin/alacritty --class dropdown --title dropdown"; always = true; } ]; fonts = { names = [ common.font ]; @@ -65,6 +66,26 @@ in window = { titlebar = false; border = 4; + commands = [ + { + command = "floating enable"; + criteria = { + instance = "dropdown"; + }; + } + { + command = "resize set 1400 800"; + criteria = { + instance = "dropdown"; + }; + } + { + command = "move scratchpad"; + criteria = { + instance = "dropdown"; + }; + } + ]; }; gaps = { inner = 5; @@ -184,10 +205,12 @@ in # Outer gaps "${cfg.modifier}+equal" = "gaps horizontal current minus 200; gaps vertical current minus 100"; "${cfg.modifier}+minus" = "gaps horizontal current plus 200; gaps vertical current plus 100"; - "${cfg.modifier}+bracketright" = "gaps outer current set 5"; "${cfg.modifier}+bracketleft" = "gaps horizontal current set 800; gaps vertical current set 400"; + # Dropdown term + "${cfg.modifier}+grave" = "[instance=\"dropdown\"] scratchpad show; [instance=\"dropdown\"] move position center"; + "${cfg.modifier}+Escape" = "[instance=\"dropdown\"] scratchpad show; [instance=\"dropdown\"] move position center"; # Multimedia Keys "XF86AudioRaiseVolume" = "exec ${pkgs.wireplumber}/bin/wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+";