move overlays to root folder

5 files changed, 1 insertions, 41 deletions

diff --git a/user/overlays/extra-packages.nix b/user/overlays/extra-packages.nix
deleted file mode 100644
index ebe4fb0c..00000000
--- a/user/overlays/extra-packages.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-self: super: {
-  emacsPackagesFor = emacs: (
-    (super.emacsPackagesFor emacs).overrideScope (
-      eself: esuper:
-        esuper // {
-          tabnine-capf = super.callPackage ../packages/tabnine-capf.nix {
-            inherit eself;
-          };
-        }
-    )
-  );
-  enchant = super.enchant.overrideAttrs (old: {
-    configureFlags = old.configureFlags ++ [ "--without-hspell" ]
-      # builtins.filter (c: c != "--with-hspell") old.configureFlags
-      ++ self.lib.optional super.stdenv.isDarwin "--with-applespell"
-    ;
-    buildInputs =
-      builtins.filter (c: c.name != "hspell") old.buildInputs
-      ++ self.lib.optionals super.stdenv.isDarwin (with super.darwin.apple_sdk.frameworks; [ Cocoa ]);
-    propagatedBuildInputs = builtins.filter (c: c.name != "hspell") old.propagatedBuildInputs;
-  });
-}
diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix
index 1b1f53da..d7d0c2eb 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -10,7 +10,7 @@
     prettier
   ] ++ (with pkgs; [
     flyctl
-    self.htmlformat
+    htmlformat
   ]);
   home.shellAliases = {
     # 0.2.25 current completion command only affects `flyctl`, although `fly` is a link to `flyctl`
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index c24bb984..dd4ea824 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -27,9 +27,6 @@ in
     maintainers = [ "alanpearce" ];
     nixpkgs = "builtins.getFlake \"nixpkgs\"";
   };
-  nixpkgs.overlays = [
-    (import ../overlays/extra-packages.nix)
-  ];
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     nix-mode
     nix-update
diff --git a/user/settings/nixpkgs.nix b/user/settings/nixpkgs.nix
index 9f8af5c8..992f6742 100644
--- a/user/settings/nixpkgs.nix
+++ b/user/settings/nixpkgs.nix
@@ -10,10 +10,4 @@ in
   imports = [
     ./nix.nix
   ];
-  nixpkgs.overlays = [
-    (self: super: {
-      firefox-bin-unwrapped = super.firefox-bin-unwrapped.override { systemLocale = "en-GB"; };
-      firefox-devedition-bin-unwrapped = super.firefox-devedition-bin-unwrapped.override { systemLocale = "en-GB"; };
-    })
-  ];
 }
diff --git a/user/settings/rofi.nix b/user/settings/rofi.nix
index c0c6990d..35d50a91 100644
--- a/user/settings/rofi.nix
+++ b/user/settings/rofi.nix
@@ -12,15 +12,6 @@
     gui_if_available = false
   '';
 
-  nixpkgs.overlays = [
-    (self: super: {
-      rofi = super.rofi.overrideAttrs (oldAttrs: rec {
-        postInstall = ''
-          ln $out/bin/rofi $out/bin/dmenu
-        '';
-      });
-    })
-  ];
   programs.rofi = {
     enable = true;
     theme = "Arc";