Added Debug Packages

homes/x86_64-linux/kb@LoyAdjo/default.nix

@@ -1,6 +1,8 @@
 { config, pkgs, lib, inputs, ... }:
 {
-  #imports =  [];
+  imports = [
+    ./ssh.nix
+  ];
   home.username = "kb";
   home.homeDirectory = "/home/kb";
 

homes/x86_64-linux/kb@LoyAdjo/ssh.nix

@@ -0,0 +1,100 @@
+{ config, pkgs, lib, inputs, ... }:
+{
+  # SSH Configuration
+  services.ssh-agent.enable = true;
+  programs.ssh.enable = true;
+  programs.ssh.extraConfig = ''
+    IdentitiesOnly=yes
+  '';
+
+  # SSH Shell Connections
+  programs.ssh.matchBlocks."master@pkpnafs-m1ni" = {
+    host = "pkpnafs";
+    hostname = "pkpnafs.kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
+    port = 3422;
+  };
+  programs.ssh.matchBlocks."master@senfnvp-m1ni" = {
+    host = "senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
+    port = 9553;
+  };
+  programs.ssh.matchBlocks."master@mow0m-m1ni" = {
+    host = "mow0m";
+    hostname = "mow0m";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
+    port = 9553;
+  };
+  programs.ssh.matchBlocks."master@web-m1ni" = {
+    host = "web";
+    hostname = "kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
+    port = 2222;
+  };
+  programs.ssh.matchBlocks."kb@Rubtrm" = {
+    host = "Rubtrm";
+    hostname = "Rubtrm";
+    user = "kb";
+    identityFile = "~/.ssh/kb@Rubtrm";
+    port = 2524;
+  };
+
+  # SSH Git Connections
+  programs.ssh.matchBlocks."kb01@kb-one-git" = {
+    host = "git.kb-one.de";
+    user = "git";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-git@m1ni";
+    port = 9522;
+  };
+  programs.ssh.matchBlocks."kb01@0x90-git" = {
+    host = "git.0x90.space";
+    user = "git";
+    identityFile = "~/.ssh/kb01-git-0x90";
+  };
+
+  # SSH Remoteunlock Connections
+  programs.ssh.matchBlocks."remoteunlock@mow0m" = {
+    host = "remoteunlock-mow0m";
+    hostname = "mow0m";
+    user = "root";
+    identityFile = "~/.ssh/remoteunlock-mow0m";
+    port = 2550;
+  };
+
+  # Nix Build Hosts
+  programs.ssh.matchBlocks."nix-builder@pkpnafs" = {
+    host = "pkpnafs";
+    hostname = "pkpnafs.kb-one.de";
+    user = "nix-builder";
+    identityFile = "~/.ssh/nix-builder@pkpnafs";
+    port = 3422;
+  };
+  programs.ssh.matchBlocks."nix-builder@senfnvp" = {
+    host = "senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "nix-builder";
+    identityFile = "~/.ssh/nix-builder@senfnvp";
+    port = 9553;
+  };
+
+  # Nix Caches
+  programs.ssh.matchBlocks."nix-ssh@pkpnafs" = {
+    host = "pkpnafs";
+    hostname = "pkpnafs.kb-one.de";
+    user = "nix-ssh";
+    identityFile = "~/.ssh/nix-ssh@pkpnafs";
+    port = 3422;
+  };
+  programs.ssh.matchBlocks."nix-ssh@senfnvp" = {
+    host = "senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "nix-ssh";
+    identityFile = "~/.ssh/nix-ssh@senfnvp";
+    port = 9553;
+  };
+}

systems/i686-linux/Rubtrm/default.nix

@@ -11,6 +11,11 @@
   ];
 
   # Configure Nix
