From c6e827fc2d3f61457697fbd07a0bdb560c601bc2 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Tue, 6 Apr 2021 08:47:04 -0400
Subject: Update nixpkgs version
---
lib/common.nix | 2 +-
lib/emacs-packages.nix | 4 ++--
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
--
cgit v1.2.3