atelier-sulphurpool theme

2 files changed, 14 insertions, 8 deletions

diff --git a/lib/emacs-packages.nix b/lib/emacs-packages.nix
index 562c2b7..b51f024 100644
--- a/lib/emacs-packages.nix
+++ b/lib/emacs-packages.nix
@@ -10,6 +10,7 @@ avy-zap
 # bbdb
 blacken
 carbon-now-sh
+centaur-tabs
 cl-lib
 company
 company-cabal
@@ -18,6 +19,8 @@ crux
 define-word
 dired-narrow
 direnv
+doom-themes
+doom-modeline
 editorconfig
 erc-hl-nicks
 evil
@@ -69,10 +72,10 @@ rainbow-mode
 rainbow-delimiters
 restclient
 rotate
+rust-mode
 s
-solarized-theme
-spacemacs-theme
-spaceline
+solaire-mode
+slime
 swiper
 sx
 undo-tree
diff --git a/lib/linux.nix b/lib/linux.nix
index 96c14f8..1f22963 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -22,11 +22,14 @@ let
     buildInputs = [ pkgs.xorg.libX11 pkgs.xorg.libXft ];
   };
 
-  base16-scheme = "solarized";
+  base16-scheme = "atelier-sulphurpool";
+  base16-scheme-filename = lib.strings.concatStrings (lib.strings.splitString "-" base16-scheme);
   base16 = pkgs.stdenv.mkDerivation {
     name = "base16-builder";
-    src = builtins.fetchTarball {
-      url = "https://github.com/auduchinok/base16-builder/archive/51e3ad4d447fc3f1f539d0bfe33c851728fb6b5f.tar.gz";
+    src = pkgs.fetchFromGitHub {
+      owner = "auduchinok";
+      repo = "base16-builder";
+      rev = "51e3ad4d447fc3f1f539d0bfe33c851728fb6b5f";
       sha256 = "1qir689h38c6jr7fbbqbc3029544zgv41lrrqdcq26kcwxcwjrz1";
     };
     nativeBuildInputs = [pkgs.ruby];
@@ -37,7 +40,7 @@ let
     '';
   };
   theme = lib.removeSuffix "\n" (builtins.readFile "${homedir}/.local/share/xtheme");
-  xresources = "${base16}/xresources/base16-${base16-scheme}.${theme}.xresources";
+  xresources = "${base16}/xresources/base16-${base16-scheme-filename}.${theme}.256.xresources";
 
   # used in polybar and dunst
   colors = { # derived from spacemacs
@@ -436,7 +439,7 @@ in
       enable = true;
       pass.enable = true;
       font = "Fira Mono 16";
-      theme = "solarized_alternate";
+      theme = "purple";
       plugins = with pkgs; [
         rofi-calc
         rofi-emoji