Skip to content

Commit

Permalink
Save latest config before updating nvim config
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlo Gravador committed Apr 28, 2024
1 parent cc2a13c commit 4fedb97
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 15 deletions.
15 changes: 7 additions & 8 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
[core]
editor = vim
editor = $GIT_EDITOR
[difftool]
prompt = true
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = "vim -d \"$LOCAL\" \"$REMOTE\""
tool = vim
[difftool "vim"]
cmd = "$EDITOR -d \"$LOCAL\" \"$REMOTE\""
[user]
name = Carlo Gravador
email = [email protected]
[pager]
branch = false
[merge]
tool = vimdiff
tool = vim
[mergetool]
keepBackup = false

[mergetool "vimdiff"]
cmd = vim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[mergetool "vim"]
cmd = $EDITOR -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
2 changes: 1 addition & 1 deletion nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ require 'colorizer'.setup {

}
-- require('nvim-highlight-colors').setup {}
vim.g.python3_host_prog = '/usr/bin/python3'
vim.g.python3_host_prog = '/opt/homebrew/bin/python3'
1 change: 1 addition & 0 deletions nvim/lua/fzf_lua_config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ require('fzf-lua').setup({'telescope',
vim.keymap.set('n', '<leader>ff', ':FzfLua files<CR>', {noremap = true})
vim.keymap.set('n', '<leader>fb', ':FzfLua buffers<CR>', {noremap = true})
vim.keymap.set('n', '<leader>fl', ':FzfLua lines<CR>', {noremap = true})
vim.keymap.set('n', '<leader>bl', ':FzfLua blines<CR>', {noremap = true})
vim.keymap.set('n', '<leader>ft', ':FzfLua tabs<CR>', {noremap = true})
vim.keymap.set('n', '<leader>gr', ':FzfLua live_grep<CR>', {noremap = true})
vim.keymap.set('n', '<leader>gw', ':FzfLua grep_cword<CR>', {noremap = true})
Expand Down
6 changes: 0 additions & 6 deletions nvim/lua/lsp_config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@ for _, lsp in ipairs(servers) do
})
end

require('lspconfig')['clangd'].setup({
on_attach = on_attach,
flags = lsp_flags,
})


-- Addtional mappings for LSP
local t = function(str)
return vim.api.nvim_replace_termcodes(str, true, true, true)
Expand Down
4 changes: 4 additions & 0 deletions skhd/skhdrc
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@ ctrl + alt - j : yabai -m window --warp south
ctrl + alt - k : yabai -m window --warp north
ctrl + alt - h : yabai -m window --warp west
ctrl + alt - l : yabai -m window --warp east

# start / stop yabai
ctrl + alt - q : yabai --stop-service
ctrl + alt - s : yabai --start-service

0 comments on commit 4fedb97

Please sign in to comment.