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

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;
           };
         };

home/modules/packages.nix

@@ -1,19 +1,17 @@
 {
   pkgs,
-  lib,
   inputs,
   config,
   ...
 }:
 
+with pkgs;
 let
   cfg = config.schmittlauch.packages;
-  unstable = inputs.nixos-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+  unstable = inputs.nixos-unstable.legacyPackages.${stdenv.hostPlatform.system};
-  nur = inputs.nur.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+  nur = inputs.nur.legacyPackages.${stdenv.hostPlatform.system};
 
-  graphicsApps =
+  graphicsApps = [
-    with pkgs;
-    [
     inkscape
     exiftool
   ]
@@ -32,9 +30,7 @@ let
     gimp2
   ];
 
-  multimediaApps =
+  multimediaApps = [
-    with pkgs;
-    [
     mpv
   ]
   ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
@@ -48,9 +44,7 @@ let
     #nur.repos.fooker.studio-link
   ];
 
-  cliApps =
+  cliApps = [
-    with pkgs;
-    [
     coreutils
     myVim
     htop
@@ -84,8 +78,6 @@ let
     spacer
 
     nix-output-monitor # putting this here as a plain `nix` alternative
-
-      fc-scripts # this might turn out to be useful even in non-work environments?
   ]
   ++ lib.optionals pkgs.stdenv.isLinux [
     xclip
@@ -96,15 +88,13 @@ let
     reptyr # re-bind running program to other tty
   ];
 
-  nixHelpers = with pkgs; [
+  nixHelpers = [
     nixpkgs-review
     nixfmt
     nix-top
     statix
   ];
-  devTools =
+  devTools = [
-    with pkgs;
-    [
     curl
     httpie
     gcc
@@ -127,7 +117,7 @@ let
     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,9 +187,7 @@ let
     chromedriver
   ];
 
-  kdeTools =
+  kdeTools = [
-    with pkgs;
-    [
     okteta
   ]
   ++ (with kdePackages; [
@@ -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 = [

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;
+      };
+    };
+  })
+]

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;
-    };
-  };
 }

packages/fc-scripts.nix

@@ -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
-  '';
-}