summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinstall.sh9
-rw-r--r--lib/common.nix1
-rw-r--r--lib/emacs-packages.nix6
-rw-r--r--lib/linux.nix3
-rw-r--r--lib/packages.nix1
5 files changed, 11 insertions, 9 deletions
diff --git a/install.sh b/install.sh
index a109c36..54b3c6c 100755
--- a/install.sh
+++ b/install.sh
@@ -25,15 +25,14 @@ else
# NOTMUCH_CONFIG (emacs), then it won't find the right config file, so I
# override with a symlink.
#
- mkdir -p ~/.config/notmuch
- [[ -e ~/.notmuch-config ]] || ln -s ~/.config/notmuch/notmuchrc ~/.notmuch-config
+ #mkdir -p ~/.config/notmuch
+ #[[ -e ~/.notmuch-config ]] || ln -s ~/.config/notmuch/notmuchrc ~/.notmuch-config
#
# symlinking must occur before initial generation. now we can install, and
# pin our own nixpkgs.
#
#nix-channel --update
NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH \
- nix-shell . -A install
- #nix-shell '<home-manager>' -A install
+ nix-shell '<home-manager>' -A install
+ #nix-shell . -A install
fi
-
diff --git a/lib/common.nix b/lib/common.nix
index ce56cf3..5019e08 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -8,6 +8,7 @@ in
{
nixpkgs.overlays = [ (import ../overlay.nix) ];
home = {
+ stateVersion = "18.09";
sessionVariables = {
GPGID = gpgid;
EDITOR = "vim";
diff --git a/lib/emacs-packages.nix b/lib/emacs-packages.nix
index 6ada756..562c2b7 100644
--- a/lib/emacs-packages.nix
+++ b/lib/emacs-packages.nix
@@ -9,13 +9,13 @@ avy
avy-zap
# bbdb
blacken
+carbon-now-sh
cl-lib
company
company-cabal
counsel
crux
define-word
-deft
dired-narrow
direnv
editorconfig
@@ -41,7 +41,7 @@ htmlize
ibuffer-vc
imenu-anywhere
indent-guide
-# ivy
+ivy
ix
ledger-mode
lispy
@@ -64,11 +64,13 @@ pass
pinentry
popwin
projectile
+projectile-ripgrep
rainbow-mode
rainbow-delimiters
restclient
rotate
s
+solarized-theme
spacemacs-theme
spaceline
swiper
diff --git a/lib/linux.nix b/lib/linux.nix
index 62a5192..ef9adc0 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -22,7 +22,7 @@ let
buildInputs = [ pkgs.xorg.libX11 pkgs.xorg.libXft ];
};
- base16-scheme = "spacemacs";
+ base16-scheme = "solarized";
base16 = pkgs.stdenv.mkDerivation {
name = "base16-builder";
src = builtins.fetchTarball {
@@ -39,6 +39,7 @@ let
theme = lib.removeSuffix "\n" (builtins.readFile "${homedir}/.local/share/xtheme");
xresources = "${base16}/xresources/base16-${base16-scheme}.${theme}.xresources";
+ # used in polybar and dunst
colors = { # derived from spacemacs
"dark" = {
highlight = "#5d4d7a";
diff --git a/lib/packages.nix b/lib/packages.nix
index 15e50f8..efc3c48 100644
--- a/lib/packages.nix
+++ b/lib/packages.nix
@@ -126,7 +126,6 @@ in {
w3m
zebra
zip
- zulip-terminal
];
}