From bc7ac2df55c22eae20a83b24f21fcdab4e5519c2 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 19 Dec 2023 02:20:08 +0800 Subject: [PATCH] home: hyprland: cleanup --- .../applications/hyprland/default.nix | 29 +++++++------------ .../applications/hyprland/hypr/autostart.conf | 21 -------------- .../applications/hyprland/hypr/env.conf | 12 -------- 3 files changed, 11 insertions(+), 51 deletions(-) delete mode 100644 users/guanranwang/home-manager/applications/hyprland/hypr/env.conf diff --git a/users/guanranwang/home-manager/applications/hyprland/default.nix b/users/guanranwang/home-manager/applications/hyprland/default.nix index 7c9f851..0108ec0 100644 --- a/users/guanranwang/home-manager/applications/hyprland/default.nix +++ b/users/guanranwang/home-manager/applications/hyprland/default.nix @@ -13,25 +13,18 @@ ../waybar ]; - wayland.windowManager = { - hyprland = { - enable = true; - enableNvidiaPatches = true; - xwayland.enable = true; - plugins = [ - #inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix - ]; + wayland.windowManager.hyprland = { + enable = true; + enableNvidiaPatches = true; + #plugins = with inputs.hyprland-plugins.packages.${pkgs.system}; [ + # csgo-vulkan-fix + #]; - extraConfig = '' - #source = ~/.config/hypr/themes/mocha.conf - #source = ~/.config/hypr/themes/colors.conf - #source = ~/.config/hypr/plugins.conf - source = ~/.config/hypr/main.conf - source = ~/.config/hypr/keybinds.conf - source = ~/.config/hypr/autostart.conf - source = ~/.config/hypr/env.conf - ''; - }; + extraConfig = '' + source = ~/.config/hypr/main.conf + source = ~/.config/hypr/keybinds.conf + source = ~/.config/hypr/autostart.conf + ''; }; xdg.configFile."hypr" = { diff --git a/users/guanranwang/home-manager/applications/hyprland/hypr/autostart.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/autostart.conf index a120cde..cdea8b1 100644 --- a/users/guanranwang/home-manager/applications/hyprland/hypr/autostart.conf +++ b/users/guanranwang/home-manager/applications/hyprland/hypr/autostart.conf @@ -3,26 +3,5 @@ # $HOME/.config/hypr/autostart.conf # -#exec-once = $HOME/.local/share/hyprload/hyprload.sh # hyprload - -#exec-once = /usr/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -#exec-once = dbus-update-activation-environment --all -#exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # authentication prompt -#exec-once = gnome-keyring-daemon --start --components=secrets # keyring exec-once = swww init # wallpaper (not working on nixos somehow) -#exec-once = hyprpaper # wallpaper but for factional scaling exec-once = waybar # status bar (bro why would nixos autostart waybar itself) -#exec-once = eww open bar # status bar but better -#exec-once = fcitx5 # input method -#exec-once = swayosd -#exec-once = dunst # notification -#exec-once = udiskie -t # auto disk mount (with tray) -#exec-once = nm-applet # wifi tray -exec-once = wl-paste --watch cliphist store # clipboard manager -#exec-once = wl-clip-persist --clipboard both # clipboard persist data, breaks text selection in gtk apps (https://github.com/hyprwm/Hyprland/issues/2619) -#exec-once = hyprctl setcursor Bibata-Modern-Classic 24 # set cursor -#exec-once = clash-verge # proxy tool -#exec-once = /usr/lib/kdeconnectd # kdeconnect -#exec-once = flatpak run org.qbittorrent.qBittorrent - -#exec-once = $HOME/.local/bin/hyprland-autostart diff --git a/users/guanranwang/home-manager/applications/hyprland/hypr/env.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/env.conf deleted file mode 100644 index 741c060..0000000 --- a/users/guanranwang/home-manager/applications/hyprland/hypr/env.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# Hyprland environment varibles config -# ~/.config/hypr/env.conf -# - -# Nvidia -#env = LIBVA_DRIVER_NAME, nvidia -#env = XDG_SESSION_TYPE, wayland -#env = GBM_BACKEND, nvidia-drm # crashes for me -#env = __GLX_VENDOR_LIBRARY_NAME -#env = WLR_NO_HARDWARE_CURSORS, 1 -#env = __GL_THREADED_OPTIMIZATIONS, 0 # workround for minecraft glitch on nvidia 535.xx driver, https://github.com/NVIDIA/open-gpu-kernel-modules/issues/522