modules/nixos/system/desktop/hyprland.nix

@@ -37,7 +37,7 @@ in
       cursor = {
         name = "macOS";
         package = pkgs.apple-cursor;
-        size = 26;
+        size = 24;
       };
 
       fonts = {

users/jordan/graphical/hyprland/default.nix

@@ -6,38 +6,9 @@
 }:
 let
   inherit (lib)
-    attrValues
-    concatStringsSep
     elem
-    mapAttrs
-    mkIf
+    optionals
     ;
-  concatMapAttrsStringSep =
-    sep: f: attrs:
-    concatStringsSep sep (attrValues (mapAttrs f attrs));
-  globalVariables =
-    {
-      _JAVA_AWT_WM_NONREPARENTING = "1";
-      GDK_BACKEND = "wayland";
-      MOZ_ENABLE_WAYLAND = "1";
-      NIXOS_OZONE_WL = "1";
-      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-      QT_QPA_PLATFORM = "wayland";
-      SDL_VIDEODRIVE = "wayland";
-      XDG_SESSION_TYPE = "wayland";
-    }
-    // (
-      if elem "nvidia" osConfig.services.xserver.videoDrivers then
-        {
-          GBM_BACKEND = "nvidia-drm";
-          LIBVA_DRIVER_NAME = "nvidia";
-        }
-      else
-        { }
-    );
-  hyprVariables = {
-    AQ_DRM_DEVICES = "/dev/dri/card0:/dev/dri/card1";
-  };
 in
 {
   imports = [
@@ -51,19 +22,26 @@ in
     "SF Pro Text"
   ];
 
-  xdg.configFile = mkIf osConfig.programs.hyprland.withUWSM {
-    "uwsm/env".text = concatMapAttrsStringSep "\n" (
-      name: value: "export ${name}=${value}"
-    ) globalVariables;
-    "uwsm/env-hyprland".text = concatMapAttrsStringSep "\n" (
-      name: value: "export ${name}=${value}"
-    ) hyprVariables;
-  };
-
   wayland.windowManager.hyprland = {
     enable = true;
     # plugins = [ hypr-dynamic-cursors ]; # https://github.com/VirtCode/hypr-dynamic-cursors
     settings = {
+      env =
+        optionals (elem "nvidia" osConfig.services.xserver.videoDrivers) [
+          "GBM_BACKEND,nvidia-drm"
+          "LIBVA_DRIVER_NAME,nvidia"
+        ]
+        ++ [
+          "_JAVA_AWT_WM_NONREPARENTING,1"
+          "GDK_BACKEND,wayland"
+          "MOZ_ENABLE_WAYLAND,1"
+          "NIXOS_OZONE_WL,1"
+          "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
+          "QT_QPA_PLATFORM,wayland"
+          "SDL_VIDEODRIVER,wayland"
+          "XDG_SESSION_TYPE,wayland"
+        ];
+
       general = {
         gaps_in = 5;
         gaps_out = 20;

users/jordan/neovim.nix

@@ -113,8 +113,6 @@
 
     plugins.undotree.enable = true;
 
-    plugins.vim-surround.enable = true;
-
     plugins.web-devicons.enable = true;
 
     # plugins.gitsigns.enable = true;
@@ -127,6 +125,7 @@
     # plugins.nvim-tree.enable = true;
     # plugins.oil.enable = true;
     # plugins.project-nvim.enable = true;
+    # plugins.surround.enable = true;
   };
 
   home.sessionVariables.EDITOR = "nvim";