unify overlays

We used to have overlay definitions in home/overlays and
packages/default. Let's unify them.
Using the exposed overlay from the flake required some changes in the
home-manager config though.

flake.nix

@@ -109,6 +109,7 @@
           # Optionally use extraSpecialArgs
           # to pass through arguments to home.nix
           extraSpecialArgs = {
+            # XXX: can we use the inputInjection pattern here as well instead?
             inherit inputs;
           };
         };

home/modules/packages.nix

@@ -1,17 +1,19 @@
 {
   pkgs,
+  lib,
   inputs,
   config,
   ...
 }:
 
-with pkgs;
 let
   cfg = config.schmittlauch.packages;
-  unstable = inputs.nixos-unstable.legacyPackages.${stdenv.hostPlatform.system};
+  unstable = inputs.nixos-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-  nur = inputs.nur.legacyPackages.${stdenv.hostPlatform.system};
+  nur = inputs.nur.legacyPackages.${pkgs.stdenv.hostPlatform.system};
 
-  graphicsApps = [
+  graphicsApps =
+    with pkgs;
+    [
       inkscape
       exiftool
     ]
@@ -30,7 +32,9 @@ let
       gimp2
     ];
 
-  multimediaApps = [
+  multimediaApps =
+    with pkgs;
+    [
       mpv
     ]
     ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
@@ -44,7 +48,9 @@ let
       #nur.repos.fooker.studio-link
     ];
 
-  cliApps = [
+  cliApps =
+    with pkgs;
+    [
       coreutils
       myVim
       htop
@@ -78,6 +84,7 @@ let
       spacer
 
       nix-output-monitor # putting this here as a plain `nix` alternative
+
     ]
     ++ lib.optionals pkgs.stdenv.isLinux [
       xclip
@@ -88,13 +95,15 @@ let
       reptyr # re-bind running program to other tty
     ];
 
-  nixHelpers = [
+  nixHelpers = with pkgs; [
     nixpkgs-review
     nixfmt
     nix-top
     statix
   ];
-  devTools = [
+  devTools =
+    with pkgs;
+    [
       curl
       httpie
       gcc
@@ -117,7 +126,7 @@ let
       zeal
     ];
 
-  pythonTools = with python3Packages; [
+  pythonTools = with pkgs.python3Packages; [
     python # to shadow old macOS python
     ipython
     uv
@@ -131,16 +140,16 @@ let
     mypy
   ];
 
-  games = [
+  games = with pkgs; [
     superTuxKart
     #hedgewars
   ];
 
-  desktopCommon = [
+  desktopCommon = with pkgs; [
     keepassxc
   ];
 
-  desktopLinux = [
+  desktopLinux = with pkgs; [
     firefox
     chromium
     kdePackages.falkon
@@ -187,7 +196,9 @@ let
     chromedriver
   ];
 
-  kdeTools = [
+  kdeTools =
+    with pkgs;
+    [
       okteta
     ]
     ++ (with kdePackages; [
@@ -248,7 +259,7 @@ in
       ++ (lib.optional cfg.kde kdeTools)
     );
 
-    nixpkgs.overlays = import ../overlays.nix;
+    nixpkgs.overlays = lib.attrValues inputs.self.overlays;
     nixpkgs.config = {
 
       permittedInsecurePackages = [

home/overlays.nix

@@ -1,31 +0,0 @@
-[
-  (self: super: {
-    myVim = super.neovim.override {
-      configure = {
-        packages.myVimPackage = with self.pkgs.vimPlugins; {
-          # loaded on start
-          start = [
-            ale
-            base16-vim
-            LanguageClient-neovim
-            ctrlp
-            direnv-vim
-            fugitive
-            haskell-vim
-            jedi-vim
-            nerdtree
-            nerdtree-git-plugin
-            supertab
-            vim-dirdiff
-            vim-pandoc
-            vim-pandoc-syntax
-            vim-nix
-            vim-jinja
-            which-key-nvim
-          ];
-        };
-        customRC = builtins.readFile ./vimrc;
-      };
-    };
-  })
-]

packages/default.nix

@@ -5,4 +5,32 @@ final: prev: {
       spsdk = python-prev.spsdk.overridePythonAttrs { doCheck = false; };
     };
   };
+  fc-scripts = final.callPackage ./fc-scripts.nix { };
+  myVim = prev.neovim.override {
+    configure = {
+      packages.myVimPackage = with final.pkgs.vimPlugins; {
+        # loaded on start
+        start = [
+          ale
+          base16-vim
+          LanguageClient-neovim
+          ctrlp
+          direnv-vim
+          fugitive
+          haskell-vim
+          jedi-vim
+          nerdtree
+          nerdtree-git-plugin
+          supertab
+          vim-dirdiff
+          vim-pandoc
+          vim-pandoc-syntax
+          vim-nix
+          vim-jinja
+          which-key-nvim
+        ];
+      };
+      customRC = builtins.readFile ../home/vimrc;
+    };
+  };
 }