darwin compatibility logic & darwin mcp

This commit is contained in:
Danilo Reyes
2026-03-18 15:58:19 -06:00
parent 9c6f17f113
commit 29bb85b5c9
6 changed files with 93 additions and 47 deletions

View File

@@ -5,28 +5,47 @@
emacsExtraConfig,
emacsExtraPackages,
}:
let
clipboardPackages =
if pkgs.stdenv.isDarwin then
builtins.attrValues {
inherit (pkgs) pngpaste;
}
else
builtins.attrValues {
inherit (pkgs)
xclip
wl-clipboard-rs
;
};
linuxWindowPackages = lib.optionals pkgs.stdenv.isLinux (
builtins.attrValues {
inherit (pkgs.xorg) xwininfo;
inherit (pkgs) xdotool;
}
);
in
{
packages = builtins.attrValues {
inherit (pkgs.xorg) xwininfo;
inherit (pkgs)
xdotool
xclip
wl-clipboard-rs
fd
fzf
ripgrep
tree-sitter
graphviz
tetex
languagetool
yaml-language-server
markdownlint-cli
;
inherit (pkgs.nodePackages)
vscode-json-languageserver
prettier
;
};
packages =
linuxWindowPackages
++ clipboardPackages
++ builtins.attrValues {
inherit (pkgs)
fd
fzf
ripgrep
tree-sitter
graphviz
tetex
languagetool
yaml-language-server
markdownlint-cli
;
inherit (pkgs.nodePackages)
vscode-json-languageserver
prettier
;
};
extraPackages =
epkgs:
let

View File

@@ -111,9 +111,11 @@ in
fi
''
''
if command -v fzf-share >/dev/null; then
source "$(fzf-share)/key-bindings.bash"
source "$(fzf-share)/completion.bash"
if [ -f "${pkgs.fzf}/share/fzf/key-bindings.zsh" ]; then
source "${pkgs.fzf}/share/fzf/key-bindings.zsh"
fi
if [ -f "${pkgs.fzf}/share/fzf/completion.zsh" ]; then
source "${pkgs.fzf}/share/fzf/completion.zsh"
fi
'';
};