4 files changed, 0 insertions, 310 deletions
diff --git a/devhell/machines/machine_common.nix b/devhell/machines/machine_common.nix
deleted file mode 100644
index b7fb5215..00000000
--- a/devhell/machines/machine_common.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
-    cleanTmpDir = true;
-  };
-
-  nix = {
-    buildCores = 0;
-    useSandbox = true;
-    binaryCaches = [
-      "https://headcounter.org/hydra/"
-      "https://cache.nixos.org/"
-    ];
-    requireSignedBinaryCaches = true;
-    binaryCachePublicKeys = [
-      "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-    ];
-    nixPath = lib.mkOptionDefault [ "nixpkgs=/home/dev/git/remote/other_github/nixpkgs" ];
-  };
-
-  time = {
-    timeZone = "Europe/London";
-  };
-
-  system = {
-    fsPackages = with pkgs; [
-      sshfsFuse
-      fuse
-      cryptsetup
-    ];
-  };
-
-  hardware = {
-    enableAllFirmware = true;
-    cpu.intel.updateMicrocode = true;
-    opengl = {
-      s3tcSupport = true;
-      driSupport32Bit = true;
-    };
-    pulseaudio = {
-      enable = true;
-      systemWide = false;
-    };
-  };
-
-  programs = {
-    ssh = {
-      startAgent = false;
-    };
-    zsh = {
-      enable = true;
-      enableCompletion = true;
-    };
-    bash = {
-      enableCompletion = true;
-      promptInit = ''
-        # Provide a nice prompt.
-        PROMPT_COLOR="1;31m"
-        let $UID && PROMPT_COLOR="1;32m"
-        PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
-        if test "$TERM" = "xterm"; then
-          PS1="\[\033]2;\h:\u:\w\007\]$PS1"
-        fi
-        eval `dircolors ~/.dir_colors`
-      '';
-    };
-  };
-
-  environment = {
-    shells = [ "/run/current-system/sw/bin/zsh" ];
-    sessionVariables.TERM = "xterm-256color";
-  };
-
-  fonts = {
-    fontconfig = {
-      enable = true;
-      ultimate = {
-        enable = true;
-      };
-    };
-    enableGhostscriptFonts = true;
-    enableCoreFonts = true;
-    fonts = with pkgs; [
-      clearlyU
-      cm_unicode
-      dejavu_fonts
-      dosemu_fonts
-      font-awesome-ttf
-      freefont_ttf
-      hack-font
-      inconsolata
-      powerline-fonts
-      proggyfonts
-      source-code-pro
-      source-sans-pro
-      source-serif-pro
-      terminus_font
-      tewi-font
-      ttf_bitstream_vera
-      ubuntu_font_family
-      unifont
-      vistafonts
-      wqy_microhei
-    ] ++ lib.filter lib.isDerivation (lib.attrValues lohit-fonts);
-  };
-}
diff --git a/devhell/machines/machine_eris.nix b/devhell/machines/machine_eris.nix
deleted file mode 100644
index 60b6944c..00000000
--- a/devhell/machines/machine_eris.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [ ./machine_common.nix ];
-
-  boot = {
-    loader = {
-      timeout = 2;
-      systemd-boot = {
-        enable = true;
-      };
-
-      efi.canTouchEfiVariables = true;
-    };
-
-    initrd = {
-      availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" ];
-      kernelModules = [ "fuse" ];
-      postDeviceCommands = ''
-        echo noop > /sys/block/sda/queue/scheduler
-      '';
-    };
-
-    kernelModules = [ "tp_smapi" ];
-    extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
-  };
-
-  hardware = {
-    opengl = {
-      extraPackages = [ pkgs.vaapiIntel ];
-    };
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/4788e218-db0f-4fd6-916e-e0c484906eb0";
-    fsType = "btrfs";
-    options = [
-      "autodefrag"
-      "space_cache"
-      "compress=lzo"
-      "noatime"
-      "ssd"
-    ];
-  };
-
-  swapDevices = [ ];
-
-  nix = {
-    maxJobs = 4;
-    extraOptions = ''
-      auto-optimise-store = true
-    '';
-  };
-
-  i18n = {
-    consoleFont = "lat9w-16";
-    consoleKeyMap = "uk";
-    defaultLocale = "en_GB.UTF-8";
-  };
-}
diff --git a/devhell/machines/machine_skunkworks.nix b/devhell/machines/machine_skunkworks.nix
deleted file mode 100644
index 12ad9687..00000000
--- a/devhell/machines/machine_skunkworks.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [ ./machine_common.nix ];
-
-  boot = {
-    loader.grub = {
-      enable = true;
-      version = 2;
-      devices = [
-        "/dev/disk/by-id/ata-ST31500541AS_6XW0NK21"
-        "/dev/disk/by-id/ata-ST31500541AS_6XW0P0CW"
-        "/dev/disk/by-id/ata-Samsung_SSD_850_EVO_250GB_S21PNSAG848626F"
-        "/dev/disk/by-id/ata-Samsung_SSD_850_EVO_250GB_S21PNSAG848674K"
-      ];
-    };
-
-    initrd = {
-      availableKernelModules = [ "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" ];
-      kernelModules = [ "fuse" ];
-    };
-
-    kernelParams = [ "pci=noaer" ];
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-    blacklistedKernelModules = [ "pcspkr" ];
-  };
-
-  hardware = {
-    opengl = {
-      extraPackages = [ pkgs.vaapiVdpau ];
-    };
-  };
-
-  fileSystems."/" = {
-    label = "nixos";
-    fsType = "btrfs";
-    options = [
-      "autodefrag"
-      "space_cache"
-      "compress=lzo"
-      "noatime"
-      "ssd"
-    ];
-  };
-
-  fileSystems."/home" = {
-    label = "home";
-    fsType = "btrfs";
-    options = [
-      "autodefrag"
-      "space_cache"
-      "compress=lzo"
-      "noatime"
-    ];
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/16bd9abd-6af5-4a24-8ea5-58adc51e9641"; }
-    { device = "/dev/disk/by-uuid/279708cb-f9c3-4a37-a064-80ff85a66f88"; }
-    { device = "/dev/disk/by-uuid/0c2409c3-e824-4759-a9ad-9bfcea1e73bb"; }
-    { device = "/dev/disk/by-uuid/3f1835a8-5587-4963-9b6c-66ecb36059de"; }
-  ];
-
-  nix.maxJobs = 8;
-
-  i18n = {
-    consoleFont = "lat9w-16";
-    consoleKeyMap = "dvorak";
-    defaultLocale = "en_US.UTF-8";
-  };
-
-  powerManagement.powerUpCommands = ''
-    ${pkgs.hdparm}/sbin/hdparm -B 255 \
-  /dev/disk/by-id/ata-ST31500541AS_6XW0NK21
-    ${pkgs.hdparm}/sbin/hdparm -B 255 \
-  /dev/disk/by-id/ata-ST31500541AS_6XW0P0CW
-  '';
-}
diff --git a/devhell/machines/machine_titan.nix b/devhell/machines/machine_titan.nix
deleted file mode 100644
index 5a0018fb..00000000
--- a/devhell/machines/machine_titan.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [ ./machine_common.nix ];
-
-  boot = {
-    loader = {
-      timeout = 2;
-      systemd-boot = {
-        enable = true;
-      };
-
-      efi.canTouchEfiVariables = true;
-    };
-
-    initrd = {
-      availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
-      kernelModules = [ "fuse" ];
-    };
-
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-
-    kernelParams = [ "elevator=noop" ];
-  };
-
-  hardware = {
-    opengl = {
-      enable = true;
-      extraPackages = [ pkgs.libvdpau-va-gl pkgs.vaapiVdpau pkgs.vaapiIntel ];
-    };
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/09d1155f-e7dd-4754-ae01-44da2517d5f0";
-    fsType = "btrfs";
-    options = [
-      "autodefrag"
-      "space_cache"
-      "compress=lzo"
-      "noatime"
-      "ssd"
-    ];
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/fecde631-8661-4a0e-88e6-5ce5b551847a"; }
-  ];
-
-  nix = {
-    maxJobs = 4;
-    extraOptions = ''
-      auto-optimise-store = true
-    '';
-  };
-
-  i18n = {
-    consoleFont = "lat9w-16";
-    consoleKeyMap = "uk";
-    defaultLocale = "en_GB.UTF-8";
-  };
-}