From 086e0f60c01730cacd716f14115bef99774f6957 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 21 Oct 2018 14:55:27 +0200 Subject: Setup trillian (MacBook) --- modules/programs/dotfiles.nix | 9 +++++++-- modules/programs/shell.nix | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'modules/programs') diff --git a/modules/programs/dotfiles.nix b/modules/programs/dotfiles.nix index 467665f..2e3f44a 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 b7bbd8f..d59f9fb 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 [ + ]); } -- cgit 1.4.1