Merge branch 'master' of origin/master
3 files changed, 14 insertions(+), 6 deletions(-)
M user/emacs/.emacs.d/init.el → user/emacs/.emacs.d/init.el
@@ -704,11 +704,17 @@ :config (progn (setq ledger-reconcile-default-commodity "€" ledger-narrow-on-reconcile t ledger-clear-whole-transactions t - ledger-reports `(("Monthly Expenses" "ledger -f %(ledger-file) reg -M \\^Flex --real -X EUR -l \"payee != 'Opening Balances'\"") - ("Average Monthly Expenses (Past 12 Months)" ,(concat "ledger -f %(ledger-file) -b " - (format-time-string "%Y-%m" (time-add (current-time) (days-to-time -365))) - " --monthly --average balance ^Flex")) - ("Expenses:This Month" "ledger -f %(ledger-file) bal \\^Flex -p \"this month\"") + ledger-reports `(("Monthly Expenses" "ledger -f %(ledger-file) reg -M \\^Expenses --real -X EUR -l \"payee != 'Opening Balances'\"") + ("Total Expenses:This Month" "ledger -f %(ledger-file) bal \\^Expenses -p \"this month\"") + ("Total Expenses:Past 90 Days" ,(concat "ledger -f %(ledger-file) balance ^Expenses -b " + (format-time-string "%Y-%m-%d" (time-add (current-time) (days-to-time -90))))) + ("Total Expenses:Past 180 Days" ,(concat "ledger -f %(ledger-file) balance ^Expenses -b " + (format-time-string "%Y-%m-%d" (time-add (current-time) (days-to-time -180))))) + ("Expenses:This Month" "ledger -f %(ledger-file) register \\^Expenses -p \"this month\"") + ("Expenses:Past 90 Days (monthly)" ,(concat "ledger -f %(ledger-file) register --monthly ^Expenses -b " + (format-time-string "%Y-%m-%d" (time-add (current-time) (days-to-time -90))))) + ("Expenses:Past 180 Days (monthly)" ,(concat "ledger -f %(ledger-file) register --monthly ^Expenses -b " + (format-time-string "%Y-%m-%d" (time-add (current-time) (days-to-time -180))))) ("All Account Balances" "ledger -f %(ledger-file) bal --current -R \\^Assets \\^Liabilities")))))
M user/settings/satoshipay.nix → user/settings/satoshipay.nix
@@ -22,7 +22,7 @@ pgcli s3cmd sops - ripcord + lumen mkcert google-cloud-sdk@@ -36,6 +36,7 @@ [ pgadmin redis-desktop-manager + ripcord robo3t ]));
M user/trillian.nix → user/trillian.nix
@@ -9,6 +9,7 @@ ./settings/emacs.nix ./settings/git.nix ./settings/gnupg.nix ./settings/javascript.nix + ./settings/ledger.nix ./settings/nixpkgs.nix ./settings/satoshipay.nix ./settings/tabnine.nix