summary refs log tree commit diff stats
path: root/user/settings
diff options
context:
space:
mode:
authorAlan Pearce2024-04-28 23:21:11 +0200
committerAlan Pearce2024-04-29 20:57:07 +0200
commit75a4e09f1d241f7882a86d7f9c4aa1804a981209 (patch)
treef56e407f99f9bbf696dd229e79f56d3664461a15 /user/settings
parent21398bece441d9afaa8e74539d993c3e976ebce0 (diff)
downloadnixfiles-75a4e09f1d241f7882a86d7f9c4aa1804a981209.tar.lz
nixfiles-75a4e09f1d241f7882a86d7f9c4aa1804a981209.tar.zst
nixfiles-75a4e09f1d241f7882a86d7f9c4aa1804a981209.zip
move overlays to root folder
Diffstat (limited to 'user/settings')
-rw-r--r--user/settings/development/web.nix2
-rw-r--r--user/settings/nix.nix3
-rw-r--r--user/settings/nixpkgs.nix6
-rw-r--r--user/settings/rofi.nix9
4 files changed, 1 insertions, 19 deletions
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";