From e20f6fdff242abf6ead01c992842481eaadd3843 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 1 Jan 2026 14:38:22 +0100 Subject: [PATCH 1/5] chore: disable audioEnhancement again as the audio is super quiet --- hosts/sakura/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 3650301..7f03056 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -50,7 +50,7 @@ in hardware.framework = { amd-7040.preventWakeOnAC = true; - laptop13.audioEnhancement.enable = true; + # laptop13.audioEnhancement.enable = true; }; # Disable light sensors and accelerometers as they are not used and consume extra battery From dd39fb6facd4845e411cb21785c94fbf2cdedf68 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 1 Jan 2026 14:39:51 +0100 Subject: [PATCH 2/5] feat: adds pomodoro module --- modules/home/waybar/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix index 6f2bfbf..0778834 100644 --- a/modules/home/waybar/default.nix +++ b/modules/home/waybar/default.nix @@ -1,6 +1,4 @@ { - config, - lib, pkgs, username, ... @@ -50,6 +48,7 @@ // "wireplumber", "group/audio", "group/battery", + "custom/pomodoro", "group/clock" ], @@ -367,6 +366,15 @@ "interval": 60, "format": "CEST: {} ", "exec": "~/.local/bin/waybar-minutes" + }, + + "custom/pomodoro": { + "interval": 1, + "format": "{}", + "return-type": "json", + "exec": "waybar-module-pomodoro --no-work-icons", + "on-click": "waybar-module-pomodoro toggle", + "on-click-right": "waybar-module-pomodoro reset" } } ] From 319e9336db09e6025ce3c32bbecbcb8f758d86f2 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 1 Jan 2026 14:40:25 +0100 Subject: [PATCH 3/5] feat: adds pomodoro package for waybar --- modules/home/waybar/scripts.nix | 8 ++--- .../home/waybar/waybar-module-pomodoro.nix | 31 +++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 modules/home/waybar/waybar-module-pomodoro.nix diff --git a/modules/home/waybar/scripts.nix b/modules/home/waybar/scripts.nix index c3723c0..b5ab0c7 100644 --- a/modules/home/waybar/scripts.nix +++ b/modules/home/waybar/scripts.nix @@ -1,12 +1,11 @@ { pkgs, username, - config, + lib, ... }: let - # homeExternalIPv4 = "${pkgs.coreutils}/bin/cat ${config.sops.secrets.homeExternalIPv4.path}"; - homeExternalIPv4 = "92.118.0.69"; + waybar-module-pomodoro = pkgs.callPackage ./waybar-module-pomodoro.nix { }; in { home.file = { @@ -242,7 +241,7 @@ in NODE="$(mullvad status | grep -Ei 'relay' | awk '{print $2}' | tr '[:upper:]' '[:lower:]')" LOCATION="$(mullvad status | grep -Ei 'location' | cut -d':' -f2 | cut -d'.' -f1 | sed 's/ //g')" IPV4="$(mullvad status | grep 'IPv4' | cut -d':' -f3 | sed 's/ //g')" - echo "$IPV4" | grep -q "${homeExternalIPv4}" && LOCATION="home" + echo "$IPV4" | grep -q "92.118.0.69" && LOCATION="home" echo "$STATUS" | grep -Eioq 'connected|connecting' && TEXT="{\"text\":\"$STATUS ($LOCATION)\",\"location\":\"$LOCATION\",\"node\":\"$NODE\"}" # || ip address show tailscale0 | grep "global tailscale0" && TEXT="{\"text\":\"tailscale ($LOCATION)\",\"location\":\"$LOCATION\",\"node\":\"$NODE\"}" echo "$STATUS" | grep -Eioq 'disconnected' && TEXT="{\"text\":\"$STATUS\",\"location\":\"$LOCATION\",\"node\":\"$NODE\"}" @@ -255,5 +254,6 @@ in wf-recorder bemenu ncspot + waybar-module-pomodoro ]; } diff --git a/modules/home/waybar/waybar-module-pomodoro.nix b/modules/home/waybar/waybar-module-pomodoro.nix new file mode 100644 index 0000000..170a50e --- /dev/null +++ b/modules/home/waybar/waybar-module-pomodoro.nix @@ -0,0 +1,31 @@ +{ + lib, + pkgs, + rustPlatform, + fetchFromGitHub, + writableTmpDirAsHomeHook, + ... +}: +rustPlatform.buildRustPackage { + pname = "waybar-module-pomodoro"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "Andeskjerf"; + repo = "waybar-module-pomodoro"; + hash = "sha256-vB5WROn/GmaJyLNHnyfhTZItjQlJ+LMXMw8gOT1GM0s="; + rev = "3867b25ab691c4a697ee2ffca76d7cc9408675cc"; + }; + + cargoHash = "sha256-FTzqNkGn1dk+pdee8U07NI/uqUR6/gs51ZWOpYro3j8="; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; + + meta = { + description = "waybar module that provides a pomodoro timer"; + homepage = "https://github.com/Andeskjerf/waybar-module-pomodoro"; + maintainers = [ ]; + }; +} From 93bf4a21a4bb2ea5793041da368b2149ea228ce4 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 1 Jan 2026 14:40:36 +0100 Subject: [PATCH 4/5] flake: oisd --- flake.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 845d516..afbfa29 100644 --- a/flake.lock +++ b/flake.lock @@ -913,7 +913,7 @@ "oisd": { "flake": false, "locked": { - "narHash": "sha256-Yro3cUgQ8VxmcsQwbvdYdGAxsfZDGEl3tyr7ILhzK7s=", + "narHash": "sha256-BEGZgyaI3g9WwpnTyW2cYT0rh3248eL0sC0z76filNM=", "type": "file", "url": "https://big.oisd.nl/domainswild" }, From f3573f3324d714ed3cf1c3208128afa8fca4df2f Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 1 Jan 2026 14:55:04 +0100 Subject: [PATCH 5/5] chore: oisd --- modules/security/dnscrypt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/security/dnscrypt.nix b/modules/security/dnscrypt.nix index 7ef1d15..c4c0785 100644 --- a/modules/security/dnscrypt.nix +++ b/modules/security/dnscrypt.nix @@ -25,7 +25,7 @@ in "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" ]; - minisign_key = "sha256-Yro3cUgQ8VxmcsQwbvdYdGAxsfZDGEl3tyr7ILhzK7s="; # See https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md + minisign_key = "sha256-BEGZgyaI3g9WwpnTyW2cYT0rh3248eL0sC0z76filNM="; # See https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md cache_file = "/var/lib/dnscrypt/public-resolvers.md"; };