diff options
| author | jakob.stendahl <jakob.stendahl@infomedia.dk> | 2023-12-02 21:11:55 +0100 |
|---|---|---|
| committer | jakob.stendahl <jakob.stendahl@infomedia.dk> | 2023-12-02 21:13:28 +0100 |
| commit | c370d604fb6038aae5638ac4ca94b6102d104682 (patch) | |
| tree | 719be1ba9aaeaf34b731ff0a2ddf8df58949bcfd /Common | |
| parent | 25c4ac296f854933f9800167c7b39a5aaf73d079 (diff) | |
| download | dotfiles-c370d604fb6038aae5638ac4ca94b6102d104682.tar.gz dotfiles-c370d604fb6038aae5638ac4ca94b6102d104682.zip | |
Some neovim and tmux changes
Diffstat (limited to 'Common')
| -rw-r--r-- | Common/alacritty/alacritty.yml | 2 | ||||
| -rwxr-xr-x | Common/nvim/init.lua | 3 | ||||
| -rwxr-xr-x | Common/nvim/lua/helper_functions.lua | 22 | ||||
| -rw-r--r-- | Common/zshrc | 2 |
4 files changed, 28 insertions, 1 deletions
diff --git a/Common/alacritty/alacritty.yml b/Common/alacritty/alacritty.yml index 570d8bc..2667788 100644 --- a/Common/alacritty/alacritty.yml +++ b/Common/alacritty/alacritty.yml @@ -13,7 +13,7 @@ font: normal: family: RobotoMono Nerd Font Mono - size: 5 + size: 7 window: padding: diff --git a/Common/nvim/init.lua b/Common/nvim/init.lua index ee75788..733bc02 100755 --- a/Common/nvim/init.lua +++ b/Common/nvim/init.lua @@ -1,3 +1,6 @@ +-- Use a mapleader +vim.g.mapleader = "," + require("helper_functions") require("basic") require('plugins') diff --git a/Common/nvim/lua/helper_functions.lua b/Common/nvim/lua/helper_functions.lua index 7a17b78..cd84fc9 100755 --- a/Common/nvim/lua/helper_functions.lua +++ b/Common/nvim/lua/helper_functions.lua @@ -44,6 +44,28 @@ vim.api.nvim_create_user_command('JoinLinesBT', JoinLinesBT, {bang=false, desc=' -- Strip trailing spaces vim.keymap.set('n', '<Leader>wt', [[:%s/\s\+$//e<cr>]]) +-- Quick json formatting using jq +function FormatJson(start_line, end_line) + if start_line == nil or end_line == nil then + if vim.fn.mode() == 'v' then + start_line, _, end_line, _ = unpack(vim.fn.getpos("'<"), 2, 5) + else + start_line, end_line = 1, vim.api.nvim_buf_line_count(0) + end + end + local lines = vim.api.nvim_buf_get_lines(0, start_line - 1, end_line, false) + local json_string = table.concat(lines, "\n") + local handle = io.popen("echo '" .. json_string .. "' | jq .", "r") + local result = handle:read("*a") + handle:close() + vim.api.nvim_buf_set_lines(0, start_line - 1, end_line, false, vim.fn.split(result, "\n")) +end +vim.api.nvim_create_user_command('FormatJson', function(opts) + FormatJson(opts.line1, opts.line2) +end, {range = true, desc = 'Format JSON'}) +vim.keymap.set('n', '<leader>jq', FormatJson, { noremap = true, silent = true }) +vim.keymap.set('v', '<leader>jq', ':FormatJson<CR>', { noremap = true, silent = true }) + -- Close buffer without closing window --[[ vim.cmd [[ diff --git a/Common/zshrc b/Common/zshrc index 4fb9aba..d3d8253 100644 --- a/Common/zshrc +++ b/Common/zshrc @@ -28,6 +28,8 @@ esac COMPLETION_WAITING_DOTS="true" +ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=7,bold" + # Setup plugins plugins=( git |