1 files changed, 41 insertions, 30 deletions
diff --git a/nix-conf/home/includes/dev-common.nix b/nix-conf/home/includes/dev-common.nix
index a76eb72..92b286e 100644
--- a/nix-conf/home/includes/dev-common.nix
+++ b/nix-conf/home/includes/dev-common.nix
@@ -1,21 +1,33 @@
-{ config, pkgs, lib, ... }:
 {
-
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  inherit (lib) optionals;
+in
+{
   imports = [
     ./common.nix
     ./clojure.nix
   ];
 
-  home.packages = with pkgs; [
-    docker
-    docker-compose
-    docker-credential-helpers
-    ffmpeg
-    gopass-jsonapi
-    mpv
-    multimarkdown
-    neovim
-  ];
+  home.packages =
+    with pkgs;
+    [
+      docker
+      docker-compose
+      docker-credential-helpers
+      gopass-jsonapi
+      multimarkdown
+      neovim
+      ripgrep-all
+    ]
+    ++ optionals (!stdenv.isDarwin) [
+      ffmpeg
+      mpv
+    ];
 
   programs.tmux = {
     enable = true;
@@ -47,28 +59,27 @@
       }
     ];
     extraConfig = ''
-     unbind-key R
-     bind-key R run-shell ' \
-       tmux source-file ~/.config/tmux/tmux.conf > /dev/null; \
-       tmux display-message "Sourced .config/tmux/tmux.conf!"'
+      unbind-key R
+      bind-key R run-shell ' \
+        tmux source-file ~/.config/tmux/tmux.conf > /dev/null; \
+        tmux display-message "Sourced .config/tmux/tmux.conf!"'
 
-      bind-key £ split-window -h
+       bind-key £ split-window -h
 
-      set-option -g status-bg '#666666'
-      set-option -g status-fg '#aaaaaa'
-      set-option -g status-left-length 50
-      set-option -g status-right " %a, %b %d - %H:%M "
+       set-option -g status-bg '#666666'
+       set-option -g status-fg '#aaaaaa'
+       set-option -g status-left-length 50
+       set-option -g status-right " %a, %b %d - %H:%M "
 
-      ${lib.optionalString pkgs.stdenv.isLinux ''
-        bind-key -T copy-mode y send-keys -X copy-pipe-and-cancel "xsel -i -p && xsel -o -p | xsel -i -b"
-        bind-key C-y run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
-      ''}
-      ${lib.optionalString pkgs.stdenv.isDarwin ''
-        bind-key -T copy-mode y send-keys -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
-        bind-key C-y run "reattach-to-user-namespace pbpaste | tmux load-buffer - ; tmux paste-buffer"
-      ''}
+       ${lib.optionalString pkgs.stdenv.isLinux ''
+         bind-key -T copy-mode y send-keys -X copy-pipe-and-cancel "xsel -i -p && xsel -o -p | xsel -i -b"
+         bind-key C-y run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
+       ''}
+       ${lib.optionalString pkgs.stdenv.isDarwin ''
+         bind-key -T copy-mode y send-keys -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
+         bind-key C-y run "reattach-to-user-namespace pbpaste | tmux load-buffer - ; tmux paste-buffer"
+       ''}
     '';
   };
 
 }
-