From f451acb559be028b5ed44d28e469ce3d2501ae05 Mon Sep 17 00:00:00 2001 From: Jacob Bachmann Date: Wed, 21 Aug 2024 12:20:55 +0200 Subject: [PATCH] feat: a lot of stuff --- users/gandalf/modules/scripts/default.nix | 5 ++- users/gandalf/modules/scripts/pomodoro.nix | 37 ++++++++++++---------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/users/gandalf/modules/scripts/default.nix b/users/gandalf/modules/scripts/default.nix index 4d1b1b8..18aba38 100644 --- a/users/gandalf/modules/scripts/default.nix +++ b/users/gandalf/modules/scripts/default.nix @@ -1,6 +1,9 @@ { pkgs, nixosConfig, ... }: { + imports = [ + ./pomodoro.nix + ]; home.packages = [ (import ./git-clone-list.nix { inherit pkgs; }) (import ./nix-update.nix { inherit pkgs nixosConfig; }) - ] ++ (import ./pomodoro.nix { inherit pkgs; }); + ]; } diff --git a/users/gandalf/modules/scripts/pomodoro.nix b/users/gandalf/modules/scripts/pomodoro.nix index b300649..e0a1282 100644 --- a/users/gandalf/modules/scripts/pomodoro.nix +++ b/users/gandalf/modules/scripts/pomodoro.nix @@ -1,20 +1,23 @@ -{ pkgs }: +{ pkgs, ... }: let pootis = ./pootis.m4a; in -[ - (pkgs.writeShellScriptBin - "pomostart" - '' - clear - ${pkgs.openpomodoro-cli}/bin/openpomodoro-cli start --wait $@ - while ${pkgs.mpv}/bin/mpv ${pootis} > /dev/null 2>&1; do :; done - '') - (pkgs.writeShellScriptBin - "pomobreak" - '' - clear - ${pkgs.openpomodoro-cli}/bin/openpomodoro-cli break --wait $@ - while ${pkgs.mpv}/bin/mpv ${pootis} > /dev/null 2>&1; do :; done - '') -] +{ + home.packages = [ + pkgs.openpomodoro-cli + (pkgs.writeShellScriptBin + "pomostart" + '' + clear + ${pkgs.openpomodoro-cli}/bin/openpomodoro-cli start --wait $@ + while ${pkgs.mpv}/bin/mpv ${pootis} > /dev/null 2>&1; do :; done + '') + (pkgs.writeShellScriptBin + "pomobreak" + '' + clear + ${pkgs.openpomodoro-cli}/bin/openpomodoro-cli break --wait $@ + while ${pkgs.mpv}/bin/mpv ${pootis} > /dev/null 2>&1; do :; done + '') + ]; +}