config stuff

6 files changed, 46 insertions, 41 deletions

diff --git a/doom.d/config.el b/doom.d/config.el
index a07cedd..676f9d4 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -113,43 +113,45 @@
 (after! mu4e
   (remove-hook 'mu4e-compose-mode-hook #'org-mu4e-compose-org-mode))
 
-(setq hledger-jfile "~/.hledger.journal")
-
-(use-package! hledger-mode
-  :defer t
-  :mode ("\\.journal\\'" "\\.hledger\\'")
-  :commands hledger-enable-reporting
-  :preface
-  (defun hledger/next-entry ()
-    "Move to next entry and pulse."
-    (interactive)
-    (hledger-next-or-new-entry)
-    (hledger-pulse-momentary-current-entry))
-
-  (defface hledger-warning-face
-    '((((background dark))
-       :background "Red" :foreground "White")
-      (((background light))
-       :background "Red" :foreground "White")
-      (t :inverse-video t))
-    "Face for warning"
-    :group 'hledger)
-
-  (defun hledger/prev-entry ()
-    "Move to last entry and pulse."
-    (interactive)
-    (hledger-backward-entry)
-    (hledger-pulse-momentary-current-entry))
-
-  :config
-  (set-company-backend! 'hledger-mode '(hledger-company))
-
-  (map! :map hledger-mode-map
-        "M-p" #'hledger/prev-entry
-        "M-n" #'hledger/next-entry
-        :localleader
-        "e" #'hledger-jentry
-        "j" #'hledger-run-command)
-  )
+;; (setq hledger-jfile "~/.hledger.journal")
+
+;; (use-package! hledger-mode
+;;   :defer t
+;;   :mode ("\\.journal\\'" "\\.hledger\\'")
+;;   :commands hledger-enable-reporting
+;;   :preface
+;;   (defun hledger/next-entry ()
+;;     "Move to next entry and pulse."
+;;     (interactive)
+;;     (hledger-next-or-new-entry)
+;;     (hledger-pulse-momentary-current-entry))
+
+;;   (defface hledger-warning-face
+;;     '((((background dark))
+;;        :background "Red" :foreground "White")
+;;       (((background light))
+;;        :background "Red" :foreground "White")
+;;       (t :inverse-video t))
+;;     "Face for warning"
+;;     :group 'hledger)
+
+;;   (defun hledger/prev-entry ()
+;;     "Move to last entry and pulse."
+;;     (interactive)
+;;     (hledger-backward-entry)
+;;     (hledger-pulse-momentary-current-entry))
+
+;;   :config
+;;   (set-company-backend! 'hledger-mode '(hledger-company))
+
+;;   (map! :map hledger-mode-map
+;;         "M-p" #'hledger/prev-entry
+;;         "M-n" #'hledger/next-entry
+;;         :localleader
+;;         "e" #'hledger-jentry
+;;         "j" #'hledger-run-command)
+;;   )
+
+(add-to-list 'auto-mode-alist '("\\.journal\\'" . ledger-mode))
 
 (load-file "~/.doom.d/config.local.el")
diff --git a/doom.d/init.el b/doom.d/init.el
index f9b8d7c..4a887c9 100644
--- a/doom.d/init.el
+++ b/doom.d/init.el
@@ -135,7 +135,7 @@
        ;;latex             ; writing papers in Emacs has never been so fun
        ;;lean
        ;;factor
-       ;;ledger            ; an accounting system in Emacs
+       ledger            ; an accounting system in Emacs
        ;;lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
diff --git a/doom.d/packages.el b/doom.d/packages.el
index 1a4873c..95c7e51 100644
--- a/doom.d/packages.el
+++ b/doom.d/packages.el
@@ -46,6 +46,6 @@
 ;; our package manager can't deal with; see raxod502/straight.el#279)
 ;(package! builtin-package :recipe (:branch "develop"))
 
-(package! hledger-mode)
+;; (package! hledger-mode)
 
 (load-file "~/.doom.d/packages.local.el")
diff --git a/nix-home-config/desktop.nix b/nix-home-config/desktop.nix
index 41dfe79..b63d20d 100644
--- a/nix-home-config/desktop.nix
+++ b/nix-home-config/desktop.nix
@@ -3,6 +3,7 @@
 {
   home.packages = with pkgs; [
     iw
+    anki
     wirelesstools
     hledger
     hledger-ui
diff --git a/nix-home-config/gaming.nix b/nix-home-config/gaming.nix
index 2df20a2..6bce62c 100644
--- a/nix-home-config/gaming.nix
+++ b/nix-home-config/gaming.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 let
   my_steam = pkgs.steam.override {
-    # nativeOnly = true;
+    nativeOnly = true;
     withJava = true;
     extraPkgs = p: [
       pkgs.openldap
diff --git a/nix-home-config/my-env.nix b/nix-home-config/my-env.nix
index 1fb7a96..5fd59ac 100644
--- a/nix-home-config/my-env.nix
+++ b/nix-home-config/my-env.nix
@@ -26,12 +26,14 @@
       ];
     })
     emacs
+    sqlite
     hledger
     ledger
     bwm_ng
     nix-index
     rustup
     gitFull
+    gargoyle
 
     ripgrep
     coreutils