diff --git a/dot_config/ideavim/ideavimrc b/dot_config/ideavim/ideavimrc index 17c715b..8143b13 100644 --- a/dot_config/ideavim/ideavimrc +++ b/dot_config/ideavim/ideavimrc @@ -36,7 +36,6 @@ map Q gq set ideamarks set ideajoin set ideastatusicon=gray -set clipboard+=unnamed """ Mappings ----------------------------------------------------------------- " IDEA binds @@ -64,6 +63,8 @@ sethandler n:ide map (PreviousTab) map > (NextTab) +map (NewScratchFile) +map (CloseContent) " Zen mode map zz (ToggleZenMode) @@ -72,7 +73,6 @@ map zz (ToggleZenMode) map ff (GotoFile) map fg (FindInPath) map fl (RecentLocations) -map fs (NewScratchFile) map [d (GotoPreviousError) map ]d (GotoNextError) diff --git a/dot_config/nvim/after/plugin/telescope.lua b/dot_config/nvim/after/plugin/telescope.lua index fec58c9..7b06a85 100644 --- a/dot_config/nvim/after/plugin/telescope.lua +++ b/dot_config/nvim/after/plugin/telescope.lua @@ -16,15 +16,15 @@ telescope.setup({ }) -local easypick = require("easypick") +local present, easypick = pcall(require, "easypick") +if not present then return end + easypick.setup({ - pickers = { - { - name = "chezmoi", - command = [[chezmoi managed -ifiles -pabsolute -xencrypted]], - previewer = easypick.previewers.default() - }, - } + pickers = { { + name = "chezmoi", + command = [[chezmoi managed -ifiles -pabsolute -xencrypted]], + previewer = easypick.previewers.default() + } } }) diff --git a/dot_config/wezterm/wezterm.lua b/dot_config/wezterm/wezterm.lua index ec91710..26e1b2e 100644 --- a/dot_config/wezterm/wezterm.lua +++ b/dot_config/wezterm/wezterm.lua @@ -1,4 +1,3 @@ --- vim:foldmethod=marker local wezterm = require("wezterm") local fonts = require("fonts") local theme = require("theme") @@ -7,40 +6,40 @@ require("bar") local font = fonts.get_font("berkeley") return { - -- keys - disable_default_key_bindings = true, - leader = { key = "s", mods = "CTRL", timeout_milliseconds = 5000 }, - keys = require("shortcuts"), - -- font - font = font.font, - font_size = font.size, - -- window - window_decorations = "RESIZE", - window_padding = { - left = 0, - right = 0, - top = 0, - bottom = 0, - }, - inactive_pane_hsb = { - saturation = 1.0, - brightness = 0.6, - }, - -- theme - color_schemes = theme.get_custom_colorschemes(), - color_scheme = theme.scheme_for_appearance(wezterm.gui.get_appearance(), { - dark = "OLEDppuccin", - light = "Catppuccin Latte", - }), - -- tab bar - hide_tab_bar_if_only_one_tab = false, - tab_bar_at_bottom = true, - tab_max_width = 32, - use_fancy_tab_bar = false, - -- etc. - adjust_window_size_when_changing_font_size = false, - audible_bell = "Disabled", - clean_exit_codes = { 130 }, - default_cursor_style = "BlinkingBar", - enable_scroll_bar = false, + -- keys + disable_default_key_bindings = true, + leader = { key = "s", mods = "CTRL", timeout_milliseconds = 5000 }, + keys = require("shortcuts"), + -- font + font = font.font, + font_size = font.size, + -- window + window_decorations = "RESIZE", + window_padding = { + left = 0, + right = 0, + top = 0, + bottom = 0, + }, + inactive_pane_hsb = { + saturation = 1.0, + brightness = 0.6, + }, + -- theme + color_schemes = theme.get_custom_colorschemes(), + color_scheme = theme.scheme_for_appearance(wezterm.gui.get_appearance(), { + dark = "OLEDppuccin", + light = "Catppuccin Latte", + }), + -- tab bar + hide_tab_bar_if_only_one_tab = false, + tab_bar_at_bottom = true, + tab_max_width = 32, + use_fancy_tab_bar = false, + -- etc. + adjust_window_size_when_changing_font_size = false, + audible_bell = "Disabled", + clean_exit_codes = { 130 }, + default_cursor_style = "BlinkingBar", + enable_scroll_bar = false, } diff --git a/dot_ssh/private_config b/dot_ssh/private_config index 3404abd..81a3caf 100644 --- a/dot_ssh/private_config +++ b/dot_ssh/private_config @@ -1,4 +1,4 @@ -# vim:filetype=sshconfig +# vim:ft=sshconfig Host * ControlMaster auto