diff options
| author | Alan Pearce | 2019-11-27 12:00:45 +0100 |
|---|---|---|
| committer | Alan Pearce | 2019-11-27 12:00:45 +0100 |
| commit | 9dc35cbdab4445932a85ab657c59aeda7718df53 (patch) | |
| tree | 4f1b8a83d530aec4b81ce0136aec841e40e8d15b | |
| parent | 248ed3a593080993e56665a1bfa50df22bb823d7 (diff) | |
| parent | 0cb682aa6485f4f9d6fcf4178053fd28f49e81f7 (diff) | |
| download | nixfiles-9dc35cbdab4445932a85ab657c59aeda7718df53.tar.lz nixfiles-9dc35cbdab4445932a85ab657c59aeda7718df53.tar.zst nixfiles-9dc35cbdab4445932a85ab657c59aeda7718df53.zip | |
Merge branch 'master' of origin/master
| -rw-r--r-- | user/emacs/.emacs.d/init.el | 16 | ||||
| -rw-r--r-- | user/settings/satoshipay.nix | 3 | ||||
| -rw-r--r-- | user/trillian.nix | 1 |
3 files changed, 14 insertions, 6 deletions
diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el index 15c6ef08..f426f58f 100644 --- a/user/emacs/.emacs.d/init.el +++ b/user/emacs/.emacs.d/init.el @@ -704,11 +704,17 @@ _p_rev _u_pper _=_: upper/lower _r_esolve (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"))))) diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix index f5eb87be..e8753141 100644 --- a/user/settings/satoshipay.nix +++ b/user/settings/satoshipay.nix @@ -22,7 +22,7 @@ in s3cmd sops - ripcord + lumen mkcert google-cloud-sdk @@ -36,6 +36,7 @@ in pgadmin redis-desktop-manager + ripcord robo3t ])); diff --git a/user/trillian.nix b/user/trillian.nix index 61e7609a..71e88622 100644 --- a/user/trillian.nix +++ b/user/trillian.nix @@ -9,6 +9,7 @@ ./settings/git.nix ./settings/gnupg.nix ./settings/javascript.nix + ./settings/ledger.nix ./settings/nixpkgs.nix ./settings/satoshipay.nix ./settings/tabnine.nix |