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,133 +1,123 @@
 {
   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
-      inkscape
+  ]
-      exiftool
+  ++ (with gimp3Plugins; [
-    ]
+    #fourier  # broken
-    ++ (with gimp3Plugins; [
+    #lqrPlugin  # broken
-      #fourier  # broken
+  ])
-      #lqrPlugin  # broken
+  ++ lib.optionals pkgs.stdenv.isLinux [
-    ])
+    darktable
-    ++ lib.optionals pkgs.stdenv.isLinux [
+    gimp3
-      darktable
+    hugin
-      gimp3
+    #luminanceHDR  # FIXME, build failure
-      hugin
+    xournalpp
-      #luminanceHDR  # FIXME, build failure
+  ]
-      xournalpp
+  ++ lib.optionals pkgs.stdenv.isDarwin [
-    ]
+    gimp2
-    ++ lib.optionals pkgs.stdenv.isDarwin [
+  ];
-      gimp2
-    ];
 
-  multimediaApps =
+  multimediaApps = [
-    with pkgs;
+    mpv
-    [
+  ]
-      mpv
+  ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
-    ]
+  ++ lib.optionals pkgs.stdenv.isLinux [
-    ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
+    vlc
-    ++ lib.optionals pkgs.stdenv.isLinux [
+    amarok
-      vlc
+    clementine
-      amarok
+    kdePackages.elisa
-      clementine
+    musescore
-      kdePackages.elisa
+    tenacity
-      musescore
+    #nur.repos.fooker.studio-link
-      tenacity
+  ];
-      #nur.repos.fooker.studio-link
-    ];
 
-  cliApps =
+  cliApps = [
-    with pkgs;
+    coreutils
-    [
+    myVim
-      coreutils
+    htop
-      myVim
+    tmux
-      htop
+    httpie
-      tmux
+    rsync
-      httpie
+    ponysay
-      rsync
+    gti
-      ponysay
+    tree
-      gti
+    lsof
-      tree
+    mosh
-      lsof
+    openssh
-      mosh
+    sshfs-fuse
-      openssh
+    sshuttle
-      sshfs-fuse
+    cryfs
-      sshuttle
+    gnupg
-      cryfs
+    unar
-      gnupg
+    lzop
-      unar
+    p7zip
-      lzop
+    pwgen
-      p7zip
+    pandoc
-      pwgen
+    pdfgrep
-      pandoc
+    # zig dependency breaks occasionally, stay on C version for now
-      pdfgrep
+    ncdu_1
-      # zig dependency breaks occasionally, stay on C version for now
+    dos2unix
-      ncdu_1
+    unzip
-      dos2unix
+    fswatch
-      unzip
+    jq
-      fswatch
+    age
-      jq
+    lnav
-      age
+    spacer
-      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?
+  nixHelpers = [
-    ]
-    ++ 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; [
     nixpkgs-review
     nixfmt
     nix-top
     statix
   ];
-  devTools =
+  devTools = [
-    with pkgs;
+    curl
-    [
+    httpie
-      curl
+    gcc
-      httpie
+    shellcheck
-      gcc
+    mtr
-      shellcheck
+    ripgrep
-      mtr
+    fd
-      ripgrep
+    pre-commit
-      fd
+    scriv
-      pre-commit
-      scriv
 
-      # Haskell
+    # Haskell
-      ghc
+    ghc
-      cabal2nix
+    cabal2nix
-    ]
+  ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
+  ++ lib.optionals pkgs.stdenv.isLinux [
-      gdb
+    gdb
-      strace
+    strace
-      ltrace
+    ltrace
-      valgrind
+    valgrind
-      zeal
+    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 =
+  kdeTools = [
-    with pkgs;
+    okteta
-    [
+  ]
-      okteta
+  ++ (with kdePackages; [
-    ]
+    okular
-    ++ (with kdePackages; [
+    gwenview
-      okular
+    yakuake
-      gwenview
+    dolphin
-      yakuake
+    spectacle
-      dolphin
+    kate
-      spectacle
+    kleopatra
-      kate
+    qdirstat
-      kleopatra
+    ark
-      qdirstat
+    kwalletmanager
-      ark
+    #ktouch  # TODO: unbreak
-      kwalletmanager
+    kcharselect
-      #ktouch  # TODO: unbreak
+    konversation
-      kcharselect
+    krdc
-      konversation
+    skanlite
-      krdc
+    akonadiconsole
-      skanlite
+    tokodon # mastodon client
-      akonadiconsole
+    networkmanager-qt
-      tokodon # mastodon client
+    kcrash
-      networkmanager-qt
+    breeze-gtk
-      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 = [

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