Removed stylix and a few small fixes

modules/features/agenix.nix

@@ -10,8 +10,8 @@
   perSystem =
     { config, pkgs, ... }:
     {
-      devShells.nix = pkgs.mkShell {
-        nativeBuildInputs = [ config.agenix-rekey.package ];
+      devShells.default = pkgs.mkShell {
+        packages = [ config.agenix-rekey.package ];
       };
 
       agenix-rekey.nixosConfigurations = inputs.self.nixosConfigurations;

modules/features/foot.nix

@@ -10,7 +10,7 @@
             term = "xterm-256color";
             include = "${config.xdg.configHome}/foot/themes/noctalia";
             dpi-aware = "no";
-            font = "${config.stylix.fonts.monospace.name}:size=${toString config.stylix.fonts.sizes.terminal}";
+            font = "JetBrainsMono Nerd Font:size=12";
           };
           mouse = {
             hide-when-typing = "yes";

modules/features/niri.nix

@@ -46,6 +46,19 @@
       brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl";
     in
     {
+      home.packages = [
+        pkgs.nautilus
+      ];
+
+      xdg.portal = {
+        enable = true;
+        configPackages = [ pkgs.gnome-session ];
+        extraPortals = with pkgs; [
+          xdg-desktop-portal-gnome
+          xdg-desktop-portal-gtk
+        ];
+      };
+
       programs.niri = {
         # Niri is enabled by niri.nixosModules.niri
         settings = {
@@ -483,8 +496,8 @@
             { argv = [ "noctalia-shell" ]; }
           ];
           cursor = {
-            size = config.stylix.cursor.size;
-            theme = config.stylix.cursor.name;
+            size = config.home.pointerCursor.size;
+            theme = config.home.pointerCursor.name;
             hide-when-typing = true;
           };
           gestures = {

modules/features/styling.nix

@@ -0,0 +1,76 @@
+{
+  flake.modules.homeManager.styling =
+    {
+      config,
+      pkgs,
+      ...
+    }:
+    {
+      home = {
+        pointerCursor = {
+          name = "catppuccin-mocha-dark-cursors";
+          package = pkgs.catppuccin-cursors.mochaDark;
+          size = 16;
+          x11.enable = true;
+          gtk.enable = true;
+        };
+        packages = with pkgs; [
+          nerd-fonts.jetbrains-mono
+          noto-fonts
+          noto-fonts-cjk-sans
+          noto-fonts-color-emoji
+        ];
+      };
+
+      fonts.fontconfig = {
+        enable = true;
+        defaultFonts = {
+          sansSerif = [ "Noto Sans" ];
+          monospace = [ "JetBrainsMono Nerd Font" ];
+          emoji = [ "Noto Color Emoji" ];
+        };
+      };
+
+      gtk = {
+        enable = true;
+        colorScheme = "dark";
+        iconTheme = {
+          name = "MoreWaita";
+          package = pkgs.morewaita-icon-theme;
+        };
+        theme = {
+          name = "adw-gtk3-dark";
+          package = pkgs.adw-gtk3;
+        };
+        gtk4.theme = config.gtk.theme;
+      };
+
+      qt =
+        let
+          qt_settings = ver: {
+            Appearance = {
+              color_scheme_path = "${config.xdg.configHome}/${ver}/colors/noctalia.conf";
+              custom_palette = true;
+              icon_theme = "MoreWaita";
+              standard_dialogs = "xdgdesktopportal";
+              style = "Breeze";
+            };
+            Fonts = {
+              fixed = "\"JetBrainsMono Nerd Font,12\"";
+              general = "\"Noto Sans,12\"";
+            };
+          };
+        in
+        {
+          enable = true;
+          platformTheme.name = "qtct";
+          style.name = "breeze";
+          qt5ctSettings = qt_settings "qt5ct";
+          qt6ctSettings = qt_settings "qt6ct";
+        };
+
+      home.sessionVariables = {
+        QS_ICON_THEME = "MoreWaita";
+      };
+    };
+}

modules/features/stylix.nix

@@ -1,105 +0,0 @@
-{
-  inputs,
-  ...
-}:
-{
-  flake.modules.homeManager.stylix =
-    {
-      config,
-      pkgs,
-      ...
-    }:
-    {
-      imports = [
-        inputs.stylix.homeModules.stylix
-      ];
-
-      # Not really using stylix as it was intended because IMO it sets too many defaults for some
-      # programs and not enought for others, meaning I wind up setting a lot myself anyway. That
-      # being said it provides a nice structure for setting fonts, cursors, icons, etc.
-      stylix = {
-        enable = true;
-        autoEnable = false;
-        polarity = "dark";
-        base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-        cursor = {
-          name = "catppuccin-mocha-dark-cursors";
-          package = pkgs.catppuccin-cursors.mochaDark;
-          size = 16;
-        };
-        # For some reason setting the fonts' package option doesn't work.
-        # Just use home.packages instead
-        fonts = {
-          monospace.name = "JetBrainsMono Nerd Font";
-          sansSerif.name = "Noto Sans";
-          emoji.name = "Noto Color Emoji";
-          sizes = {
-            applications = 12;
-            terminal = 12;
-          };
-        };
-        icons = {
-          enable = true;
-          package = pkgs.morewaita-icon-theme;
-          light = "MoreWaita";
-          dark = "MoreWaita";
-        };
-      };
-
-      # Fonts
-      home.packages = with pkgs; [
-        nerd-fonts.jetbrains-mono
-        noto-fonts
-        noto-fonts-cjk-sans
-        noto-fonts-color-emoji
-      ];
-
-      fonts.fontconfig = {
-        enable = true;
-        defaultFonts = {
-          sansSerif = [ "Noto Sans" ];
-          monospace = [ "JetBrainsMono Nerd Font" ];
-          emoji = [ "Noto Color Emoji" ];
-        };
-      };
-
-      gtk = {
-        enable = true;
-        colorScheme = config.stylix.polarity;
-        # iconTheme is set by default by stylix.icons.enable
-        theme = {
-          name = "adw-gtk3-${config.stylix.polarity}";
-          package = pkgs.adw-gtk3;
-        };
-        gtk4.theme = config.gtk.theme;
-      };
-
-      qt =
-        let
-          qt_settings = ver: {
-            Appearance = {
-              color_scheme_path = "${config.xdg.configHome}/${ver}/colors/noctalia.conf";
-              custom_palette = true;
-              icon_theme = config.stylix.icons.${config.stylix.polarity};
-              standard_dialogs = "xdgdesktopportal";
-              style = "Breeze";
-            };
-            Fonts = {
-              fixed = "\"${config.stylix.fonts.monospace.name},${toString config.stylix.fonts.sizes.applications}\"";
-              general = "\"${config.stylix.fonts.sansSerif.name},${toString config.stylix.fonts.sizes.applications}\"";
-            };
-          };
-        in
-        {
-          enable = true;
-          platformTheme.name = "qtct";
-          style.name = "breeze";
-          qt5ctSettings = qt_settings "qt5ct";
-          qt6ctSettings = qt_settings "qt6ct";
-        };
-
-      home.sessionVariables = {
-        QS_ICON_THEME = config.stylix.icons.${config.stylix.polarity};
-      };
-    };
-}

modules/features/vicinae.nix

@@ -1,43 +1,38 @@
 {
-  flake.modules.homeManager.vicinae =
-    {
-      config,
-      ...
-    }:
-    {
-      # Not using Vicinae's flake because the server fucking seg faults immediately
-      programs.vicinae = {
+  flake.modules.homeManager.vicinae = {
+    # Not using Vicinae's flake because the server fucking seg faults immediately
+    programs.vicinae = {
+      enable = true;
+      systemd = {
         enable = true;
-        systemd = {
-          enable = true;
-          autoStart = true;
+        autoStart = true;
+      };
+      # For configuration option documentation, see: https://github.com/vicinaehq/vicinae/blob/f6222f1e82fe2077ad42f10a6d6837dc61c67fd0/vicinae/assets/config.jsonc
+      settings = {
+        escape_key_behavior = "close_window";
+        close_on_focus_loss = true;
+        pop_to_root_on_close = true;
+        favicon_service = "twenty";
+        telemetry = {
+          system_info = false;
         };
-        # For configuration option documentation, see: https://github.com/vicinaehq/vicinae/blob/f6222f1e82fe2077ad42f10a6d6837dc61c67fd0/vicinae/assets/config.jsonc
-        settings = {
-          escape_key_behavior = "close_window";
-          close_on_focus_loss = true;
-          pop_to_root_on_close = true;
-          favicon_service = "twenty";
-          telemetry = {
-            system_info = false;
+        font = {
+          normal = {
+            size = 12;
+            family = "JetBrainsMono Nerd Font";
           };
-          font = {
-            normal = {
-              size = config.stylix.fonts.sizes.applications;
-              family = "${config.stylix.fonts.monospace.name}";
-            };
+        };
+        theme = {
+          light = {
+            name = "noctalia";
+            icon_theme = "MoreWaita";
           };
-          theme = {
-            light = {
-              name = "noctalia";
-              icon_theme = "${config.stylix.icons.light}";
-            };
-            dark = {
-              name = "noctalia";
-              icon_theme = "${config.stylix.icons.dark}";
-            };
+          dark = {
+            name = "noctalia";
+            icon_theme = "MoreWaita";
           };
         };
       };
     };
+  };
 }

modules/features/xdg.nix

@@ -2,20 +2,11 @@
   flake.modules.homeManager.xdg =
     {
       config,
-      pkgs,
       ...
     }:
     {
       xdg = {
         enable = true;
-        portal = {
-          enable = true;
-          configPackages = [ pkgs.gnome-session ];
-          extraPortals = with pkgs; [
-            xdg-desktop-portal-gnome
-            xdg-desktop-portal-gtk
-          ];
-        };
         userDirs = {
           enable = true;
           setSessionVariables = true;