+  #nix.package = pkgs.lixPackageSets.stable.lix;
+  nix.extraOptions = ''
+    secret-key-files = /root/secrets/cache-Rubtrm.sec
+    builders-use-substitutes = true
+  '';
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
     substituters = [ 
@@ -18,19 +23,32 @@
     ];
     trusted-public-keys = [
       "cache.game01.kb-one.de:XcqI+uobV7EoTKuRmnzYup/+oSfn8uLwnsiQFp8dk/g="
+      "cache-LoyAdjo:kZM9GP0q/DG9U8IvX+rGuHgUdiwKLcwwUw4KPM2kA7c="
     ];
     trusted-users = [ "kb" ];
   };
   nixpkgs.config.allowUnsupportedSystem = true;
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.packageOverrides = pkgs: {
-    xorg.xorgserver = pkgs.xorg.xorgserver.override (old: {
-      configureFlags = pkgs.lib.remove "--enable-glamor" old.configureFlags ++ [ "--disable-glamor" ];
-    });
-    #w3m = pkgs.w3m.overrideAttrs (old: {
-    #  libX11 = old.libx11;
-    #});
-  };
+#  nixpkgs.config.packageOverrides = pkgs: {
+#    xorg.xorgserver = pkgs.xorg.xorgserver.override (old: {
+#      configureFlags = pkgs.lib.remove "--enable-glamor" old.configureFlags ++ [ "--disable-glamor" ];
+#    });
+#    #w3m = pkgs.w3m.overrideAttrs (old: {
+#    #  libX11 = old.libx11;
+#    #});
+#  };
+  nix.buildMachines = [
+    {
+      hostName = "kb-senfnvp-remotebuild";
+      systems = [ "aarch64-linux" ];
+      protocol = "ssh-ng";
+      maxJobs = 10;
+      speedFactor = 2;
+      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" ];
+      mandatoryFeatures = [];
+    }
+  ];
+  nix.distributedBuilds = true;
 
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
@@ -55,13 +73,13 @@
   services.xserver.enable = true;
   services.xserver.videoDrivers = [ "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
   # Enable Desktop Environment.
-  #services.displayManager.sddm = {
-  #  #package = pkgs.kdePackages.sddm;
-  #  theme = "${pkgs.where-is-my-sddm-theme}/share/sddm/themes/where_is_my_sddm_theme";
-  #};
+  services.displayManager.sddm = {
+    #package = pkgs.kdePackages.sddm;
+    theme = "${pkgs.where-is-my-sddm-theme}/share/sddm/themes/where_is_my_sddm_theme";
+  };
   #services.displayManager.sddm.enable = true;
   # services.displayManager.sddm.wayland.enable = true;
-  # services.xserver.displayManager.lightdm.enable = true;
+  #services.xserver.displayManager.lightdm.enable = true;
   # services.xserver.desktopManager.plasma5.enable = true;
   #services.xserver.desktopManager.xfce.enable = true;
   # services.xserver.desktopManager.lxqt.enable = true;
@@ -116,8 +134,18 @@
     #kdePackages.plasma-nano
     #catppuccin-sddm
     pkgs.where-is-my-sddm-theme
+
+    # Packages for Debugging
+    pciutils
+    usbutils
+    libva-utils
+    vdpauinfo
+    vulkan-tools
   ];
 
+  # Enable SSH-Agent
+  programs.ssh.startAgent = true;
+
   # SSH and Mosh
   services.openssh = {
     enable = true;

systems/i686-linux/Rubtrm/hardware.nix

@@ -13,7 +13,7 @@
   boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
-  boot.kernelParams = [ "i915.force_probe=27ae" ];
+  boot.kernelParams = [ "i915.force_probe=27a6" ];
 
 
   # Boot Process
@@ -54,8 +54,9 @@
   # libva-vdpau-drivemesar
   # libvdpau-va-gl
   # mesa
-  hardware.graphics.extraPackages = [ pkgs.driversi686Linux.mesa ];
-  hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.mesa ];
+  # Test Device 2
+  #hardware.graphics.extraPackages = [ pkgs.driversi686Linux.mesa ];
+  #hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.mesa ];
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.enableAllFirmware = true;
 }

systems/x86_64-linux/LoyAdjo/default.nix

@@ -8,11 +8,49 @@
 
   # Configure Nix
   nix.package = pkgs.lixPackageSets.stable.lix;
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-    trusted-users = [ "remotebuild" ];
-  };
   nixpkgs.config.allowUnfree = false;
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.connect-timeout = 5;
+  nix.settings.fallback = true;
+
+  # Binary Cache and Substitutes
+  #nix.settings.substituters = [
+  #  "ssh://ssh-nix@pkpnafs"
+  #];
+  #nix.settings.trusted-substituters = [
+  #  "ssh://ssh-nix@pkpnafs"
+  #];
+  nix.settings.trusted-public-keys = [
+    "cache-pkpnafs:guOMrEa3XPWnRihJtf7KraRRFLHlKvd1bmWbk7BZEow="
+    "cache-senfnvp:8fiqd165A80WZD8gLgzMjiQk6/8AdaANZqERktzIXkU="
+    "cache-Ohybke:0D+ovjv+/WqRX7hQ2qJzBbpE8NEBGtzmWQDpmlszcHQ="
+  ];
+  nix.extraOptions = ''
+    secret-key-files = /root/secrets/cache-LoyAdjo.sec
+    builders-use-substitutes = true
+  '';
+  #nix.sshServe.enable = true;
+  #nix.sshServe.keys = [
+  #];
+
+  # Nix Builders
+  nix.distributedBuilds = true;
+  nix.buildMachines = [
+    {
+      hostName = "pkpnafs";
+      sshUser = "nix-builder";
+      system = "x86_64-linux";
+      systems = [ "x86_64-linux" "i686-linux" ];
+      supportedFeatures = [
+        "kvm"
+        "big-parallel"
+      ];
+      maxJobs = 1;
+    }
+  ];
+
+  # Nix Security
+  nix.settings.trusted-users=[ "remotebuild" ];
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "ungoogled-chromium"
     "ungoogled-chromium-unwrapped"
@@ -118,6 +156,7 @@
   programs.steam.remotePlay.openFirewall = true;
   hardware.steam-hardware.enable = true;
 
+
   # Languagetool Spellchecking Server  
   services.languagetool = {
     enable = true;