all repos — nixfiles @ 75a4e09f1d241f7882a86d7f9c4aa1804a981209

System and user configuration, managed by nix and home-manager

move overlays to root folder

Alan Pearce
commit

75a4e09f1d241f7882a86d7f9c4aa1804a981209

parent

21398bece441d9afaa8e74539d993c3e976ebce0

15 files changed, 39 insertions(+), 32 deletions(-)

jump to
M flake.nix → flake.nix
@@ -50,11 +50,7 @@ };
       };
     in
     {
-      overlays.default = final: prev: {
-        self = {
-          htmlformat = final.callPackage ./packages/htmlformat { };
-        };
-      };
+      overlays.default = import ./overlays/htmlformat;
 
       nixosConfigurations.prefect = nixpkgs.lib.nixosSystem {
         system = utils.lib.system.x86_64-linux;
A overlays/cgit-pink/default.nix
@@ -0,0 +1,5 @@
+self: super: {
+  cgit-pink = super.cgit-pink.overrideAttrs (old: {
+    patches = [ ./cgit-pink.patch ];
+  });
+}
A overlays/emacs.nix
@@ -0,0 +1,4 @@
+let
+  sources = import ../nix/sources.nix;
+in
+import sources.emacs-overlay
A overlays/firefox.nix
@@ -0,0 +1,4 @@
+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"; };
+}
A overlays/htmlformat/default.nix
@@ -0,0 +1,3 @@
+self: super: {
+  htmlformat = super.callPackage ./htmlformat.nix { };
+}
A overlays/rofi.nix
@@ -0,0 +1,7 @@
+self: super: {
+  rofi = super.rofi.overrideAttrs (oldAttrs: rec {
+    postInstall = ''
+      ln $out/bin/rofi $out/bin/dmenu
+    '';
+  });
+}
M system/linde.nix → system/linde.nix
@@ -242,13 +242,6 @@ '';
 
   nixpkgs = {
     config.allowUnfree = true;
-    overlays = [
-      (self: super: {
-        cgit-pink = super.cgit-pink.overrideAttrs (old: {
-          patches = [ ../patches/cgit-pink.patch ];
-        });
-      })
-    ];
   };
 
   programs.fish = {
M system/nanopi.nix → system/nanopi.nix
@@ -615,7 +615,6 @@ dates = [ "04:00" ];
     };
   };
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ ];
   system.autoUpgrade = {
     enable = false;
     dates = "01:00";
M user/overlays/extra-packages.nix → overlays/extra-packages.nix
@@ -9,6 +9,20 @@ };
         }
     )
   );
+  vimPlugins = super.vimPlugins.extend (final: prev: {
+    coc-tabnine =
+      let
+        inherit (super) tabnine;
+      in
+      prev.coc-tabnine.overrideAttrs {
+        buildInputs = [ tabnine ];
+
+        postFixup = ''
+          mkdir -p $target/binaries/${tabnine.version}
+          ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform}
+        '';
+      };
+  });
   enchant = super.enchant.overrideAttrs (old: {
     configureFlags = old.configureFlags ++ [ "--without-hspell" ]
       # builtins.filter (c: c != "--with-hspell") old.configureFlags
M user/settings/development/web.nix → user/settings/development/web.nix
@@ -10,7 +10,7 @@ stylelint
     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`
M user/settings/nix.nix → user/settings/nix.nix
@@ -27,9 +27,6 @@ xdg.configFile."nix-init/config.toml".source = toml.generate "config.toml" {
     maintainers = [ "alanpearce" ];
     nixpkgs = "builtins.getFlake \"nixpkgs\"";
   };
-  nixpkgs.overlays = [
-    (import ../overlays/extra-packages.nix)
-  ];
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     nix-mode
     nix-update
M user/settings/nixpkgs.nix → user/settings/nixpkgs.nix
@@ -10,10 +10,4 @@ {
   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"; };
-    })
-  ];
 }
M user/settings/rofi.nix → user/settings/rofi.nix
@@ -12,15 +12,6 @@ terminal = ${config.home.sessionVariables.TERMINAL}
     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";