Compare commits
No commits in common. "b45296765a454e72ebec4f0637f65690d94285d4" and "662549b6b017a96682e9d9a98fe6d22aca83cc46" have entirely different histories.
b45296765a
...
662549b6b0
6 changed files with 39 additions and 29 deletions
|
@ -4,10 +4,3 @@ packages = ["workstation"]
|
||||||
[files]
|
[files]
|
||||||
|
|
||||||
[variables]
|
[variables]
|
||||||
|
|
||||||
multimedia_beets_musicbrainz_user = ""
|
|
||||||
multimedia_beets_musicbrainz_pass = ""
|
|
||||||
multimedia_mopidy_subidy_url = ""
|
|
||||||
multimedia_mopidy_subidy_user = ""
|
|
||||||
multimedia_mopidy_subidy_pass = ""
|
|
||||||
|
|
||||||
|
|
37
.gitlab-ci.yml
Normal file
37
.gitlab-ci.yml
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
---
|
||||||
|
# install moreutils to enable ifne (if not empty)
|
||||||
|
# will only run the respective analyzers when files to test
|
||||||
|
# are acutally found
|
||||||
|
image: fnichol/check-shell:latest
|
||||||
|
|
||||||
|
analyze:
|
||||||
|
stage: test
|
||||||
|
before_script:
|
||||||
|
- apk add moreutils
|
||||||
|
- shellcheck --version
|
||||||
|
script:
|
||||||
|
- echo "--------- CHECKING POSIX SHELLSCRIPTS -------------"
|
||||||
|
- find . -type f -name '*.sh' | ifne xargs shellcheck -Calways
|
||||||
|
- echo "--------- CHECKING ZSH SHELLSCRIPTS -------------"
|
||||||
|
- find . -type f -name '*.zsh' | ifne xargs shellcheck -Calways -s bash -e SC2034
|
||||||
|
|
||||||
|
lint:
|
||||||
|
stage: test
|
||||||
|
before_script:
|
||||||
|
- apk add moreutils
|
||||||
|
- shfmt -version
|
||||||
|
script:
|
||||||
|
- echo "--------- CHECKING POSIX SHELLSCRIPTS -------------"
|
||||||
|
- find . -type f -name '*.sh' -not -path '*/pomo-app/*' | ifne xargs shfmt -d -i 4
|
||||||
|
- echo "--------- CHECKING ZSH SHELLSCRIPTS -------------"
|
||||||
|
- find . -type f -name '*.zsh' -not -path '*/pomo-app/*' | ifne xargs shfmt -d -i 4
|
||||||
|
|
||||||
|
test:
|
||||||
|
stage: test
|
||||||
|
image: alpine
|
||||||
|
before_script:
|
||||||
|
- apk add git bash
|
||||||
|
- git clone https://github.com/bats-core/bats-core.git /bats
|
||||||
|
- /bats/bin/bats --version
|
||||||
|
script:
|
||||||
|
- /bats/bin/bats -r .
|
|
@ -3,7 +3,6 @@
|
||||||
# {{scheme-name}} scheme by{{scheme-author}}
|
# {{scheme-name}} scheme by{{scheme-author}}
|
||||||
|
|
||||||
custom_background_color #{{base00-hex}}
|
custom_background_color #{{base00-hex}}
|
||||||
custom_color_mode_empty_background_color #{{base00-hex}}
|
|
||||||
custom_text_color #{{base06-hex}}
|
custom_text_color #{{base06-hex}}
|
||||||
|
|
||||||
page_separator_color #{{base00-hex}}
|
page_separator_color #{{base00-hex}}
|
||||||
|
@ -14,6 +13,7 @@ ui_text_color #{{base06-hex}}
|
||||||
ui_selected_text_color #{{base06-hex}}
|
ui_selected_text_color #{{base06-hex}}
|
||||||
ui_background_color #{{base01-hex}}
|
ui_background_color #{{base01-hex}}
|
||||||
ui_selected_background_color #{{base03-hex}}
|
ui_selected_background_color #{{base03-hex}}
|
||||||
|
background_color #{{base00-hex}}
|
||||||
visual_mark_color {{base03-dec-r}} {{base03-dec-g}} {{base03-dec-b}} 0.2
|
visual_mark_color {{base03-dec-r}} {{base03-dec-g}} {{base03-dec-b}} 0.2
|
||||||
text_highlight_color #{{base03-hex}}
|
text_highlight_color #{{base03-hex}}
|
||||||
link_highlight_color #{{base0D-hex}}
|
link_highlight_color #{{base0D-hex}}
|
||||||
|
|
|
@ -48,8 +48,6 @@ item_fields:
|
||||||
|
|
||||||
musicbrainz:
|
musicbrainz:
|
||||||
extra_tags: [year, catalognum, country, media, label]
|
extra_tags: [year, catalognum, country, media, label]
|
||||||
user: {{multimedia_beets_musicbrainz_user}}
|
|
||||||
pass: {{multimedia_beets_musicbrainz_pass}}
|
|
||||||
auto: yes
|
auto: yes
|
||||||
remove: yes
|
remove: yes
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,7 @@ enabled = false
|
||||||
#default_playlist_scheme = m3u
|
#default_playlist_scheme = m3u
|
||||||
|
|
||||||
[local]
|
[local]
|
||||||
enabled = false
|
#enabled = true
|
||||||
#max_search_results = 100
|
#max_search_results = 100
|
||||||
media_dir = $XDG_MUSIC_DIR
|
media_dir = $XDG_MUSIC_DIR
|
||||||
scan_timeout = 5000
|
scan_timeout = 5000
|
||||||
|
@ -182,11 +182,6 @@ scan_timeout = 5000
|
||||||
# *.jpeg
|
# *.jpeg
|
||||||
# *.png
|
# *.png
|
||||||
|
|
||||||
[subidy]
|
|
||||||
url={{multimedia_mopidy_subidy_url}}
|
|
||||||
username={{multimedia_mopidy_subidy_user}}
|
|
||||||
password={{multimedia_mopidy_subidy_pass}}
|
|
||||||
|
|
||||||
[mpris]
|
[mpris]
|
||||||
#enabled = true
|
#enabled = true
|
||||||
#bus_type = session
|
#bus_type = session
|
||||||
|
|
|
@ -109,24 +109,12 @@ local function on_attach(client, bufnr)
|
||||||
"<cmd>lua vim.lsp.buf.signature_help()<cr>",
|
"<cmd>lua vim.lsp.buf.signature_help()<cr>",
|
||||||
{ buffer = bufnr, desc = "Signature help" }
|
{ buffer = bufnr, desc = "Signature help" }
|
||||||
)
|
)
|
||||||
map("n", "<localleader>lo", function()
|
|
||||||
if vim.diagnostic.is_disabled(0) then
|
|
||||||
vim.diagnostic.enable(0)
|
|
||||||
else
|
|
||||||
vim.diagnostic.disable(0)
|
|
||||||
end
|
|
||||||
end, { buffer = bufnr, desc = "Disable buffer diagnostics" })
|
|
||||||
|
|
||||||
if vim.g.format_on_save then
|
if vim.g.format_on_save then
|
||||||
require("lsp-setup.utils").format_on_save(client)
|
require("lsp-setup.utils").format_on_save(client)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Display diagnostics as virtual text only if not in insert mode
|
|
||||||
-- https://lr.artemislena.eu/r/neovim/comments/12inp4c/disable_diagnostics_virtual_text_when_in_insert/jqqifwk/
|
|
||||||
vim.api.nvim_create_autocmd("InsertEnter", { callback = function() vim.diagnostic.config({ virtual_text = false, }) end })
|
|
||||||
vim.api.nvim_create_autocmd("InsertLeave", { callback = function() vim.diagnostic.config({ virtual_text = true, }) end })
|
|
||||||
|
|
||||||
lsp.setup({
|
lsp.setup({
|
||||||
default_mappings = false,
|
default_mappings = false,
|
||||||
servers = servers,
|
servers = servers,
|
||||||
|
@ -208,4 +196,3 @@ require("mason-null-ls").setup({
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue