flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c5f08b62ed75415439d48152c2a784e36909b1bc' (2025-08-09)
  → 'github:NixOS/nixpkgs/ddae11e58c0c345bf66efbddbf2192ed0e58f896' (2025-08-11)
• Updated input 'nur':
    'github:nix-community/NUR/f6fa362b700f64a9ac6e7d38b06db4f0c8101b4c' (2025-08-09)
  → 'github:nix-community/NUR/3a675e8f6015cb8ea14138b0c69722b2a0e09dee' (2025-08-13)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/c2ae88e026f9525daf89587f3cbee584b92b6134' (2025-08-06)
  → 'github:nixos/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054' (2025-08-09)

.git-blame-ignore-revs

@@ -0,0 +1 @@
+ce54be9aac846c7798307d6d6fcee3346c01f601

common/default.nix

@@ -28,7 +28,6 @@ in
 
   # configure console
   console = {
-    font = "Lat2-Terminus16";
     keyMap = "de";
   };
 
@@ -181,7 +180,7 @@ in
 
   # Flatpak support
   services.flatpak.enable = true;
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
+  xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
 
   # Define a user account. Don't forget to set a password with `passwd`.
   users.users.spiollinux = {
@@ -269,4 +268,5 @@ in
   networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
 
   services.dbus.implementation = "broker";
+  system.rebuild.enableNg = true;
 }

common/packages.nix

@@ -40,7 +40,7 @@
     exfat
     iotop
     cifs-utils
-    dstat
+    dool
     lsof
     macchanger
     borgbackup

