From de5d4a223aeb07d56efd206679d3c99ae857b4f9 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 13 Jul 2021 17:05:36 +0000
Subject: [PATCH] upstream pub-solar changes from teutat3s (#11)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/11
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
---
 modules/graphical/default.nix          |  1 +
 modules/terminal-life/nvim/default.nix |  3 +-
 modules/terminal-life/nvim/lsp.vim     | 84 +++++++++++++-------------
 modules/terminal-life/nvim/plugins.vim |  2 +
 profiles/base-user/mimeapps.nix        |  2 +-
 profiles/core/default.nix              |  1 +
 6 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 63e7a43e..cad10837 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -98,6 +98,7 @@ in
         flameshot
         libnotify
         gnome3.adwaita-icon-theme
+        gnome.eog
         gnome3.nautilus
 
         wine
diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index ba0e49ab..4647a76c 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -86,7 +86,7 @@ in
     python-language-server
     solargraph
     rust-analyzer
-    ctags
+    universal-ctags
     ccls
     rnix-lsp
     terraform-ls
@@ -111,6 +111,7 @@ in
     sonokai
 
     fugitive
+    vim-rhubarb
     vim-gitgutter
     vimagit
 
diff --git a/modules/terminal-life/nvim/lsp.vim b/modules/terminal-life/nvim/lsp.vim
index 600131d7..87c15ce5 100644
--- a/modules/terminal-life/nvim/lsp.vim
+++ b/modules/terminal-life/nvim/lsp.vim
@@ -16,74 +16,74 @@ lua <<EOF
   local nvim_lsp    = require('lspconfig')
   -- Attach `completion-nvim` to the buffer.
   local function lsp_setup()
-  	require('completion').on_attach()
+    require('completion').on_attach()
   end
-  
+
   for lsp_key, lsp_settings in pairs({
         'bashls', ------------------------------- Bash
         'ccls', --------------------------------- C / C++ / Objective-C
         'cssls', -------------------------------- CSS / SCSS / LESS
         'dockerls', ----------------------------- Docker
         ['gopls'] = { --------------------------- Go
-                ['settings'] = {
-                	['gopls'] = {
-				['analyses'] = {
-                                	['unusedparams'] = true,
-                                },
-                                ['staticcheck'] = true
-                        },
+            ['settings'] = {
+                ['gopls'] = {
+                    ['analyses'] = {
+                        ['unusedparams'] = true,
+                    },
+                    ['staticcheck'] = true
                 },
-
-        }, 
+            },
+        },
         'html', --------------------------------- HTML
-  	['jdtls'] = { --------------------------- Java
-  		['root_dir'] = nvim_lsp.util.root_pattern('.git', 'pom.xml', 'build.xml'),
-  		['init_options'] = {
-  			['jvm_args'] = {['java.format.settings.url'] = vim.fn.stdpath('config')..'/eclipse-formatter.xml'},
-  			['workspace'] = vim.fn.stdpath('cache')..'/java-workspaces'
-  		}
-  	},
+        ['jdtls'] = { --------------------------- Java
+            ['root_dir'] = nvim_lsp.util.root_pattern('.git', 'pom.xml', 'build.xml'),
+            ['init_options'] = {
+                ['jvm_args'] = {['java.format.settings.url'] = vim.fn.stdpath('config')..'/eclipse-formatter.xml'},
+                ['workspace'] = vim.fn.stdpath('cache')..'/java-workspaces'
+            }
+        },
         'jsonls', ------------------------------- JSON
+        'phpactor', ----------------------------- PHP
         'pyls', --------------------------------- Python
         'rnix', --------------------------------- Nix
         'solargraph', --------------------------- Ruby
         'rust_analyzer', ------------------------ Rust
         ['sqlls'] = {
-        	['cmd'] = {"$XDG_DATA_HOME/nvm/versions/node/v12.19.0/bin/sql-language-server", "up", "--method", "stdio"}
+            ['cmd'] = {"$XDG_DATA_HOME/nvm/versions/node/v12.19.0/bin/sql-language-server", "up", "--method", "stdio"}
         },
         ['terraformls'] = { --------------------- Terraform
-                ['filetypes'] = { "terraform", "hcl", "tf" }
+            ['filetypes'] = { "terraform", "hcl", "tf" }
         },
         'tsserver', ----------------------------- Typescript / JavaScript
         'angularls', ---------------------------- Angular
         'vuels', -------------------------------- Vue
         'svelte', ------------------------------- Svelte
         ['yamlls'] = { -------------------------- YAML
-		['settings'] = {
-			['yaml'] = {
-				['schemas'] = {
-					['https://json.schemastore.org/github-workflow'] = '.github/workflows/*.{yml,yaml}',
-        				['https://json.schemastore.org/github-action'] = '.github/action.{yml,yaml}',
-                                        ['https://json.schemastore.org/ansible-stable-2.9'] = 'roles/tasks/*.{yml,yaml}',
-                                        ['https://json.schemastore.org/drone'] = '*.drone.{yml,yaml}',
-                                }
-                        }
+            ['settings'] = {
+                ['yaml'] = {
+                    ['schemas'] = {
+                        ['https://json.schemastore.org/github-workflow'] = '.github/workflows/*.{yml,yaml}',
+                        ['https://json.schemastore.org/github-action'] = '.github/action.{yml,yaml}',
+                        ['https://json.schemastore.org/ansible-stable-2.9'] = 'roles/tasks/*.{yml,yaml}',
+                        ['https://json.schemastore.org/drone'] = '*.drone.{yml,yaml}',
+                    }
                 }
+            }
         }
   }) do -- Setup all of the language servers. †
-  	if type(lsp_key) == 'number' then -- Enable the LSP with defaults.
-  		-- The `lsp` is an index in this case.
-  		nvim_lsp[lsp_settings].setup{['on_attach'] = lsp_setup}
-  	else -- Use the LSP's configuration.
-  		local on_attach_setting = lsp_settings.on_attach
-  
-  		lsp_settings.on_attach = function()
-  			lsp_setup()
-  			if on_attach_setting then on_attach_setting() end
-  		end
-  
-  		nvim_lsp[lsp_key].setup(lsp_settings)
-  	end
+    if type(lsp_key) == 'number' then -- Enable the LSP with defaults.
+      -- The `lsp` is an index in this case.
+      nvim_lsp[lsp_settings].setup{['on_attach'] = lsp_setup}
+    else -- Use the LSP's configuration.
+      local on_attach_setting = lsp_settings.on_attach
+
+    lsp_settings.on_attach = function()
+      lsp_setup()
+      if on_attach_setting then on_attach_setting() end
+    end
+
+      nvim_lsp[lsp_key].setup(lsp_settings)
+    end
   end -- ‡
 EOF
 
diff --git a/modules/terminal-life/nvim/plugins.vim b/modules/terminal-life/nvim/plugins.vim
index eb5a5c51..b174531e 100644
--- a/modules/terminal-life/nvim/plugins.vim
+++ b/modules/terminal-life/nvim/plugins.vim
@@ -2,6 +2,8 @@
 au! BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml
 autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
 
+let g:gutentags_file_list_command = 'git ls-files'
+
 " Golang
 " Go test shortcut
 nmap <Leader>got :GoTest<CR>
diff --git a/profiles/base-user/mimeapps.nix b/profiles/base-user/mimeapps.nix
index f6b4d2d5..25f8ee38 100644
--- a/profiles/base-user/mimeapps.nix
+++ b/profiles/base-user/mimeapps.nix
@@ -14,7 +14,7 @@
     "application/x-extension-xht" = [ "firefox.desktop" ];
     "image/jpeg" = [ "viewnior.desktop" "gpicview.desktop" ];
     "image/png" = [ "viewnior.desktop" "gpicview.desktop" ];
-    "text/plain" = [ "mousepad.desktop" ];
+    "text/plain" = [ "firefox.desktop" ];
     "x-scheme-handler/mailto" = [ "userapp-Thunderbird.desktop" ];
     "message/rfc822" = [ "userapp-Thunderbird.desktop" ];
     "application/pdf" = [ "org.gnome.Evince.desktop" ];
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index cf2834ba..f0f8b407 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -53,6 +53,7 @@ in
         diffutils
         findutils
         exfat-utils
+        file
 
         # zippit
         zip