diff options
author | Markus Hihn <markus.hihn@dcso.de> | 2017-12-20 21:38:35 +0100 |
---|---|---|
committer | Markus Hihn <markus.hihn@dcso.de> | 2017-12-20 21:38:35 +0100 |
commit | 03fde41b6c223e65363df43a26e735459a3cf92a (patch) | |
tree | 9c7e4d6cc9444c3fff936bcc21c4580d53c5fcab /lass/1systems | |
parent | b1983327610628028021374e519baa27dc63d9bf (diff) | |
parent | a5d7056ccba9fb5f3495390ad1213e133e44fa78 (diff) |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/1systems')
-rw-r--r-- | lass/1systems/helios/config.nix | 33 | ||||
-rw-r--r-- | lass/1systems/prism/config.nix | 9 |
2 files changed, 29 insertions, 13 deletions
diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix index b14ef2a3e..8bd9735a9 100644 --- a/lass/1systems/helios/config.nix +++ b/lass/1systems/helios/config.nix @@ -20,20 +20,26 @@ with import <stockholm/lib>; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.kernelModules = [ "kvm-intel" ]; - fileSystems."/" = - { device = "/dev/pool/root"; - fsType = "btrfs"; - }; + fileSystems."/" = { + device = "/dev/pool/root"; + fsType = "btrfs"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/1F60-17C6"; + fsType = "vfat"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/1F60-17C6"; - fsType = "vfat"; - }; + fileSystems."/home" = { + device = "/dev/pool/home"; + fsType = "btrfs"; + }; - fileSystems."/home" = - { device = "/dev/pool/home"; - fsType = "btrfs"; - }; + fileSystems."/tmp" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = ["nosuid" "nodev" "noatime"]; + }; nix.maxJobs = lib.mkDefault 8; } @@ -150,4 +156,7 @@ with import <stockholm/lib>; services.printing.drivers = [ pkgs.postscript-lexmark ]; + services.logind.extraConfig = '' + HandleLidSwitch=ignore + ''; } diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 87270b8b8..1cca76331 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -186,6 +186,7 @@ in { #hotdog containers.hotdog = { config = { ... }: { + environment.systemPackages = [ pkgs.git ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey @@ -201,6 +202,7 @@ in { #kaepsele containers.kaepsele = { config = { ... }: { + environment.systemPackages = [ pkgs.git ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = with config.krebs.users; [ lass.pubkey @@ -217,6 +219,7 @@ in { #onondaga containers.onondaga = { config = { ... }: { + environment.systemPackages = [ pkgs.git ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey @@ -290,7 +293,11 @@ in { { krebs.git.rules = [ { - user = [ config.krebs.users.jeschli ]; + user = with config.krebs.users; [ + jeschli + jeschli-bln + jeschli-brauerei + ]; repo = [ config.krebs.git.repos.stockholm ]; perm = with git; push "refs/heads/staging/jeschli" [ fast-forward non-fast-forward create delete merge ]; } |