common/pulseaudio.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   # Enable sound.
-  hardware.pulseaudio = {
+  services.pulseaudio = {
     enable = true;
     package = pkgs.pulseaudioFull;
     # decouple pulseaudio application and sink volumes

darwin/configuration.nix

@@ -4,7 +4,6 @@
   imports = [ ../common/nix-settings.nix ];
   nix = {
     enable = true;
-    package = pkgs.nixVersions.nix_2_25;
     settings = {
       trusted-users = [
         "os"
@@ -21,9 +20,6 @@
     };
   };
 
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = [ pkgs.vim ];
@@ -38,6 +34,7 @@
   # system-wide SSH configuration, used by nix-daemon for remote builders
 
   # show hidden files
+  system.primaryUser = "os";
   system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
 
   # Used for backwards compatibility, please read the changelog before changing.

flake.lock

@@ -102,16 +102,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747020534,
+        "lastModified": 1753592768,
-        "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -163,27 +163,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1743127615,
+        "lastModified": 1749744770,
-        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
+        "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
+        "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
         "type": "github"
       },
       "original": {
         "owner": "LnL7",
-        "ref": "nix-darwin-24.11",
+        "ref": "nix-darwin-25.05",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1747129300,
+        "lastModified": 1754564048,
-        "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
+        "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e81fd167b33121269149c57806599045fd33eeed",
+        "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1746904237,
+        "lastModified": 1754725699,
-        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
+        "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
+        "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
         "type": "github"
       },
       "original": {
@@ -243,27 +243,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1746957726,
+        "lastModified": 1754937576,
-        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+        "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+        "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1746904237,
+        "lastModified": 1754725699,
-        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
+        "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
+        "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
         "type": "github"
       },
       "original": {
@@ -276,15 +276,14 @@
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_3"
-        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1747261242,
+        "lastModified": 1755080806,
-        "narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=",
+        "narHash": "sha256-P94SMIPWhpSX5tvX4ccFDEC1pm0SsddKNouM49Dz5Oo=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e29c558fa4174da179e2e7f9a41c34466a200fda",
+        "rev": "3a675e8f6015cb8ea14138b0c69722b2a0e09dee",
         "type": "github"
       },
       "original": {
@@ -330,7 +329,7 @@
         "nixos-unstable": "nixos-unstable",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
-        "treefmt-nix": "treefmt-nix_2",
+        "treefmt-nix": "treefmt-nix",
         "utils": "utils"
       }
     },
@@ -373,36 +372,15 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "nur",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1733222881,
+        "lastModified": 1748243702,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746216483,
-        "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,11 +2,11 @@
   description = "NixOS system flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     lanzaboote = {
@@ -19,7 +19,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-darwin = {
-      url = "github:LnL7/nix-darwin/nix-darwin-24.11";
+      url = "github:LnL7/nix-darwin/nix-darwin-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -53,7 +53,7 @@
         (import nixpkgs { inherit system; }).applyPatches {
           name = "nixpkgs-patched";
           src = nixpkgs;
-          patches = [ ./patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch ];
+          patches = [ ];
         };
 
       # necessary to make the top-level inputs available to system configuration
@@ -166,6 +166,7 @@
         # inspired by https://github.com/Mic92/dotfiles/blob/main/home-manager/flake-module.nix
         # run like: `nix run .#hm -- <action>`
         apps.hm = {
+          meta.description = "Wrapper around home-manager with automatic profile selection";
           type = "app";
           program = "${pkgs.writeShellScriptBin "hm" ''
                 set -x

home/common.nix

@@ -11,6 +11,7 @@
     ./modules/packages.nix
     ./modules/vscodium.nix
     ./modules/fonts.nix
+    ./modules/captive-browser.nix
   ];
   home.homeDirectory =
     if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}";
@@ -51,9 +52,7 @@
       merge.tool = "vimdiff";
       # provide `git mergetool -t nixfmt`
       mergetool.nixfmt = {
-        cmd = "${
+        cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
-          lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
-        } --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
         trustExitCode = true;
       };
       core.excludesfile = toString (
@@ -105,7 +104,7 @@
     enable = true;
     syntaxHighlighting.enable = true;
     history.ignoreSpace = true;
-    initExtra = ''
+    initContent = ''
       # Uncomment following line if you want red dots to be displayed while waiting for completion
       COMPLETION_WAITING_DOTS="true"
       ### Fix slowness of pastes with zsh-syntax-highlighting.zsh

home/desktop.nix

@@ -33,46 +33,45 @@
       contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
     in
     {
-      includes =
+      includes = [
-        [
+        {
-          {
+          condition = "gitdir:~/Seafile/Studium/";
-            condition = "gitdir:~/Seafile/Studium/";
+          contents = {
+            user.name = contacts.personal.name;
+            user.email = contacts.uni.email;
+          };
+        }
+        {
+          condition = "gitdir:~/src/nixpkgs/";
+          contents = {
+            user.name = "Trolli Schmittlauch";
+            user.email = contacts.nixOs.email;
+          };
+        }
+      ]
+      # set default name for several other common locations
+      ++
+        map
+          (dir: {
+            condition = "gitdir:${dir}";
             contents = {
-              user.name = contacts.personal.name;
+              user = {
-              user.email = contacts.uni.email;
+                inherit (contacts.schmittlauch) email name;
-            };
-          }
-          {
-            condition = "gitdir:~/src/nixpkgs/";
-            contents = {
-              user.name = "Trolli Schmittlauch";
-              user.email = contacts.nixOs.email;
-            };
-          }
-        ]
-        # set default name for several other common locations
-        ++
-          map
-            (dir: {
-              condition = "gitdir:${dir}";
-              contents = {
-                user = {
-                  inherit (contacts.schmittlauch) email name;
-                };
               };
-            })
+            };
-            [
+          })
-              "~/src/"
+          [
-              "~/bin/"
+            "~/src/"
-              "~/tmp/"
+            "~/bin/"
-              "~/nixconfigs/"
+            "~/tmp/"
-            ];
+            "~/nixconfigs/"
+          ];
     };
 
   services.gpg-agent = {
     enable = true;
     #enableSshSupport = true;
-    pinentryPackage = pkgs.pinentry-qt;
+    pinentry.package = pkgs.pinentry-qt;
   };
 
   programs.ssh = {

home/modules/captive-browser.nix

@@ -0,0 +1,81 @@
+{
+  pkgs,
+  lib,
+  inputs,
+  config,
+  system,
+  ...
+}:
+
+let
+  tomlFormat = pkgs.formats.toml { };
+  cfg = config.programs.captive-browser;
+  inherit (pkgs.stdenv.hostPlatform) isDarwin;
+in
+{
+  options.programs.captive-browser = {
+    enable = lib.mkEnableOption "Enable custom captive-browser in user PATH";
+    package = lib.mkPackageOption pkgs "captive-browser" { nullable = true; };
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = tomlFormat.type;
+
+        options = {
+          browser = lib.mkOption {
+            type = lib.types.str;
+            description = "command to invoke the browser with";
+
+            # browser is the shell (/bin/sh) command executed once the proxy starts.
+            # When browser exits, the proxy exits. An extra env var PROXY is available.
+            #
+            # Here, we use a separate Chrome instance in Incognito mode, so that
+            # it can run (and be waited for) alongside the default one, and that
+            # it maintains no state across runs. To configure this browser open a
+            # normal window in it, settings will be preserved.
+            default = ''
+              ${cfg.browserCommand} \
+              --user-data-dir="$HOME/Library/Application Support/Google/Captive" \
+              --proxy-server="socks5://$PROXY" \
+              --host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost" \
+              --no-first-run --new-window --incognito \
+              http://example.com
+            '';
+          };
+        };
+      };
+    };
+    interface = lib.mkOption {
+      type = lib.types.str;
+      description = "WLAN interface to use";
+    };
+    browserCommand = lib.mkOption {
+      type = lib.types.str;
+      default = if isDarwin then "open -n -W -a \"Google Chrome\" --args" else (lib.getExe pkgs.chromium);
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    programs.captive-browser.settings = builtins.mapAttrs (_: lib.mkOptionDefault) {
+      # dhcp-dns is the shell (/bin/sh) command executed to obtain the DHCP
+      # DNS server address. The first match of an IPv4 regex is used.
+      # IPv4 only, because let's be real, it's a captive portal.
+      dhcp-dns =
+        if isDarwin then
+          "ipconfig getoption ${cfg.interface} domain_name_server"
+        else
+          "${lib.getExe pkgs.dhcpcd} -U ${cfg.interface} | grep domain_name_servers";
+
+      # socks5-addr is the listen address for the SOCKS5 proxy server.
+      socks5-addr = "localhost:1666";
+    };
+    home.file.".config/captive-browser.toml" = lib.mkIf (isDarwin && !config.xdg.enable) {
+      source = tomlFormat.generate "captive-browser-config" cfg.settings;
+    };
+
+    xdg.configFile."captive-browser.toml" = lib.mkIf (!(isDarwin && !config.xdg.enable)) {
+      source = tomlFormat.generate "captive-browser-config" cfg.settings;
+    };
+
+  };
+}

home/modules/latex.nix

@@ -43,5 +43,6 @@ in
         koma-script
         ;
     })
