diff --git a/configuration.nix b/configuration.nix
index 7e03c6d..0bb2ae3 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -99,6 +99,7 @@
      okular
      texlive.combined.scheme-full
      rustup
+     rust-analyzer
      usbutils
      starship
   ];
@@ -106,6 +107,12 @@
   #services.emacs.enable = true;
   #services.emacs.defaultEditor = true;
 
+  #nixpkgs.overlays = [
+  #  (import (builtins.fetchTarball {
+  #    url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+  #  }))
+  #];
+
   environment.shells = [ pkgs.zsh ];
   environment.pathsToLink = [ "/share/zsh" ];
 
diff --git a/programs/emacs/default.el b/programs/emacs/default.el
index c238618..0c4a5f1 100644
--- a/programs/emacs/default.el
+++ b/programs/emacs/default.el
@@ -2,7 +2,11 @@
 (setq package-enable-at-startup nil)
 (package-initialize)
 
-(load-theme 'spacemacs-dark t)
+(use-package spacemacs-theme
+  :ensure t
+  :config (load-theme 'spacemacs-dark t))
+
+;(load-theme 'spacemacs-dark t)
 
 ;; Tab-width
 (setq tab-width 2)
@@ -30,7 +34,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (bind-key "C-c l" 'org-toggle-link-display) ;shows org links in plain text
-
 (require 'org-roam)
 (require 'org-roam-protocol)
 (require 'ox-md)
@@ -225,8 +228,8 @@
  ;; If there is more than one, they won't work right.
  '(inhibit-startup-screen t)
  '(org-agenda-files '("~/org-notes/daily/" "~/org-notes/"))
- '(package-selected-packages
-   '(projectile-ripgrep projectile yaml-mode ox-pandoc use-package treemacs-all-the-icons treemacs-magit ivy org-roam-server org-roam ob-rust magit zenburn-theme treemacs spacemacs-theme rustic monokai-theme moe-theme lsp-ui gruvbox-theme company-lsp bind-key)))
+; '(package-selected-packages
+;   '(projectile-ripgrep projectile yaml-mode ox-pandoc use-package treemacs-all-the-icons treemacs-magit ivy org-roam-server org-roam ob-rust magit zenburn-theme treemacs spacemacs-theme rustic monokai-theme moe-theme lsp-ui gruvbox-theme company-lsp bind-key)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix
index 0d63a74..dbc6396 100644
--- a/programs/emacs/default.nix
+++ b/programs/emacs/default.nix
@@ -7,8 +7,8 @@ let
     mkdir -p $out/share/emacs/site-lisp
     cp ${defaultEl} $out/share/emacs/site-lisp/default.el
   '';
-
-  emacsPackage = (pkgs.emacsPackagesGen pkgs.emacsUnstable).emacsWithPackages
+  
+  emacsPackage = (pkgs.emacsPackagesGen pkgs.emacs).emacsWithPackages
     (epkgs:
       #let
       #  lpkgs = import ./packages.nix {
@@ -23,7 +23,7 @@ let
       #])
       [(with epkgs.elpaPackages; [
         auctex
-	org
+	      org
         flymake
       ])]
       ++ (with epkgs.melpaStablePackages; [ ]) ++ (with epkgs.melpaPackages; [
@@ -46,7 +46,7 @@ let
         flycheck
         free-keys
         highlight-indentation
-	ivy
+	      ivy
         json-mode
         less-css-mode
         lsp-mode
@@ -55,14 +55,14 @@ let
         nix-mode
         nixpkgs-fmt
         org-bullets
-        org-pdftools
-        org-roam
+        #org-roam
+	      #org-roam-server
         pasp-mode
         pdf-tools
         projectile
         projectile-ripgrep
         rustic
-	spacemacs-theme
+	      spacemacs-theme
         sparql-mode
         use-package
         yaml-mode
@@ -74,10 +74,13 @@ in
     defaultEditor = true;
     package = emacsPackage;
   };
+  #nixpkgs.overlays = [ (self: super: { emacsOrig = super.emacs; }) (import (builtins.fetchTarball {
+  #    url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+  #})) ];
 
   nixpkgs.overlays = [
     (import (builtins.fetchTarball {
       url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
     }))
   ];
-}
\ No newline at end of file
+}