summary refs log tree commit diff stats
path: root/modules/programs
diff options
context:
space:
mode:
authorAlan Pearce2018-10-21 14:55:27 +0200
committerAlan Pearce2018-10-21 15:01:02 +0200
commit086e0f60c01730cacd716f14115bef99774f6957 (patch)
tree864771585e2c27878d63520d39589ff2c3740517 /modules/programs
parente30c6624e41d8b8b55085897a57f9c9c0c6c3edf (diff)
downloadnixfiles-086e0f60c01730cacd716f14115bef99774f6957.tar.lz
nixfiles-086e0f60c01730cacd716f14115bef99774f6957.tar.zst
nixfiles-086e0f60c01730cacd716f14115bef99774f6957.zip
Setup trillian (MacBook)
Diffstat (limited to 'modules/programs')
-rw-r--r--modules/programs/dotfiles.nix9
-rw-r--r--modules/programs/shell.nix10
2 files changed, 14 insertions, 5 deletions
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 [
+  ]);
 }