diff --git a/etc/hosts b/etc/hosts index 3d028a9d..c9d9377c 100644 --- a/etc/hosts +++ b/etc/hosts @@ -11,12 +11,12 @@ # IP remapping # 127.0.0.1 youtube.com # 127.0.0.1 www.youtube.com -# 127.0.0.1 zeit.de -# 127.0.0.1 www.zeit.de -# 127.0.0.1 reddit.com -# 127.0.0.1 www.reddit.com -# 127.0.0.1 imgur.com -# 127.0.0.1 www.imgur.com +127.0.0.1 zeit.de +127.0.0.1 www.zeit.de +127.0.0.1 reddit.com +127.0.0.1 www.reddit.com +127.0.0.1 imgur.com +127.0.0.1 www.imgur.com # 127.0.0.1 bikepacking.com # 127.0.0.1 www.bikepacking.com # 127.0.0.1 ultraleicht-trekking.com diff --git a/nvim/init.lua b/nvim/init.lua index b9105ff8..ca4956cf 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,6 +1,5 @@ -- small helper function for loading external plugin config files local g = vim.g -local cmd = vim.cmd local set = vim.opt local setlocal = vim.opt_local local createCmd = vim.api.nvim_create_autocmd @@ -131,8 +130,8 @@ g.loaded_perl_provider = 0 set.background = 'dark' set.termguicolors = true g.gruvbox_baby_telescope_theme = 1 -cmd 'colorscheme gruvbox-baby' -cmd 'language en_US.UTF-8' +vim.cmd('colorscheme gruvbox-baby') +vim.cmd('language en_US.UTF-8') -- autoresize windows/splits everytime we change to a buffer createCmd({ 'VimResized', 'FocusGained' }, { diff --git a/nvim/lua/plugins/which-key.lua b/nvim/lua/plugins/which-key.lua index c6578c72..0b67a7f8 100644 --- a/nvim/lua/plugins/which-key.lua +++ b/nvim/lua/plugins/which-key.lua @@ -27,6 +27,7 @@ wk.register({ e = { 'lua vim.diagnostic.goto_next()', 'go to next error in file' }, f = { 'lua vim.lsp.buf.format()', 'format file with LSP' }, h = { 'lua vim.lsp.buf.hover()', 'show hover info' }, + z = { 'ZenMode', 'toggle zen mode' }, x = { 'execute "/\\v^[<\\|=>]{7}/"', 'find git conflicts in file' }, }, diff --git a/wezterm.lua b/wezterm.lua index 56043df7..a304656a 100644 --- a/wezterm.lua +++ b/wezterm.lua @@ -66,20 +66,16 @@ config.window_decorations = 'RESIZE' -- key mappings config.keys = { - { key = '\\', - mods = 'LEADER', - action = act.SplitHorizontal, - }, - { - key = '-', - mods = 'LEADER', - action = act.SplitVertical, - }, - { - key = ']', - mods = 'LEADER', - action = act.ActivateCopyMode, - }, + { key = '\\', mods = 'LEADER', action = act.SplitHorizontal }, + { key = '-', mods = 'LEADER', action = act.SplitVertical }, + { key = ']', mods = 'LEADER', action = act.ActivateCopyMode }, + { key = 'g', mods = 'LEADER', action = act.ShowLauncherArgs { flags = 'FUZZY|WORKSPACES' } }, + -- Navigator.nvim keys + { key = 'h', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDirection-left') }, + { key = 'j', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDirection-down') }, + { key = 'k', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDirection-up') }, + { key = 'l', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDirection-right') }, + -- leader-key mappings { key = ',', mods = 'LEADER', @@ -133,18 +129,6 @@ config.keys = { end), }, }, - { - key = 'g', - mods = 'LEADER', - action = act.ShowLauncherArgs { - flags = 'FUZZY|WORKSPACES', - }, - }, - -- Navigator.nvim keys - { key = 'h', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDirection-left') }, - { key = 'j', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDirection-down') }, - { key = 'k', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDirection-up') }, - { key = 'l', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDirection-right') }, } -- Navigator.nvim events diff --git a/zsh/exports.zsh b/zsh/exports.zsh index 6a8327b9..72d1b748 100644 --- a/zsh/exports.zsh +++ b/zsh/exports.zsh @@ -31,7 +31,7 @@ export NNN_OPTS='deHR' export NNN_BMS='a:~/Sites;s:~/Dotfiles;d:~/Downloads;h:~/' export NNN_FCOLORS='c1e26c2e006033f5c6d6abc4' export NNN_PLUG='p:preview-tui;j:autojump' -export NNN_FIFO='/tmp/nnn.fifo' +export NNN_FIFO='/Users/webgefrickel/.local/share/nnn/nnn.fifo' export NNN_TRASH=0 export NNN_ARCHIVE="\\.(7z|bz|bz2|gz|rar|rpm|tar|tgz|zip)$"