A lot of shit from the past month or so

modules/home-manager/cli/wezterm/wezterm.lua

@@ -50,18 +50,22 @@ if utils.is_linux() then
 else
   c.window_decorations = "RESIZE"
 end
-c.window_padding = { left = 10, right = 0, top = 0, bottom = 0 }
+c.window_padding = { left = 10, right = 10, top = 0, bottom = 0 }
 c.adjust_window_size_when_changing_font_size = false
 
 -- fonts
 c.font = wezterm.font_with_fallback({
-  "Maple Mono",
-  "Symbols Nerd Font",
+  {
+    family = "Maple Mono NF",
+    weight = 500,
+    harfbuzz_features = { "cv03", "calt", "ss08" },
+  },
+  { family = "Symbols Nerd Font", weight = "Bold" },
 })
 c.font_size = 13
 c.adjust_window_size_when_changing_font_size = false
 c.window_frame = {
-  font = wezterm.font("Maple Mono"),
+  font = wezterm.font("Maple Mono NF"),
   font_size = c.font_size,
 }
 

modules/home-manager/hypr/default.nix

@@ -1,9 +1,10 @@
 {
   pkgs,
-  config,
-  inputs,
+  lib,
   ...
-}: {
+}: let
+  inherit (lib.modules) mkDefault;
+in {
   imports = [
     ./hyprland/rules.nix
     ./hyprland/keybinds.nix
@@ -36,8 +37,7 @@
   };
 
   xdg.portal = {
-    enable = true;
-    configPackages = [config.wayland.windowManager.hyprland.package];
+    enable = mkDefault true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
     ];
@@ -46,7 +46,9 @@
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
-    package = inputs.hyprland.packages."${pkgs.system}".hyprland;
+    package = null;
+    portalPackage = null;
+    systemd.variables = ["--all"];
 
     settings = {
       monitor = [

modules/home-manager/hypr/hyprland/execs.nix

@@ -12,7 +12,7 @@
       "vesktop"
       "wl-paste --type text --watch cliphist store"
       "wl-paste --type image --watch cliphist store"
-      "JKPS"
+      # "JKPS"
       "ags"
     ];
   };

modules/home-manager/hypr/hyprland/rules.nix

@@ -5,27 +5,19 @@ _: {
     ];
 
     windowrule = [
-      "noblur,.*"
-      "workspace special, spotify"
-      "workspace 11 silent, JKPS"
-      "workspace 10 silent, ^(org.qbittorrent.qBittorrent)$"
-      "workspace 8 silent, Element"
-      "workspace 6 silent, firefox"
-      "workspace 5 silent, ^(org.prismlauncher.PrismLauncher)$"
-      "workspace 3 silent, vesktop"
-      "workspace 2 silent, ^(steam)$"
-      "workspace 1 silent, floorp"
-      "float, ^(blueberry.py)$"
-      "float, ^(com.github.Aylur.ags)$"
-      "float, ^(JKPS)(.*)"
-    ];
-
-    windowrulev2 = [
+      "workspace special, class:spotify"
+      # "workspace 11 silent, class:JKPS"
+      "workspace 10 silent, class:(org.qbittorrent.qBittorrent)"
+      "workspace 6 silent, class:firefox"
+      "workspace 5 silent, class:(org.prismlauncher.PrismLauncher)"
+      "workspace 3 silent, class:vesktop"
+      "workspace 2 silent, class:steam"
+      "workspace 1 silent, class:floorp"
+      "noblur, class:(org.wezfurlong.wezterm)"
     ];
 
     layerrule = [
       "xray 0, .*"
-      "noanim, walker"
       "noanim, selection"
       "noanim, overview"
       "noanim, anyrun"
@@ -35,8 +27,6 @@ _: {
       "blur, shell:*"
       "ignorealpha 0.6, shell:*"
 
-      "blur, eww"
-      "ignorealpha 0.8, eww"
       "noanim, noanim"
       "blur, noanim"
       "blur, gtk-layer-shell"
@@ -46,8 +36,6 @@ _: {
       "blur, notifications"
       "ignorealpha 0.69, notifications"
 
-      "animation slide top, sideleft.*"
-      "animation slide top, sideright.*"
       "blur, session"
 
       "blur, bar"

modules/home-manager/spotify/default.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   lib,
-  config,
   inputs,
   ...
 }: {