-  ] ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools;
+  ]
+  ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools;
 }

home/modules/packages.nix

@@ -12,83 +12,85 @@ let
   unstable = inputs.nixos-unstable.legacyPackages.${system};
   nur = inputs.nur.legacyPackages.${system};
 
-  graphicsApps =
+  graphicsApps = [
-    [
+    inkscape
-      inkscape
+    darktable
-      darktable
+    exiftool
-      exiftool
+  ]
-      gimp
+  ++ (with gimp3Plugins; [
-    ]
+    #fourier  # broken
-    ++ (with gimpPlugins; [
+    #lqrPlugin  # broken
-      fourier
+  ])
-      lqrPlugin
+  ++ lib.optionals pkgs.stdenv.isLinux [
-    ])
+    gimp3
-    ++ lib.optionals pkgs.stdenv.isLinux [
+    hugin
-      hugin
+    #luminanceHDR  # FIXME, build failure
-      luminanceHDR
+    xournalpp
-      xournal
+  ]
-    ];
+  ++ lib.optionals pkgs.stdenv.isDarwin [
+    gimp
+  ];
 
-  multimediaApps =
+  multimediaApps = [
-    [
+    mpv
-      mpv
+    yt-dlp
-      yt-dlp
+  ]
-    ]
+  ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
+  ++ lib.optionals pkgs.stdenv.isLinux [
-      vlc
+    vlc
-      amarok
+    amarok
-      clementine
+    clementine
-      elisa
+    kdePackages.elisa
-      musescore
+    musescore
-      tenacity
+    tenacity
-      soundkonverter
+    soundkonverter
-      #nur.repos.fooker.studio-link
+    #nur.repos.fooker.studio-link
-    ];
+  ];
 
