package updates

3 files changed, 6 insertions, 2 deletions

diff --git a/common.nix b/common.nix
index 79e6597..7fe0094 100644
--- a/common.nix
+++ b/common.nix
@@ -68,7 +68,7 @@ in
       userName  = "Ben Sima";
       userEmail = "ben@bsima.me";
       ignores = [ "*~" "*.swp" ];
-      package = pkgs.gitAndTools.stgit;
+      package = pkgs.gitAndTools.gitFull;
       aliases = {
         authors = "shortlog -s -n";
       };
diff --git a/emacs-packages.nix b/emacs-packages.nix
index 17e5794..8403c78 100644
--- a/emacs-packages.nix
+++ b/emacs-packages.nix
@@ -27,7 +27,7 @@ editorconfig
 evil
 evil-collection
 melpaStablePackages.evil-escape
-evil-magit
+#melpaStablePackages.evil-magit
 evil-org
 evil-surround
 emojify
@@ -53,6 +53,7 @@ multiple-cursors
 neotree
 notmuch
 nix-mode
+org-alert
 org-bullets
 org-dashboard
 org-jira
diff --git a/packages.nix b/packages.nix
index 89f12f1..9a77817 100644
--- a/packages.nix
+++ b/packages.nix
@@ -10,6 +10,7 @@ cloc
 cmdtree
 dict
 dmenu
+dolphin
 entr
 exercism
 expect
@@ -24,6 +25,7 @@ hledger-ui
 hledger-web
 htop
 jq
+texlive.combined.scheme-full
 ledger
 lsof
 minitube
@@ -46,6 +48,7 @@ unrar
 urlscan
 w3m
 xorg.xmodmap
+xournal
 xterm
 yank
 youtube-dl