From 169bbea902ce9e70703279ab791df825aca65a67 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Sun, 17 Mar 2024 13:36:14 +0100 Subject: [PATCH] fail at everything --- flake.nix | 1 - home-manager/kde-path.nix | 47 +++++++++++++++++++++++++++++++++++ modules/graphical/plasma.nix | 2 +- modules/graphical/wayland.nix | 21 ---------------- users/kopatz/home.nix | 1 + 5 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 home-manager/kde-path.nix delete mode 100644 modules/graphical/wayland.nix diff --git a/flake.nix b/flake.nix index a661931..2b96754 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,6 @@ ### User specific ### ./users/kopatz ### System modules ### - ./modules/graphical/wayland.nix ./modules/graphical/plasma.nix #./modules/graphical/hyprland.nix ./modules/graphical/emulators.nix diff --git a/home-manager/kde-path.nix b/home-manager/kde-path.nix new file mode 100644 index 0000000..c5f866a --- /dev/null +++ b/home-manager/kde-path.nix @@ -0,0 +1,47 @@ +{ config, ... }: +{ + home.file."path.sh" = { + enable = true; + recursive = true; + executable = true; + text = '' + #!/usr/bin/env sh + if [ "$XDG_SESSION_TYPE" = "wayland" ]; then + export MOZ_DBUS_REMOTE="1" + export KITTY_ENABLE_WAYLAND="1" + export _JAVA_AWT_WM_NONREPARENTING="1" + export MOZ_ENABLE_WAYLAND="1" + export WLR_NO_HARDWARE_CURSORS="1" + export NIXOS_OZONE_WL="1" + + export LIBVA_DRIVER_NAME="nvidia" + export __GLX_VENDOR_LIBRARY_NAME="nvidia" + export GBM_BACKEND="nvidia-drm" + + export XDG_SESSION_TYPE="wayland" + export QT_QPA_PLATFORM="wayland;xcb" + export ELECTRON_OZONE_PLATFORM_HINT="wayland" + fi + ''; + target = ".config/plasma-workspace/env/path.sh"; + }; + # home.file."path.desktop" = { + # enable = true; + # recursive = true; + # executable = true; + # text = '' + # [Desktop Entry] + # Type=Application + # Exec=${config.xdg.configHome}/autostart/path.sh + # Hidden=false + # NoDisplay=false + # X-GNOME-Autostart-enabled=true + # Name[en_US]=Login Script + # Name=Login Script + # Comment[en_US]=Launches login script and sets environment variables + # Comment=Launches login script and sets environment variables + # ''; + # target = ".config/autostart/path.desktop"; + # }; + +} diff --git a/modules/graphical/plasma.nix b/modules/graphical/plasma.nix index c205fb1..73c18ab 100644 --- a/modules/graphical/plasma.nix +++ b/modules/graphical/plasma.nix @@ -6,7 +6,7 @@ xkb.variant = ""; enable = true; displayManager.sddm.enable = true; - displayManager.sddm.wayland.enable = true; + #displayManager.sddm.wayland.enable = true; }; services.desktopManager.plasma6.enable = true; } diff --git a/modules/graphical/wayland.nix b/modules/graphical/wayland.nix deleted file mode 100644 index 73760a7..0000000 --- a/modules/graphical/wayland.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - environment.sessionVariables = { - # For shared clipboard with Xwayland apps - MOZ_DBUS_REMOTE = "1"; - KITTY_ENABLE_WAYLAND = "1"; - _JAVA_AWT_WM_NONREPARENTING = "1"; - MOZ_ENABLE_WAYLAND = "1"; - WLR_NO_HARDWARE_CURSORS = "1"; - NIXOS_OZONE_WL = "1"; - - LIBVA_DRIVER_NAME = "nvidia"; - __GLX_VENDOR_LIBRARY_NAME = "nvidia"; - GBM_BACKEND = "nvidia-drm"; - - XDG_SESSION_TYPE = "wayland"; - # Can break some native games - SDL_VIDEODRIVER = "wayland"; - QT_QPA_PLATFORM = "wayland;xcb"; - ELECTRON_OZONE_PLATFORM_HINT = "wayland"; - }; -} diff --git a/users/kopatz/home.nix b/users/kopatz/home.nix index ccc3deb..ea3f28c 100644 --- a/users/kopatz/home.nix +++ b/users/kopatz/home.nix @@ -21,6 +21,7 @@ ../../home-manager/lf.nix ../../home-manager/kitty.nix ../../home-manager/rofi.nix + ../../home-manager/kde-path.nix inputs.nix-colors.homeManagerModule ];