Skip to content

Commit

Permalink
chore: misc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kalvenschraut committed Aug 4, 2023
1 parent 857753d commit 1e00ac9
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 17 deletions.
8 changes: 7 additions & 1 deletion bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ gfbs() {
return
}
git fetch -p
git flow bugfix start $1 $(git branch -a | grep -E 'remotes.*release' | sed 's%remotes/origin/%%' | sort | tail -n1 | xargs)
local current_release_branch="$(git branch -a | grep -E 'remotes.*release' | sed 's%remotes/origin/%%' | sort | tail -n1 | xargs)"
test -z "$current_release_branch" && {
echo "Could not find the current release branch"
return
}
git checkout "$current_release_branch"
git flow bugfix start "$1" "$current_release_branch"
}

source_dir ~/.bash.d/local/before
Expand Down
2 changes: 1 addition & 1 deletion i3/scripts/startup
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ TEAMS_APP="$BRAVE --app-id=cifhbcnohmdccbgoicgdjpfamggdegmo"
# need to sleep in between workspace msgs otherwise
# things can open up in the wrong workspace
i3-msg "$WORKSPACE 1; append_layout ~/.i3/workspaces/terminal.json;"
i3-msg 'exec "kitty bash -l -c \"~/.terminal_startup; bash\"'
i3-msg 'exec "kitty bash -l -c \"~/.terminal_startup; bash -l\"'
sleep 0.2
i3-msg "$WORKSPACE 2; append_layout ~/.i3/workspaces/browser.json;"
i3-msg "exec $BRAVE https://app.kalvens.rtvision.com"
Expand Down
28 changes: 14 additions & 14 deletions nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"LuaSnip": { "branch": "master", "commit": "45a4e899ca8f54936fe32ead6bba65f2a8d42e12" },
"bufferline.nvim": { "branch": "main", "commit": "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75" },
"LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" },
"bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" },
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
"copilot-cmp": { "branch": "master", "commit": "c2cdb3c0f5078b0619055af192295830a7987790" },
"copilot.lua": { "branch": "master", "commit": "e48bd7020a98be217d85c006a298656294fd6210" },
"copilot.lua": { "branch": "master", "commit": "f306957de0f9730de4298bb1ea85c3735ef7cc43" },
"cspell.nvim": { "branch": "main", "commit": "0e9c586bd7f7ab3f1f2f000a084121203e0ee62c" },
"gruvbox.nvim": { "branch": "main", "commit": "df149bccb19a02c5c2b9fa6ec0716f0c0487feb0" },
"gruvbox.nvim": { "branch": "main", "commit": "353be593e52e2008ce17d61208668747dd557248" },
"harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
"lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "f306adde671281d77cebd635098cc8b8fc8368ee" },
"lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "73bc33fe9ad5a1d4501536fdd4755b3aa18c3392" },
"lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" },
"mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
"mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" },
"null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
"nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
"nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" },
"nvim-lspconfig": { "branch": "master", "commit": "ba3ec2527aa7aae9b989d69966174a22b7d1b1dd" },
"nvim-treesitter": { "branch": "master", "commit": "f6c52eb8392e47aaf4878e5799ba54e7b30fa4f8" },
"nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" },
"nvim-lspconfig": { "branch": "master", "commit": "c0de180ddb3df36feef8ac3607670894d0e7497f" },
"nvim-treesitter": { "branch": "master", "commit": "cc360a9beb1b30d172438f640e2c3450358c4086" },
"nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
"playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" },
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
"ripgrep": { "branch": "master", "commit": "1d35859861fa4710cee94cf0e0b2e114b152b946" },
"rose-pine": { "branch": "main", "commit": "76cae45b4e6716ee93afc78bd3860134935ea9d7" },
"ripgrep": { "branch": "master", "commit": "341a19e0d05bc6f0cabeb2dc756b37cfc047f8f0" },
"rose-pine": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" },
"telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
"tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" },
"undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
"vim-fugitive": { "branch": "master", "commit": "43f18ab9155c853a84ded560c6104e6300ad41da" },
"vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" },
"vscode-js-debug": { "branch": "main", "commit": "4ef836967faf560498fffdae82131dd1a6ced8ca" }
}
9 changes: 8 additions & 1 deletion nvim/lua/config/remap.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
vim.keymap.set('n', '<leader>pv', vim.cmd.Ex)

-- a cool remap, allows using shift j and k
-- to move hightlighted text in visual mode
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
Expand Down Expand Up @@ -51,8 +50,16 @@ vim.keymap.set('n', '<leader>x', '<cmd>bd<CR>')
vim.keymap.set('n', '<Space>', 'za')
vim.keymap.set('n', '<leader>/', '<cmd>nohlsearch<CR>');

vim.g.diagnostics_showing = true
vim.keymap.set({ 'c', 'i', 'v', 'n' }, '<F8>', function()
-- Closest thing to a ternary in lua
local signColumnValue = (vim.wo.signcolumn == 'yes' and 'no') or 'yes';
if vim.g.diagnostics_showing then
vim.g.diagnostics_showing = false
vim.diagnostic.hide();
else
vim.g.diagnostics_showing = true
vim.diagnostic.show()
end
return ':set invpaste invnumber invlist relativenumber! signcolumn=' .. signColumnValue .. '<CR>';
end, { expr = true })
1 change: 1 addition & 0 deletions nvim/lua/plugin/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ return {
lazy = false,
priority = 1000,
build = ':TSUpdate',
version = 'v0.9',
config = function()
local treesitterConfigs = require('nvim-treesitter.configs');
treesitterConfigs.setup({
Expand Down

0 comments on commit 1e00ac9

Please sign in to comment.