summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/nin/default.nix5
-rw-r--r--nin/1systems/onondaga/config.nix65
2 files changed, 6 insertions, 64 deletions
diff --git a/krebs/3modules/nin/default.nix b/krebs/3modules/nin/default.nix
index d5d13cd1a..aab568352 100644
--- a/krebs/3modules/nin/default.nix
+++ b/krebs/3modules/nin/default.nix
@@ -3,7 +3,10 @@
with import <stockholm/lib>;
{
- hosts = mapAttrs (_: setAttr "owner" config.krebs.users.nin) {
+ hosts = mapAttrs (_: recursiveUpdate {
+ owner = config.krebs.users.nin;
+ ci = true;
+ }) {
hiawatha = {
cores = 2;
nets = {
diff --git a/nin/1systems/onondaga/config.nix b/nin/1systems/onondaga/config.nix
index 242d67c26..3cd0773ae 100644
--- a/nin/1systems/onondaga/config.nix
+++ b/nin/1systems/onondaga/config.nix
@@ -7,7 +7,6 @@
{
imports = [
<stockholm/nin>
- <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
<stockholm/nin/2configs/retiolum.nix>
<stockholm/nin/2configs/weechat.nix>
<stockholm/nin/2configs/git.nix>
@@ -15,70 +14,10 @@
krebs.build.host = config.krebs.hosts.onondaga;
- boot.loader.grub.enable = true;
- boot.loader.grub.version = 2;
- # boot.loader.grub.efiSupport = true;
- # boot.loader.grub.efiInstallAsRemovable = true;
- # boot.loader.efi.efiSysMountPoint = "/boot/efi";
- # Define on which hard drive you want to install Grub.
- boot.loader.grub.device = "/dev/sda";
+ boot.isContainer = true;
+ networking.useDHCP = false;
- # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
-
- # Select internationalisation properties.
- # i18n = {
- # consoleFont = "Lat2-Terminus16";
- # consoleKeyMap = "us";
- # defaultLocale = "en_US.UTF-8";
- # };
-
- # Set your time zone.
time.timeZone = "Europe/Amsterdam";
- # List packages installed in system profile. To search by name, run:
- # $ nix-env -qaP | grep wget
- # environment.systemPackages = with pkgs; [
- # wget
- # ];
-
- # List services that you want to enable:
-
- # Enable the OpenSSH daemon.
services.openssh.enable = true;
-
- # Enable CUPS to print documents.
- # services.printing.enable = true;
-
- # Enable the X11 windowing system.
- # services.xserver.enable = true;
- # services.xserver.layout = "us";
- # services.xserver.xkbOptions = "eurosign:e";
-
- # Enable the KDE Desktop Environment.
- # services.xserver.displayManager.kdm.enable = true;
- # services.xserver.desktopManager.kde4.enable = true;
-
- # Define a user account. Don't forget to set a password with ‘passwd’.
- # users.extraUsers.guest = {
- # isNormalUser = true;
- # uid = 1000;
- # };
-
- # The NixOS release to be compatible with for stateful data such as databases.
- system.stateVersion = "16.09";
-
- boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "sd_mod" "sr_mod" ];
-
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/7238cc6e-4bea-4e52-9408-32d8aa05abff";
- fsType = "ext4";
- };
-
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/5e923175-854b-4bcf-97c8-f3a91806fa22";
- fsType = "ext2";
- };
-
- nix.maxJobs = lib.mkDefault 1;
-
}