diff --git a/README.md b/README.md index 4bc11d9..a4c943f 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,5 @@ nixos-rebuild switch --flake 'git+https://git.sense-t.eu.org/NixOS/gpd-configura - [ ] waybar 微调 - [ ] 使用 pipewire - [ ] 电源选项 +- [ ] hyprland 微调 +- [ ] nwg-launchers 微调+配置 diff --git a/home/user/config/waybar.nix b/home/user/config/waybar.nix index 75b249e..ecd15bc 100644 --- a/home/user/config/waybar.nix +++ b/home/user/config/waybar.nix @@ -96,12 +96,11 @@ "custom/launcher" ={ format = " "; - on-click = "rofi -show drun"; - on-click-right = "killall rofi"; + on-click = "nwggrid -o 0.6"; }; "custom/power" ={ format = " "; - on-click = "bash ~/.config/rofi/leave/leave.sh"; + on-click = "nwgbar"; }; } \ No newline at end of file diff --git a/home/user/files/hyprland.conf b/home/user/files/hyprland.conf index 9a673c9..c24be12 100644 --- a/home/user/files/hyprland.conf +++ b/home/user/files/hyprland.conf @@ -33,7 +33,7 @@ input { follow_mouse = 1 touchpad { - natural_scroll = false + natural_scroll = true } sensitivity = 0 # -1.0 - 1.0, 0 means no modification. diff --git a/home/user/home.nix b/home/user/home.nix index f260087..4a3ceae 100644 --- a/home/user/home.nix +++ b/home/user/home.nix @@ -12,8 +12,9 @@ icdiff podman jdk17 - rofi - rofi-rbw + #rofi + #rofi-rbw + nwg-launchers ]; sessionPath = [ @@ -34,7 +35,7 @@ ".config/hypr/hyprland.conf".source = ./files/hyprland.conf; # Use flatseal to change permissions. - #".local/share/fonts".source = /run/current-system/sw/share/X11/fonts; + ".local/share/fonts".source = /run/current-system/sw/share/X11/fonts; # Fix flatpak fonts ".local/share/flatpak/overrides/global".text = '' diff --git a/home/user/programs.nix b/home/user/programs.nix index d900322..bd59346 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -61,5 +61,9 @@ pinentry = "gnome3"; }; }; + + wlogout = { + enable = false; + }; }; } \ No newline at end of file