3 files changed, 20 insertions, 2 deletions
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"
 }