Update emacs

Precompiling native code now seems to work.

3 files changed, 15 insertions, 16 deletions

diff --git a/gui/conf/init.el b/gui/conf/init.el
index b516ceb..4187f92 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -107,7 +107,7 @@
   :after evil
   :ensure t
   :config
-  (setq evil-collection-mode-list '(dired eshell eww pdf))
+  (setq evil-collection-mode-list '(dired eshell eww pdf magit))
   (evil-collection-init))
 
 (use-package which-key
@@ -319,6 +319,7 @@
   ("l" org-toggle-link-display      "Toggle links"   :column "View")
 
   ("s" org-time-stamp-inactive  "Timestamp (inactive)" :column "Fragments")
+  ("S" org-time-stamp           "Timestamp (active)"   :column "Fragments")
 
   ("h" org-html-export-to-html  "HTML export" :column "Export")
 
@@ -447,9 +448,6 @@
   :config
   (evil-leader/set-key "pg" 'magit))
 
-(use-package evil-magit
-  :ensure t)
-
 (use-package projectile
   :ensure t
   :config
diff --git a/gui/emacs.nix b/gui/emacs.nix
index 2e7fc14..2c253f1 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -52,6 +52,7 @@ in {
 
     package = pkgs-unstable.emacsWithPackagesFromUsePackage {
       config = ./conf/init.el;
+      alwaysEnsure = false;
       # remove builtin org as in https://github.com/chrisbarrett/.emacs.d/blob/6efd82c8e328e677dbef84331ed54763b89667a3/default.nix
       # this is a workaround until I find a better way to force usage of a non-builtin up-to-date org version
       package = pkgs-unstable.emacsGcc.overrideAttrs (old: {
diff --git a/nix/sources.json b/nix/sources.json
index e6bd54e..9fdcc58 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "0bb3c36bb8cddd92b788d8ce474c39475148d5e2",
-        "sha256": "18zrn9bskjk10iqljq0c288fapxs376rka4kzj59pfpdxpcx2nhz",
+        "rev": "063ee066b5095dd2f21f47c582b04024674974a8",
+        "sha256": "11526l3jzqi624fzi9cn4l59zxgwrsjycir0f9vn3lggq5qv2c72",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/0bb3c36bb8cddd92b788d8ce474c39475148d5e2.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/063ee066b5095dd2f21f47c582b04024674974a8.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
@@ -42,10 +42,10 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "9d35b9e4837ab88517210b1701127612c260eccf",
-        "sha256": "0q50xhnm8g2yfyakrh0nly4swyygxpi0a8cb9gp65wcakcgvzvdh",
+        "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e",
+        "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/9d35b9e4837ab88517210b1701127612c260eccf.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
@@ -54,10 +54,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2394284537b89471c87065b040d3dedd8b5907fe",
-        "sha256": "1j7vp735is5d32mbrgavpxi3fbnsm6d99a01ap8gn30n5ysd14sl",
+        "rev": "38eaa62f28384bc5f6c394e2a99bd6a4913fc71f",
+        "sha256": "1pvbhvy6m5zmhhifk66ll07fnwvwnl9rrif03i4yc34s4f48m7ld",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/2394284537b89471c87065b040d3dedd8b5907fe.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/38eaa62f28384bc5f6c394e2a99bd6a4913fc71f.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {
@@ -66,10 +66,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e49e3a756b325ca47f31c11bddd296d807f2eca0",
-        "sha256": "0zzl365wsfcvihjkf3hn4bx8z0n3d5pjac3m3bdj2wailmkflpyk",
+        "rev": "aed173ff9707387b238c1c7e143152ca9d8878e9",
+        "sha256": "14m757nlacv1x1p924n4i2sxq0amrsp475slwzg8p7pbvg143w32",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e49e3a756b325ca47f31c11bddd296d807f2eca0.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/aed173ff9707387b238c1c7e143152ca9d8878e9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }