common/default.nix

@@ -13,7 +13,6 @@ in
   imports = [
     ./packages.nix
     ./nitrokey.nix
-    ./nix-settings.nix
   ];
 
   services.davfs2.enable = true;
@@ -222,7 +221,27 @@ in
   # Enable all sysrq functions (useful to recover from some issues):
   boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command)
 
-  nix.settings.trusted-users = [ "spiollinux" ];
+  nix = {
+    # expose all flake inputs through nix Path and registry
+    registry = (lib.mapAttrs (_: value: { flake = value; }) inputs) // {
+      nixpkgs.flake = inputs.nixpkgs;
+    };
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+    # keep build-time deps around for offline-rebuilding
+    settings = {
+      # keep around all inputs necessary for offline-rebuilding the system
+      keep-outputs = true;
+      keep-derivations = true;
+      trusted-users = [ "spiollinux" ];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "repl-flake"
+      ];
+      # use all cores for building
+      cores = 0;
+    };
+  };
   # override tmpdir for daemon
   #systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
 

common/nix-settings.nix

@@ -1,34 +0,0 @@
-# needs to be kept compatible to both NixOS and nix-darwin
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  inputs = config.inputInjection.flake-inputs;
-  unstable = inputs.nixos-unstable;
-in
-{
-  nix = {
-    # expose all flake inputs through nix Path and registry
-    registry = (lib.mapAttrs (_: value: { flake = value; }) inputs) // {
-      nixpkgs.flake = inputs.nixpkgs;
-    };
-    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
-  };
-  nix.settings = builtins.mapAttrs (_: lib.mkDefault) {
-    # keep around all inputs necessary for offline-rebuilding the system
-    keep-outputs = true;
-    keep-derivations = true;
-    trusted-users = [ "spiollinux" ];
-    experimental-features = [
-      "nix-command"
-      "flakes"
-      "repl-flake"
-    ];
-    # use all cores for building
-    cores = 0;
-  };
-}

darwin/configuration.nix

@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../common/nix-settings.nix ];
-  nix.settings.trusted-users = [ "os" ];
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = [ pkgs.vim ];

flake.nix

@@ -112,10 +112,7 @@
         ];
       };
       darwinConfigurations."OS-MacBook-Pro" = nix-darwin.lib.darwinSystem {
-        modules = [
+        modules = [ ./darwin/configuration.nix ];
-          ./darwin/configuration.nix
-          inputInjection
-        ];
       };
       homeConfigurations = {
         spiollinux-desktop = mkHomeManager "desktop" "spiollinux" systems.x86_64-linux;

home/vimrc

@@ -24,11 +24,7 @@ filetype plugin indent on
  
 syntax on
 
-" use relative numbering…
 set relativenumber
-" except for current line
-set number
-
 set mouse=a
 set mousehide