summary refs log tree commit diff stats
path: root/user/settings
diff options
context:
space:
mode:
authorAlan Pearce2019-10-13 12:39:23 +0200
committerAlan Pearce2019-10-16 19:27:33 +0200
commitbbe5d54a343420183f7a2202a1df000a95a53fd1 (patch)
treeb47f804039f645d67eb3a775b0fa014bb6bbf1fe /user/settings
parentea0c6d2c9ab02546ee29ca5b415c8ca1d962db78 (diff)
downloadnixfiles-bbe5d54a343420183f7a2202a1df000a95a53fd1.tar.lz
nixfiles-bbe5d54a343420183f7a2202a1df000a95a53fd1.tar.zst
nixfiles-bbe5d54a343420183f7a2202a1df000a95a53fd1.zip
Prefer firefox to -devedition
Dev-edition can still be launched via CLI
Diffstat (limited to 'user/settings')
-rw-r--r--user/settings/development/base.nix4
-rw-r--r--user/settings/zsh.nix5
2 files changed, 5 insertions, 4 deletions
diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix
index 9bf68a38..83bfe03d 100644
--- a/user/settings/development/base.nix
+++ b/user/settings/development/base.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 { home.packages = with pkgs; [
     checkbashisms
@@ -21,7 +21,7 @@
     then [
       ldns
       httping
-      firefox-devedition-bin
+      (lib.lowPrio firefox-devedition-bin)
     ] else [
     ]
   );
diff --git a/user/settings/zsh.nix b/user/settings/zsh.nix
index ae2fe2ff..dd24b663 100644
--- a/user/settings/zsh.nix
+++ b/user/settings/zsh.nix
@@ -257,8 +257,7 @@ in
       ngc = "nix-collect-garbage --delete-older-than 14d";
     };
 
-    # move to envExtra after 19.09
-    initExtra = ''
+    envExtra = ''
       case $OSTYPE in
         darwin*)
           os=darwin
@@ -298,7 +297,9 @@ in
       else
         EMAIL=alan@alanpearce.eu
       fi
+    '';
 
+    initExtra = ''
       typeset -T GHQ_ROOT ghq_root
       export GHQ_ROOT="$HOME/projects:$HOME/go/src:$HOME/quicklisp/local-projects"