From d697b6c8996dcc3bed88bbc01cd748aa30064419 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 25 Nov 2019 22:43:06 +0100 Subject: satoshipay: only install ripcord on Linux --- user/settings/satoshipay.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix index f5eb87be..93dce324 100644 --- a/user/settings/satoshipay.nix +++ b/user/settings/satoshipay.nix @@ -22,8 +22,6 @@ in s3cmd sops - ripcord - mkcert google-cloud-sdk docker_compose @@ -36,6 +34,7 @@ in pgadmin redis-desktop-manager + ripcord robo3t ])); -- cgit 1.4.1 From c7dd27626485b49f0d8a87551335784861681547 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 26 Nov 2019 19:49:26 +0100 Subject: Add lumen to satoshipay environment --- user/settings/satoshipay.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix index 93dce324..e8753141 100644 --- a/user/settings/satoshipay.nix +++ b/user/settings/satoshipay.nix @@ -22,6 +22,8 @@ in s3cmd sops + lumen + mkcert google-cloud-sdk docker_compose -- cgit 1.4.1 From a98e86dd38c26432e79482be732ec83082018093 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 26 Nov 2019 22:47:15 +0100 Subject: Emacs: update ledger expense accounts --- user/emacs/.emacs.d/init.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el index 15c6ef08..a2c65924 100644 --- a/user/emacs/.emacs.d/init.el +++ b/user/emacs/.emacs.d/init.el @@ -704,11 +704,11 @@ _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'\"") + ledger-reports `(("Monthly Expenses" "ledger -f %(ledger-file) reg -M \\^Expenses --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\"") + " --monthly --average balance ^Expenses")) + ("Expenses:This Month" "ledger -f %(ledger-file) bal \\^Expenses -p \"this month\"") ("All Account Balances" "ledger -f %(ledger-file) bal --current -R \\^Assets \\^Liabilities"))))) -- cgit 1.4.1 From 8f859f1ec1deef2ddfbdadc0d7acfa21441ce9ac Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 26 Nov 2019 22:47:33 +0100 Subject: trillian: setup ledger --- user/trillian.nix | 1 + 1 file changed, 1 insertion(+) 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 -- cgit 1.4.1 From 85484881997989635e719b44889c439e6c8c15a9 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 26 Nov 2019 23:24:22 +0100 Subject: Emacs: tweak ledger reports --- user/emacs/.emacs.d/init.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el index a2c65924..f426f58f 100644 --- a/user/emacs/.emacs.d/init.el +++ b/user/emacs/.emacs.d/init.el @@ -705,10 +705,16 @@ _p_rev _u_pper _=_: upper/lower _r_esolve ledger-narrow-on-reconcile t ledger-clear-whole-transactions t ledger-reports `(("Monthly Expenses" "ledger -f %(ledger-file) reg -M \\^Expenses --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 ^Expenses")) - ("Expenses:This Month" "ledger -f %(ledger-file) bal \\^Expenses -p \"this month\"") + ("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"))))) -- cgit 1.4.1