Skip to content

Commit

Permalink
some shit
Browse files Browse the repository at this point in the history
  • Loading branch information
mosheavni committed Dec 9, 2024
1 parent c9e1424 commit 10b8ab4
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 31 deletions.
7 changes: 6 additions & 1 deletion .config/nvim/ftplugin/fugitiveblame.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ end
-- set winbar to empty string
-- vim.api.nvim_win_set_option(0, 'winbar', '-')
vim.schedule(function()
vim.api.nvim_set_option_value('winbar', 'Git blame', { win = 0 })
vim.api.nvim_set_option_value(
'winbar',
'Git blame (<CR> to open commit in diffview | yy to copy commit hash to clipboard | <leader>gh to open commit in GitHub)',
{ win = 0 }
)

vim.api.nvim_buf_set_keymap(0, 'n', '<CR>', '', {
noremap = true,
silent = true,
Expand Down
1 change: 1 addition & 0 deletions .config/nvim/ftplugin/markdown.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vim.wo.wrap = false
4 changes: 1 addition & 3 deletions .config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"mini.notify": { "branch": "main", "commit": "a933dc637b84314976d6482449f9f51ecd02d2b3" },
"mini.operators": { "branch": "main", "commit": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888" },
"mini.splitjoin": { "branch": "main", "commit": "3e92f6764e770ba392325cad3a4497adcada695f" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"neogit": { "branch": "master", "commit": "683ee5d02b3b223a5c39953d700c252187fc5be9" },
"nginx.vim": { "branch": "master", "commit": "cffaec54f0c7f9518de053634413a20e90eac825" },
"none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
Expand All @@ -73,7 +74,6 @@
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
"nvim-pqf": { "branch": "main", "commit": "148ee2ca8b06d83fd9bf6f9b9497724ad39a07d6" },
"nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
"nvim-tree.lua": { "branch": "master", "commit": "db8d7ac1f524fc6f808764b29fa695c51e014aa6" },
"nvim-treesitter": { "branch": "master", "commit": "0c26a5c4bc407fdbca545ab25cf6084fd069444b" },
"nvim-treesitter-context": { "branch": "master", "commit": "3288c5af7d3820d716272f1d05ab661cc540a5d6" },
Expand Down Expand Up @@ -108,9 +108,7 @@
"vim-kubernetes": { "branch": "master", "commit": "f477818c30efe4914e9a047ba1105b524d78e1b5" },
"vim-lister": { "branch": "master", "commit": "ec903e615f867f910cd8adc73f5906d521f3f214" },
"vim-matchup": { "branch": "master", "commit": "5fb083de1e06fdd134c6ad8d007d4b5576b25ba7" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
"vim-sh-indent": { "branch": "master", "commit": "4a3ef08bbf3a2ddacd6d80ef732726a59d9012f9" },
"vim-speeddating": { "branch": "master", "commit": "c17eb01ebf5aaf766c53bab1f6592710e5ffb796" },
"vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
"vim-swap": { "branch": "master", "commit": "9358bfdc5e377aa13e7c2c2dd8699ba32b0dcf83" },
"winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
Expand Down
4 changes: 0 additions & 4 deletions .config/nvim/lua/plugins/functionality.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ local M = {
vim.g.loaded_matchparen = 1
end,
},
{
'tpope/vim-speeddating',
keys = { '<C-a>', '<C-x>' },
},
{
'mosheavni/vim-kubernetes',
ft = 'yaml',
Expand Down
16 changes: 3 additions & 13 deletions .config/nvim/lua/plugins/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,6 @@ local M = {
-----------------------
-- Text Manipulation --
-----------------------
{
'tpope/vim-repeat',
event = 'VeryLazy',
},
{
'kylechui/nvim-surround',
version = '*', -- Use for stability; omit to use `main` branch for the latest features
keys = { 'ds', 'cs', 'ys', { 'S', nil, mode = 'v' } },
opts = {},
},
{
'junegunn/vim-easy-align',
keys = { { 'ga', '<Plug>(EasyAlign)', mode = { 'v', 'n' } } },
Expand Down Expand Up @@ -217,17 +207,17 @@ local M = {
},
dependencies = {
{ 'zbirenbaum/copilot.lua' }, -- or github/copilot.vim
{ 'nvim-lua/plenary.nvim' }, -- for curl, log wrapper
{ 'nvim-lua/plenary.nvim' }, -- for curl, log wrapper
},
build = 'make tiktoken', -- Only on MacOS or Linux
build = 'make tiktoken', -- Only on MacOS or Linux
opts = {
model = 'claude-3.5-sonnet',
question_header = ' User ', -- Header to use for user questions
answer_header = ' Copilot ', -- Header to use for AI answers
error_header = ' Error ', -- Header to use for errors
},
keys = {
{ '<leader>ccc', '<cmd>CopilotChat<CR>', mode = { 'n', 'v' } },
{ '<leader>ccc', '<cmd>CopilotChat<CR>', mode = { 'n', 'v' } },
{ '<leader>ccs', '<cmd>CopilotChatStop<CR>' },
},
},
Expand Down
9 changes: 9 additions & 0 deletions .config/nvim/lua/plugins/look-and-feel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,15 @@ local M = {
'vim-scripts/CursorLineCurrentWindow',
event = 'BufReadPost',
},
{
'OXY2DEV/markview.nvim',
ft = 'markdown', -- If you decide to lazy-load anyway
opts = { initial_state = false },

dependencies = {
'nvim-treesitter/nvim-treesitter',
},
},
}

return M
32 changes: 23 additions & 9 deletions .config/nvim/lua/plugins/mini.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
local the_king = 'echasnovski/mini.'
local M = {
{
'echasnovski/mini.indentscope',
the_king .. 'indentscope',
version = false,
event = 'BufReadPost',
opts = {
Expand Down Expand Up @@ -39,7 +40,7 @@ local M = {
end,
},
{
'echasnovski/mini.cursorword',
the_king .. 'cursorword',
version = false,
event = 'BufReadPost',
config = function()
Expand All @@ -51,7 +52,7 @@ local M = {
end,
},
{
'echasnovski/mini.icons',
the_king .. 'icons',
lazy = true,
opts = {},
init = function()
Expand All @@ -62,7 +63,7 @@ local M = {
end,
},
{
'echasnovski/mini.hipatterns',
the_king .. 'hipatterns',
version = false,
event = { 'BufNewFile', 'BufReadPre', 'VeryLazy' },
config = function()
Expand All @@ -80,11 +81,11 @@ local M = {
end,
},
{
'echasnovski/mini.notify',
the_king .. 'notify',
version = false,
lazy = false,
keys = {
{ '<leader>x', '<cmd>lua require("mini.notify").clear()<cr>', { silent = true, desc = 'Dismiss all notifications' } },
{ '<leader>x', '<cmd>lua require("mini.notify").clear()<cr>', { silent = true, desc = 'Dismiss all notifications' } },
{ '<leader>n', '<cmd>lua require("mini.notify").show_history()<cr>', { silent = true, desc = 'Show notifications history' } },
},
init = function()
Expand All @@ -94,14 +95,26 @@ local M = {
end,
},
{
'echasnovski/mini.splitjoin',
the_king .. 'splitjoin',
version = false,
opts = {},
keys = { 'gS' },
},
{
'echasnovski/mini.ai',
the_king .. 'surround',
version = false,
opts = {
mappings = {
add = 'ys',
delete = 'ds',
replace = "cs",
}
}
},
{
the_king .. 'ai',
version = false,
event = "VeryLazy",
config = function()
local gen_spec = require('mini.ai').gen_spec
require('mini.ai').setup {
Expand All @@ -113,8 +126,9 @@ local M = {
end,
},
{
'echasnovski/mini.operators',
the_king .. 'operators',
version = false,
event = "VeryLazy",
opts = {
-- g= Evaluate text and replace with output
-- gx Exchange text regions
Expand Down
3 changes: 2 additions & 1 deletion zsh.d/term-support.zsh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
source /Applications/WezTerm.app/Contents/Resources/wezterm.sh
[[ -f /Applications/WezTerm.app/Contents/Resources/wezterm.sh ]] && \
source /Applications/WezTerm.app/Contents/Resources/wezterm.sh
export TERM=xterm-256color
export WEZTERM_SHELL_INTEGRATION=1

Expand Down

0 comments on commit 10b8ab4

Please sign in to comment.