From 81218d19522cc171445c47fb71b0826f78dad0f3 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 20 Feb 2026 10:06:29 +0100 Subject: [PATCH 1/3] fix(remEYEnder): Avoid flickering --- scripts/remEYEnder.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/remEYEnder.sh b/scripts/remEYEnder.sh index c6dd482..b06e5fa 100644 --- a/scripts/remEYEnder.sh +++ b/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}" + From 48c15ea72aa097229996495702cb2184e974bd80 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 20 Feb 2026 10:17:22 +0100 Subject: [PATCH 2/3] fix(waybar): Avoid always-on-top --- nixos/modules/desktop/waybar/default.nix | 4 ++++ stow/waybar/.config/waybar/config.jsonc | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/nixos/modules/desktop/waybar/default.nix b/nixos/modules/desktop/waybar/default.nix index d893470..3eab3df 100644 --- a/nixos/modules/desktop/waybar/default.nix +++ b/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 diff --git a/stow/waybar/.config/waybar/config.jsonc b/stow/waybar/.config/waybar/config.jsonc index a83d47c..addef9e 100644 --- a/stow/waybar/.config/waybar/config.jsonc +++ b/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 } ] From ef3703c297d72fe6173a5090b0a103918f216bc5 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 20 Feb 2026 10:23:28 +0100 Subject: [PATCH 3/3] fix(tailscale) + move module --- nixos/hosts/Tibo-NixDesk/default.nix | 2 +- nixos/hosts/Tibo-NixFat/default.nix | 6 ++--- nixos/hosts/Tibo-NixTop/default.nix | 7 +++--- nixos/modules/networking/default.nix | 1 + .../modules/networking/tailscale/default.nix | 22 +++++++++++++++++++ nixos/modules/services/default.nix | 1 - nixos/modules/services/tailscale/default.nix | 15 ------------- 7 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 nixos/modules/networking/tailscale/default.nix delete mode 100644 nixos/modules/services/tailscale/default.nix diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix index 9373483..2bcb52f 100644 --- a/nixos/hosts/Tibo-NixDesk/default.nix +++ b/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; diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix index 2e790c3..80d9d98 100644 --- a/nixos/hosts/Tibo-NixFat/default.nix +++ b/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; diff --git a/nixos/hosts/Tibo-NixTop/default.nix b/nixos/hosts/Tibo-NixTop/default.nix index 7d977af..8cbbec7 100644 --- a/nixos/hosts/Tibo-NixTop/default.nix +++ b/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; diff --git a/nixos/modules/networking/default.nix b/nixos/modules/networking/default.nix index 94bb711..897a716 100644 --- a/nixos/modules/networking/default.nix +++ b/nixos/modules/networking/default.nix @@ -3,5 +3,6 @@ ./networkmanager ./openconnect-sso ./openvpn + ./tailscale ]; } diff --git a/nixos/modules/networking/tailscale/default.nix b/nixos/modules/networking/tailscale/default.nix new file mode 100644 index 0000000..ac2a936 --- /dev/null +++ b/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; + }; + }; +} diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix index 663fc70..324ef55 100644 --- a/nixos/modules/services/default.nix +++ b/nixos/modules/services/default.nix @@ -6,6 +6,5 @@ ./pipewire ./printing ./remEYEnder - ./tailscale ]; } diff --git a/nixos/modules/services/tailscale/default.nix b/nixos/modules/services/tailscale/default.nix deleted file mode 100644 index 48eceb7..0000000 --- a/nixos/modules/services/tailscale/default.nix +++ /dev/null @@ -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"; - }; - }; -}