diff --git a/flake.nix b/flake.nix index 20bf7b8..c53459c 100644 --- a/flake.nix +++ b/flake.nix @@ -64,29 +64,29 @@ modules = [ inputs.home-manager.darwinModules.home-manager inputs.nix-homebrew.darwinModules.nix-homebrew - { - nixpkgs.overlays = - commonOverlays - ++ darwinOverlays - ++ [ - (final: prev: { - zjstatus = inputs.zjstatus.packages.${prev.system}.default; - }) - ]; + { + nixpkgs.overlays = + commonOverlays + ++ darwinOverlays + ++ [ + (final: prev: { + zjstatus = inputs.zjstatus.packages.${prev.system}.default; + }) + ]; - nix-homebrew = { - inherit user; - enable = true; - taps = { - "homebrew/homebrew-core" = inputs.homebrew-core; - "homebrew/homebrew-cask" = inputs.homebrew-cask; - "cameroncooke/axe" = inputs.homebrew-axe; - }; - mutableTaps = true; + nix-homebrew = { + inherit user; + enable = true; + taps = { + "homebrew/homebrew-core" = inputs.homebrew-core; + "homebrew/homebrew-cask" = inputs.homebrew-cask; + "cameroncooke/axe" = inputs.homebrew-axe; }; - } - ./hosts/darwin/${hostname} - ]; + mutableTaps = true; + }; + } + ./hosts/darwin/${hostname} + ]; } ); diff --git a/hosts/darwin/chidi/default.nix b/hosts/darwin/chidi/default.nix index 906b67d..82e146c 100644 --- a/hosts/darwin/chidi/default.nix +++ b/hosts/darwin/chidi/default.nix @@ -13,8 +13,6 @@ networking.hostName = "chidi"; networking.computerName = "Chidi"; - - services.postgresql = { enable = true; }; diff --git a/modules/darwin/syncthing.nix b/modules/darwin/syncthing.nix index 0a5eb30..e960423 100644 --- a/modules/darwin/syncthing.nix +++ b/modules/darwin/syncthing.nix @@ -393,4 +393,4 @@ in { ''} ''; }; -} \ No newline at end of file +} diff --git a/modules/home/neovim/plugins/conform.nix b/modules/home/neovim/plugins/conform.nix index 531f711..6a8dd42 100644 --- a/modules/home/neovim/plugins/conform.nix +++ b/modules/home/neovim/plugins/conform.nix @@ -7,6 +7,7 @@ nix = ["alejandra"]; javascript = ["prettier"]; typescript = ["prettier"]; + vue = ["prettier"]; }; }; }; diff --git a/modules/home/neovim/plugins/lsp.nix b/modules/home/neovim/plugins/lsp.nix index d287d0b..aab792a 100644 --- a/modules/home/neovim/plugins/lsp.nix +++ b/modules/home/neovim/plugins/lsp.nix @@ -1,15 +1,39 @@ { + lib, + pkgs, + ... +}: { programs.nixvim.plugins = { lsp = { enable = true; inlayHints = true; servers = { - nil_ls.enable = true; # Nix - ts_ls.enable = true; # TS/JS - volar.enable = true; # Vue - cssls.enable = true; # CSS - dockerls.enable = true; # Docker - elixirls.enable = true; # Elixir + nil_ls.enable = true; + vtsls = { + enable = true; + package = pkgs.vtsls; + filetypes = ["vue" "javascript" "javascriptreact" "typescript" "typescriptreact"]; + settings = { + vtsls = { + tsserver = { + globalPlugins = [ + { + name = "@vue/typescript-plugin"; + # Keep your working path to the language server package + location = "${pkgs.vue-language-server}/lib/language-tools/packages/language-server"; + languages = ["vue"]; + configNamespace = "typescript"; + enableForWorkspaceTypeScriptVersions = true; + } + ]; + }; + }; + }; + }; + cssls.enable = true; + dockerls.enable = true; + elixirls.enable = true; + yamlls.enable = true; }; }; }; diff --git a/modules/syncthing.nix b/modules/syncthing.nix index 31af060..852cd12 100644 --- a/modules/syncthing.nix +++ b/modules/syncthing.nix @@ -4,8 +4,14 @@ ... }: let isDarwin = pkgs.stdenv.isDarwin; - homeDir = if isDarwin then "/Users/${user}" else "/home/${user}"; - group = if isDarwin then "staff" else "users"; + homeDir = + if isDarwin + then "/Users/${user}" + else "/home/${user}"; + group = + if isDarwin + then "staff" + else "users"; in { services.syncthing = { enable = true;