fixing sshd and suspend problems

configs/sternchen/configuration.nix

@@ -29,6 +29,8 @@
   programs.custom.steam.enable = false;
   programs.custom.video.enable = true;
 
+  system.custom.suspend.enable = false;
+
   services.printing.enable = true;
 
   # fonts

system/desktop/default.nix

@@ -26,6 +26,8 @@
     ./wtf.nix
   ];
 
+  system.custom.suspend.enable = lib.mkDefault true;
+
   backup.dirs =
     [ "/home/palo/.password-store" "/home/palo/.task" "/home/palo/.vit" ];
 

system/desktop/sshd.nix

@@ -1,7 +1,6 @@
-{ config, ... }:
+{ config, ... }: {
-{
   # make sure ssh is only available trough the tinc
-  #networking.firewall.extraCommands = ''
+  networking.firewall.extraCommands = ''
-  #  iptables -t nat -A PREROUTING ! -i tinc.private -p tcp -m tcp --dport 22 -j REDIRECT --to-ports 0
+    iptables --table nat --append PREROUTING ! --in-interface tinc.+ --protocol tcp --match tcp --dport 22 --jump REDIRECT --to-ports 0
-  #'';
+  '';
 }

system/desktop/suspend.nix

@@ -1,6 +1,15 @@
 { pkgs, config, lib, ... }:
+with lib;
+
+let
+
+  cfg = config.system.custom.suspend;
+in {
+
+  options.system.custom.suspend.enable = mkEnableOption "use xlock in suspend";
+
+  config = mkIf cfg.enable {
 
-{
     systemd.services.screenlock = {
       before = [ "sleep.target" ];
       requiredBy = [ "sleep.target" ];
@@ -24,4 +33,5 @@
 
     services.logind.lidSwitch = "suspend";
 
+  };
 }