diff options
| author | Alan Pearce | 2018-11-07 16:25:15 +0100 |
|---|---|---|
| committer | Alan Pearce | 2018-11-07 16:25:15 +0100 |
| commit | ccb69f84f6123011a176a42e0e1c50ae822d3c58 (patch) | |
| tree | b09faefb995112ebe9ec801d44addf5124733a6f /modules | |
| parent | 8003056612155a356e50829b998a0436c3d0f3a5 (diff) | |
| parent | d2c76a7b484ff11dc9a19a3e1c56bd71e9fc725f (diff) | |
| download | nixfiles-ccb69f84f6123011a176a42e0e1c50ae822d3c58.tar.lz nixfiles-ccb69f84f6123011a176a42e0e1c50ae822d3c58.tar.zst nixfiles-ccb69f84f6123011a176a42e0e1c50ae822d3c58.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/development/base.nix | 15 | ||||
| -rw-r--r-- | modules/development/javascript.nix | 18 | ||||
| -rw-r--r-- | modules/programs/dotfiles.nix | 9 | ||||
| -rw-r--r-- | modules/programs/shell.nix | 10 |
4 files changed, 36 insertions, 16 deletions
diff --git a/modules/development/base.nix b/modules/development/base.nix index 777f8bef..5c474ac4 100644 --- a/modules/development/base.nix +++ b/modules/development/base.nix @@ -11,18 +11,23 @@ go gocode - ldns - httping wrk - whois ag ripgrep httpie - http-prompt jq discount - ]; + ] ++ ( + if !stdenv.isDarwin + then [ + whois + ldns + httping + http-prompt + ] else [ + ] + ); } diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix index 1d25ae85..37b78656 100644 --- a/modules/development/javascript.nix +++ b/modules/development/javascript.nix @@ -2,8 +2,6 @@ { environment.systemPackages = with pkgs.unstable; [ nodejs-8_x - phantomjs2 - yarn nodePackages.tern nodePackages.node2nix @@ -11,13 +9,21 @@ nodePackages.javascript-typescript-langserver nodePackages.eslint_d + nodePackages.node-gyp + nodePackages.node-gyp-build + nodePackages.node-pre-gyp + ] ++ ( + if stdenv.isDarwin + then + [ + ] + else + [ # npm install may use any of these binutils gcc gnumake python2 - nodePackages.node-gyp - nodePackages.node-gyp-build - nodePackages.node-pre-gyp - ]; + ] + ); } diff --git a/modules/programs/dotfiles.nix b/modules/programs/dotfiles.nix index 467665ff..2e3f44aa 100644 --- a/modules/programs/dotfiles.nix +++ b/modules/programs/dotfiles.nix @@ -1,9 +1,14 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ - git stow fzf ghq - ]; + ] ++ ( + if stdenv.isDarwin + then [ + ] else [ + git + ] + ); } diff --git a/modules/programs/shell.nix b/modules/programs/shell.nix index b7bbd8fb..d59f9fb5 100644 --- a/modules/programs/shell.nix +++ b/modules/programs/shell.nix @@ -5,9 +5,9 @@ promptInit = ""; }; programs.bash.enableCompletion = true; + programs.vim.enable = pkgs.stdenv.isDarwin; environment.systemPackages = with pkgs; [ - vim pv fd entr @@ -23,7 +23,11 @@ zip unzip telnet - + ] ++ ( + if !stdenv.isDarwin + then [ + vim unar - ]; + ] else [ + ]); } |