diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index c3238fd..c3b60ac 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -579,7 +579,6 @@ let ECORE_EVAS_ENGINE = "wayland_egl"; ELM_ENGINE = "wayland_egl"; _JAVA_AWT_WM_NONREPARENTING = "1"; - XDG_CURRENT_DESKTOP = "Unity"; }; programs.waybar = { diff --git a/modules/ezpc.nix b/modules/ezpc.nix index dd22409..3d2f9f2 100644 --- a/modules/ezpc.nix +++ b/modules/ezpc.nix @@ -20,19 +20,39 @@ let hardware.pulseaudio.enable = lib.mkDefault (!cfg.portals); - services.pipewire.enable = lib.mkDefault cfg.portals; - services.pipewire.jack.enable = lib.mkDefault cfg.portals; - services.pipewire.alsa.enable = lib.mkDefault cfg.portals; - services.pipewire.alsa.support32Bit = lib.mkDefault cfg.portals; - services.pipewire.pulse.enable = lib.mkDefault cfg.portals; + services.pipewire = { + enable = lib.mkDefault cfg.portals; + jack.enable = lib.mkDefault cfg.portals; + alsa.enable = lib.mkDefault cfg.portals; + alsa.support32Bit = lib.mkDefault cfg.portals; + pulse.enable = lib.mkDefault cfg.portals; + media-session.config.bluez-monitor = { + properties = { }; + rules = [ + { + actions = { + update-props = { + "bluez5.auto-connect" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ]; + "bluez5.hw-volume" = + [ "hfp_ag" "hsp_ag" "a2dp_source" "a2dp_sink" ]; + }; + }; + matches = [{ "device.name" = "~bluez_card.*"; }]; + } + { + actions = { update-props = { "node.pause-on-idle" = false; }; }; + matches = [ + { "node.name" = "~bluez_input.*"; } + { "node.name" = "~bluez_output.*"; } + ]; + } + ]; + }; + }; xdg.portal.enable = lib.mkDefault cfg.portals; xdg.portal.gtkUsePortal = lib.mkDefault cfg.portals; xdg.portal.extraPortals = lib.mkDefault (if cfg.portals then with pkgs; [ xdg-desktop-portal-wlr xdg-desktop-portal-gtk ] else []); - # https://github.com/NixOS/nixpkgs/issues/108855 - systemd.user.services.xdg-desktop-portal.environment = lib.mkDefault (lib.mkIf cfg.portals { - XDG_DESKTOP_PORTAL_DIR = config.environment.variables.XDG_DESKTOP_PORTAL_DIR; - }); # let me use audio and phones programs.adb.enable = cfg.developer; diff --git a/modules/workstation.nix b/modules/workstation.nix index 0b2c0f7..552604d 100644 --- a/modules/workstation.nix +++ b/modules/workstation.nix @@ -66,6 +66,7 @@ in # make fonts not fucked up fonts.fontconfig.enable = true; fonts.fontconfig.dpi = lib.mkDefault 96; + fonts.enableDefaultFonts = true; services.xserver.dpi = lib.mkDefault 96; # this helps with some compatibility