diff options
| author | makefu <github@syntax-fehler.de> | 2016-12-21 12:34:57 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-12-21 12:34:57 +0100 |
| commit | 933ba962019300c0cd590956ad96cc0fe862fe21 (patch) | |
| tree | 31248468f973c58b87ad1d604a288159641bce30 /lass | |
| parent | c7f2a0d7d99c8e7aa0145fc033ddab1678a103d9 (diff) | |
| parent | deaef40bdfb1da44c7daf59d2a4b833cb7581730 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/mors.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/nixpkgs.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/teamviewer.nix | 6 | ||||
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 9f2cec9a1..594f342db 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -18,13 +18,13 @@ with import <stockholm/lib>; ../2configs/wine.nix ../2configs/git.nix ../2configs/skype.nix - ../2configs/teamviewer.nix ../2configs/libvirt.nix ../2configs/fetchWallpaper.nix #../2configs/c-base.nix ../2configs/mail.nix ../2configs/krebs-pass.nix ../2configs/repo-sync.nix + ../2configs/ircd.nix { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index fd331e90d..e2bdd5755 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "76f346d61d537f5bbe4f365f9f659df7024602b4"; + ref = "2a97e149e50e1c701a957c6bd060cc74b7e9a905"; }; } diff --git a/lass/2configs/teamviewer.nix b/lass/2configs/teamviewer.nix deleted file mode 100644 index 87b6fbac3..000000000 --- a/lass/2configs/teamviewer.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, pkgs, ... }: - -with import <stockholm/lib>; -{ - services.teamviewer.enable = true; -} diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 2a6df06ff..76e13412b 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -151,7 +151,7 @@ in { description = "maintenance acc for domsen"; home = "/home/domsen"; useDefaultShell = true; - extraGroups = [ "nginx" ]; + extraGroups = [ "nginx" "download" ]; createHome = true; }; |