From 4cba5a0b8a8917ef01b8db7fa7087d90fa1573bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 8 Apr 2021 20:00:54 +0200 Subject: [PATCH] feat: friendship ended with todo.txt --- configs/default.nix | 1 - configs/neovim.nix | 2 -- configs/todo-txt.nix | 25 ------------------------- lib/i3status-rust.nix | 15 --------------- lib/vim/init.vim | 1 - packages/vimPlugins/todo-txt-vim.nix | 10 ---------- 6 files changed, 54 deletions(-) delete mode 100644 configs/todo-txt.nix delete mode 100644 packages/vimPlugins/todo-txt-vim.nix diff --git a/configs/default.nix b/configs/default.nix index 9aa6d54..3f97c78 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -244,7 +244,6 @@ in { ./theming.nix ./tmux.nix ./tor.nix - ./todo-txt.nix ./traadfri.nix ./unclutter.nix ./version.nix diff --git a/configs/neovim.nix b/configs/neovim.nix index 27213f5..f485f3a 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -11,7 +11,6 @@ vim-colors-paramount = pkgs.callPackage { }; vim-256noir = pkgs.callPackage { }; icalendar-vim = pkgs.callPackage { }; - todo-txt-vim = pkgs.callPackage { }; jq-vim = pkgs.callPackage { }; vim-fsharp = pkgs.callPackage { }; vim-reason-plus = pkgs.callPackage { }; @@ -65,7 +64,6 @@ jq-vim purescript-vim rust-vim - todo-txt-vim typescript-vim vim-fsharp vim-javascript diff --git a/configs/todo-txt.nix b/configs/todo-txt.nix deleted file mode 100644 index e962a74..0000000 --- a/configs/todo-txt.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, ... }: -let - get-todo-dir = pkgs.writers.writeDash "git-toplevel-todo" '' - if GIT_TOPLEVEL=$(${pkgs.git}/bin/git rev-parse --show-toplevel 2>/dev/null); then - echo "$GIT_TOPLEVEL/.todo" - else - echo "$HOME/cloud/Dropbox/todo" - fi - ''; -in { - home-manager.users.me.home.file.".todo/config".text = '' - # export TODO_DIR="$(${get-todo-dir})" - export TODO_DIR="$HOME/cloud/Dropbox/todo" - - export TODO_FILE="$TODO_DIR/todo.txt" - export DONE_FILE="$TODO_DIR/done.txt" - export REPORT_FILE="$TODO_DIR/report.txt" - ''; - - environment = { - systemPackages = [ pkgs.todo-txt-cli ]; - shellAliases.t = "todo.sh"; - variables.TODOTXT_DEFAULT_ACTION = "ls"; - }; -} diff --git a/lib/i3status-rust.nix b/lib/i3status-rust.nix index c032131..75e805a 100644 --- a/lib/i3status-rust.nix +++ b/lib/i3status-rust.nix @@ -91,21 +91,6 @@ in { units = "metric"; }; } - { - block = "custom"; - interval = 20; - command = pkgs.writers.writeDash "tasks" '' - ${pkgs.todo-txt-cli}/bin/todo.sh list '(.)' \ - | tail -n 1 \ - | ${pkgs.gawk}/bin/awk '{ print "⏳ " $2 "/" $4 }' - ''; - on_click = let sleepSeconds = 2.5; - in pkgs.writers.writeDash "show-tasks" '' - ${pkgs.st}/bin/st -c floating -e ${pkgs.dash}/bin/dash -c "${pkgs.todo-txt-cli}/bin/todo.sh list && sleep ${ - toString sleepSeconds - }" - ''; - } { block = "custom"; interval = 30; diff --git a/lib/vim/init.vim b/lib/vim/init.vim index 0a609a3..ea90c15 100644 --- a/lib/vim/init.vim +++ b/lib/vim/init.vim @@ -135,7 +135,6 @@ if has("autocmd") autocmd bufnewfile,bufread urls,config set filetype=conf autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4 autocmd bufnewfile,bufread *.dhall packadd dhall-vim | set filetype=dhall - autocmd bufnewfile,bufread *todo.txt packadd todo.txt-vim | set filetype=todo.txt autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i autocmd filetype javascript packadd vim-javascript autocmd filetype make setlocal noexpandtab diff --git a/packages/vimPlugins/todo-txt-vim.nix b/packages/vimPlugins/todo-txt-vim.nix deleted file mode 100644 index 19ec573..0000000 --- a/packages/vimPlugins/todo-txt-vim.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ vimUtils, fetchFromGitHub }: -vimUtils.buildVimPluginFrom2Nix { - name = "todo.txt-vim"; - src = fetchFromGitHub { - owner = "freitass"; - repo = "todo.txt-vim"; - rev = "6845221d45bd62e604c2024bc511a56e79d1118b"; - sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v"; - }; -}