all repos — nixfiles @ bbe5d54a343420183f7a2202a1df000a95a53fd1

System and user configuration, managed by nix and home-manager

Prefer firefox to -devedition

Dev-edition can still be launched via CLI
Alan Pearce alan@alanpearce.eu
Sun, 13 Oct 2019 12:39:23 +0200
commit

bbe5d54a343420183f7a2202a1df000a95a53fd1

parent

ea0c6d2c9ab02546ee29ca5b415c8ca1d962db78

2 files changed, 5 insertions(+), 4 deletions(-)

jump to
M user/settings/development/base.nix → user/settings/development/base.nix
@@ -1,4 +1,4 @@-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 { home.packages = with pkgs; [
     checkbashisms
@@ -21,7 +21,7 @@ if !stdenv.isDarwin     then [
       ldns
       httping
-      firefox-devedition-bin
+      (lib.lowPrio firefox-devedition-bin)
     ] else [
     ]
   );
M user/settings/zsh.nix → user/settings/zsh.nix
@@ -257,8 +257,7 @@ nup = "nix-env -u";       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 @@ EMAIL=alan@satoshipay.io       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"