diff --git a/common/fish/functions.fish b/common/fish/functions.fish index 54cd557..9a06b0f 100644 --- a/common/fish/functions.fish +++ b/common/fish/functions.fish @@ -169,7 +169,10 @@ alias mount 'sudo -E mount' alias umount 'sudo -E umount' 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 test -n $TMUX && begin diff --git a/common/fish/paths.fish b/common/fish/paths.fish index d8b495b..a8451ef 100644 --- a/common/fish/paths.fish +++ b/common/fish/paths.fish @@ -23,6 +23,7 @@ set --erase CDPATH set --export --global CDPATH . $NICE_HOME set --export --universal GOPATH $HOME/.go +set --export --universal GOBIN $GOPATH/bin set paths_candidates \ $DOTFILES_PATH/common/bin \ diff --git a/common/git/config b/common/git/config index e0bc12e..97c83c0 100644 --- a/common/git/config +++ b/common/git/config @@ -63,6 +63,9 @@ -c 'silent execute \"normal gg2dd\"' \ -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' +[url "git@git-p1ap1.divvy.co:"] + insteadOf = https://git-p1ap1.divvy.co + [gpg] program = gpg2 diff --git a/common/neovim/lua/lsp.lua b/common/neovim/lua/lsp.lua index 1c92abe..4857f08 100644 --- a/common/neovim/lua/lsp.lua +++ b/common/neovim/lua/lsp.lua @@ -9,7 +9,11 @@ local opts = { 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', 'e', 'lua vim.diagnostic.open_float()', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'g]', 'lua vim.diagnostic.goto_next()', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'g[', 'lua vim.diagnostic.goto_prev()', opts) @@ -39,6 +43,7 @@ local common_config = { } local lsp_configs = { + gopls = {}, elixirls = { cmd = { vim.fn.expand'~/.local/share/nvim/lsp_servers/elixir/elixir-ls/language_server.sh' }, }, diff --git a/common/neovim/lua/plugins.lua b/common/neovim/lua/plugins.lua index a8d91f2..37428bd 100644 --- a/common/neovim/lua/plugins.lua +++ b/common/neovim/lua/plugins.lua @@ -5,7 +5,7 @@ if #vim.fn.glob(packer_install_path) == 0 then end 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 end @@ -102,7 +102,7 @@ packer.startup(function() elseif has_words_before() then cmp.complete() else - fallback() + -- fallback() end end, { "i", "s" }), [""] = cmp.mapping(function(fallback) @@ -111,7 +111,7 @@ packer.startup(function() elseif luasnip.jumpable(-1) then luasnip.jump(-1) else - fallback() + -- fallback() end end, { "i", "s" }), }, @@ -169,6 +169,7 @@ packer.startup(function() } end }, + 'lukas-reineke/lsp-format.nvim', } for _,plugin in pairs(plugins) do packer.use(plugin) end end) diff --git a/os/linux/kanshi/config b/os/linux/kanshi/config index 8f155aa..fd507ed 100644 --- a/os/linux/kanshi/config +++ b/os/linux/kanshi/config @@ -12,11 +12,6 @@ profile desktop-H-2x4kside2 { 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 { 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" # } -profile tv4ktest { - output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 0,900 scale 1.5 transform normal - output "Samsung Electric Company SyncMaster H1AK500000" enable mode 3840x2160@60Hz position 2560,0 scale 1.0 transform normal +profile desktop-primary { + 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 1440,0 scale 1.0 transform normal } profile tv4k {