summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/nin/default.nix25
-rw-r--r--nin/1systems/hiawatha.nix3
-rw-r--r--nin/1systems/onondaga.nix83
-rw-r--r--nin/2configs/default.nix1
-rw-r--r--nin/2configs/nixpkgs.nix2
5 files changed, 113 insertions, 1 deletions
diff --git a/krebs/3modules/nin/default.nix b/krebs/3modules/nin/default.nix
index 375faf808..3231c0e23 100644
--- a/krebs/3modules/nin/default.nix
+++ b/krebs/3modules/nin/default.nix
@@ -29,6 +29,31 @@ with import <stockholm/lib>;
ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFizK5kauDlnjm/IzyzLi+W4hLKqjSWMkfuxzLwg6egx";
};
+ onondaga = {
+ cores = 1;
+ nets = {
+ retiolum = {
+ ip4.addr = "10.243.132.55";
+ ip6.addr = "42:0000:0000:0000:0000:0000:0000:1357";
+ aliases = [
+ "onondaga.retiolum"
+ "onondaga.r"
+ ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEAqj6NPhRVsr8abz9FFx9+ld3amfxN7SRNccbksUOqkufGS0vaupFR
+ OWsgj4Qmt3lQ82YVt5yjx0FZHkAsenCEKM3kYoIb4nipT0e1MWkQ7plVveMfGkiu
+ htaJ1aCbI2Adxfmk4YbyAr8k3G+Zl9t7gTikBRh7cf5PMiu2JhGUZHzx9urR0ieH
+ xyashZFjl4TtIy4q6QTiyST9kfzteh8k7CJ72zfYkdHl9dPlr5Nk22zH9xPkyzmO
+ kCNeknuDqKeTT9erNtRLk6pjEcyutt0y2/Uq6iZ38z5qq9k4JzcMuQ3YPpNy8bxn
+ hVuk2qBu6kBTUW3iLchoh0d4cfFLWLx1SQIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
+ };
+ };
+ ssh.privkey.path = <secrets/ssh.id_ed25519>;
+ ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmQk7AXsYLzjUrOjsuhZ3+gT7FjhPtjwxv5XnuU8GJO";
+ };
};
users = {
diff --git a/nin/1systems/hiawatha.nix b/nin/1systems/hiawatha.nix
index ca7071408..6fa8a3388 100644
--- a/nin/1systems/hiawatha.nix
+++ b/nin/1systems/hiawatha.nix
@@ -82,6 +82,9 @@ with lib;
git
hexchat
networkmanagerapplet
+ python
+ virtmanager
+ libvirt
];
nixpkgs.config = {
diff --git a/nin/1systems/onondaga.nix b/nin/1systems/onondaga.nix
new file mode 100644
index 000000000..f7518aa6b
--- /dev/null
+++ b/nin/1systems/onondaga.nix
@@ -0,0 +1,83 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, lib, pkgs, ... }:
+
+{
+ imports = [
+ ../.
+ <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+ ../2configs/retiolum.nix
+ ];
+
+ krebs.build.host = config.krebs.hosts.hiawatha;
+
+ 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";
+
+ networking.hostName = "onondaga";
+ # 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;
+
+}
diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index 8ea9e49d8..e181a6041 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -97,6 +97,7 @@ with import <stockholm/lib>;
p7zip
unzip
unrar
+ hashPassword
];
programs.bash = {
diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix
index eceab7e7b..9d73afbe0 100644
--- a/nin/2configs/nixpkgs.nix
+++ b/nin/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
{
krebs.build.source.nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "fd1dbe551cf6338c5f4e4f80c2f5dde9f9e6a271";
+ ref = "6b28bd0daf00b8e5e370a04347844cb8614138ff";
};
}