updates

hosts/desktop/hyprland/environment.nix

@@ -13,19 +13,18 @@ in
   environment.systemPackages = with pkgs; [
     adwaita-icon-theme
     apple-cursor
-    catppuccin
-    catppuccin-gtk
-    catppuccin-qt5ct
     catppuccin-sddm
     colloid-gtk-theme
     colloid-icon-theme
     ddcutil
     dunst
     egl-wayland
+    file-roller
     glib
     gnome-tweaks
     gnome-disk-utility
     gsettings-desktop-schemas
+    hyprcursor
     hyprland
     hyprshot
     libnotify
@@ -57,6 +56,7 @@ in
     xdg-desktop-portal-hyprland
     xdg-desktop-portal-gtk
     xdg-desktop-portal-wlr
+    xsettingsd
     xwayland
   ];
 }

hosts/desktop/hyprland/home.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let
   wallpaper = "/home/matt/.config/wallpapers/wall.png";
-  cursorTheme = "macOS-Monterey";
+  cursorTheme = "macOS";
   cursorThemePkg = pkgs.apple-cursor;
   cursorSize = 24;
   gtkThemeSize = "compact";
@@ -16,10 +16,13 @@ let
     tweaks = [ gtkThemeVariant ];
   };
   iconThemeColor = "dark"; # "" "light" "dark"
-  # iconThemeVariant = "default"; # "" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey"
+  iconThemeVariant = ""; # "" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey"
   iconThemeScheme = "nord"; # "" "nord" "dracula" "gruvbox" "everforest" "catppuccin"
-  iconTheme = "Colloid-${iconThemeScheme}-${iconThemeColor}";
-  iconThemePkg = pkgs.colloid-icon-theme.override { schemeVariants = [ iconThemeScheme ]; };
+  iconTheme = "Colloid-Dark";
+  iconThemePkg = pkgs.colloid-icon-theme.override { 
+    schemeVariants = [ iconThemeScheme ];
+    colorVariants = [ "default" ];
+  };
 in
 {
   imports = [
@@ -135,6 +138,8 @@ in
     # WLR_RENDERER = "vulkan";
     XCURSOR_THEME = cursorTheme;
     XCURSOR_SIZE = cursorSize;
+    HYPRCURSOR_THEME = cursorTheme;
+    HYPRCURSOR_SIZE = cursorSize;
     GTK_THEME = gtkTheme;
     XDG_CURRENT_DESKTOP = "Hyprland";
     XDG_SESSION_DESKTOP = "Hyprland";
@@ -154,6 +159,13 @@ in
     name = cursorTheme;
     size = cursorSize;
   };
+  
+  dconf = {
+    enable = true;
+    settings = {
+      "org/gnome/desktop/interface".cursor-theme = cursorTheme;
+    };
+  };
 
   gtk = {
     enable = true;

hosts/nas/apps.nix

@@ -1,5 +1,9 @@
 { config, ... }:
 {
+  # imports = [
+  #   ../../modules/services/jellyfin
+  # ];
+
   nas-apps = {
     beszel.enable = true;