From f4e14d0da566ac4a00443d9823f98191b02315b1 Mon Sep 17 00:00:00 2001
From: Sense T <me@sense-t.eu.org>
Date: Tue, 27 Jun 2023 23:10:56 +0800
Subject: [PATCH] 1

---
 README.md                     |  7 ++++---
 home/user/config/waybar.nix   |  2 +-
 home/user/files/hyprland.conf | 10 +++++-----
 home/user/home.nix            |  7 +++++++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 627ab85..52e694c 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,9 @@ nixos-rebuild switch --flake 'git+https://git.sense-t.eu.org/NixOS/gpd-configura
 - [x] 无状态 `/` 分区
 - [ ] wsproxy on podman
 - [ ] waybar 微调
-  - [ ] 使用 pipewire
+  - [ ] 测试 pulseaudio
+  - [x] ~~使用 pipewire~~
   - [x] 电源选项
 - [x] hyprland 微调
-- [ ] nwg-launchers 微调+配置
-- [ ] [HMCL](https://gitlab.com/accessable-net/hmcl-flatpak)
+- [x] nwg-launchers 微调+配置
+- [x] [HMCL](https://gitlab.com/accessable-net/hmcl-flatpak)
diff --git a/home/user/config/waybar.nix b/home/user/config/waybar.nix
index a876d2a..31a692b 100644
--- a/home/user/config/waybar.nix
+++ b/home/user/config/waybar.nix
@@ -22,7 +22,7 @@
         scroll-step = 5;
         format = "{icon} {volume}%";
         format-muted = "{icon} {volume}%";
-        on-click ="wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; # wpctl?
+        on-click ="wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; # wpctl?
         format-icons = {
             default = ["" "" ""];
         };
diff --git a/home/user/files/hyprland.conf b/home/user/files/hyprland.conf
index 823632b..a30c902 100644
--- a/home/user/files/hyprland.conf
+++ b/home/user/files/hyprland.conf
@@ -20,8 +20,8 @@ exec-once = nm-applet --sm-disable
 exec-once = systemctl --user start dunst
 exec-once = systemctl --user start fcitx5-daemon
 
-# Source a file (multi-file configs)
-# source = ~/.config/hypr/myColors.conf
+# SINK a file (multi-file configs)
+# SINK = ~/.config/hypr/myColors.conf
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
@@ -161,9 +161,9 @@ bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1
 
 # XF86Keys
-bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bind = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-
-bind = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SOURCE@ 5%+
+bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bind = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bind = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+
 bind = , XF86MonBrightnessUP, exec, light -A 5
 bind = , XF86MonBrightnessDown, exec, light -U 5
 
diff --git a/home/user/home.nix b/home/user/home.nix
index 2e3213d..469f4d0 100644
--- a/home/user/home.nix
+++ b/home/user/home.nix
@@ -24,6 +24,13 @@
             "Applications"
         ];
 
+        sessionVariables = {
+            #GTK_IM_MODULE = "fcitx";
+            #QT_IM_MODULE = "fcitx";
+            SDL_VIDEODRIVER = "wayland";
+            SDL_IM_MODULE = "fcitx";
+        };
+
         shellAliases = {
             cao = "fuck";
             top = "btop";