This commit is contained in:
Daniel Flanagan 2022-03-28 09:57:47 -05:00
parent a199c64f28
commit 6a4008221e
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
6 changed files with 21 additions and 13 deletions

View file

@ -169,7 +169,10 @@ alias mount 'sudo -E mount'
alias umount 'sudo -E umount' alias umount 'sudo -E umount'
has_command xdg-open && alias open xdg-open has_command xdg-open && alias open xdg-open
has_command docker && alias dc "docker compose" has_command docker && begin
alias dc "docker compose"
alias dk "docker"
end
function fish_preexec function fish_preexec
test -n $TMUX && begin test -n $TMUX && begin

View file

@ -23,6 +23,7 @@ set --erase CDPATH
set --export --global CDPATH . $NICE_HOME set --export --global CDPATH . $NICE_HOME
set --export --universal GOPATH $HOME/.go set --export --universal GOPATH $HOME/.go
set --export --universal GOBIN $GOPATH/bin
set paths_candidates \ set paths_candidates \
$DOTFILES_PATH/common/bin \ $DOTFILES_PATH/common/bin \

View file

@ -63,6 +63,9 @@
-c 'silent execute \"normal gg2dd\"' \ -c 'silent execute \"normal gg2dd\"' \
-c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile'
[url "git@git-p1ap1.divvy.co:"]
insteadOf = https://git-p1ap1.divvy.co
[gpg] [gpg]
program = gpg2 program = gpg2

View file

@ -9,7 +9,11 @@ local opts = {
silent = true, silent = true,
} }
local on_attach = function(_, bufnr) local lsp_format = require'lsp-format'
local on_attach = function(client, bufnr)
lsp_format.on_attach(client)
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<cr>', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<cr>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<cr>', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<cr>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<cr>', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<cr>', opts)
@ -39,6 +43,7 @@ local common_config = {
} }
local lsp_configs = { local lsp_configs = {
gopls = {},
elixirls = { elixirls = {
cmd = { vim.fn.expand'~/.local/share/nvim/lsp_servers/elixir/elixir-ls/language_server.sh' }, cmd = { vim.fn.expand'~/.local/share/nvim/lsp_servers/elixir/elixir-ls/language_server.sh' },
}, },

View file

@ -5,7 +5,7 @@ if #vim.fn.glob(packer_install_path) == 0 then
end end
local has_words_before = function() local has_words_before = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0)) local line, col = vim.api.nvim_win_get_cursor(0)
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
end end
@ -102,7 +102,7 @@ packer.startup(function()
elseif has_words_before() then elseif has_words_before() then
cmp.complete() cmp.complete()
else else
fallback() -- fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback) ["<S-Tab>"] = cmp.mapping(function(fallback)
@ -111,7 +111,7 @@ packer.startup(function()
elseif luasnip.jumpable(-1) then elseif luasnip.jumpable(-1) then
luasnip.jump(-1) luasnip.jump(-1)
else else
fallback() -- fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
}, },
@ -169,6 +169,7 @@ packer.startup(function()
} }
end end
}, },
'lukas-reineke/lsp-format.nvim',
} }
for _,plugin in pairs(plugins) do packer.use(plugin) end for _,plugin in pairs(plugins) do packer.use(plugin) end
end) end)

View file

@ -12,11 +12,6 @@ profile desktop-H-2x4kside2 {
exec "$DOTFILES_PATH/os/linux/kanshi/desktop-H-workspaces.sh" exec "$DOTFILES_PATH/os/linux/kanshi/desktop-H-workspaces.sh"
} }
profile desktop-H-2x4kside2 {
output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 0,1200 scale 1 transform normal
output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 3440,0 scale 1 transform 90
}
profile desktop-H-2x4kside2 { profile desktop-H-2x4kside2 {
output "Dell Inc. DELL U2720Q D3TM623" enable mode 3840x2160@60Hz position 0,0 scale 1.5 transform normal output "Dell Inc. DELL U2720Q D3TM623" enable mode 3840x2160@60Hz position 0,0 scale 1.5 transform normal
} }
@ -28,9 +23,9 @@ profile desktop-H-2x4kside2 {
# exec "$DOTFILES_PATH/os/linux/kanshi/desktop-H-workspaces.sh" # exec "$DOTFILES_PATH/os/linux/kanshi/desktop-H-workspaces.sh"
# } # }
profile tv4ktest { profile desktop-primary {
output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 0,900 scale 1.5 transform normal output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 0,500 scale 1.5 transform 90
output "Samsung Electric Company SyncMaster H1AK500000" enable mode 3840x2160@60Hz position 2560,0 scale 1.0 transform normal output "Samsung Electric Company SyncMaster H1AK500000" enable mode 3840x2160@60Hz position 1440,0 scale 1.0 transform normal
} }
profile tv4k { profile tv4k {