diff --git a/darwin/configuration.nix b/darwin/configuration.nix
index 3ee831b..874c56b 100644
--- a/darwin/configuration.nix
+++ b/darwin/configuration.nix
@@ -27,7 +27,6 @@ in
       sandbox = "relaxed";
     };
   };
-  services.angrr.timer.enable = true;
 
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
diff --git a/flake.nix b/flake.nix
index 84dbbcf..7b733a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,7 +109,6 @@
           # Optionally use extraSpecialArgs
           # to pass through arguments to home.nix
           extraSpecialArgs = {
-            # XXX: can we use the inputInjection pattern here as well instead?
             inherit inputs;
           };
         };
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 3c9583d..cdfedeb 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -1,133 +1,123 @@
 {
   pkgs,
-  lib,
   inputs,
   config,
   ...
 }:
 
+with pkgs;
 let
   cfg = config.schmittlauch.packages;
-  unstable = inputs.nixos-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-  nur = inputs.nur.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+  unstable = inputs.nixos-unstable.legacyPackages.${stdenv.hostPlatform.system};
+  nur = inputs.nur.legacyPackages.${stdenv.hostPlatform.system};
 
-  graphicsApps =
-    with pkgs;
-    [
-      inkscape
-      exiftool
-    ]
-    ++ (with gimp3Plugins; [
-      #fourier  # broken
-      #lqrPlugin  # broken
-    ])
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      darktable
-      gimp3
-      hugin
-      #luminanceHDR  # FIXME, build failure
-      xournalpp
-    ]
-    ++ lib.optionals pkgs.stdenv.isDarwin [
-      gimp2
-    ];
+  graphicsApps = [
+    inkscape
+    exiftool
+  ]
+  ++ (with gimp3Plugins; [
+    #fourier  # broken
+    #lqrPlugin  # broken
+  ])
+  ++ lib.optionals pkgs.stdenv.isLinux [
+    darktable
+    gimp3
+    hugin
+    #luminanceHDR  # FIXME, build failure
+    xournalpp
+  ]
+  ++ lib.optionals pkgs.stdenv.isDarwin [
+    gimp2
+  ];
 
-  multimediaApps =
-    with pkgs;
-    [
-      mpv
-    ]
-    ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      vlc
-      amarok
-      clementine
-      kdePackages.elisa
-      musescore
-      tenacity
-      #nur.repos.fooker.studio-link
-    ];
+  multimediaApps = [
+    mpv
+  ]
+  ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
+  ++ lib.optionals pkgs.stdenv.isLinux [
+    vlc
+    amarok
+    clementine
+    kdePackages.elisa
+    musescore
+    tenacity
+    #nur.repos.fooker.studio-link
+  ];
 
