Upgrade -> 20.09
authorTomas Zeman <tomas@functionals.cz>
Thu, 24 Dec 2020 16:46:01 +0100
changeset 19 dc56fca2ff30
parent 18 343402e5861e
child 20 ab2a7f653156
Upgrade -> 20.09
home.nix
--- a/home.nix	Sat Oct 10 14:30:10 2020 +0200
+++ b/home.nix	Thu Dec 24 16:46:01 2020 +0100
@@ -49,7 +49,6 @@
     my-nur.hgeditor
     pkgs.android-file-transfer
     pkgs.fossil
-    pkgs.nix-direnv
     pkgs.quilt
     pkgs.xorg.xwd     # X dump/screenshot
     pkgs.netpbm       # pnmtops
@@ -58,9 +57,13 @@
 
   nixpkgs.config = import ./nixpkgs-config.nix;
 
+  programs.autojump = {
+    enable = true;
+    enableBashIntegration = true;
+  };
+
   programs.bash = {
     enable = true;
-    enableAutojump = true;
     initExtra = ''
       export LC_CTYPE=cs_CZ.UTF-8
       unset LC_ALL
@@ -79,11 +82,7 @@
   programs.direnv = {
     enable = true;
     enableBashIntegration = true;
-    stdlib = ''
-      if [ -f ~/.nix-profile/share/nix-direnv/direnvrc ]; then
-        source ~/.nix-profile/share/nix-direnv/direnvrc
-      fi
-    '';
+    enableNixDirenvIntegration = true;
   };
 
   services.gpg-agent = {