fix(tailscale) + move module

nixos/hosts/Tibo-NixDesk/default.nix

@@ -21,6 +21,7 @@
       networkmanager.enable = true;
       openconnect-sso.enable = true;
       openvpn.enable = true;
+      tailscale.enable = true;
     };
 
     nix = {
@@ -36,7 +37,6 @@
     };
 
     services = {
-      tailscale.enable = true;
       pipewire.enable = true;
       printing.enable = true;
       openrgb.enable = true;

nixos/hosts/Tibo-NixFat/default.nix

@@ -23,6 +23,7 @@
     networking = {
       networkmanager.enable = true;
       openconnect-sso.enable = true;
+      tailscale.enable = true;
     };
 
     nix = {
@@ -37,10 +38,7 @@
       ssh.enable = true;
     };
 
-    services = {
-      pipewire.enable = true;
-      tailscale.enable = true;
-    };
+    services.pipewire.enable = true;
 
     users.tdpeuter.enable = true;
 

nixos/hosts/Tibo-NixTop/default.nix

@@ -26,6 +26,8 @@
     networking = {
       networkmanager.enable = true;
       openconnect-sso.enable = true;
+      openvpn.enable = true;
+      tailscale.enable = true;
     };
 
     nix = {
@@ -41,10 +43,7 @@
       wireshark.enable = true;
     };
 
-    services = {
-      pipewire.enable = true;
-      tailscale.enable = true;
-    };
+    services.pipewire.enable = true;
 
     users.tdpeuter.enable = true;
 

nixos/modules/desktop/waybar/default.nix

@@ -13,6 +13,10 @@ in {
       j4-dmenu-desktop
     ];
 
+    fonts.packages = with pkgs; [
+      font-awesome_6
+    ];
+
     programs.waybar.enable = true;
 
     services.atd.enable = true; # Command scheduler

nixos/modules/networking/default.nix

@@ -3,5 +3,6 @@
     ./networkmanager
     ./openconnect-sso
     ./openvpn
+    ./tailscale
   ];
 }

nixos/modules/networking/tailscale/default.nix

@@ -0,0 +1,22 @@
+{ config, lib, pkgs, pkgs-unstable, ... }:
+
+let
+  cfg = config.sisyphus.networking.tailscale;
+in {
+  options.sisyphus.networking.tailscale.enable = lib.mkEnableOption "Tailscale";
+
+  config = lib.mkIf cfg.enable {
+    services = {
+      tailscale = {
+        enable = true;
+        package = pkgs-unstable.tailscale;
+        useRoutingFeatures = "client";
+        extraDaemonFlags = [
+          "--no-logs-no-support"
+        ];
+      };
+
+      resolved.enable = true;
+    };
+  };
+} 

nixos/modules/services/default.nix

@@ -6,6 +6,5 @@
     ./pipewire
     ./printing
     ./remEYEnder
-    ./tailscale
   ];
 }

nixos/modules/services/tailscale/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, pkgs-unstable, ... }:
-
-let
-  cfg = config.sisyphus.services.tailscale;
-in {
-  options.sisyphus.services.tailscale.enable = lib.mkEnableOption "Tailscale";
-
-  config = lib.mkIf cfg.enable {
-    services.tailscale = {
-      enable = true;
-      package = pkgs-unstable.tailscale;
-      useRoutingFeatures = "client";
-    };
-  };
-} 

scripts/remEYEnder.sh

@@ -7,11 +7,10 @@ interval_ms="$(( "${DURATION}" * ( 10 ** "${EXP}" ) / "${STEPS}" ))"
 padded_interval_ms="$(printf "%0${EXP}d" "${interval_ms}")"
 interval_s="${padded_interval_ms:0:-${EXP}}.${padded_interval_ms:-${EXP}}"
 
-end_time="$(( "$( date '+%s' )" + "${DURATION}" + 1 ))"
+end_time="$(( "$( date '+%s' )" + "${DURATION}" ))"
 
 # notify-send args
 replace_id="${end_time}"
-expire_time="$(( "${interval_ms}" + 1 ))" # To avoid flickering
 
 counter=0
 while [[ "${end_time}" -gt "$( date '+%s' )" ]]; do
@@ -22,9 +21,16 @@ while [[ "${end_time}" -gt "$( date '+%s' )" ]]; do
         'Look away from your screen :)' 'RemEYEnder' \
         --hint="int:value:${remaining_part}" \
         --category='sysinfo' \
-        --replace-id="${replace_id}" \
-        --expire-time="${expire_time}"
+        --replace-id="${replace_id}"
 
     counter="$(( "${counter}" + 1 ))"
     sleep "${interval_s}"
 done
+
+notify-send \
+    'Look away from your screen :)' 'RemEYEnder' \
+    --hint="int:value:${remaining_part}" \
+    --category='sysinfo' \
+    --replace-id="${replace_id}" \
+    --expire-time="${interval_ms}"
+

stow/waybar/.config/waybar/config.jsonc

@@ -23,18 +23,17 @@
         ],
         "include": [
             "~/.config/waybar/modules.json"
-        ]
+        ],
+        "start_hidden": true
     },
 
     /* Toggle this bar, contains all information */
     {
         "name": "toggle",
-        "mode": "hide",
-        "ipc": true,
         "position": "top",
         "height": 26,
         /* Show this bar on top of the other one, seemingly replacing it. */
-        "margin": "-26px 0 0 0",
+        /*"margin": "-26px 0 0 0",*/
         "modules-left": [
             "custom/meta",
             "sway/window",
@@ -59,6 +58,7 @@
         ],
         "include": [
             "~/.config/waybar/modules.json"
-        ]
+        ],
+        "reload_style_on_change": true
     }
 ]