diff options
Diffstat (limited to 'flake/packages/default.nix')
-rw-r--r-- | flake/packages/default.nix | 83 |
1 files changed, 44 insertions, 39 deletions
diff --git a/flake/packages/default.nix b/flake/packages/default.nix index d4258bfa..125bf888 100644 --- a/flake/packages/default.nix +++ b/flake/packages/default.nix @@ -14,45 +14,50 @@ inherit (import ./merge.nix {inherit lib;}) merge; output = import ../../bootstrap {inherit pkgs sysLib;}; - nvim = - builtins.mapAttrs ( - name: value: let - nvim_config = - import ../../modules/home.legacy/conf/nvim/default.nix - build_args; - build_args = let - inherit (value._module.args) pkgs; - inherit (pkgs) lib; - in { - inherit pkgs pkgsStable lib; - nixosConfig = value.config; - config = value.config.home-manager.users.soispha; - }; - - resolve_imports = attrs: - merge (builtins.map (v: import v build_args) - attrs.imports); - - resolve_imports' = attrs: - if builtins.any (n: n == "imports") (builtins.attrNames attrs) - then - resolve_imports' (merge [ - (resolve_imports attrs) - (builtins.removeAttrs - attrs - ["imports"]) - ]) - else attrs; - - complete_config = resolve_imports' nvim_config; - in - nixVim.legacyPackages."${system}".makeNixvim - ( - builtins.removeAttrs - complete_config.programs.nixvim ["enable"] - ) - ) - self.nixosConfigurations; + # FIXME: Do what the trace says. <2024-11-09> + nvim = builtins.trace "nvim build currently broken, using default" { + tiamat = pkgs.neovim; + apzu = + pkgs.neovim; + }; + # builtins.mapAttrs ( + # name: value: let + # nvim_config = + # import ../../modules/home.legacy/conf/nvim/default.nix + # build_args; + # build_args = let + # inherit (value._module.args) pkgs; + # inherit (pkgs) lib; + # in { + # inherit pkgs pkgsStable lib; + # nixosConfig = value.config; + # config = value.config.home-manager.users.soispha; + # }; + # + # resolve_imports = attrs: + # merge (builtins.map (v: import v build_args) + # attrs.imports); + # + # resolve_imports' = attrs: + # if builtins.any (n: n == "imports") (builtins.attrNames attrs) + # then + # resolve_imports' (merge [ + # (resolve_imports attrs) + # (builtins.removeAttrs + # attrs + # ["imports"]) + # ]) + # else attrs; + # + # complete_config = resolve_imports' nvim_config; + # in + # nixVim.legacyPackages."${system}".makeNixvim + # ( + # builtins.removeAttrs + # complete_config.programs.nixvim ["enable"] + # ) + # ) + # self.nixosConfigurations; output_neovim = lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair "nvim_${name}" value) nvim; |