-  cliApps =
-    with pkgs;
-    [
-      coreutils
-      myVim
-      htop
-      tmux
-      httpie
-      rsync
-      ponysay
-      gti
-      tree
-      lsof
-      mosh
-      openssh
-      sshfs-fuse
-      sshuttle
-      cryfs
-      gnupg
-      unar
-      lzop
-      p7zip
-      pwgen
-      pandoc
-      pdfgrep
-      # zig dependency breaks occasionally, stay on C version for now
-      ncdu_1
-      dos2unix
-      unzip
-      fswatch
-      jq
-      age
-      lnav
-      spacer
+  cliApps = [
+    coreutils
+    myVim
+    htop
+    tmux
+    httpie
+    rsync
+    ponysay
+    gti
+    tree
+    lsof
+    mosh
+    openssh
+    sshfs-fuse
+    sshuttle
+    cryfs
+    gnupg
+    unar
+    lzop
+    p7zip
+    pwgen
+    pandoc
+    pdfgrep
+    # zig dependency breaks occasionally, stay on C version for now
+    ncdu_1
+    dos2unix
+    unzip
+    fswatch
+    jq
+    age
+    lnav
+    spacer
 
-      nix-output-monitor # putting this here as a plain `nix` alternative
+    nix-output-monitor # putting this here as a plain `nix` alternative
+  ]
+  ++ lib.optionals pkgs.stdenv.isLinux [
+    xclip
+    smbnetfs # for FUSE smb mounting
+    psmisc # for killall
+    torsocks
+    agrep
+    reptyr # re-bind running program to other tty
+  ];
 
-      fc-scripts # this might turn out to be useful even in non-work environments?
-    ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      xclip
-      smbnetfs # for FUSE smb mounting
-      psmisc # for killall
-      torsocks
-      agrep
-      reptyr # re-bind running program to other tty
-    ];
-
-  nixHelpers = with pkgs; [
+  nixHelpers = [
     nixpkgs-review
     nixfmt
     nix-top
     statix
   ];
-  devTools =
-    with pkgs;
-    [
-      curl
-      httpie
-      gcc
-      shellcheck
-      mtr
-      ripgrep
-      fd
-      pre-commit
-      scriv
+  devTools = [
+    curl
+    httpie
+    gcc
+    shellcheck
+    mtr
+    ripgrep
+    fd
+    pre-commit
+    scriv
 
-      # Haskell
-      ghc
-      cabal2nix
-    ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      gdb
-      strace
-      ltrace
-      valgrind
-      zeal
-    ];
+    # Haskell
+    ghc
+    cabal2nix
+  ]
+  ++ lib.optionals pkgs.stdenv.isLinux [
+    gdb
+    strace
+    ltrace
+    valgrind
+    zeal
+  ];
 
-  pythonTools = with pkgs.python3Packages; [
+  pythonTools = with python3Packages; [
     python # to shadow old macOS python
     ipython
     uv
@@ -141,16 +131,16 @@ let
     mypy
   ];
 
-  games = with pkgs; [
+  games = [
     superTuxKart
     #hedgewars
   ];
 
-  desktopCommon = with pkgs; [
+  desktopCommon = [
     keepassxc
   ];
 
-  desktopLinux = with pkgs; [
+  desktopLinux = [
     firefox
     chromium
     kdePackages.falkon
@@ -197,33 +187,31 @@ let
     chromedriver
   ];
 
-  kdeTools =
-    with pkgs;
-    [
-      okteta
-    ]
-    ++ (with kdePackages; [
-      okular
-      gwenview
-      yakuake
-      dolphin
-      spectacle
-      kate
-      kleopatra
-      qdirstat
-      ark
-      kwalletmanager
-      #ktouch  # TODO: unbreak
-      kcharselect
-      konversation
-      krdc
-      skanlite
-      akonadiconsole
-      tokodon # mastodon client
-      networkmanager-qt
-      kcrash
-      breeze-gtk
-    ]);
+  kdeTools = [
+    okteta
+  ]
+  ++ (with kdePackages; [
+    okular
+    gwenview
+    yakuake
+    dolphin
+    spectacle
+    kate
+    kleopatra
+    qdirstat
+    ark
+    kwalletmanager
+    #ktouch  # TODO: unbreak
+    kcharselect
+    konversation
+    krdc
+    skanlite
+    akonadiconsole
+    tokodon # mastodon client
+    networkmanager-qt
+    kcrash
+    breeze-gtk
+  ]);
 in
 {
   options.schmittlauch.packages = {
@@ -260,7 +248,7 @@ in
       ++ (lib.optional cfg.kde kdeTools)
     );
 
-    nixpkgs.overlays = lib.attrValues inputs.self.overlays;
+    nixpkgs.overlays = import ../overlays.nix;
     nixpkgs.config = {
 
       permittedInsecurePackages = [
diff --git a/home/overlays.nix b/home/overlays.nix
new file mode 100644
index 0000000..74db291
--- /dev/null
+++ b/home/overlays.nix
@@ -0,0 +1,31 @@
+[
+  (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;
+      };
+    };
+  })
+]
diff --git a/packages/default.nix b/packages/default.nix
index 1405ec3..fe84da9 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -5,32 +5,4 @@ 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;
-    };
-  };
 }
diff --git a/packages/fc-scripts.nix b/packages/fc-scripts.nix
deleted file mode 100644
index f8725ed..0000000
--- a/packages/fc-scripts.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  fetchFromGitHub,
-  runCommand,
-  python3,
-  stdenvNoCC,
-}:
-stdenvNoCC.mkDerivation {
-  pname = "fc-scripts";
-  version = "20260202";
-  src = fetchFromGitHub {
-    owner = "flyingcircusio";
-    repo = "scripts";
-    rev = "887f066006829fc3ee44b3cfbe748c578ea2e7c1";
-    hash = "sha256-mrL/dULb0NKw8cH9ferzfDdRjhWANrWQg/u7FNCtzWw=";
-  };
-
-  buildInputs = [ python3 ];
-  dontBuild = true;
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp *.py $out/bin/
-
-    runHook postInstall
-  '';
-}