From 9e6145c031b47fc37398b80dec1b4dfc0cfb5183 Mon Sep 17 00:00:00 2001 From: sefidel Date: Fri, 9 Sep 2022 17:49:03 +0900 Subject: milestone: darwin! feat(darwin/kompakt)!: support darwin chore: reformat feat(home/o32): manage neovim feat(home/development): fix haskell lsp version mismatch feat(darwin/*): stabilise --- home/profiles/development/default.nix | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'home/profiles/development') diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index 21ff03d..4bc761c 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -2,8 +2,6 @@ let cfg = config.profiles.development; - - inherit (self.packages.x86_64-linux) codelldb; in { options.profiles.development = { @@ -74,22 +72,22 @@ in ]; }; + programs.vscode = { + enable = if pkgs.stdenv.isDarwin then true else false; + extensions = with pkgs.vscode-extensions; [ + ]; + }; + home.packages = [ - pkgs.bandwhich pkgs.bfg-repo-cleaner pkgs.diffoscopeMinimal - # clangd - pkgs.clang-tools pkgs.du-dust - pkgs.dnsutils + # pkgs.dnsutils # Err on darwin # TODO: https://github.com/cli/cli/issues/4955 pkgs.gh - pkgs.ghc - pkgs.haskell-language-server pkgs.hyperfine pkgs.jq pkgs.lsof - pkgs.lldb pkgs.ouch pkgs.tcpdump pkgs.tokei @@ -101,17 +99,23 @@ in pkgs.rust-analyzer pkgs.sd pkgs.tig - pkgs.valgrind pkgs.xh - pkgs.cargo-play pkgs.cargo-edit pkgs.cargo-sort pkgs.cargo-diet pkgs.cargo-deny + pkgs.clang-tools + pkgs.lldb + pkgs.ghc + pkgs.stack + (pkgs.haskell-language-server.override { supportedGhcVersions = [ (builtins.replaceStrings [ "." ] [ "" ] pkgs.ghc.version) ]; }) + ] ++ pkgs.lib.optionals (pkgs.stdenv.isLinux) [ + # TODO: currently broken/doesn't support Darwin + pkgs.valgrind ]; - # home.file.".codelldb".source = pkgs.vscode-extensions.vadimcn.vscode-lldb; + nixpkgs.allowedUnfree = [ "vscode" ]; }; } -- cgit 1.4.1