diff options
| -rw-r--r-- | kartei/krebs/default.nix | 23 | ||||
| -rw-r--r-- | kartei/lass/blue.nix | 1 | ||||
| -rw-r--r-- | krebs/1systems/arcadeomat/config.nix | 82 | ||||
| -rw-r--r-- | krebs/1systems/arcadeomat/hw.nix | 25 |
4 files changed, 1 insertions, 130 deletions
diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index 8a12d6f24..e48b3e32a 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -233,29 +233,6 @@ in { ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPpVwKv9mQGfcn5oFwuitq+b6Dz4jBG9sGhVoCYFw5RY"; syncthing.id = "DK5CEE2-PNUXYCE-Q42H2HP-623GART-B7KS4VK-HU2RBGQ-EK6QPUP-HUL3PAR"; }; - arcadeomat = { - ci = true; - nets = { - retiolum = { - ip4.addr = "10.243.77.67"; - aliases = [ - "arcadeomat.r" - ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAzpXyEATt8+ElxPq650/fkboEC9RvTWqN6UIAl/R4Zu+uDhAZ2ekb - HBjoSbRxu/0w2I37nwWUhEOemxGm4PXCgWrtO0jeRF4nVNYu3ZBppA3vuVALUWq7 - apxRUEL9FdsWQlXGo4PVd20dGaDTi8M/Ggo755MStVTY0rRLluxyPq6VAa015sNg - 4NOFuWm0NDn4e+qrahTCTiSjbCU8rWixm0GktV40kdg0QAiFbEcRhuXF1s9/yojk - 7JT/nFg6LELjWUSSNZnioj5oSfVbThDRelIld9VaAKBAZZ5/zy6T2XSeDfoepytH - 8aw6itEuTCy1M1DTiTG+12SPPw+ubG+NqQIDAQAB - -----END RSA PUBLIC KEY----- - Ed25519PublicKey = n/HMlgTTyLa0fcXqSBO/G6sVOUYh2yZ5PfU4vLI9CJO - ''; - }; - }; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOu6EVN3928qWiWszqBUzOjeQJRvFozTBl4xAhBP/Ymc"; - }; wolf = { ci = true; nets = { diff --git a/kartei/lass/blue.nix b/kartei/lass/blue.nix index ddec9553d..b3ce1af44 100644 --- a/kartei/lass/blue.nix +++ b/kartei/lass/blue.nix @@ -1,5 +1,6 @@ { r6, w6, ... }: { + ci = false; nets = { retiolum = { ip4.addr = "10.243.0.77"; diff --git a/krebs/1systems/arcadeomat/config.nix b/krebs/1systems/arcadeomat/config.nix deleted file mode 100644 index 7439e687e..000000000 --- a/krebs/1systems/arcadeomat/config.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config,lib, pkgs, ... }: -let - shack-ip = config.krebs.build.host.nets.shack.ip4.addr; - ext-if = "et0"; - external-mac = "52:54:b0:0b:af:fe"; - mainUser = "krebs"; - -in -{ - imports = [ - ./hw.nix - ../../../krebs - ../../../krebs/2configs - - #../../../krebs/2configs/binary-cache/nixos.nix - #../../../krebs/2configs/binary-cache/prism.nix - - ../../../krebs/2configs/shack/ssh-keys.nix - ../../../krebs/2configs/save-diskspace.nix - ../../../krebs/2configs/shack/prometheus/node.nix - - ]; - # use your own binary cache, fallback use cache.nixos.org (which is used by - # apt-cacher-ng in first place) - - # local discovery in shackspace - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; - krebs.tinc.retiolum.extraConfig = "TCPOnly = yes"; - - - #networking = { - # firewall.enable = false; - # firewall.allowedTCPPorts = [ 8088 8086 8083 ]; - # interfaces."${ext-if}".ipv4.addresses = [ - # { - # address = shack-ip; - # prefixLength = 20; - # } - # ]; - - # defaultGateway = "10.42.0.1"; - # nameservers = [ "10.42.0.100" "10.42.0.200" ]; - #}; - - ##################### - # uninteresting stuff - ##################### - krebs.build.host = config.krebs.hosts.arcadeomat; - users.users."${mainUser}" = { - uid = 9001; - extraGroups = [ "audio" "video" ]; - isNormalUser = true; - }; - - - time.timeZone = "Europe/Berlin"; - - # avahi - services.avahi = { - enable = true; - wideArea = false; - }; - environment.systemPackages = with pkgs;[ glxinfo sdlmame ]; - nixpkgs.config.allowUnfree = true; - hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_340; - boot.kernelPackages = pkgs.linuxPackages_5_4; - - services.xserver = { - videoDrivers = [ "nvidia" ]; - enable = true; - windowManager = { - awesome.enable = true; - awesome.noArgb = true; - awesome.luaModules = [ pkgs.luaPackages.vicious ]; - }; - displayManager.defaultSession = lib.mkDefault "none+awesome"; - displayManager.autoLogin = { - enable = true; - user = mainUser; - }; - }; -} diff --git a/krebs/1systems/arcadeomat/hw.nix b/krebs/1systems/arcadeomat/hw.nix deleted file mode 100644 index b24deeecb..000000000 --- a/krebs/1systems/arcadeomat/hw.nix +++ /dev/null @@ -1,25 +0,0 @@ - -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/0aae456e-0548-4917-a282-11d5d4e403cf"; - fsType = "ext4"; - }; - - swapDevices = [ ]; - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/sda"; - boot.loader.grub.copyKernels = true; - -} |