From f1c07c06139cbbbe3cd759fe34684279dc04b0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be> Date: Sun, 14 Jan 2024 23:11:00 +0100 Subject: [PATCH] Additional nvim configuration --- hypr/hyprland.conf | 1 - nvim/lua/mappings.lua | 2 ++ nvim/lua/plugins.lua | 2 +- nvim/lua/settings.lua | 1 + nvim/lua/telescope_config.lua | 1 + zsh/.zshrc | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 7220076..18d3927 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,6 +1,5 @@ env = WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1 env = WLR_NO_HARDWARE_CURSORS,1 -env = GTK_THEME, Adwaita $scripts = /home/user/.config/scripts diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index fec797b..156cd79 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -5,6 +5,8 @@ vim.keymap.set("n", "<S-k>", "<Nop>", {}) vim.keymap.set("t", "jj", "<C-\\><C-n>", { noremap = true, silent = true }) vim.keymap.set("n", "<Backspace>", ":q<cr>", { noremap = true, silent = true }) vim.keymap.set("n", "<C-U>", "<C-O>", { noremap = true }) +vim.keymap.set("n", "<S-C-U>", "g;", { noremap = true }) +vim.keymap.set("n", "<S-C-I>", "g,", { noremap = true }) vim.keymap.set("n", "<C-E>", "<C-U>zz", { noremap = true }) vim.keymap.set("n", "<C-D>", "<C-D>zz", { noremap = true }) vim.keymap.set("n", "<C-I>", "<C-I>", { noremap = true }) diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 7f1ff90..8d44c45 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -33,7 +33,7 @@ require('lazy').setup({ ["<leader>v"] = "actions.select_vsplit", ["<leader>s"] = "actions.select_split", ["<leader>p"] = "actions.preview", - ["<escape>"] = "actions.close", + ["<backspace>"] = "actions.close", ["<leader>r"] = "actions.refresh", ["-"] = "actions.parent", ["_"] = "actions.open_cwd", diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 73f2197..8683918 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -36,6 +36,7 @@ vim.wo.signcolumn = "yes" vim.wo.relativenumber = true vim.g.rooter_patterns = {".git", "Makefile", "CMakeLists.txt", "build/", "meson.build"} vim.g.rooter_silent_chdir = 1 +vim.opt.shada = "!,'2000,f1,<50,s10,h" -- Vimtex vim.g.tex_flavor = 'latex' diff --git a/nvim/lua/telescope_config.lua b/nvim/lua/telescope_config.lua index 3a12006..6d8a4bc 100644 --- a/nvim/lua/telescope_config.lua +++ b/nvim/lua/telescope_config.lua @@ -90,6 +90,7 @@ telescope.load_extension('fzy_native') vim.keymap.set("n", "<leader>u", function() require("telescope").extensions.undo.undo() end, {noremap = true, silent = true}) vim.keymap.set("n", "<C-p>", function() require('telescope_config').git_files() end, {noremap = true, silent = true}) vim.keymap.set("n", "<C-O>", function() require('telescope_config').project_files() end, { silent = true, noremap = true }) +vim.keymap.set("n", "<C-Space>", function() require('telescope.builtin').oldfiles() end, { silent = true, noremap = true }) -- vim.keymap.set("n", "<C-f>", function() require('telescope.builtin').live_grep{ cwd = vim.fn.systemlist("git rev-parse --show-toplevel 2> /dev/null || pwd")[1] } end, { silent = true, noremap = true }) vim.keymap.set("n", "<C-f>", function() require('telescope_config').fuzzyFindFiles() end, { silent = true, noremap = true }) diff --git a/zsh/.zshrc b/zsh/.zshrc index 3ecc645..fa9616f 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -182,6 +182,7 @@ alias fzf="fzf-tmux" alias clip="xsel --clipboard" alias compress="tar --use-compress-program=lbzip2 -cvf" alias vim="nvim" +alias v="nvim" alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts" alias xbindkeys="xbindkeys -f $XDG_CONFIG_HOME/xbindkeys/config" alias python=python3