Skip to content

Commit 0839ab4

Browse files
author
Said Neder
committed
updating dotfiles
1 parent 0a63dcf commit 0839ab4

File tree

15 files changed

+57
-59
lines changed

15 files changed

+57
-59
lines changed

fish/config.fish

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ alias nv="nvim"
2222
alias vi="nvim"
2323
alias vim="nvim"
2424
alias zyp="sudo zypper"
25+
alias pip="pip3.10"
26+
alias python="python3"
2527

2628
# Auto-start commands
2729
PF_INFO="ascii title os host kernel shell editor de palette" /usr/bin/pfetch

fish/fish_variables

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow
3030
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
3131
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
3232
SETUVAR fish_pager_color_selected_background:\x2dr
33-
SETUVAR fish_user_paths:/home/said/\x2ecargo/bin\x1e/home/said/\x2ebin\x1e/home/said/bin\x1e/home/said/\x2elocal/bin
33+
SETUVAR fish_user_paths:/opt/ventoy\x2d1\x2e0\x2e77\x1e/opt/ltex\x2dls\x2d15\x2e2\x2e0/bin\x1e/usr/sbin\x1e/home/said/\x2ecargo/bin\x1e/home/said/\x2ebin\x1e/home/said/bin\x1e/home/said/\x2elocal/bin

nvim/lua/lsp/handlers.lua

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ M.setup = function()
3535

3636
vim.diagnostic.config(config)
3737

38-
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
39-
border = "rounded",
40-
})
38+
-- vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
39+
-- border = "rounded",
40+
-- })
4141

42-
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
43-
border = "rounded",
44-
})
42+
-- vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
43+
-- border = "rounded",
44+
-- })
4545
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
4646
-- Disable underline, it's very annoying
4747
underline = false,
@@ -98,6 +98,9 @@ M.on_attach = function(client, bufnr)
9898
if client.name == "sumneko_lua" then
9999
client.resolved_capabilities.document_formatting = false
100100
end
101+
if client.name == "ltex" then
102+
client.resolved_capabilities.document_formatting = false
103+
end
101104

102105
lsp_keymaps(bufnr)
103106
lsp_highlight_document(client)

nvim/lua/lsp/lsp-installer.lua

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,10 @@ lsp_installer.on_server_ready(function(server)
1515
local sumneko_opts = require("lsp.servers.sumneko_lua")
1616
opts = vim.tbl_deep_extend("force", sumneko_opts, opts)
1717
end
18-
-- CSS
19-
if server.name == "cssls" then
20-
local cssls_opts = require("lsp.servers.cssls")
21-
opts = vim.tbl_deep_extend("force", cssls_opts, opts)
22-
end
23-
-- HTML
24-
if server.name == "html" then
25-
local html_opts = require("lsp.servers.html")
26-
opts = vim.tbl_deep_extend("force", html_opts, opts)
18+
-- HTML&CSS
19+
if server.name == "emmet_ls" then
20+
local emmet_opts = require("lsp.servers.emmet")
21+
opts = vim.tbl_deep_extend("force", emmet_opts, opts)
2722
end
2823
-- Typescript
2924
if server.name == "tsserver" then
@@ -52,9 +47,9 @@ lsp_installer.on_server_ready(function(server)
5247
end
5348

5449
-- Markdown
55-
if server.name == "zeta_note" then
56-
local zeta_opts = require("lsp.servers.zeta")
57-
opts = vim.tbl_deep_extend("force", zeta_opts, opts)
50+
if server.name == "marksman" then
51+
local marksman_opts = require("lsp.servers.marksman")
52+
opts = vim.tbl_deep_extend("force", marksman_opts, opts)
5853
end
5954
-- This setup() function is exactly the same as lspconfig's setup function.
6055
-- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md

nvim/lua/lsp/servers/cssls.lua

Lines changed: 0 additions & 17 deletions
This file was deleted.

nvim/lua/lsp/servers/emmet.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
return {
2+
cmd = { "emmet-ls", "--stdio" },
3+
filetypes = { "html", "css" },
4+
single_file_support = true,
5+
}

nvim/lua/lsp/servers/html.lua

Lines changed: 0 additions & 14 deletions
This file was deleted.

nvim/lua/lsp/servers/marksman.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
return {
2+
cmd = { "marksman", "server" },
3+
filetypes = { "markdown" },
4+
}

nvim/lua/lsp/servers/pyright.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
return {
2-
cmd = { "pyright-langserver", "--stdio" },
2+
cmd = { "pyright" },
33
filetypes = { "python" },
44
single_file_support = true,
55
}

nvim/lua/lsp/servers/zeta.lua

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)