pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/core' into b12f

Browse source
This commit is contained in:
drone 2021-07-14 00:24:51 +00:00
parent 99597d1b30 de5d4a223a
commit 05836bcdf4
6 changed files with 49 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/graphical/default.nix
View file

@ -98,6 +98,7 @@ in
flameshot
libnotify
gnome3.adwaita-icon-theme
gnome.eog
gnome3.nautilus
wine

3
modules/terminal-life/nvim/default.nix
View file

@ -95,7 +95,7 @@ in
python-language-server
solargraph
rust-analyzer
ctags
universal-ctags
ccls
rnix-lsp
terraform-ls
@ -120,6 +120,7 @@ in
sonokai
fugitive
vim-rhubarb
vim-gitgutter
vimagit

76
modules/terminal-life/nvim/lsp.vim
View file

@ -16,7 +16,7 @@ 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({
@ -25,65 +25,65 @@ lua <<EOF
'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
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
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
nvim_lsp[lsp_key].setup(lsp_settings)
end
end -- ‡
EOF

2
modules/terminal-life/nvim/plugins.vim
View file

@ -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>

2
profiles/base-user/mimeapps.nix
View file

@ -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" ];

1
profiles/core/default.nix
View file

@ -53,6 +53,7 @@ in
diffutils
findutils
exfat-utils
file
# zippit
zip