mirror of
https://git.kb-one.de/kb01/aux-config.git
synced 2025-12-05 18:28:53 +00:00
Compare commits
4 commits
d82856dfda
...
fd4f379f18
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fd4f379f18 | ||
|
|
dfbcca0873 | ||
|
|
5c7f669921 | ||
|
|
07434754ba |
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, pkgs, lib, inputs, ... }:
|
||||||
{
|
{
|
||||||
#imports = [];
|
imports = [
|
||||||
|
./ssh.nix
|
||||||
|
];
|
||||||
home.username = "kb";
|
home.username = "kb";
|
||||||
home.homeDirectory = "/home/kb";
|
home.homeDirectory = "/home/kb";
|
||||||
|
|
||||||
|
|
|
||||||
100
homes/x86_64-linux/kb@LoyAdjo/ssh.nix
Normal file
100
homes/x86_64-linux/kb@LoyAdjo/ssh.nix
Normal file
|
|
@ -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;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -11,6 +11,11 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
# Configure Nix
|
# Configure Nix
|
||||||
|
#nix.package = pkgs.lixPackageSets.stable.lix;
|
||||||
|
nix.extraOptions = ''
|
||||||
|
secret-key-files = /root/secrets/cache-Rubtrm.sec
|
||||||
|
builders-use-substitutes = true
|
||||||
|
'';
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
experimental-features = [ "nix-command" "flakes" ];
|
||||||
substituters = [
|
substituters = [
|
||||||
|
|
@ -18,19 +23,32 @@
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"cache.game01.kb-one.de:XcqI+uobV7EoTKuRmnzYup/+oSfn8uLwnsiQFp8dk/g="
|
"cache.game01.kb-one.de:XcqI+uobV7EoTKuRmnzYup/+oSfn8uLwnsiQFp8dk/g="
|
||||||
|
"cache-LoyAdjo:kZM9GP0q/DG9U8IvX+rGuHgUdiwKLcwwUw4KPM2kA7c="
|
||||||
];
|
];
|
||||||
trusted-users = [ "kb" ];
|
trusted-users = [ "kb" ];
|
||||||
};
|
};
|
||||||
nixpkgs.config.allowUnsupportedSystem = true;
|
nixpkgs.config.allowUnsupportedSystem = true;
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
# nixpkgs.config.packageOverrides = pkgs: {
|
||||||
xorg.xorgserver = pkgs.xorg.xorgserver.override (old: {
|
# xorg.xorgserver = pkgs.xorg.xorgserver.override (old: {
|
||||||
configureFlags = pkgs.lib.remove "--enable-glamor" old.configureFlags ++ [ "--disable-glamor" ];
|
# configureFlags = pkgs.lib.remove "--enable-glamor" old.configureFlags ++ [ "--disable-glamor" ];
|
||||||
});
|
|
||||||
#w3m = pkgs.w3m.overrideAttrs (old: {
|
|
||||||
# libX11 = old.libx11;
|
|
||||||
# });
|
# });
|
||||||
};
|
# #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.
|
# Use the GRUB 2 boot loader.
|
||||||
boot.loader.grub.enable = true;
|
boot.loader.grub.enable = true;
|
||||||
|
|
@ -55,10 +73,10 @@
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.xserver.videoDrivers = [ "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
|
services.xserver.videoDrivers = [ "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
|
||||||
# Enable Desktop Environment.
|
# Enable Desktop Environment.
|
||||||
#services.displayManager.sddm = {
|
services.displayManager.sddm = {
|
||||||
# #package = pkgs.kdePackages.sddm;
|
#package = pkgs.kdePackages.sddm;
|
||||||
# theme = "${pkgs.where-is-my-sddm-theme}/share/sddm/themes/where_is_my_sddm_theme";
|
theme = "${pkgs.where-is-my-sddm-theme}/share/sddm/themes/where_is_my_sddm_theme";
|
||||||
#};
|
};
|
||||||
#services.displayManager.sddm.enable = true;
|
#services.displayManager.sddm.enable = true;
|
||||||
# services.displayManager.sddm.wayland.enable = true;
|
# services.displayManager.sddm.wayland.enable = true;
|
||||||
#services.xserver.displayManager.lightdm.enable = true;
|
#services.xserver.displayManager.lightdm.enable = true;
|
||||||
|
|
@ -116,8 +134,18 @@
|
||||||
#kdePackages.plasma-nano
|
#kdePackages.plasma-nano
|
||||||
#catppuccin-sddm
|
#catppuccin-sddm
|
||||||
pkgs.where-is-my-sddm-theme
|
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
|
# SSH and Mosh
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
|
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
|
||||||
boot.kernelModules = [ ];
|
boot.kernelModules = [ ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
boot.kernelParams = [ "i915.force_probe=27ae" ];
|
boot.kernelParams = [ "i915.force_probe=27a6" ];
|
||||||
|
|
||||||
|
|
||||||
# Boot Process
|
# Boot Process
|
||||||
|
|
@ -54,8 +54,9 @@
|
||||||
# libva-vdpau-drivemesar
|
# libva-vdpau-drivemesar
|
||||||
# libvdpau-va-gl
|
# libvdpau-va-gl
|
||||||
# mesa
|
# mesa
|
||||||
hardware.graphics.extraPackages = [ pkgs.driversi686Linux.mesa ];
|
# Test Device 2
|
||||||
hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.mesa ];
|
#hardware.graphics.extraPackages = [ pkgs.driversi686Linux.mesa ];
|
||||||
|
#hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.mesa ];
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
hardware.enableAllFirmware = true;
|
hardware.enableAllFirmware = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,49 @@
|
||||||
|
|
||||||
# Configure Nix
|
# Configure Nix
|
||||||
nix.package = pkgs.lixPackageSets.stable.lix;
|
nix.package = pkgs.lixPackageSets.stable.lix;
|
||||||
nix.settings = {
|
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
|
||||||
trusted-users = [ "remotebuild" ];
|
|
||||||
};
|
|
||||||
nixpkgs.config.allowUnfree = false;
|
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) [
|
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||||
"ungoogled-chromium"
|
"ungoogled-chromium"
|
||||||
"ungoogled-chromium-unwrapped"
|
"ungoogled-chromium-unwrapped"
|
||||||
|
|
@ -118,6 +156,7 @@
|
||||||
programs.steam.remotePlay.openFirewall = true;
|
programs.steam.remotePlay.openFirewall = true;
|
||||||
hardware.steam-hardware.enable = true;
|
hardware.steam-hardware.enable = true;
|
||||||
|
|
||||||
|
|
||||||
# Languagetool Spellchecking Server
|
# Languagetool Spellchecking Server
|
||||||
services.languagetool = {
|
services.languagetool = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue