1 files changed, 31 insertions, 6 deletions
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index f866bbca9..cffa1c744 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -9,7 +9,7 @@ let
     ];
   };
 
-  orgAgendaView = import ./emacs-org-agenda.nix;
+#  orgAgendaView = import ./emacs-org-agenda.nix;
 
   packageRepos = ''
     (require 'package) ;; You might already have this line
@@ -123,6 +123,8 @@ let
   #
   # This requires rls and racer to be installed on the system
   rustDevelopment = ''
+    (setq racer-rust-src-path nil) ;; read from shell-nix
+    (setq racer-cmd "racer") ;; read from shell-nix
     (add-hook 'rust-mode-hook #'racer-mode)
     (add-hook 'rust-mode-hook (lambda()
       (local-set-key (kbd "C-c C-d") 'racer-describe)
@@ -177,7 +179,6 @@ let
     ${theme}
     ${windowCosmetics}
 
-    ${orgAgendaView}
     ${myFunctionKeys}
     ${lspMode}
   '';
@@ -200,9 +201,14 @@ let
     epkgs.melpaPackages.academic-phrases
 
     epkgs.melpaPackages.gitlab
-    epkgs.melpaPackages.helm
     epkgs.melpaPackages.weechat
 
+# helm
+    epkgs.melpaPackages.helm
+    epkgs.melpaPackages.helm-fuzzier
+    epkgs.melpaPackages.helm-ag
+
+
 # emacs convenience
     epkgs.melpaPackages.ag
     epkgs.melpaPackages.company
@@ -210,6 +216,7 @@ let
     epkgs.melpaPackages.evil
     epkgs.melpaPackages.google-this
     epkgs.melpaPackages.monokai-alt-theme
+    epkgs.melpaPackages.spacemacs-theme
     epkgs.melpaPackages.zenburn-theme
 
 # development
@@ -232,12 +239,15 @@ let
     epkgs.melpaPackages.org-mime
     epkgs.melpaPackages.orgit
 
-
     epkgs.elpaPackages.which-key
+
+    epkgs.exwm
+    epkgs.melpaPackages.desktop-environment
+    epkgs.melpaPackages.helm-exwm
   ];
 
   emacsWithOverlay = pkgsWithOverlay.emacsWithPackagesFromUsePackage {
-    config = builtins.readFile dotEmacs; # builtins.readFile ./emacs.el;
+    config = builtins.readFile ./elisp/init.el;
     # Package is optional, defaults to pkgs.emacs
     package = pkgsWithOverlay.emacsGit;
     # Optionally provide extra packages not in the configuration file
@@ -257,6 +267,21 @@ let
   '';
 in {
   environment.systemPackages = [
-    myEmacs myEmacsWithDaemon myEmacsClient
+    myEmacs myEmacsWithDaemon myEmacsClient emacsWithOverlay
   ];
+
+  services.xserver = {
+    enable = true;
+    xkbOptions = "caps:super";
+    exportConfiguration = true;
+
+    displayManager.slim.enable = true;
+    windowManager.default = "exwm";
+
+    # Set up the login session
+    windowManager.session = [{
+      name = "exwm";
+      start = "${emacsWithOverlay}/bin/emacs -q -l " + builtins.toString ./elisp/init.el;
+    }];
+  };
 }