From e84a8ae2efc7b75d0841ae3cbbe5698ca62bbbd4 Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 21 Oct 2024 01:20:13 +0200 Subject: [PATCH] right package for neovim with allegro and no gcc with allegro --- terminal-software.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terminal-software.nix b/terminal-software.nix index 5cc0efb..849767a 100644 --- a/terminal-software.nix +++ b/terminal-software.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: { +{ lib, config, pkgs, variant, pkgs-unstable, ... }: { home.packages = with pkgs; [ entr trash-cli @@ -20,9 +20,8 @@ enable = true; viAlias = true; defaultEditor = true; - extraPackages = with pkgs; [ + extraPackages = (with pkgs; [ nodejs_22 - gcc ocamlPackages.lsp ocamlPackages.ocamlformat cargo @@ -33,8 +32,9 @@ ocamlPackages.ocaml-lsp pyright ripgrep - ]; - }; + ]) ++ (if variant != "allegro" then [ pkgs.gcc ] else [] ); + } + // lib.attrsets.optionalAttrs (variant == "allegro") { package = pkgs-unstable.neovim-unwrapped;}; xdg.mimeApps.defaultApplications = { "text/plain" = "nvim.desktop"; };