From 34c1d0aadb83cea186280c10ff3bb1cafad3d19d Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Wed, 27 Oct 2021 19:18:11 +0200 Subject: [PATCH] waybar: Use myxer as a graphical audio mixer --- hosts/miku.nix | 13 ++++++++++++- modules/programs/waybar/default.nix | 3 +++ overlays/default.nix | 1 + overlays/stable.nix | 21 +++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 overlays/stable.nix diff --git a/hosts/miku.nix b/hosts/miku.nix index 48a3fd0..4e96796 100644 --- a/hosts/miku.nix +++ b/hosts/miku.nix @@ -6,7 +6,7 @@ in mkHost config { userName = "alexander"; hostName = "miku"; primaryInterface = "enp6s0"; - overlays = [ "nur" "unstable" "simple" "custom" "emacs" ]; + overlays = [ "nur" "unstable" "stable" "simple" "custom" "emacs" ]; hardwareImports = [ "amdgpu" "amd" ]; programImports = [ "zsh" "git" "mpv" "tmux" "emacs" "firefox" "i18n" "gamemode" "gnome" #"gnome-terminal" @@ -112,6 +112,17 @@ in mkHost config { gnome.gnome-keyring.enable = true; }; + environment.sessionVariables = { + # sway + #"_JAVA_AWT_NONREPARENTING" = 1; + + # Wayland + "QT_QPA_PLATFORM" = "wayland-egl"; + "ECORE_EVAS_ENGINE" = "wayland-egl"; + "ELM_ENGINE" = "wayland-egl"; + "SDL_VIDEODRIVER" = "wayland"; + }; + # TODO: Move into modules systemd.user.services = { scream = { diff --git a/modules/programs/waybar/default.nix b/modules/programs/waybar/default.nix index 7db0ccd..25da8c3 100644 --- a/modules/programs/waybar/default.nix +++ b/modules/programs/waybar/default.nix @@ -44,6 +44,9 @@ on-click = "${pkgs.wlogout}/bin/wlogout"; tooltip = "false"; }; + "pulseaudio" = { + on-click = "${pkgs.stable.myxer}/bin/myxer"; + }; }; } ]; diff --git a/overlays/default.nix b/overlays/default.nix index a35c045..a436d18 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,6 +16,7 @@ in { }); nur = import ./nur.nix pkgs; unstable = importWrapper ./unstable.nix; + stable = importWrapper ./stable.nix; custom = import ./custom.nix pkgs; simple = import ./simple.nix; surface = import ./surface.nix pkgs; diff --git a/overlays/stable.nix b/overlays/stable.nix new file mode 100644 index 0000000..ada1ea4 --- /dev/null +++ b/overlays/stable.nix @@ -0,0 +1,21 @@ +# NOTE: pkgs is unused but there for consistency with nur.nix +{ + lib, ... +}: final: prev: + +let + stableTarball = + fetchTarball + https://github.com/NixOS/nixpkgs/archive/nixos-21.05.tar.gz; +in { + stable = import stableTarball { + # TODO + config = { + allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel" + "steam" "steam-original" "steam-runtime" + "discord" + ]; + }; + }; +}