From f9ae40f53c649c1b3c62884547a516ba482d76e6 Mon Sep 17 00:00:00 2001
From: iofq <cjriddz@protonmail.com>
Date: Sat, 27 May 2023 03:34:05 -0500
Subject: [PATCH] update CI

---
 .github/workflows/main.yml |  4 ++--
 Dockerfile                 | 24 ++++++++++++------------
 config/lua/git-conf.lua    |  2 --
 config/lua/lsp-conf.lua    |  3 +--
 plugins.nix                |  3 +++
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0469fb1..03da694 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
           push: true
           tags: ghcr.io/iofq/nvim:latest
       -
-        name: Extract .tar.gz from container
+        name: Extract full .tar.gz from container
         uses: shrink/actions-docker-extract@v1
         id: extract
         with:
@@ -33,7 +33,7 @@ jobs:
           path: /app/neovim-x86_64-linux.AppImage
 
       -
-        name: Extract .tar.gz from container
+        name: Extract minimal .tar.gz from container
         uses: shrink/actions-docker-extract@v1
         id: extract-minimal
         with:
diff --git a/Dockerfile b/Dockerfile
index 04ff68f..039223f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,15 +4,15 @@ WORKDIR /app
 COPY . .
 
 RUN nix bundle \
-    --bundler github:ralismark/nix-appimage \
-    --extra-experimental-features nix-command \
-    --extra-experimental-features flakes .#full && \
-    mv $(realpath nvim-x86_64.AppImage) neovim-x86_64-linux.AppImage && \
-    nix-collect-garbage
-
-RUN nix bundle \
-    --bundler github:ralismark/nix-appimage \
-    --extra-experimental-features nix-command \
-    --extra-experimental-features flakes .#minimal && \
-    mv $(realpath nvim-x86_64.AppImage) neovim-x86_64-linux-minimal.AppImage && \
-    nix-collect-garbage
+        -o nvim.AppImage \
+        --bundler github:ralismark/nix-appimage \
+        --extra-experimental-features nix-command \
+        --extra-experimental-features flakes .#full && \
+        mv $(realpath nvim.AppImage) neovim-x86_64-linux.AppImage && \
+    nix bundle \
+        -o nvim-minimal.AppImage \
+        --bundler github:ralismark/nix-appimage \
+        --extra-experimental-features nix-command \
+        --extra-experimental-features flakes .#minimal && \
+        mv $(realpath nvim-minimal.AppImage) neovim-x86_64-linux-minimal.AppImage && \
+        nix-collect-garbage
diff --git a/config/lua/git-conf.lua b/config/lua/git-conf.lua
index f809a97..c8017dc 100644
--- a/config/lua/git-conf.lua
+++ b/config/lua/git-conf.lua
@@ -26,5 +26,3 @@ require('gitsigns').setup{
           return '<Ignore>'
         end, {expr=true})   end
 }
-
-require("neogit").setup()
diff --git a/config/lua/lsp-conf.lua b/config/lua/lsp-conf.lua
index e047466..d645068 100644
--- a/config/lua/lsp-conf.lua
+++ b/config/lua/lsp-conf.lua
@@ -1,7 +1,6 @@
 -- Setup language servers.
 local lspconfig = require('lspconfig')
 lspconfig.gopls.setup {}
-lspconfig.phpactor.setup {}
 
 -- Global mappings.
 -- See `:help vim.diagnostic.*` for documentation on any of the below functions
@@ -31,7 +30,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
         vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts)
         vim.keymap.set("n", "gd", "<cmd>Telescope lsp_definitions<cr>", { buffer = bufnr })
         vim.keymap.set("n", "gi", "<cmd>Telescope lsp_implementations<cr>", { buffer = bufnr })
-        vim.keymap.set("n", "gr", "<cmd>Telescope lsp_references<cr>", { buffer = bufnr })
+        vim.keymap.set("n", "gR", "<cmd>Telescope lsp_references<cr>", { buffer = bufnr })
         vim.keymap.set("n", "<leader>dt", "<cmd>Telescope lsp_type_definitions<cr>", { buffer = bufnr })
         vim.keymap.set("n", "<leader>ds", "<cmd>Telescope lsp_document_symbols<cr>", { buffer = bufnr })
         vim.keymap.set("n", "<leader>dS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", { buffer = bufnr })
diff --git a/plugins.nix b/plugins.nix
index 5f4e66c..d238021 100644
--- a/plugins.nix
+++ b/plugins.nix
@@ -17,6 +17,7 @@
         tree-sitter-c
         tree-sitter-dockerfile
         tree-sitter-go
+        tree-sitter-html
         tree-sitter-javascript
         tree-sitter-json
         tree-sitter-lua
@@ -24,6 +25,8 @@
         tree-sitter-markdown-inline
         tree-sitter-php
         tree-sitter-python
+        tree-sitter-svelte
+        tree-sitter-typescript
         tree-sitter-yaml
       ]
       )