From 43d33ec192a52055c8bc8422d63927b7d6d71e37 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sat, 22 Jun 2024 17:58:03 +0200 Subject: [PATCH] image: add --- flake.nix | 68 +++++++++++++++++++++++++--------------------- module/default.nix | 1 + 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/flake.nix b/flake.nix index bf2d9ff..4736e9a 100644 --- a/flake.nix +++ b/flake.nix @@ -14,41 +14,47 @@ }; }; - outputs = { self, nixvim, ... }: let - angularLsp = { pkgs }: { - name = "angularls"; - package = pkgs.callPackage ./pkgs/angular-language-server { }; - }; - in { - homeManagerModules = { - nvim = { config, lib, pkgs, ... }: let - mkLsp = import "${nixvim.outPath}/plugins/lsp/language-servers/_mk-lsp.nix" { inherit config lib pkgs; }; - in { - imports = [ - nixvim.homeManagerModules.nixvim + outputs = { self, nixvim, ... }: + let + angularLsp = { pkgs }: { + name = "angularls"; + package = pkgs.callPackage ./pkgs/angular-language-server { }; + }; + in + { + homeManagerModules = { + nvim = { config, lib, pkgs, ... }: + let + mkLsp = import "${nixvim.outPath}/plugins/lsp/language-servers/_mk-lsp.nix" { inherit config lib pkgs; }; + in { - programs.nixvim = mkLsp (angularLsp { inherit pkgs; }); - } - ./module - ]; + imports = [ + nixvim.homeManagerModules.nixvim + { + programs.nixvim = mkLsp (angularLsp { inherit pkgs; }); + } + ./module + ]; + }; + default = self.homeManagerModules.nvim; }; - default = self.homeManagerModules.nvim; - }; - nixosModules = { - nvim = { config, lib, pkgs, ... }: let - mkLsp = import "${nixvim.outPath}/plugins/lsp/language-servers/_mk-lsp.nix" { inherit config lib pkgs; }; - in { - imports = [ - nixvim.nixosModules.nixvim + nixosModules = { + nvim = { config, lib, pkgs, ... }: + let + mkLsp = import "${nixvim.outPath}/plugins/lsp/language-servers/_mk-lsp.nix" { inherit config lib pkgs; }; + in { - programs.nixvim = mkLsp (angularLsp { inherit pkgs; }); - } - ./module - ]; - }; + imports = [ + nixvim.nixosModules.nixvim + { + programs.nixvim = mkLsp (angularLsp { inherit pkgs; }); + } + ./module + ]; + }; - default = self.nixosModules.nvim; + default = self.nixosModules.nvim; + }; }; - }; } diff --git a/module/default.nix b/module/default.nix index 8c944cd..514ef86 100644 --- a/module/default.nix +++ b/module/default.nix @@ -38,6 +38,7 @@ }; plugins = { + image.enable = true; # needs 24.05 # remove from extraPlugins # autoclose.enable = true; # brackets, html, ...