diff --git a/env/.config/nvim/after/plugin/dap.lua b/env/.config/nvim/after/plugin/dap.lua index 88d552c..b52a5e4 100644 --- a/env/.config/nvim/after/plugin/dap.lua +++ b/env/.config/nvim/after/plugin/dap.lua @@ -1,18 +1,5 @@ local ok, dap = pcall(require, 'dap') if ok then - vim.keymap.set("n", "dl", function() dap.step_into() end) - vim.keymap.set("n", "dj", function() dap.step_over() end) - vim.keymap.set("n", "dk", function() dap.step_out() end) - vim.keymap.set("n", "dc", function() dap.continue() end) - vim.keymap.set("n", "db", function() dap.toggle_breakpoint() end) - vim.keymap.set("n", "db>", function() - dap.set_breakpoint(vim.fn.input('Breakpoint condition: ')) - end) - vim.keymap.set("n", "dd", function() dap.terminate() end) - vim.keymap.set("n", "dr", function() dap.run_last() end) - --vim.keymap.set("n", "dt", "lua vim.cmd('RustLsp testables')") - - -- vim.api.nvim_set_hl(namespace, 'DapBreakpoint', { fg='#993939', bg='#31353f' }) -- vim.api.nvim_set_hl(namespace, 'DapLogPoint', { fg='#61afef', bg='#31353f' }) -- vim.api.nvim_set_hl(namespace, 'DapStopped', { fg='#98c379', bg='#31353f' }) @@ -41,6 +28,21 @@ if ok then local ok, dapui = pcall(require, 'dapui') if ok then dapui.setup() + + vim.keymap.set("n", "dl", function() dap.step_into() end) + vim.keymap.set("n", "dj", function() dap.step_over() end) + vim.keymap.set("n", "dk", function() dap.step_out() end) + vim.keymap.set("n", "dc", function() dap.continue() end) + vim.keymap.set("n", "db", function() dap.toggle_breakpoint() end) + vim.keymap.set("n", "dB", function() + dap.set_breakpoint(vim.fn.input('Breakpoint condition: ')) + end) + vim.keymap.set("n", "dd", function() dap.terminate() end) + vim.keymap.set("n", "dr", function() dap.run_last() end) + --vim.keymap.set("n", "dt", "lua vim.cmd('RustLsp testables')") + vim.keymap.set("n", "ds", function() dapui.toggle() end) + + --[[ dap.listeners.before.attach.dapui_config = function() dapui.open() end @@ -53,6 +55,7 @@ if ok then dap.listeners.before.event_exited.dapui_config = function() dapui.close() end + ]]-- end dap.configurations.rust = { diff --git a/env/.config/nvim/after/plugin/telescope.lua b/env/.config/nvim/after/plugin/telescope.lua index 6eb028d..8cc8efd 100755 --- a/env/.config/nvim/after/plugin/telescope.lua +++ b/env/.config/nvim/after/plugin/telescope.lua @@ -1,6 +1,5 @@ -local ok, _ = pcall(require, 'telescope') +local ok, telescope = pcall(require, 'telescope') if ok then - local telescope = require('telescope') local builtin = require('telescope.builtin') local action = require('telescope.actions') telescope.setup{ @@ -11,8 +10,21 @@ if ok then ["q"] = action.close, } } - } + }, + pickers = { + find_files = { + find_command = { + "rg", + "--files", + "--hidden", + "--ignore-vcs", + "--no-ignore", + "-g", "!**/.git/*", + }, + }, + }, } + --[[ if string.find(vim.loop.cwd(),"iceys%-linux%-stuffs") then telescope.setup{ pickers = { @@ -22,6 +34,7 @@ if ok then } } end + ]]-- -- vim.keymap.set('n', 'pf', "Telescope find_files initial_mode=normal", {}) -- sort_mru=true sort by most recently used -- sort_lastused=true @@ -40,5 +53,7 @@ if ok then local word = vim.fn.expand("") builtin.grep_string({ search = word }) end) - vim.keymap.set('n', 'pg', builtin.git_files, {}) + vim.keymap.set('n', 'gg', builtin.git_files, {}) + vim.keymap.set('n', 'gs', builtin.git_status, {}) + vim.keymap.set('n', 'gm', builtin.git_commits, {}) end diff --git a/env/.local/bin/scripts/fzf-thumb b/env/.local/bin/scripts/fzf-thumb new file mode 100755 index 0000000..a779b21 --- /dev/null +++ b/env/.local/bin/scripts/fzf-thumb @@ -0,0 +1,25 @@ +#!/bin/bash +FZF_PREVIEW_LINES=50 +FZF_PREVIEW_COLUMN=50 + +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" + +Preview_file="$script_dir/preview-image-typed.sh" + +[ "$1" ] && view_dir="$1" + +if [ ! "$view_dir" ]; then + echo NO DIR + exit 1 +fi + +cd "$view_dir" + +while :; do + open_file=$(fzf --preview "$Preview_file {} $FZF_PREVIEW_LINES $FZF_PREVIEW_COLUMN") + if [ "$open_file" ]; then + vlc "$open_file" & disown + else + break + fi +done diff --git a/env/.local/bin/scripts/preview-image-typed.sh b/env/.local/bin/scripts/preview-image-typed.sh new file mode 100755 index 0000000..013ac2a --- /dev/null +++ b/env/.local/bin/scripts/preview-image-typed.sh @@ -0,0 +1,17 @@ +preview() { + # chafa "$@" -f sixel -s "$(($2-2))x$3" | sed 's/#/\n#/g' + chafa "$1" --clear -f iterm -s $2x$3 +} + +thumbnail="/tmp/thumbnail.png" + +file="$1"; shift + +case "$file" in +*.avi|*.gif|*.mp4|*.mkv|*.webm|*.mov) + ffmpegthumbnailer -i "$file" -s 0 -q 5 -o "/tmp/thumbnail.png" + preview "$thumbnail" "$@" + ;; +*) + preview "$file" "$@" +esac