summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2021-04-06 08:47:04 -0400
committerBen Sima <ben@bsima.me>2021-04-06 08:47:23 -0400
commitc6e827fc2d3f61457697fbd07a0bdb560c601bc2 (patch)
treece285f0066f697eb7dac997a4e65cac9ae321c7c
parent99b391e566770eeba39cbc4873b1acbbe0d4824d (diff)
Update nixpkgs version
-rw-r--r--lib/common.nix2
-rw-r--r--lib/emacs-packages.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/common.nix b/lib/common.nix
index f546a71..80b8c79 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -121,7 +121,7 @@ in
secureSocket = false;
plugins = [
# copied from upstream nixpkgs
- (pkgs.tmuxPlugins.mkDerivation {
+ (pkgs.tmuxPlugins.mkTmuxPlugin {
pluginName = "extrakto";
version = "2021-04-06";
src = pkgs.fetchFromGitHub {
diff --git a/lib/emacs-packages.nix b/lib/emacs-packages.nix
index 5fae535..14bf9ec 100644
--- a/lib/emacs-packages.nix
+++ b/lib/emacs-packages.nix
@@ -12,7 +12,7 @@ blacken
cl-lib
company
company-cabal
-# counsel
+counsel
crux
define-word
deft
@@ -23,7 +23,7 @@ erc-hl-nicks
evil
evil-collection
melpaStablePackages.evil-escape
-evil-magit
+# evil-magit
evil-org
evil-surround
emojify