Merge branch 'master' of https://cgit.lassul.us/stockholm

9 files changed, 0 insertions, 1016 deletions

diff --git a/mb/1systems/gr33n/configuration.nix b/mb/1systems/gr33n/configuration.nix
deleted file mode 100644
index dcf987791..000000000
--- a/mb/1systems/gr33n/configuration.nix
+++ /dev/null
@@ -1,144 +0,0 @@
-{ config, pkgs, callPackage, ... }: let
-  unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
-in {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      <stockholm/mb>
-    ];
-
-  krebs.build.host = config.krebs.hosts.gr33n;
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.extraModulePackages = with config.boot.kernelPackages; [ wireguard ];
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
-  fileSystems."/mnt/public" = {
-    device = "//192.168.0.4/public";
-    fsType = "cifs";
-    options = let
-      automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-    in [ "${automount_opts},user,rw,username=mb0,iocharset=utf8,credentials=${config.users.users.mb.home}/.smbcredentials" ];
-  };
-
-  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de";
-    defaultLocale = "en_US.UTF-8";
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  nixpkgs.config.allowUnfree = true;
-
-  nixpkgs.config.packageOverrides = super: {
-    openvpn = super.openvpn.override {
-      pkcs11Support = true;
-      useSystemd = false;
-    };
-  };
-
-  environment.shellAliases = {
-    ll = "ls -alh";
-    ls = "ls --color=tty";
-  };
-
-  environment.systemPackages = with pkgs; [
-     curl
-     fish
-     git
-     htop
-     nmap
-     ranger
-     tcpdump
-     tmux
-     traceroute
-     tree
-     vim
-     wcalc
-     wget
-     xz
-     zbackup
-  ];
-
-  programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
-
-  sound.enable = false;
-
-  services.openssh.enable = true;
-  services.openssh.passwordAuthentication = false;
-
-  services.codimd = {
-    enable = true;
-    workDir = "/storage/codimd";
-    configuration = {
-      port = 1337;
-      host = "0.0.0.0";
-      db = {
-        dialect = "sqlite";
-        storage = "/storage/codimd/db.codimd.sqlite";
-      };
-    };
-  };
-
-  networking.wireless.enable = false;
-  networking.networkmanager.enable = false;
-  krebs.iptables.enable = true;
-  networking.enableIPv6 = false;
-
-   programs.fish = {
-    enable = true;
-    shellInit = ''
-      function ssh_agent --description 'launch the ssh-agent and add the id_rsa identity'
-          if begin
-              set -q SSH_AGENT_PID
-              and kill -0 $SSH_AGENT_PID
-              and grep -q '^ssh-agent' /proc/$SSH_AGENT_PID/cmdline
-          end
-              echo "ssh-agent running on pid $SSH_AGENT_PID"
-          else
-              eval (command ssh-agent -c | sed 's/^setenv/set -Ux/')
-          end
-          set -l identity $HOME/.ssh/id_rsa
-          set -l fingerprint (ssh-keygen -lf $identity | awk '{print $2}')
-          ssh-add -l | grep -q $fingerprint
-            or ssh-add $identity
-      end
-    '';
-    promptInit = ''
-      function fish_prompt --description 'Write out the prompt'
-          set -l color_cwd
-          set -l suffix
-          set -l nix_shell_info (
-              if test "$IN_NIX_SHELL" != ""
-                 echo -n " <nix-shell>"
-              end
-          )
-          switch "$USER"
-              case root toor
-                  if set -q fish_color_cwd_root
-                      set color_cwd $fish_color_cwd_root
-                  else
-                      set color_cwd $fish_color_cwd
-                  end
-                  set suffix '#'
-              case '*'
-                  set color_cwd $fish_color_cwd
-                  set suffix '>'
-          end
-
-          echo -n -s "$USER" @ (set_color green) (prompt_hostname) (set_color normal) "$nix_shell_info" ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
-      end
-    '';
-  };
-
-  nix.buildCores = 4;
-  system.autoUpgrade.enable = false;
-  system.autoUpgrade.channel = "https://nixos.org/channels/nixos-19.03";
-  system.stateVersion = "19.03";
-
-}
diff --git a/mb/1systems/gr33n/hardware-configuration.nix b/mb/1systems/gr33n/hardware-configuration.nix
deleted file mode 100644
index 1d13b8dc7..000000000
--- a/mb/1systems/gr33n/hardware-configuration.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  boot.initrd.mdadmConf = ''
-    ARRAY /dev/md0 level=raid6 num-devices=4 metadata=1.2 name=gr33n:0 UUID=5b715fd9:0be6bfa6:19f07db4:c16836d6
-       devices=/dev/sda1,/dev/sdb1,/dev/sdc1,/dev/sdd1
-  '';
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a9f2c19b-f60f-450c-87f1-146a54c4198b";
-      fsType = "ext4";
-    };
-  fileSystems."/storage" =
-    { device = "/dev/disk/by-label/storage";
-      fsType = "ext4";
-    };
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/93EB-BCA3";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  nix.maxJobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-}
diff --git a/mb/1systems/orange/configuration.nix b/mb/1systems/orange/configuration.nix
deleted file mode 100644
index b43bd8a0f..000000000
--- a/mb/1systems/orange/configuration.nix
+++ /dev/null
@@ -1,238 +0,0 @@
-{ config, pkgs, callPackage, ... }: let
-    unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
-in {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      <stockholm/mb>
-      <stockholm/mb/2configs/nvim.nix>
-    ];
-
-  krebs.build.host = config.krebs.hosts.orange;
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.extraModulePackages = with config.boot.kernelPackages; [ wireguard ];
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.initrd.luks.devices = [
-    {
-      name = "root";
-      device = "/dev/disk/by-uuid/09a36f91-a713-4b82-8b41-4e7a6acc4acf";
-      preLVM = true;
-      allowDiscards = true;
-    }
-  ];
-
-  fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
-  fileSystems."/mnt/public" = {
-    device = "//192.168.0.4/public";
-    fsType = "cifs";
-    options = let
-      automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-    in [ "${automount_opts},user,rw,username=mb0,iocharset=utf8,credentials=${config.users.users.mb.home}/.smbcredentials" ];
-  };
-
-
-  # Select internationalisation properties.
-  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de";
-    defaultLocale = "en_US.UTF-8";
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  nixpkgs.config.packageOverrides = super: {
-    openvpn = super.openvpn.override { pkcs11Support = true; useSystemd = false; };
-  };
-
-  nixpkgs.config.allowUnfree = true;
-
-  fonts = {
-    enableCoreFonts = true;
-    enableGhostscriptFonts = true;
-    fonts = with pkgs; [
-      anonymousPro
-      corefonts
-      dejavu_fonts
-      envypn-font
-      fira
-      gentium
-      gohufont
-      inconsolata
-      liberation_ttf
-      powerline-fonts
-      source-code-pro
-      terminus_font
-      ttf_bitstream_vera
-      ubuntu_font_family
-      unifont
-      unstable.cherry
-      xorg.fontbitstream100dpi
-      xorg.fontbitstream75dpi
-      xorg.fontbitstreamtype1
-    ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    adapta-gtk-theme
-    aircrackng
-    ag
-    arandr
-    binutils
-    chromium
-    cifs-utils
-    curl
-    evince
-    exfat
-    feh
-    file
-    firefox
-    freetype
-    gimp
-    git
-    gnupg
-    graphite2
-    hicolor_icon_theme
-    htop
-    i3lock
-    jq
-    keepassx2
-    kvm
-    lxappearance
-    man-pages
-    moc
-    mpv
-    mpvc
-    mupdf
-    ncdu
-    nmap
-    openvpn
-    pass
-    p7zip
-    powertop
-    ranger
-    rofi
-    sshfs
-    tcpdump
-    tmux
-    traceroute
-    tree
-    unstable.alacritty
-    unstable.ponyc
-    unstable.sublime3
-    unstable.youtube-dl
-    virt-viewer
-    virtmanager
-    vulnix
-    wcalc
-    wget
-    xz
-    zbackup
-  ];
-
-  environment.variables = {
-    EDITOR = ["nvim"];
-  };
-
-  environment.shellAliases = {
-    ll = "ls -alh";
-    ls = "ls --color=tty";
-  };
-
-  virtualisation.libvirtd.enable = true;
-  #virtualisation.kvmgt.enable = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  hardware.pulseaudio.support32Bit = true;
-  nixpkgs.config.pulseaudio = true;
-
-  services.xserver = {
-    enable = true;
-    layout = "de";
-    xkbVariant = "nodeadkeys";
-    libinput.enable = true;
-    desktopManager = {
-      default = "xfce";
-      xterm.enable = false;
-      xfce = {
-        enable = true;
-        noDesktop = true;
-        enableXfwm = false;
-      };
-    };
-    windowManager.ratpoison.enable = true;
-  };
-
-  services.openssh.enable = true;
-  #services.openssh.permitRootLogin = "yes";
-  services.openssh.passwordAuthentication = false;
-
-  networking.wireless.enable = false;
-  networking.networkmanager.enable = false;
-  krebs.iptables.enable = true;
-  #networking.nameservers = [ "8.8.8.8" "141.1.1.1" ];
-  networking.enableIPv6 = false;
-
-  programs.fish = {
-    enable = true;
-    shellInit = ''
-      function ssh_agent --description 'launch the ssh-agent and add the id_rsa identity'
-          if begin
-              set -q SSH_AGENT_PID
-              and kill -0 $SSH_AGENT_PID
-              and grep -q '^ssh-agent' /proc/$SSH_AGENT_PID/cmdline
-          end
-              echo "ssh-agent running on pid $SSH_AGENT_PID"
-          else
-              eval (command ssh-agent -c | sed 's/^setenv/set -Ux/')
-          end
-          set -l identity $HOME/.ssh/id_rsa
-          set -l fingerprint (ssh-keygen -lf $identity | awk '{print $2}')
-          ssh-add -l | grep -q $fingerprint
-            or ssh-add $identity
-      end
-    '';
-    promptInit = ''
-      function fish_prompt --description 'Write out the prompt'
-          set -l color_cwd
-          set -l suffix
-          set -l nix_shell_info (
-              if test "$IN_NIX_SHELL" != ""
-                 echo -n " <nix-shell>"
-              end
-          )
-          switch "$USER"
-              case root toor
-                  if set -q fish_color_cwd_root
-                      set color_cwd $fish_color_cwd_root
-                  else
-                      set color_cwd $fish_color_cwd
-                  end
-                  set suffix '#'
-              case '*'
-                  set color_cwd $fish_color_cwd
-                  set suffix '>'
-          end
-
-          echo -n -s "$USER" @ (set_color yellow) (prompt_hostname) (set_color normal) "$nix_shell_info" ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
-      end
-    '';
-  };
-
-  nix.maxJobs = 4;
-  nix.buildCores = 4;
-  system.autoUpgrade.enable = false;
-  system.autoUpgrade.channel = "https://nixos.org/channels/nixos-19.03";
-  system.stateVersion = "19.03";
-
-}
diff --git a/mb/1systems/orange/hardware-configuration.nix b/mb/1systems/orange/hardware-configuration.nix
deleted file mode 100644
index 8aa191269..000000000
--- a/mb/1systems/orange/hardware-configuration.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b1d32c54-35f8-4bf1-9fd2-82adc760af01";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/BF9B-03A2";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  nix.maxJobs = lib.mkDefault 4;
-}
diff --git a/mb/1systems/p1nk/configuration.nix b/mb/1systems/p1nk/configuration.nix
deleted file mode 100644
index 19efc75b0..000000000
--- a/mb/1systems/p1nk/configuration.nix
+++ /dev/null
@@ -1,227 +0,0 @@
-{ config, pkgs, callPackage, ... }: let
-  unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
-in {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      <stockholm/mb>
-      <stockholm/mb/2configs/nvim.nix>
-    ];
-
-  krebs.build.host = config.krebs.hosts.p1nk;
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.initrd.luks.devices = [
-    {
-      name = "root";
-      device = "/dev/disk/by-uuid/0392257b-f6cf-484d-8c46-e20aab4fddb7";
-      preLVM = true;
-      allowDiscards = true;
-    }
-  ];
-  fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
-  fileSystems."/mnt/public" = {
-    device = "//192.168.0.4/public";
-    fsType = "cifs";
-    options = let
-      automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-    in [ "${automount_opts},user,rw,username=mb0,iocharset=utf8,credentials=${config.users.users.mb.home}/.smbcredentials" ];
-  };
-
-
-  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de";
-    defaultLocale = "en_US.UTF-8";
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  fonts = {
-    enableCoreFonts = true;
-    enableGhostscriptFonts = true;
-    fonts = with pkgs; [
-      anonymousPro
-      corefonts
-      dejavu_fonts
-      envypn-font
-      fira
-      gentium
-      gohufont
-      inconsolata
-      liberation_ttf
-      powerline-fonts
-      source-code-pro
-      terminus_font
-      ttf_bitstream_vera
-      ubuntu_font_family
-      unifont
-      unstable.cherry
-      xorg.fontbitstream100dpi
-      xorg.fontbitstream75dpi
-      xorg.fontbitstreamtype1
-    ];
-  };
-
-  nixpkgs.config.packageOverrides = super: {
-    openvpn = super.openvpn.override { pkcs11Support = true; useSystemd = false; };
-  };
-
-  nixpkgs.config.allowUnfree = true;
-
-  environment.systemPackages = with pkgs; [
-    adapta-gtk-theme
-    aircrackng
-    ag
-    arandr
-    binutils
-    chromium
-    cifs-utils
-    curl
-    evince
-    exfat
-    feh
-    file
-    firefox
-    freetype
-    gimp
-    git
-    gnupg
-    graphite2
-    hicolor_icon_theme
-    htop
-    i3lock
-    jq
-    keepassx2
-    kvm
-    lxappearance
-    man-pages
-    moc
-    mpv
-    mpvc
-    mupdf
-    ncdu
-    nmap
-    openvpn
-    pass
-    p7zip
-    powertop
-    ranger
-    rofi
-    sshfs
-    tcpdump
-    tmux
-    traceroute
-    tree
-    unstable.alacritty
-    unstable.ponyc
-    unstable.sublime3
-    youtube-dl
-    virt-viewer
-    virtmanager
-    vulnix
-    wcalc
-    wget
-    xz
-    zbackup
-  ];
-
-  environment.shellAliases = {
-    ll = "ls -alh";
-    ls = "ls --color=tty";
-  };
-
-  virtualisation.libvirtd.enable = true;
-  virtualisation.kvmgt.enable = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  hardware.pulseaudio.support32Bit = true;
-
-  services.xserver = {
-    enable = true;
-    layout = "de";
-    xkbOptions = "nodeadkeys";
-    libinput.enable = true;
-    desktopManager = {
-      default = "xfce";
-      xterm.enable = false;
-      xfce = {
-        enable = true;
-        noDesktop = true;
-        enableXfwm = false;
-      };
-    };
-    windowManager.ratpoison.enable = true;
-    windowManager.pekwm.enable = true;
-  };
-
-  services.openssh.enable = true;
-  services.openssh.passwordAuthentication = false;
-
-  krebs.iptables.enable = true;
-  networking.networkmanager.enable = false;
-  networking.wireless.enable = true;
-  networking.nameservers = [ "8.8.8.8" "141.1.1.1" ];
-  networking.enableIPv6 = false;
-
-  programs.fish = {
-    enable = true;
-    shellInit = ''
-      function ssh_agent --description 'launch the ssh-agent and add the id_rsa identity'
-          if begin
-              set -q SSH_AGENT_PID
-              and kill -0 $SSH_AGENT_PID
-              and grep -q '^ssh-agent' /proc/$SSH_AGENT_PID/cmdline
-          end
-              echo "ssh-agent running on pid $SSH_AGENT_PID"
-          else
-              eval (command ssh-agent -c | sed 's/^setenv/set -Ux/')
-          end
-          set -l identity $HOME/.ssh/id_rsa
-          set -l fingerprint (ssh-keygen -lf $identity | awk '{print $2}')
-          ssh-add -l | grep -q $fingerprint
-            or ssh-add $identity
-      end
-    '';
-    promptInit = ''
-      function fish_prompt --description 'Write out the prompt'
-          set -l color_cwd
-          set -l suffix
-          set -l nix_shell_info (
-              if test "$IN_NIX_SHELL" != ""
-                 echo -n " <nix-shell>"
-              end
-          )
-          switch "$USER"
-              case root toor
-                  if set -q fish_color_cwd_root
-                      set color_cwd $fish_color_cwd_root
-                  else
-                      set color_cwd $fish_color_cwd
-                  end
-                  set suffix '#'
-              case '*'
-                  set color_cwd $fish_color_cwd
-                  set suffix '>'
-          end
-
-          echo -n -s "$USER" @ (set_color magenta) (prompt_hostname) (set_color normal) "$nix_shell_info" ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
-      end
-    '';
-  };
-
-  nix.maxJobs = 4;
-  nix.buildCores = 4;
-  system.autoUpgrade.enable = false;
-  system.autoUpgrade.channel = "https://nixos.org/channels/nixos-19.03";
-  system.stateVersion = "19.03";
-
-}
diff --git a/mb/1systems/p1nk/hardware-configuration.nix b/mb/1systems/p1nk/hardware-configuration.nix
deleted file mode 100644
index ab5b6e204..000000000
--- a/mb/1systems/p1nk/hardware-configuration.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/4cc2add6-ed19-4685-bbd9-b992bd8d51fb";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/9F87-AEAA";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  nix.maxJobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-}
diff --git a/mb/1systems/rofl/configuration.nix b/mb/1systems/rofl/configuration.nix
deleted file mode 100644
index 3c5c56c84..000000000
--- a/mb/1systems/rofl/configuration.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ config, pkgs, callPackage, ... }: let
-  unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
-in {
-  imports =
-    [ # Include the results of the hardware scan.
-      <stockholm/mb/2configs/google-compute-config.nix>
-      <stockholm/mb>
-    ];
-
-  krebs.build.host = config.krebs.hosts.rofl;
-
-  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de";
-    defaultLocale = "en_US.UTF-8";
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  nixpkgs.config.allowUnfree = true;
-
-  environment.shellAliases = {
-    ll = "ls -alh";
-    ls = "ls --color=tty";
-  };
-
-  environment.systemPackages = with pkgs; [
-     curl
-     fish
-     git
-     htop
-     nmap
-     ranger
-     tcpdump
-     tmux
-     traceroute
-     tree
-     vim
-     xz
-     zbackup
-  ];
-
-  sound.enable = false;
-
-  services.openssh.enable = true;
-  services.openssh.passwordAuthentication = false;
-
-  networking.wireless.enable = false;
-  networking.networkmanager.enable = false;
-  krebs.iptables.enable = true;
-  networking.enableIPv6 = false;
-
-   programs.fish = {
-    enable = true;
-    shellInit = ''
-      function ssh_agent --description 'launch the ssh-agent and add the id_rsa identity'
-          if begin
-              set -q SSH_AGENT_PID
-              and kill -0 $SSH_AGENT_PID
-              and grep -q '^ssh-agent' /proc/$SSH_AGENT_PID/cmdline
-          end
-              echo "ssh-agent running on pid $SSH_AGENT_PID"
-          else
-              eval (command ssh-agent -c | sed 's/^setenv/set -Ux/')
-          end
-          set -l identity $HOME/.ssh/id_rsa
-          set -l fingerprint (ssh-keygen -lf $identity | awk '{print $2}')
-          ssh-add -l | grep -q $fingerprint
-            or ssh-add $identity
-      end
-    '';
-    promptInit = ''
-      function fish_prompt --description 'Write out the prompt'
-          set -l color_cwd
-          set -l suffix
-          set -l nix_shell_info (
-              if test "$IN_NIX_SHELL" != ""
-                 echo -n " <nix-shell>"
-              end
-          )
-          switch "$USER"
-              case root toor
-                  if set -q fish_color_cwd_root
-                      set color_cwd $fish_color_cwd_root
-                  else
-                      set color_cwd $fish_color_cwd
-                  end
-                  set suffix '#'
-              case '*'
-                  set color_cwd $fish_color_cwd
-                  set suffix '>'
-          end
-
-          echo -n -s "$USER" @ (set_color green) (prompt_hostname) (set_color normal) "$nix_shell_info" ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
-      end
-    '';
-  };
-
-  system.autoUpgrade.enable = false;
-  system.autoUpgrade.channel = "https://nixos.org/channels/nixos-19.03";
-  system.stateVersion = "19.03";
-
-}
diff --git a/mb/1systems/sunsh1n3/configuration.nix b/mb/1systems/sunsh1n3/configuration.nix
deleted file mode 100644
index 633d122ea..000000000
--- a/mb/1systems/sunsh1n3/configuration.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-
-{ config, pkgs, ... }: let
-  unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
-in {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-     <stockholm/mb>
-    ];
-
-  krebs.build.host = config.krebs.hosts.sunsh1n3;
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
-  
-  boot.initrd.luks.devices = [
-    {
-      name = "root";
-      device = "/dev/disk/by-uuid/5354ba31-c7de-4b55-8f86-a2a437dfbb21";
-      preLVM = true;
-      allowDiscards = true;
-    }
-  ];
-
-  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de";
-    defaultLocale = "en_US.UTF-8";
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  nixpkgs.config.packageOverrides = super : {
-   openvpn = super.openvpn.override { pkcs11Support = true; useSystemd = true ; };
-  };
-
-  nixpkgs.config.allowUnfree = true;
-
-  fonts = {
-    enableCoreFonts = true;
-    enableGhostscriptFonts = true;
-    fonts = with pkgs; [
-      anonymousPro
-      corefonts
-      dejavu_fonts
-      envypn-font
-      fira
-      gentium
-      gohufont
-      inconsolata
-      liberation_ttf
-      powerline-fonts
-      source-code-pro
-      terminus_font
-      ttf_bitstream_vera
-      ubuntu_font_family
-      unifont
-      unstable.cherry
-      xorg.fontbitstream100dpi
-      xorg.fontbitstream75dpi
-      xorg.fontbitstreamtype1
-    ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    wget vim git curl fish
-    ag
-    chromium
-    firefox
-    gimp
-    p7zip
-    htop
-    mpv
-    mpvc
-    nmap
-    ntfs3g
-    keepassx2
-    sshfs
-    #unstable.skrooge
-    skrooge
-    unstable.alacritty
-    tmux
-    tree
-    wcalc
-    virtmanager
-    virt-viewer
-    (wine.override { wineBuild = "wineWow"; }) 
-    xz    
-    zbackup
-  ];
-
-  virtualisation.libvirtd.enable = true;
-  virtualisation.kvmgt.enable = true;
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-
-  programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
-  programs.dconf.enable = true;
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  services.openssh.passwordAuthentication = false;
-
-  krebs.iptables.enable = true;
-  #networking.wireless.enable = true;  
-  networking.networkmanager.enable = true;
-  networking.enableIPv6 = false;
-
-  # Enable sound.
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  hardware.pulseaudio.support32Bit = true;
-  nixpkgs.config.pulseaudio = true;
-
-  services.xserver.enable = true;
-  services.xserver.layout = "de";
-  services.xserver.xkbOptions = "nodeadkeys";
-  services.xserver.libinput.enable = true;
-
-  # Enable the KDE Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
-  programs.fish = {
-    enable = true;
-    shellInit = ''
-      function ssh_agent --description 'launch the ssh-agent and add the id_rsa identity'
-          if begin
-              set -q SSH_AGENT_PID
-              and kill -0 $SSH_AGENT_PID
-              and grep -q '^ssh-agent' /proc/$SSH_AGENT_PID/cmdline
-          end
-              echo "ssh-agent running on pid $SSH_AGENT_PID"
-          else
-              eval (command ssh-agent -c | sed 's/^setenv/set -Ux/')
-          end
-          set -l identity $HOME/.ssh/id_rsa
-          set -l fingerprint (ssh-keygen -lf $identity | awk '{print $2}')
-          ssh-add -l | grep -q $fingerprint
-            or ssh-add $identity
-      end
-    '';
-    promptInit = ''
-      function fish_prompt --description 'Write out the prompt'
-          set -l color_cwd
-          set -l suffix
-          set -l nix_shell_info (
-              if test "$IN_NIX_SHELL" != ""
-                 echo -n " <nix-shell>"
-              end
-          )
-          switch "$USER"
-              case root toor
-                  if set -q fish_color_cwd_root
-                      set color_cwd $fish_color_cwd_root
-                  else
-                      set color_cwd $fish_color_cwd
-                  end
-                  set suffix '#'
-              case '*'
-                  set color_cwd $fish_color_cwd
-                  set suffix '>'
-          end
-
-          echo -n -s "$USER" @ (set_color yellow) (prompt_hostname) (set_color normal) "$nix_shell_info" ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
-      end
-    '';
-  };
-  
-  nix.buildCores = 4;
-
-  system.stateVersion = "19.09";
-
-}
diff --git a/mb/1systems/sunsh1n3/hardware-configuration.nix b/mb/1systems/sunsh1n3/hardware-configuration.nix
deleted file mode 100644
index 2beee7c4f..000000000
--- a/mb/1systems/sunsh1n3/hardware-configuration.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" "rtsx_usb_sdmmc" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a3257922-d2d4-45ae-87cc-cc38d32e0774";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/60A6-4DAB";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  nix.maxJobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-}