From 6fdefa5e878ac5ded5c60d0399703b063d263cb4 Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Sat, 5 Jul 2025 12:33:19 +0200 Subject: some nvim related fixes --- home-manager/modules/apps/nvim/default.nix | 16 +++++++++------- nixos/desktop/hyprland.nix | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/home-manager/modules/apps/nvim/default.nix b/home-manager/modules/apps/nvim/default.nix index 2ce7fd8..c4e9325 100644 --- a/home-manager/modules/apps/nvim/default.nix +++ b/home-manager/modules/apps/nvim/default.nix @@ -1,5 +1,8 @@ -{ pkgs, config, ...}: -{ +{ pkgs, config, lib,...}: +let +ts_ls=pkgs.typescript-language-server; +vue_ls=pkgs.vue-language-server; +in { programs.neovim = { enable = true; defaultEditor = true; @@ -22,8 +25,8 @@ ''; home.file."./.config/nvim/lua/wilkuu/nix.lua".text = '' - return { - vue_ts_plugin = "/home/wilkuu/.npm/@vue/typescript-plugin", + return { + vue_ts_plugin = "${lib.getBin vue_ls}/lib/node_modules/@vue/language-server/node_modules/@vue/typescript-plugin/" } ''; @@ -42,13 +45,12 @@ nil statix nixfmt-rfc-style + # phpactor pyright nodePackages.intelephense texlive.combined.scheme-full texlab - vue-language-server mermaid-cli - typescript-language-server - ]; + ] ++ [ ts_ls vue_ls]; } diff --git a/nixos/desktop/hyprland.nix b/nixos/desktop/hyprland.nix index 84c05e7..62b39ae 100644 --- a/nixos/desktop/hyprland.nix +++ b/nixos/desktop/hyprland.nix @@ -32,13 +32,15 @@ xdg.portal = { enable = true; + extraPortals = with pkgs; [ xdg-desktop-portal-hyprland xdg-desktop-portal-gtk ]; config = { - common = { - default = [ - "hyprland" - "gtk" - ]; - }; - }; + common = { + default = [ + "hyprland" + "gtk" + ]; + "org.freedesktop.impl.portal.Filechooser"="gtk"; + }; + }; }; } -- cgit v1.3.1