Use feature/native-comp Emacs build from overlay

3 files changed, 33 insertions, 21 deletions

diff --git a/gui/conf/init.el b/gui/conf/init.el
index 674ebd0..e355071 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -32,6 +32,8 @@
       '(kill-ring search-ring))
 (setq savehist-file "~/.emacs.d/savehist")
 
+(global-eldoc-mode -1)
+
 (setq mouse-wheel-scroll-amount '(5))
 (setq mouse-wheel-progressive-speed nil)
 (setq fast-but-imprecise-scrolling t)
@@ -54,14 +56,6 @@
 
 (add-hook 'prog-mode-hook 'display-line-numbers-mode)
 
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
-(package-initialize)
-
-(unless (package-installed-p 'use-package)
-  (package-refresh-contents)
-  (package-install 'use-package))
-
 (eval-when-compile (require 'use-package))
 
 (set-face-attribute 'default        nil :family "Iosevka")
@@ -69,7 +63,10 @@
 (set-face-attribute 'variable-pitch nil :family "Source Sans Pro" :height 1.1)
 
 (load-library "custom-runtime-env")
-(load-library "akr-theme")
+
+(use-package akr-theme
+  :config
+  (enable-theme 'akr))
 
 (use-package gcmh ; noticeably reduces unwanted GC pauses when editing e.g. large fancy org files
   :ensure t
diff --git a/gui/conf/metakr.org b/gui/conf/metakr.org
index 81ecf8e..0cb6448 100644
--- a/gui/conf/metakr.org
+++ b/gui/conf/metakr.org
@@ -308,14 +308,17 @@ For quick iteration all colors are stored in a table.
    :foreground @org-tag)
   (org-block-begin-line
    :inherit fixed-pitch
-   :background @org-block-line)
+   :background @org-block-line
+   :extend t)
   (org-block-end-line
    :inherit fixed-pitch
-   :background @org-block-line)
+   :background @org-block-line
+   :extend t)
   (org-block
    :background @org-block-bg
    :inherit fixed-pitch
-   :height 0.9)
+   :height 0.9
+   :extend t)
   (org-priority
    :inherit fixed-pitch
    :weight normal)
diff --git a/gui/emacs.nix b/gui/emacs.nix
index 0a24cf2..ce5912b 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -12,7 +12,6 @@
         rm metakr.org
         mkdir -p $out/share/emacs/site-lisp
         mv akr-theme.el $out/share/emacs/site-lisp/
-        ${pkgs.emacs}/bin/emacs -batch -f batch-byte-compile $out/share/emacs/site-lisp/*.el
       '';
     };
 
@@ -45,13 +44,27 @@
   in {
     enable = true;
 
-    extraPackages = epkgs: with epkgs.melpaPackages; [
-      pdf-tools
-    ] ++ [
-      akr-color-theme
-      custom-runtime-env
-      pkgs.mu
-    ];
+    package = let
+      pkgs-unstable = import <nixpkgs-unstable> {
+        overlays = [
+          (import (builtins.fetchTarball {
+            url = https://github.com/nix-community/emacs-overlay/archive/c10d59874dfa8341237702bce514a763198770c4.tar.gz;
+          }))
+        ];
+      };
+    in
+      pkgs-unstable.emacsWithPackagesFromUsePackage {
+        config = ./conf/init.el;
+        package = pkgs-unstable.emacsGcc;
+        extraEmacsPackages = epkgs: with epkgs.melpaPackages; [
+          pdf-tools
+          mu4e-alert
+        ] ++ [
+          akr-color-theme
+          custom-runtime-env
+          pkgs.mu
+        ];
+      };
   };
 
   home.packages = with pkgs; [
@@ -71,6 +84,5 @@
 
   services.emacs = {
     enable = true;
-    client.enable = true;
   };
 }