treewide: pull out nixpkgs.config to flake.nix

2configs/collectd/collectd-base.nix

@@ -31,9 +31,9 @@ let
 in {
   imports = [ ];
 
-  nixpkgs.config.packageOverrides = pkgs: with pkgs; {
+  #nixpkgs.config.packageOverrides = pkgs: with pkgs; {
-    collectd = pkgs.collectd.override { python= pkgs.python; };
+  #  collectd = pkgs.collectd.override { python= pkgs.python; };
-  };
+  #};
   services.collectd = {
     enable = true;
     include = [ (toString connect-time-cfg) (toString graphite-cfg) ];

2configs/default.nix

@@ -8,7 +8,7 @@ with lib;
     ./binary-cache/nixos.nix
     ./minimal.nix
     ./secrets/ssh_server.nix
-    ./overlays/default.nix
+    # ./overlays/default.nix
     # ./security/hotfix.nix
   ];
 
@@ -29,9 +29,9 @@ with lib;
   # nix.settings.trusted-users = [ config.krebs.build.user.name ];
   nix.settings.experimental-features = [ "flakes" "nix-command" ];
 
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages;
+  # boot.kernelPackages = lib.mkDefault pkgs.linuxPackages;
 
-  nixpkgs.config.allowUnfreePredicate = pkg: packageName pkg == "unrar";
+  # nixpkgs.config.allowUnfreePredicate = pkg: packageName pkg == "unrar";
 
   krebs = {
     enable = true;
@@ -63,10 +63,10 @@ with lib;
     grep = "grep --color=auto";
   };
 
-  nixpkgs.config.packageOverrides = pkgs: {
+  # nixpkgs.config.packageOverrides = pkgs: {
     #nano = pkgs.runCommand "empty" {} "mkdir -p $out";
-    tinc = pkgs.tinc_pre;
+  #  tinc = pkgs.tinc_pre;
-  };
+  #};
 
 
   nix.extraOptions = ''

2configs/fs/cac-boot-partition.nix

@@ -16,5 +16,4 @@
   };
 
   hardware.enableRedistributableFirmware = true;
-  nixpkgs.config.allowUnfree = true;
 }

2configs/hw/tp-x2x0.nix

@@ -16,7 +16,6 @@
   networking.wireless.enable = lib.mkDefault true;
 
   hardware.enableRedistributableFirmware = true;
-  nixpkgs.config.allowUnfree = true;
 
   hardware.cpu.intel.updateMicrocode = true;
 

2configs/nur.nix

@@ -1,11 +1,11 @@
 { pkgs, ... }:{
-  nixpkgs.config.packageOverrides = pkgs: {
+  #nixpkgs.config.packageOverrides = pkgs: {
-    nur = import (builtins.fetchTarball {
+  #  nur = import (builtins.fetchTarball {
-    url = "https://github.com/nix-community/NUR/archive/28e5326ecbaef8b961bec7d18dbfe35f522fb2b1.tar.gz";
+  #  url = "https://github.com/nix-community/NUR/archive/28e5326ecbaef8b961bec7d18dbfe35f522fb2b1.tar.gz";
-      sha256 = "1yni27g71r8n9bgsck7lz5dzx2fciljnba249yqhr9k3mzlkr7yb";
+  #    sha256 = "1yni27g71r8n9bgsck7lz5dzx2fciljnba249yqhr9k3mzlkr7yb";
-    }
+  #  }
-  ){
+  #){
-      inherit pkgs;
+  #    inherit pkgs;
-    };
+  #  };
-  };
+  #};
 }

2configs/overlays/default.nix

@@ -2,9 +2,10 @@
 {
   nixpkgs.overlays = [
     self.overlays.default
+    self.inputs.nix-writers.overlays.default
     (import (self.inputs.stockholm.inputs.nix-writers + "/pkgs"))
-    (self: super: {
+    (this: super: {
-      inherit (self.writers) writeDash writeDashBin;
+      inherit (this.writers) writeDash writeDashBin;
       stockholm.lib = self.inputs.stockholm.lib;
       ha-ara-menu = self.inputs.ha-ara-menu.packages.${pkgs.system}.default;
       inventory4ce = self.inputs.inventory4ce.packages.${pkgs.system}.default;

2configs/pyload.nix

@@ -1,6 +1,5 @@
 {pkgs, ... }:
 {
-  nixpkgs.config.unfreeRedistributable = true;
   users.users.makefu.packages = with pkgs;[
       pyload
       spidermonkey

2configs/tools/android-pentest.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.config.android_sdk.accept_license = true;
+  # nixpkgs.config.android_sdk.accept_license = true;
   users.users.makefu.packages = with pkgs; [
     # mitmproxy
     nmap

2configs/tools/dev.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
   users.users.makefu.packages = with pkgs;[

2configs/tools/scanner-tools.nix

@@ -1,7 +1,7 @@
 {
   # ln -s /run/current-system/sw/bin/xsane ~/.gimp-2.8/plug-ins/xsane
-  nixpkgs.config.packageOverrides = pkgs: {
+  #nixpkgs.config.packageOverrides = pkgs: {
-    xsaneGimp = pkgs.xsane.override { gimpSupport = true; };
+  #  xsaneGimp = pkgs.xsane.override { gimpSupport = true; };
-  };
+  #};
 }
 

2configs/tools/studio.nix

@@ -1,9 +1,9 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.config.permittedInsecurePackages = [
+  #nixpkgs.config.permittedInsecurePackages = [
-    "openssl-1.0.2u" # required for studio-link
+  #  "openssl-1.0.2u" # required for studio-link
-  ];
+  #];
   users.users.makefu.packages = with pkgs; [
     obs-studio
     studio-link