-  cliApps =
+  cliApps = [
-    [
+    coreutils
-      coreutils
+    myVim
-      myVim
+    htop
-      htop
+    tmux
-      tmux
+    httpie
-      httpie
+    rsync
-      ponysay
+    ponysay
-      gti
+    gti
-      tree
+    tree
-      lsof
+    lsof
-      mosh
+    mosh
-      openssh
+    openssh
-      sshfs-fuse
+    sshfs-fuse
-      sshuttle
+    sshuttle
-      cryfs
+    cryfs
-      thefuck
+    thefuck
-      gnupg
+    gnupg
-      unar
+    unar
-      lzop
+    lzop
-      p7zip
+    p7zip
-      pwgen
+    pwgen
-      pandoc
+    pandoc
-      pdfgrep
+    pdfgrep
-      # zig dependency breaks occasionally, stay on C version for now
+    # zig dependency breaks occasionally, stay on C version for now
-      ncdu_1
+    ncdu_1
-      dos2unix
+    dos2unix
-      unzip
+    unzip
-      fswatch
+    fswatch
-      jq
+    jq
-      age
+    age
-      lnav
+    lnav
-      spacer
+    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 [
+  ++ lib.optionals pkgs.stdenv.isLinux [
-      xclip
+    xclip
-      smbnetfs # for FUSE smb mounting
+    smbnetfs # for FUSE smb mounting
-      psmisc # for killall
+    psmisc # for killall
-      torsocks
+    torsocks
-      agrep
+    agrep
-      reptyr # re-bind running program to other tty
+    reptyr # re-bind running program to other tty
-    ];
+  ];
 
   nixHelpers = [
     nixpkgs-review
@@ -96,33 +98,32 @@ let
     nix-top
     statix
   ];
-  devTools =
+  devTools = [
-    [
+    curl
-      curl
+    httpie
-      httpie
+    gcc
-      gcc
+    shellcheck
-      shellcheck
+    mtr
-      mtr
+    ripgrep
-      ripgrep
+    fd
-      fd
+    gitui
-      gitui
+    pre-commit
-      pre-commit
+    scriv
-      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 python3Packages; [
-    python3 # to shadow old macOS python
+    python # to shadow old macOS python
     ipython
     uv
     pip
@@ -142,13 +143,12 @@ let
 
   desktopCommon = [
     keepassxc
-    tigervnc
   ];
 
   desktopLinux = [
     firefox
     chromium
-    falkon
+    kdePackages.falkon
     thunderbird
     calibre
     dino
@@ -164,15 +164,15 @@ let
     seafile-client
     alacritty
     libreoffice-qt6 # still with KDE integration
-    backintime-common
     anki
     signal-desktop
     (tor-browser-bundle-bin.override {
       mediaSupport = true;
       pulseaudioSupport = pkgs.stdenv.isLinux;
     })
+    tigervnc
+    rustdesk-flutter
     pdfpc
-    quaternion
     nheko
     gpxsee
     subsurface
@@ -183,7 +183,7 @@ let
     #(pkgs.pidgin-with-plugins.override {
     #    plugins = [ pkgs.pidginotr ];})
 
-    unstable.logseq
+    logseq
 
     # for Hibiscus banking software
     jameica
@@ -192,33 +192,32 @@ let
     chromedriver
   ];
 
-  kdeTools =
+  kdeTools = [
-    [
+    okteta
-      okteta
+    plasma5Packages.kdeconnect-kde
-      plasma5Packages.kdeconnect-kde
+  ]
-    ]
+  ++ (with kdePackages; [
-    ++ (with kdePackages; [
+    okular
-      okular
+    gwenview
-      gwenview
+    yakuake
-      yakuake
+    dolphin
-      dolphin
+    spectacle
-      spectacle
+    kate
-      kate
+    kleopatra
-      kleopatra
+    qdirstat
-      qdirstat
+    ark
-      ark
+    kwalletmanager
-      kwalletmanager
+    #ktouch  # TODO: unbreak
-      #ktouch  # TODO: unbreak
+    kcharselect
-      kcharselect
+    konversation
-      konversation
+    krdc
-      krdc
+    skanlite
-      skanlite
+    akonadiconsole
-      akonadiconsole
+    tokodon # mastodon client
-      tokodon # mastodon client
+    networkmanager-qt
-      networkmanager-qt
+    kcrash
-      kcrash
+    breeze-gtk
-      breeze-gtk
+  ]);
-    ]);
 in
 {
   options.schmittlauch.packages = {

home/modules/vscodium.nix

@@ -11,112 +11,110 @@
     enable = true;
     package = pkgs.vscodium;
     mutableExtensionsDir = true;
-    extensions =
+    profiles.default = {
-      with pkgs.vscode-extensions;
+      extensions =
-      [
+        with pkgs.vscode-extensions;
-        ms-python.python
+        [
-        vscodevim.vim
+          ms-python.python
-        yzhang.markdown-all-in-one
+          charliermarsh.ruff
-        bungcip.better-toml
+          vscodevim.vim
-        eamodio.gitlens
+          yzhang.markdown-all-in-one
-        jnoortheen.nix-ide
+          bungcip.better-toml
-        mkhl.direnv
+          eamodio.gitlens
-        editorconfig.editorconfig
+          jnoortheen.nix-ide
-      ]
+          mkhl.direnv
-      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+          editorconfig.editorconfig
+        ]
+        ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+          {
+            name = "Sync-Rsync";
+            publisher = "vscode-ext";
+            version = "0.36.0";
+            sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
+          }
+          # TODO: probably available in nixpkgs soonish?
+          {
+            name = "mypy-type-checker";
+            publisher = "ms-python";
+            version = "2023.3.12681020";
+            sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
+          }
+          {
+            name = "vscode-pets";
+            publisher = "tonybaloney";
+            version = "1.25.1";
+            sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
+          }
+        ];
+      userSettings =
+        let
+          defaultPython = pkgs.python3.withPackages (ps: [
+            ps.jedi
+            ps.jedi-language-server
+            ps.pip
+            ps.setuptools # for pkg_resources
+            ps.black
+            ps.mypy
+          ]);
+        in
         {
-          name = "Sync-Rsync";
+          "editor.fontLigatures" = true;
-          publisher = "vscode-ext";
+          "editor.accessibilitySupport" = false; # prevent asking
-          version = "0.36.0";
+          "editor.cursorBlinking" = "phase";
-          sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
+          "editor.stickyScroll.enabled" = true;
-        }
+          "workbench.editor.highlightModifiedTabs" = true;
-        # TODO: probably available in nixpkgs soonish?
+          "window.autoDetectColorScheme" = true;
-        {
+          "workbench.preferredDarkColorTheme" = "Default Dark Modern";
-          name = "mypy-type-checker";
+          "workbench.preferredLightColorTheme" = "Default Light Modern";
-          publisher = "ms-python";
+          "[nix]" = {
-          version = "2023.3.12681020";
+            "editor.insertSpaces" = true;
-          sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
+            "editor.tabSize" = 2;
-        }
+            # for now, disable automatic formatting to prevent disruption of existing code bases
-        {
+            "editor.formatOnPaste" = false;
-          name = "black-formatter";
+            "editor.formatOnSave" = false;
-          publisher = "ms-python";
+            "editor.formatOnType" = false;
-          version = "2023.5.12771008";
+          };
-          sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
+          "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
-        }
+          "nix.enableLanguageServer" = true;
-        {
+          "nix.serverPath" = lib.getExe pkgs.nixd;
-          name = "vscode-pets";
+          "nix.serverSettings" = { };
-          publisher = "tonybaloney";
+          "editor.fontSize" = 13;
-          version = "1.25.1";
+          "editor.fontWeight" = "normal";
-          sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
+          "git.detectSubmodulesLimit" = 30;
-        }
+          "[python]" = {
-      ];
+            "breadcrumbs.showClasses" = true;
-    userSettings =
+            "breadcrumbs.showFunctions" = true;
-      let
+            "gitlens.codeLens.symbolScopes" = [ "!Module" ];
-        defaultPython = pkgs.python3.withPackages (ps: [
+            "editor.defaultFormatter" = "charliermarsh.ruff";
-          ps.jedi
+            "editor.formatOnSave" = true;
-          ps.jedi-language-server
+          };
-          ps.pip
+          "python.experiments.enabled" = false;
-          ps.setuptools # for pkg_resources
+          "python.languageServer" = "Jedi"; # don't use proprietary pylance server
-          ps.black
+          "python.defaultInterpreterPath" = "${defaultPython}/bin/python";
-          ps.mypy
+          "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
-        ]);
+          "mypy-type-checker.importStrategy" = "fromEnvironment";
-      in
+          "mypy-type-checker.args" = [ "--ignore-missing-imports" ];
-      {
+          "ruff.path" = [ (lib.getExe pkgs.ruff) ];
-        "editor.fontLigatures" = true;
+          "ruff.importStrategy" = "fromEnvironment";
-        "editor.accessibilitySupport" = false; # prevent asking
+          "gitlens.telemetry.enabled" = false;
-        "editor.cursorBlinking" = "phase";
+          "vim.highlightedyank.enable" = true;
-        "editor.stickyScroll.enabled" = true;
+          "vim.history" = 500;
-        "workbench.editor.highlightModifiedTabs" = true;
+          "vim.neovimUseConfigFile" = true;
-        "window.autoDetectColorScheme" = true;
+          "vim.enableNeovim" = true;
-        "workbench.preferredDarkColorTheme" = "Default Dark Modern";
+          "git.suggestSmartCommit" = false;
-        "workbench.preferredLightColorTheme" = "Default Light Modern";
+          "editor.rulers" = [ 79 ];
-        "[nix]" = {
+          "vim.useSystemClipboard" = true;
-          "editor.insertSpaces" = true;
+          "vim.smartRelativeLine" = true;
-          "editor.tabSize" = 2;
+          "diffEditor.ignoreTrimWhitespace" = false;
-          # for now, disable automatic formatting to prevent disruption of existing code bases
+          "files.associations" = {
-          "editor.formatOnPaste" = false;
+            "*.py" = "python";
-          "editor.formatOnSave" = false;
+          };
-          "editor.formatOnType" = false;
+          "editor.renderWhitespace" = "all";
+          "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
+          "vim.neovimPath" = lib.getExe pkgs.myVim;
+          "sync-rsync.options" = [ ];
+          "direnv.path.executable" = lib.getExe pkgs.direnv;
         };
-        "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
+    };
-        "nix.enableLanguageServer" = true;
-        "nix.serverPath" = lib.getExe pkgs.nixd;
-        "nix.serverSettings" = { };
-        "editor.fontSize" = 13;
-        "editor.fontWeight" = "normal";
-        "git.detectSubmodulesLimit" = 30;
-        "[python]" = {
-          "breadcrumbs.showClasses" = true;
-          "breadcrumbs.showFunctions" = true;
-          "gitlens.codeLens.symbolScopes" = [ "!Module" ];
-          "editor.defaultFormatter" = "ms-python.black-formatter";
-          "editor.formatOnSave" = true;
-        };
-        "python.languageServer" = "Jedi"; # don't use proprietary pylance server
-        "python.defaultInterpreterPath" = "${defaultPython}/bin/python";
-        "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ];
-        "black-formatter.importStrategy" = "fromEnvironment";
-        "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
-        "mypy-type-checker.importStrategy" = "fromEnvironment";
-        "mypy-type-checker.args" = [ "--ignore-missing-imports" ];
-        "gitlens.telemetry.enabled" = false;
-        "vim.highlightedyank.enable" = true;
-        "vim.history" = 500;
-        "vim.neovimUseConfigFile" = true;
-        "vim.enableNeovim" = true;
-        "git.suggestSmartCommit" = false;
-        "editor.rulers" = [ 79 ];
-        "vim.useSystemClipboard" = true;
-        "vim.smartRelativeLine" = true;
-        "diffEditor.ignoreTrimWhitespace" = false;
-        "files.associations" = {
-          "*.py" = "python";
-        };
-        "editor.renderWhitespace" = "all";
-        "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
-        "vim.neovimPath" = lib.getExe pkgs.myVim;
-        "sync-rsync.options" = [ ];
-        "direnv.path.executable" = lib.getExe pkgs.direnv;
-      };
   };
 }

home/workmac.nix

@@ -35,9 +35,11 @@ in
     # defaults in bottom match block "*"
     # TODO: common config for desktop as well
     # multiplexer, e.g. to avoid rate limiting on jumphost usage
-    serverAliveInterval = 60;
+    serverAliveInterval = 10;
+    serverAliveCountMax = 2; # 2 strikes and you're out
     controlMaster = "auto";
-    controlPersist = "4h";
+    # not too long, due to the frequent keepalives
+    controlPersist = "1h";
     # ssh host config
     matchBlocks = {
 
@@ -45,7 +47,6 @@ in
       "*" = {
         extraOptions = {
           IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
-          #ControlPath = "/tmp/ssh_mux_%h_%p_%r";
         };
       };
 
@@ -66,34 +67,38 @@ in
       contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
     in
     {
-      includes =
+      includes = [
-        [
+        {
-          {
+          condition = "gitdir:~/src/schmittlauch/";
-            condition = "gitdir:~/src/schmittlauch/";
-            contents = {
-              user = {
-                inherit (contacts.schmittlauch) name email;
-              };
-            };
-          }
-        ]
-        # set default name for several other common locations
-        ++ map (dir: {
-          condition = "gitdir:${dir}";
           contents = {
             user = {
-              inherit (contacts.work) name email;
+              inherit (contacts.schmittlauch) name email;
             };
           };
-        }) [ "~/" ];
+        }
+      ]
+      # set default name for several other common locations
+      ++ map (dir: {
+        condition = "gitdir:${dir}";
+        contents = {
+          user = {
+            inherit (contacts.work) name email;
+          };
+        };
+      }) [ "~/" ];
     };
 
   # some extra shell scripts
-  programs.zsh.initExtra = lib.mkAfter (
+  programs.zsh.initContent = lib.mkAfter (
     import ./scripts/reporsync.nix { inherit pkgs lib; }
     + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
   );
 
+  # separate proxied browser using the DHCP-supplied DNS for accessing captive portals
+  programs.captive-browser = {
+    enable = true;
+    interface = "en0";
+  };
   launchd.agents.hydra_proxy = {
     enable = true;
     config = {
@@ -103,7 +108,7 @@ in
         "0"
         "-D"
         "1080"
-        "-oServerAliveInterval=60"
+        "-oServerAliveInterval=30"
         "-oControlMaster=no"
         "-N"
         "vpn-whq.services.fcio.net"

hosts/framenix/storage.nix

@@ -39,6 +39,17 @@ in
       fsType = "vfat";
       options = [ "discard" ];
     };
+    # nix/ lix build directory
+    # lix:
+    # > If you plan to use a tmpfs, we **strongly recommend** to set `mode=0755` as a mount option for that `tmpfs`, otherwise you are effectively reverting this mitigation.
+    "/nix/var/nix/builds" = {
+      device = "tmpfs";
+      fsType = "tmpfs";
+      options = [
+        "mode=0755"
+        "size=75%"
+      ];
+    };
   };
 
   services.fstrim.enable = true;

hosts/thinknix/hardware-configuration.nix

@@ -21,7 +21,6 @@
   boot.extraModulePackages = [ ];
 
   nix.settings.max-jobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   # modesetting is always better than intel (legacy)
   services.xserver.videoDrivers = [ "modesetting" ];

nixremotebuildermachines

@@ -0,0 +1 @@
+ssh-ng://schmittlauch@build01.nix-community.org x86_64-linux /root/.ssh/remote_builder_key 64 1 big-parallel,kvm,nixos-test  -

patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch

@@ -1,26 +0,0 @@
-From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001
-From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
-Date: Mon, 7 Apr 2025 21:03:09 -0400
-Subject: [PATCH] nodejs_20: fix test failure on darwin on latest MacOS 15.4
-
-Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
-(cherry picked from commit 9674c1f688d12b99fbde26e6068ab62609fef3b1)
----
- pkgs/development/web/nodejs/v20.nix | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
-index b9c9345c441afa..20cceb5b5d1cda 100644
---- a/pkgs/development/web/nodejs/v20.nix
-+++ b/pkgs/development/web/nodejs/v20.nix
-@@ -50,5 +50,10 @@ buildNodejs {
-       stripLen = 1;
-       hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
-     })
-+    # fix test failure on macos 15.4
-+    (fetchpatch2 {
-+      url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1";
-+      hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU=";
-+    })
-   ] ++ gypPatches;
- }