summaryrefslogtreecommitdiffstats
path: root/nin
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-01-09 19:06:50 +0100
committertv <tv@krebsco.de>2018-01-09 19:06:50 +0100
commit8ff5c5e992ebafeca5edb2b22a0ab700edc715a5 (patch)
treee141f28bca4e5494669282d41c1c8dbbc96b4ce8 /nin
parentfb0bbec70ae1a0dd4fdc3c9bc9ed47f2a8573fd9 (diff)
parent5ef3a2c6caa2f018c2adf795de992e0487dd2413 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'nin')
-rw-r--r--nin/1systems/axon/config.nix117
-rw-r--r--nin/1systems/axon/source.nix4
-rw-r--r--nin/2configs/default.nix2
-rw-r--r--nin/2configs/git.nix2
4 files changed, 124 insertions, 1 deletions
diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix
new file mode 100644
index 000000000..c5f38c1f3
--- /dev/null
+++ b/nin/1systems/axon/config.nix
@@ -0,0 +1,117 @@
+# 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, ... }:
+
+with lib;
+
+{
+ imports = [
+ <stockholm/nin>
+ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+ #../2configs/copyq.nix
+ <stockholm/nin/2configs/games.nix>
+ <stockholm/nin/2configs/git.nix>
+ <stockholm/nin/2configs/retiolum.nix>
+ <stockholm/nin/2configs/termite.nix>
+ ];
+
+ krebs.build.host = config.krebs.hosts.axon;
+
+ boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ];
+ boot.kernelModules = [ "kvm-intel" ];
+ boot.extraModulePackages = [ ];
+
+ fileSystems."/" =
+ { device = "/dev/pool/root";
+ fsType = "ext4";
+ };
+
+ fileSystems."/tmp" =
+ { device = "tmpfs";
+ fsType = "tmpfs";
+ };
+
+ fileSystems."/boot" =
+ { device = "/dev/sda1";
+ fsType = "ext2";
+ };
+
+ boot.initrd.luks.devices.crypted.device = "/dev/sda2";
+ boot.initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
+
+ swapDevices = [ ];
+
+ nix.maxJobs = lib.mkDefault 4;
+ # Use the GRUB 2 boot loader.
+ boot.loader.grub.enable = true;
+ boot.loader.grub.version = 2;
+ # Define on which hard drive you want to install Grub.
+ boot.loader.grub.device = "/dev/sda";
+
+ # Enable the OpenSSH daemon.
+ services.openssh.enable = true;
+
+ # Enable CUPS to print documents.
+ # services.printing.enable = true;
+
+ # nin config
+ time.timeZone = "Europe/Berlin";
+ services.xserver.enable = true;
+
+ networking.networkmanager.enable = true;
+ #networking.wireless.enable = true;
+
+ hardware.pulseaudio = {
+ enable = true;
+ systemWide = true;
+ };
+
+ hardware.bluetooth.enable = true;
+
+ hardware.opengl.driSupport32Bit = true;
+
+ #nixpkgs.config.steam.java = true;
+
+ environment.systemPackages = with pkgs; [
+ firefox
+ git
+ lmms
+ networkmanagerapplet
+ python
+ steam
+ thunderbird
+ vim
+ virtmanager
+ ];
+
+ nixpkgs.config = {
+
+ allowUnfree = true;
+
+ };
+
+ #services.logind.extraConfig = "HandleLidSwitch=ignore";
+
+ services.xserver.synaptics = {
+ enable = true;
+ };
+
+
+ services.xserver.desktopManager.xfce = let
+ xbindConfig = pkgs.writeText "xbindkeysrc" ''
+ "${pkgs.pass}/bin/passmenu --type"
+ Control + p
+ '';
+ in {
+ enable = true;
+ extraSessionCommands = ''
+ ${pkgs.xbindkeys}/bin/xbindkeys -f ${xbindConfig}
+ '';
+ };
+
+ # The NixOS release to be compatible with for stateful data such as databases.
+ system.stateVersion = "17.03";
+
+}
diff --git a/nin/1systems/axon/source.nix b/nin/1systems/axon/source.nix
new file mode 100644
index 000000000..6a40296da
--- /dev/null
+++ b/nin/1systems/axon/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/nin/source.nix> {
+ name = "axon";
+ secure = true;
+}
diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index d7b89c80c..62f499a2d 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -16,6 +16,7 @@ with import <stockholm/lib>;
root = {
openssh.authorizedKeys.keys = [
config.krebs.users.nin.pubkey
+ config.krebs.users.nin_h.pubkey
];
};
nin = {
@@ -31,6 +32,7 @@ with import <stockholm/lib>;
];
openssh.authorizedKeys.keys = [
config.krebs.users.nin.pubkey
+ config.krebs.users.nin_h.pubkey
];
};
};
diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix
index 2a8604689..9ebbaabd2 100644
--- a/nin/2configs/git.nix
+++ b/nin/2configs/git.nix
@@ -53,7 +53,7 @@ let
with git // config.krebs.users;
repo:
singleton {
- user = [ nin ];
+ user = [ nin nin_h ];
repo = [ repo ];
perm = push "refs/*" [ non-fast-forward create delete merge ];
} ++