7 files changed, 23 insertions, 54 deletions
diff --git a/modules/by-name/ni/nix-index/command_not_found.sh b/modules/by-name/ni/nix-index/command_not_found.sh
index f650cf7b..579f9db4 100644
--- a/modules/by-name/ni/nix-index/command_not_found.sh
+++ b/modules/by-name/ni/nix-index/command_not_found.sh
@@ -26,12 +26,12 @@ command_not_found_handle() {
 
     toplevel=nixpkgs # nixpkgs should always be available even in NixOS
     cmd="$1"
-    attrs=$(nix-locate --minimal --no-group --type x --type s --top-level --whole-name --at-root "/bin/$cmd")
+    attrs=$(nix-locate --minimal --no-group --type x --type s --whole-name --at-root "/bin/$cmd")
     len=$(if [ -n "$attrs" ]; then echo "$attrs" | wc -l; else echo 0; fi)
 
     case "$len" in
     0)
-        eprintln "$cmd: command not found"
+        printf "%s: command not found\n" "$cmd" >&2
         ;;
     1)
         # If only one package provides this, then we can invoke it
diff --git a/modules/by-name/ni/nix-index/module.nix b/modules/by-name/ni/nix-index/module.nix
index 06acfc8a..5ddaece3 100644
--- a/modules/by-name/ni/nix-index/module.nix
+++ b/modules/by-name/ni/nix-index/module.nix
@@ -23,7 +23,7 @@ in {
     soispha.programs.zsh.integrations.nix-index = ./command_not_found.sh;
     home-manager.users.soispha = {
       imports = [
-        modules.nix-index-database.hmModules.nix-index
+        modules.nix-index-database.homeModules.nix-index
       ];
 
       programs.nix-index = {
diff --git a/modules/by-name/ni/nixos-option/module.nix b/modules/by-name/ni/nixos-option/module.nix
new file mode 100644
index 00000000..0053d357
--- /dev/null
+++ b/modules/by-name/ni/nixos-option/module.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  libraries,
+  ...
+}: let
+  cfg = config.soispha.programs.nixos-option;
+in {
+  options.soispha.programs.nixos-option = {
+    enable = libraries.base.options.mkEnable "nixos-option";
+  };
+
+  config = lib.mkIf cfg.enable {
+    # NOTE: We disable nixos-option here explicitly, because I never used it, and it
+    # depends on cppnix. <2025-12-11>
+    system.tools.nixos-option.enable = false;
+  };
+}
diff --git a/modules/by-name/ni/nixos-shell/module.nix b/modules/by-name/ni/nixos-shell/module.nix
index 219f080d..8dda2890 100644
--- a/modules/by-name/ni/nixos-shell/module.nix
+++ b/modules/by-name/ni/nixos-shell/module.nix
@@ -91,7 +91,7 @@ in {
       modules = [
         {
           # TODO(@bpeetz): This should be bumped each release. <2025-05-17>
-          system.stateVersion = "25.05";
+          system.stateVersion = "25.11";
         }
 
         cfg.configuration.value
diff --git a/modules/by-name/ni/nixos-shell/nixos-shell.sh b/modules/by-name/ni/nixos-shell/nixos-shell.sh
index 390e60b1..3b34019a 100755
--- a/modules/by-name/ni/nixos-shell/nixos-shell.sh
+++ b/modules/by-name/ni/nixos-shell/nixos-shell.sh
@@ -10,7 +10,7 @@
 # You should have received a copy of the License along with this program.
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 
-SHARED_DIR="$(mktemp --directory)"
+SHARED_DIR="$(mktemp -t --directory "nixos_shell_XXXXXXXXX")"
 cleanup() {
     rm --recursive "$SHARED_DIR"
 }
diff --git a/modules/by-name/ni/nixpkgs/config.nix b/modules/by-name/ni/nixpkgs/config.nix
deleted file mode 100644
index ea8f3c45..00000000
--- a/modules/by-name/ni/nixpkgs/config.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-# nixos-config - My current NixOS configuration
-#
-# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# This file is part of my nixos-config.
-#
-# You should have received a copy of the License along with this program.
-# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{
-  cfg,
-  lib,
-  packageSets,
-  ...
-}: let
-  myPkgsOverlay = self: super: packageSets.soispha;
-in {
-  nixpkgs = {
-    hostPlatform = cfg.systemName;
-
-    overlays = [
-      myPkgsOverlay
-    ];
-
-    config = {
-      # TODO: this fails because of the root tempsize, which should be increased
-      # contentAddressedByDefault = true;
-
-      hostSystem = cfg.systemName;
-
-      allowUnfreePredicate = pkg:
-        builtins.elem (lib.getName pkg) [
-          "pypemicro" # required by pynitrokey
-
-          # TODO(@bpeetz): Allow moving them to their respective module. <2025-04-25>
-          "steam"
-          "steam-unwrapped"
-          "steam-original"
-          "steam-run"
-        ];
-    };
-  };
-}
diff --git a/modules/by-name/ni/nixpkgs/module.nix b/modules/by-name/ni/nixpkgs/module.nix
index fcde9505..502bcff2 100644
--- a/modules/by-name/ni/nixpkgs/module.nix
+++ b/modules/by-name/ni/nixpkgs/module.nix
@@ -44,12 +44,6 @@ in {
           allowUnfreePredicate = pkg:
             builtins.elem (lib.getName pkg) [
               "pypemicro" # required by pynitrokey
-
-              # TODO(@bpeetz): Allow moving them to their respective module. <2025-04-25>
-              "steam"
-              "steam-unwrapped"
-              "steam-original"
-              "steam-run"
             ];
         };
       };