diff --git a/system/machines/desktop/default.nix b/system/machines/desktop/default.nix index 16a68c0..539aa63 100644 --- a/system/machines/desktop/default.nix +++ b/system/machines/desktop/default.nix @@ -11,7 +11,6 @@ ../../keys ../../modules/sops ../../modules/docker - ../../modules/nix-ld ./hardware.nix ./system.nix ]; diff --git a/system/machines/server/default.nix b/system/machines/server/default.nix index 57add69..c7f50e0 100644 --- a/system/machines/server/default.nix +++ b/system/machines/server/default.nix @@ -10,7 +10,6 @@ ../../../user ../../keys ../../modules/sops - ../../modules/nix-ld ./hardware.nix ./system.nix ]; diff --git a/system/machines/wsl/default.nix b/system/machines/wsl/default.nix index 2d2a831..9fb4e88 100644 --- a/system/machines/wsl/default.nix +++ b/system/machines/wsl/default.nix @@ -10,7 +10,6 @@ ../../../user ../../keys ../../modules/sops - ../../modules/nix-ld ./system.nix ]; } diff --git a/system/modules/nix-ld/default.nix b/system/modules/nix-ld/default.nix deleted file mode 100644 index efe4d81..0000000 --- a/system/modules/nix-ld/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs, lib, config, ... }: - -with lib; -let - cfg = config.modules.system.nix-ld; - -in -{ - options.modules.system.nix-ld = { - enable = mkOption { - type = types.bool; - default = any - (user: user.modules.user.neovim.enable or false) - (attrValues config.home-manager.users); - description = "Enable nix-ld so Mason-installed Neovim tools can run on NixOS."; - }; - }; - - config = mkIf cfg.enable { - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ - curl - expat - fontconfig - freetype - glib - icu - libgcc - libGL - libxkbcommon - openssl - stdenv.cc.cc - zlib - zstd - ]; - }; - }; -} diff --git a/user/modules/neovim/nvim b/user/modules/neovim/nvim index f11e6a0..da6106c 160000 --- a/user/modules/neovim/nvim +++ b/user/modules/neovim/nvim @@ -1 +1 @@ -Subproject commit f11e6a02db5cd8e4c8c1bdec0d34557ff995c32c +Subproject commit da6106c77470b336783951ff2bce795688e9663d