Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
mosheavni committed Dec 28, 2024
1 parent 0a0c68f commit cc5bbae
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 72 deletions.
8 changes: 7 additions & 1 deletion nvim/.config/nvim/lua/plugins/conform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,13 @@ return {
less = { 'prettierd' },
lua = { 'stylua' },
markdown = { 'cbfmt', 'injected', 'markdownlint' },
python = { 'isort', 'black' },
python = function(bufnr)
if require('conform').get_formatter_info('ruff_format', bufnr).available then
return { 'ruff_format' }
else
return { 'isort', 'black' }
end
end,
scss = { 'prettierd' },
sh = { 'shfmt' },
svelte = { 'prettierd' },
Expand Down
22 changes: 13 additions & 9 deletions nvim/.config/nvim/lua/plugins/functionality.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,23 @@ local M = {
require('user.menu').add_actions('Diff', {
['Between 2 directories'] = function()
local pretty_print = require('user.utils').pretty_print
vim.ui.input({ prompt = 'Directory A: ' }, function(a)
if not a or a == '' then
pretty_print 'Canceled.'
return
end
vim.ui.input({ prompt = 'Directory B: ' }, function(b)
if not b or b == '' then
vim.defer_fn(function()
vim.ui.input({ prompt = 'Directory A: ' }, function(a)
if not a or a == '' then
pretty_print 'Canceled.'
return
end
vim.cmd('DirDiff ' .. a .. ' ' .. b)
vim.defer_fn(function()
vim.ui.input({ prompt = 'Directory B: ' }, function(b)
if not b or b == '' then
pretty_print 'Canceled.'
return
end
vim.cmd('DirDiff ' .. a .. ' ' .. b)
end)
end, 100)
end)
end)
end, 100)
end,
})
end,
Expand Down
62 changes: 0 additions & 62 deletions zsh/.bin/mkgp.py

This file was deleted.

0 comments on commit cc5bbae

Please sign in to comment.