diff options
Diffstat (limited to 'lass/1systems')
-rw-r--r-- | lass/1systems/mors/config.nix | 11 | ||||
-rw-r--r-- | lass/1systems/prism/config.nix | 27 | ||||
-rw-r--r-- | lass/1systems/uriel/config.nix | 1 |
3 files changed, 2 insertions, 37 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index fe0b6d85..c1ceb063 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -39,6 +39,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/network-manager.nix> <stockholm/lass/2configs/nfs-dl.nix> #<stockholm/lass/2configs/hardening.nix> + <stockholm/lass/2configs/ppp.nix> { krebs.iptables.tables.filter.INPUT.rules = [ #risk of rain @@ -77,16 +78,6 @@ with import <stockholm/lib>; }; } { - lass.umts = { - enable = true; - modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_2C7D8D7C35FC7040-if09"; - initstrings = '' - Init1 = AT+CFUN=1 - Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0 - ''; - }; - } - { services.nginx = { enable = true; virtualHosts.default = { diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index d8bb14d0..f1f14e79 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -65,13 +65,6 @@ with import <stockholm/lib>; config.krebs.users.makefu.pubkey ]; }; - users.users.nin = { - uid = genid "nin"; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - config.krebs.users.nin.pubkey - ]; - }; users.extraUsers.dritter = { uid = genid_uint31 "dritter"; isNormalUser = true; @@ -123,26 +116,6 @@ with import <stockholm/lib>; localAddress = "10.233.2.2"; }; } - { - #onondaga - systemd.services."container@onondaga".reloadIfChanged = mkForce false; - containers.onondaga = { - config = { ... }: { - imports = [ <stockholm/lass/2configs/rebuild-on-boot.nix> ]; - environment.systemPackages = [ pkgs.git ]; - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = [ - config.krebs.users.lass.pubkey - config.krebs.users.nin.pubkey - ]; - }; - autoStart = true; - enableTun = true; - privateNetwork = true; - hostAddress = "10.233.2.5"; - localAddress = "10.233.2.6"; - }; - } <stockholm/lass/2configs/exim-smarthost.nix> <stockholm/lass/2configs/ts3.nix> <stockholm/lass/2configs/privoxy-retiolum.nix> diff --git a/lass/1systems/uriel/config.nix b/lass/1systems/uriel/config.nix index 3eddcfc5..b50dc63f 100644 --- a/lass/1systems/uriel/config.nix +++ b/lass/1systems/uriel/config.nix @@ -12,6 +12,7 @@ with import <stockholm/lib>; i18n.defaultLocale ="de_DE.UTF-8"; time.timeZone = "Europe/Berlin"; services.xserver.enable = true; + services.xserver.libinput.enable = false; users.users.locke = { uid = genid "locke"; home = "/home/locke"; |