refactor: use overlays where possible

configurations/nos/modules/jellyfin/packages.nix

@@ -6,6 +6,7 @@
 }: let
   jellyPkgs =
     if config.nvidia.enableCUDA
+    # TODO: add overlays to upstream flake
     then jellyfin-flake.packages.${pkgs.system}.cudaPackages
     else jellyfin-flake.packages.${pkgs.system};
 in {

configurations/servivi/modules/minecraft/default.nix

@@ -7,6 +7,7 @@
   imports = [minix.nixosModules.default];
 
   environment.systemPackages = [
+    # TODO: add overlays to upstream flake
     minix.packages.${pkgs.system}.curseforge-server-downloader
   ];
 

homeManagerModules/neovim/langs/nix-lang/default.nix

@@ -25,7 +25,7 @@ self: {
     '';
   };
 
-  nixdPkg = self.inputs.nixd.packages.${pkgs.system}.default;
+  nixdPkg = pkgs.nixd;
 
   flakeEnv = config.programs.bash.sessionVariables.FLAKE;
   flakeDir = "${removePrefix "${mainHmCfg.home.homeDirectory}/" flakeEnv}";

modules/ags/default.nix

@@ -52,8 +52,10 @@ in {
     security.pam.services.astal-auth = {};
     services.upower.enable = true;
 
-    # FIXME: https://github.com/NixOS/nixpkgs/pull/377867
     nixpkgs.overlays = [
+      virtualkeyboard-adapter.overlays.default
+
+      # FIXME: https://github.com/NixOS/nixpkgs/pull/377867
       (final: prev: {
         gtk4-layer-shell = prev.gtk4-layer-shell.overrideAttrs (o: rec {
           version = "1.1.0";
@@ -75,7 +77,7 @@ in {
         waylandFrontend = true;
         plasma6Support = true;
         addons = [
-          virtualkeyboard-adapter.packages.${pkgs.system}.default
+          pkgs.virtualkeyboard-adapter
         ];
       };
     };

modules/ags/packages.nix

@@ -30,6 +30,7 @@ in {
   config = mkIf cfgDesktop.ags.enable {
     # Make these accessible outside these files
     programs.ags = {
+      # TODO: add overlays to upstream flake
       package = ags.packages.${pkgs.system}.ags.override {
         extraPackages = cfg.astalLibs;
 
@@ -58,7 +59,10 @@ in {
           wireplumber
           ;
 
+        # TODO: switch to Gtk4 version to get rid of this dep
         gtkSessionLock = gtk-session-lock.packages.${pkgs.system}.default;
+
+        # TODO: add overlays to upstream flake
         libKompass = kompass.packages.${pkgs.system}.libkompass;
 
         # libkompass dependencies

modules/base/default.nix

@@ -5,7 +5,7 @@ self: {
   ...
 }: let
   inherit (lib) attrValues mkDefault mkIf mkOption types;
-  inherit (self.inputs) home-manager nh;
+  inherit (self.inputs) home-manager;
 
   cfg = config.roles.base;
 in {
@@ -70,7 +70,7 @@ in {
 
     programs.nh = {
       enable = true;
-      package = nh.packages.${pkgs.system}.default;
+      package = pkgs.nh;
 
       # weekly cleanup
       clean = {

modules/base/packages/default.nix

@@ -12,6 +12,9 @@ in {
     nixpkgs.overlays =
       (map (i: self.inputs.${i}.overlays.default) [
         "grim-hyprland"
+        "nh"
+        "nixd"
+        "nurl"
         "nixpkgs-wayland"
       ])
       ++ (attrValues {
@@ -30,7 +33,7 @@ in {
       nurl =
         if (cfg.user != "nixos" && cfg.user != "nix-on-droid")
         then
-          self.inputs.nurl.packages.${pkgs.system}.default.overrideAttrs {
+          pkgs.nurl.overrideAttrs {
             postInstall = ''
               wrapProgram $out/bin/nurl --prefix PATH : ${makeBinPath [
                 (config.home-manager.users.${cfg.user}.programs.git.package or pkgs.gitMinimal)

modules/desktop/default.nix

@@ -28,6 +28,13 @@ in {
         '';
       }
     ];
+
+    nixpkgs.overlays = map (i: self.inputs.${i}.overlays.default) [
+      "hyprland"
+      "hyprland-plugins"
+      "hyprpaper"
+      "nixpkgs-wayland"
+    ];
   };
 
   options.roles.desktop = {

modules/desktop/environment/default.nix

@@ -4,7 +4,6 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.inputs) hyprland;
   inherit (self.lib.hypr) mkBind mkMonitor;
 
   inherit (lib) attrValues concatStringsSep mkIf optionals removeSuffix;
@@ -65,13 +64,6 @@ in {
       };
     };
 
-    # Make sure we only use the package from the hyprland flake
-    nixpkgs.overlays = [
-      (final: prev: {
-        xdg-desktop-portal-hyprland = hyprCfg.finalPortalPackage;
-      })
-    ];
-
     home-manager.users.${cfg.user} = {
       imports = [
         ./home/dev.nix
@@ -88,19 +80,13 @@ in {
         enable = true;
 
         # Get rid of logs shown on the TTY right before Hyprland launches
-        package = hyprland.packages.${pkgs.system}.default.overrideAttrs (o: {
+        package = pkgs.hyprland.overrideAttrs (o: {
           postInstall = ''
             ${removeSuffix "\n\n" o.postInstall} \
                 --append-flags '&>/dev/null'
           '';
         });
 
-        portalPackage =
-          hyprland
-          .packages
-          .${pkgs.system}
-          .xdg-desktop-portal-hyprland;
-
         systemd.variables = ["-all"];
 
         settings = {

modules/desktop/environment/home/hyprexpo.nix

@@ -12,7 +12,7 @@ self: {
 in {
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland = {
-      plugins = [self.inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo];
+      plugins = [pkgs.hyprlandPlugins.hyprexpo];
 
       settings = {
         plugin.hyprexpo = {

modules/desktop/environment/home/hyprgrass.nix

@@ -12,6 +12,7 @@ self: {
 in {
   config = mkIf (cfg.enable && cfg.isTouchscreen) {
     wayland.windowManager.hyprland = {
+      # TODO: add overlays to upstream flake
       plugins = [self.inputs.hyprgrass.packages.${pkgs.system}.default];
 
       settings = {

modules/desktop/environment/home/obs.nix

@@ -1,13 +1,9 @@
-self: {
+{
   lib,
   osConfig,
   pkgs,
   ...
 }: let
-  inherit (self.inputs) nixpkgs-wayland;
-
-  waypkgs = nixpkgs-wayland.packages.${pkgs.system};
-
   inherit (lib) mkIf;
 
   cfg = osConfig.roles.desktop;
@@ -17,13 +13,10 @@ in {
       obs-studio = {
         enable = true;
         plugins = [
-          waypkgs.obs-wlrobs
+          pkgs.waylandPkgs.obs-wlrobs
           pkgs.obs-studio-plugins.droidcam-obs
         ];
       };
     };
   };
-
-  # For accurate stack trace
-  _file = ./obs.nix;
 }

modules/desktop/environment/modules/packages.nix

@@ -40,8 +40,8 @@ in {
     home-manager.users.${cfg.user} = {
       imports = [
         ../home/foot.nix
+        ../home/obs.nix
         (import ../home/mpv.nix self)
-        (import ../home/obs.nix self)
 
         nixcord.homeManagerModules.nixcord
 

modules/desktop/theme/default.nix

@@ -9,10 +9,10 @@ self: {
 in {
   imports = [
     ./gtk
+    ./hyprpaper
     ./xresources
 
     (import ./cursors self)
-    (import ./hyprpaper self)
     (import ./qt self)
   ];
 

modules/desktop/theme/hyprpaper/default.nix

@@ -1,4 +1,4 @@
-self: {
+{
   lib,
   osConfig,
   pkgs,
@@ -7,12 +7,10 @@ self: {
   inherit (lib) mkIf;
 
   cfg = osConfig.roles.desktop;
-
-  hyprpaper = self.inputs.hyprpaper.packages.${pkgs.system}.default;
   wallpaper = toString pkgs.scopedPackages.dracula.wallpaper;
 in {
   config = mkIf cfg.enable {
-    home.packages = [hyprpaper];
+    home.packages = [pkgs.hyprpaper];
 
     xdg.configFile."hypr/hyprpaper.conf" = {
       text = lib.hm.generators.toHyprconf {
@@ -29,7 +27,4 @@ in {
       };
     };
   };
-
-  # For accurate stack trace
-  _file = ./default.nix;
 }