From e08ffb4d446a83c72e32662b80500926fc2bcdce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 4 Jul 2023 10:12:34 +0200 Subject: [PATCH] feat(notemenu): use as flake package --- configs/i3.nix | 21 +-------------------- flake.nix | 1 + packages/notemenu.nix | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 packages/notemenu.nix diff --git a/configs/i3.nix b/configs/i3.nix index 3613ded..f47528d 100644 --- a/configs/i3.nix +++ b/configs/i3.nix @@ -271,26 +271,7 @@ in { "${modifier}+0" = "exec ${niveumPackages.menu-calc}/bin/="; "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}"; - "${modifier}+Shift+d" = "exec ${ - pkgs.writers.writeDash "notemenu" '' - set -efu - PATH=$PATH:${ - lib.makeBinPath [pkgs.rofi pkgs.findutils pkgs.coreutils] - } - NOTE_DIR=~/cloud/syncthing/obsidian - - cd "$NOTE_DIR" - note_file=$({ - echo diary/$(date -I).md - echo diary/$(date -I -d yesterday).md - find . ! -name '.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2- - } | rofi -dmenu -i -p 'notes') - if test "$note_file" - then - alacritty --working-directory "$NOTE_DIR" -e "$EDITOR" "$note_file" - fi - '' - }"; + "${modifier}+Shift+d" = "exec ${niveumPackages.notemenu}/bin/notemenu"; "${modifier}+p" = "exec rofi-pass"; "${modifier}+Shift+p" = "exec rofi-pass --insert"; "${modifier}+u" = "exec ${niveumPackages.unicodmenu}/bin/unicodmenu"; diff --git a/flake.nix b/flake.nix index be9c68c..de60cd0 100644 --- a/flake.nix +++ b/flake.nix @@ -307,6 +307,7 @@ new-mac = pkgs.callPackage packages/new-mac.nix {}; nix-git = pkgs.callPackage packages/nix-git.nix {}; nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;}; + notemenu = pkgs.callPackage packages/notemenu.nix {}; opustags = pkgs.callPackage packages/opustags.nix {}; pls = pkgs.callPackage packages/pls.nix {}; qrpaste = pkgs.callPackage packages/qrpaste.nix {}; diff --git a/packages/notemenu.nix b/packages/notemenu.nix new file mode 100644 index 0000000..764248d --- /dev/null +++ b/packages/notemenu.nix @@ -0,0 +1,28 @@ +{ + writers, + lib, + rofi, + findutils, + coreutils, + noteDirectory ? "~/cloud/syncthing/obsidian", + currentDates ? false, +}: +writers.writeDashBin "notemenu" '' + set -efu + PATH=$PATH:${ + lib.makeBinPath [rofi findutils coreutils] + } + + cd ${noteDirectory} + note_file=$({ + ${lib.optionalString currentDates '' + echo $(date -I).md + echo $(date -I -d yesterday).md + ''} + find . -not -path '*/.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2- + } | rofi -dmenu -i -p 'notes') + if test "$note_file" + then + alacritty --working-directory ${noteDirectory} -e "$EDITOR" "$note_file" + fi +''