From bbe5d54a343420183f7a2202a1df000a95a53fd1 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 13 Oct 2019 12:39:23 +0200
Subject: Prefer firefox to -devedition

Dev-edition can still be launched via CLI
---
 user/settings/development/base.nix | 4 ++--
 user/settings/zsh.nix              | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'user/settings')

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"
 
-- 
cgit 1.4.1