From 3e9450e1c634620dc7abb2175fd31bfbd94755b7 Mon Sep 17 00:00:00 2001
From: Adithya Nair <adtya@adtya.xyz>
Date: Sun, 12 May 2024 14:52:02 +0530
Subject: [PATCH] remove everything from overlays

---
 flake.nix                    | 2 +-
 home/programs/neovim.nix     | 4 ++--
 home/wm/default.nix          | 5 +++--
 home/wm/hyprland/default.nix | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5f58bb8..3c67468 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,7 +55,7 @@
           pkgs = import nixpkgs {
             inherit system;
             config = nixpkgs-config;
-            overlays = [ (import ./packages) neovim-nightly.overlay hyprland.overlays.default ];
+            overlays = [ (import ./packages) ];
           };
           specialArgs = inputs // { inherit secrets; };
           modules = [
diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix
index ebaeb52..e8b0272 100644
--- a/home/programs/neovim.nix
+++ b/home/programs/neovim.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, neovim-nightly, ... }: {
   xdg = {
     desktopEntries = {
       "nvim".name = "Neovim wrapper";
@@ -8,7 +8,7 @@
   };
   programs.neovim = {
     enable = true;
-    package = pkgs.neovim-nightly;
+    package = neovim-nightly.packages.${pkgs.system}.default;
     withNodeJs = true;
     withPython3 = true;
     withRuby = true;
diff --git a/home/wm/default.nix b/home/wm/default.nix
index 428929b..a1dcc38 100644
--- a/home/wm/default.nix
+++ b/home/wm/default.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, hyprland, ... }:
 let
   hyprland-pkg = config.wayland.windowManager.hyprland.finalPackage;
+  xdph = hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
 in
 {
   imports = [
@@ -12,7 +13,7 @@ in
     xdgOpenUsePortal = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
-      (pkgs.xdg-desktop-portal-hyprland.override { hyprland = hyprland-pkg; })
+      (xdph.override { hyprland = hyprland-pkg; })
     ];
     config = {
       common = {
diff --git a/home/wm/hyprland/default.nix b/home/wm/hyprland/default.nix
index f0eca9c..c784a07 100644
--- a/home/wm/hyprland/default.nix
+++ b/home/wm/hyprland/default.nix
@@ -1,5 +1,6 @@
 { config
 , pkgs
+, hyprland
 , ...
 }:
 let
@@ -19,6 +20,7 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = true;
+    package = hyprland.packages.${pkgs.system}.hyprland;
     systemd = {
       enable = true;
       variables = [ "--all" ];