From 9a589412c8dfd0ab7acc4110b345cb8c800b2b3b Mon Sep 17 00:00:00 2001 From: Thomas Naderer Date: Fri, 3 Jan 2025 13:13:25 +0100 Subject: [PATCH] NVIM - adapting Transparency from Terminal YAZI - Keymaps for work related folders ZSH - updated aliases --- nvim/lua/keymaps.lua | 11 ++- nvim/lua/plugins.lua | 224 ++++++++++++++++++++++-------------------- nvim/lua/settings.lua | 6 ++ yazi/keymap.toml | 7 +- yazi/yazi.toml | 2 + zsh/.zshrc | 4 +- 6 files changed, 136 insertions(+), 118 deletions(-) diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua index a0dd9cc..1d895bb 100644 --- a/nvim/lua/keymaps.lua +++ b/nvim/lua/keymaps.lua @@ -44,7 +44,7 @@ keymap("n", "j", "gj", opts) keymap("n", "k", "gk", opts) -- toggle relativenumber -keymap("n", "r", ":set invrnu", opts) +keymap("n", "r", ":set number invrnu", opts) -- easy folding -- toggle fold under cursor no jumping around @@ -55,8 +55,8 @@ keymap("v", ">", ">gv", opts) keymap("v", "<", "", ":move '>+1gv-gv", opts) --- keymap("x", "", ":move '<-2gv-gv", opts) +keymap("x", "", ":move '>+1gv-gv", opts) +keymap("x", "", ":move '<-2gv-gv", opts) -- navigate buffers keymap("n", "", ":bnext", opts) @@ -70,7 +70,8 @@ keymap("c", "", "", opts) keymap("n", "x", [[:!xdg-open %]], opts) -- -- no ex mode for me --- keymap("n", "Q", "", opts) +keymap("n", "Q", "gq", opts) +keymap("x", "Q", "gq", opts) -- prevent accidentally record functionality keymap("n", "q", "", opts) @@ -105,3 +106,5 @@ keymap("c", "w!!", [[w !sudo tee %]], opt) -- diff since last save keymap("n", "df", [[:w !diff % -]], opt) + + diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 2ac88e6..3da2b73 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -2,105 +2,126 @@ vim.cmd [[packadd packer.nvim]] require('packer').startup(function(use) - -- {{{ Packer manages itself - use 'wbthomason/packer.nvim' -- Packer manages itself - -- }}} + -- {{{ Packer manages itself + use 'wbthomason/packer.nvim' -- Packer manages itself + -- }}} - -- {{{ VIM AutoSave - use({ - 'okuuva/auto-save.nvim', - tag = 'v1*', - config = function() - require('auto-save').setup({ - -- your config goes here - -- or just leave it empty :) - }) - end, - }) - -- }}} + -- {{{ VIM AutoSave + use({ + 'okuuva/auto-save.nvim', + tag = 'v1*', + config = function() + require('auto-save').setup({ + -- your config goes here + -- or just leave it empty :) + }) + end, + }) + -- }}} - -- {{{ Headlines for Markdown and TeX - use { - 'lukas-reineke/headlines.nvim', - after = 'nvim-treesitter', - config = function() - require('headlines').setup() - end, - } - -- }}} + -- {{{ Headlines for Markdown and TeX + use { + 'lukas-reineke/headlines.nvim', + after = 'nvim-treesitter', + config = function() + require('headlines').setup() + end, + } + -- }}} - -- {{{ Nvim-Tree - use { - 'nvim-tree/nvim-tree.lua', - config = function() - require('plugins.nvim-tree').setup() - end, - } - -- }}} + -- {{{ Nvim-Tree + use { + 'nvim-tree/nvim-tree.lua', + config = function() + require('plugins.nvim-tree').setup() + end, + } + -- }}} - -- {{{ Themes - use 'gruvbox-community/gruvbox' -- Gruvbox theme - use 'folke/tokyonight.nvim' -- Tokyo Night theme - -- }}} + -- {{{ Themes + use 'gruvbox-community/gruvbox' -- Gruvbox theme + use 'folke/tokyonight.nvim' -- Tokyo Night theme + -- }}} - -- {{{ Treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate' -- Keep parsers up to date - } - require('plugins.treesitter') - -- }}} + -- {{{ Treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate' -- Keep parsers up to date + } + require('plugins.treesitter') + -- }}} - -- {{{ Rainbow Delimiters - use 'HiPhish/rainbow-delimiters.nvim' - require('plugins.rainbow_delimiters') - -- }}} + -- {{{ Rainbow Delimiters + use 'HiPhish/rainbow-delimiters.nvim' + require('plugins.rainbow_delimiters') + -- }}} - -- {{{ Git Integration - use 'lewis6991/gitsigns.nvim' -- Git decorations in the gutter - use 'tpope/vim-fugitive' -- Git commands in Neovim - -- }}} + -- {{{ Git Integration + use 'lewis6991/gitsigns.nvim' -- Git decorations in the gutter + use 'tpope/vim-fugitive' -- Git commands in Neovim + -- }}} - -- {{{ Status Line - use { - 'nvim-lualine/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true } -- Optional icons - } - require('plugins.lualine') - -- }}} + -- {{{ Status Line + use { + 'nvim-lualine/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true } -- Optional icons + } + require('plugins.lualine') + -- }}} - -- {{{ HardTime - use { - 'm4xshen/hardtime.nvim', - requires = { 'MunifTanjim/nui.nvim' } - } - -- }}} + -- {{{ HardTime + use { + 'm4xshen/hardtime.nvim', + requires = { 'MunifTanjim/nui.nvim' } + } + -- }}} - -- {{{ FZF - use { - 'junegunn/fzf', - run = function() vim.fn['fzf#install']() end - } - use 'junegunn/fzf.vim' - -- }}} + -- {{{ FZF + use { + 'junegunn/fzf', + run = function() vim.fn['fzf#install']() end + } + use 'junegunn/fzf.vim' + -- }}} - -- {{{ Cool Startup Dashboard - use { - 'glepnir/dashboard-nvim', - requires = { 'kyazdani42/nvim-web-devicons' } - } - -- }}} + -- {{{ Cool Startup Dashboard + use { + 'glepnir/dashboard-nvim', + requires = { 'kyazdani42/nvim-web-devicons' } + } + -- }}} - -- {{{ Productivity - use 'numToStr/Comment.nvim' - use 'windwp/nvim-autopairs' - use 'tpope/vim-surround' - -- }}} + -- {{{ Productivity + use 'numToStr/Comment.nvim' + use 'windwp/nvim-autopairs' + use 'tpope/vim-surround' + -- }}} - -- {{{ LaTeX - use 'lervag/vimtex' - require('plugins.vimtex') - -- }}} + -- {{{ LaTeX + use 'lervag/vimtex' + require('plugins.vimtex') + -- }}} + + -- {{{ Outline + use { + 'hedyhli/outline.nvim', + config = function() + require('plugins.outline').setup() + end + } + -- }}} + + -- {{{ Org-Mode + use {'nvim-orgmode/orgmode', config = function() + require('orgmode').setup{} + end + } + --}}} + + -- {{{ Autocompletions + use 'hrsh7th/nvim-cmp' + use 'hrsh7th/cmp-nvim-lsp' + -- }}} -- {{{ Telescope use { @@ -108,29 +129,14 @@ require('packer').startup(function(use) requires = { {'nvim-lua/plenary.nvim'} }, config = function() -- Leader key mappings for Telescope - vim.api.nvim_set_keymap('n', 'ff', ':Telescope find_files', { noremap = true, silent = true }) - vim.api.nvim_set_keymap('n', 'fg', ':Telescope live_grep', { noremap = true, silent = true }) - vim.api.nvim_set_keymap('n', 'fb', ':Telescope buffers', { noremap = true, silent = true }) - vim.api.nvim_set_keymap('n', 'fh', ':Telescope help_tags', { noremap = true, silent = true }) + vim.api.nvim_set_keymap('n', 'ff', ':Telescope find_files' +, { noremap = true, silent = true }) + vim.api.nvim_set_keymap('n', 'fg', ':Telescope live_grep', + { noremap = true, silent = true }) + vim.api.nvim_set_keymap('n', 'fb', ':Telescope buffers', { + noremap = true, silent = true }) + vim.api.nvim_set_keymap('n', 'fh', ':Telescope help_tags', + { noremap = true, silent = true }) end } - -- }}} - - -- {{{ Outline - use { - 'hedyhli/outline.nvim', - config = function() - require('plugins.outline').setup() - end - } - -- }}} - - -- {{{ Org-Mode - use {'nvim-orgmode/orgmode', config = function() - require('orgmode').setup{} - end - } ---}}} - end) - diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index ff6fc1d..ba3c08f 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -7,3 +7,9 @@ vim.opt.expandtab = true -- Use spaces instead of tabs vim.cmd [[colorscheme tokyonight]] vim.cmd [[set spelllang=en]] + + +vim.cmd([[ + highlight Normal ctermbg=none guibg=none + highlight NonText ctermbg=none guibg=none +]]) diff --git a/yazi/keymap.toml b/yazi/keymap.toml index f6d12d1..6edd082 100644 --- a/yazi/keymap.toml +++ b/yazi/keymap.toml @@ -126,10 +126,11 @@ keymap = [ # Goto { on = [ "g", "h" ], run = "cd ~", desc = "Go home" }, { on = [ "g", "c" ], run = "cd ~/.config", desc = "Goto ~/.config" }, - { on = [ "g", "a" ], run = "cd ~/tnh", desc = "Goto AK127132" }, - { on = [ "g", "i" ], run = "cd ~/tng", desc = "Goto Intern" }, { on = [ "g", "d" ], run = "cd ~/Downloads", desc = "Goto ~/Downloads" }, { on = [ "g", "t" ], run = "cd ~/Torrents", desc = "Goto ~/Torrents" }, + { on = [ "g", "t" ], run = "cd ~/Torrents", desc = "Goto ~/Torrents" }, + { on = [ "g", "a" ], run = "cd /Volumes/AK127132", desc = "Goto AK127132" }, + { on = [ "g", "i" ], run = "cd /Volumes/intern", desc = "Goto intern" }, { on = [ "g", "o" ], run = "cd ~/Library/Mobile\\ Documents/iCloud~md~obsidian/Documents/Privat", desc = "Goto ~/Obsidian" }, { on = [ "g", "" ], run = "cd --interactive", desc = "Jump interactively" }, @@ -337,7 +338,7 @@ keymap = [ # Help { on = "~", run = "help", desc = "Open help" }, - { on = "", run = "help", desc = "Open help" }, + { on = "", run = "help", desc = "Open help" }, ] [help] diff --git a/yazi/yazi.toml b/yazi/yazi.toml index e69de29..7ef3be2 100644 --- a/yazi/yazi.toml +++ b/yazi/yazi.toml @@ -0,0 +1,2 @@ +max_width=1000 +max_height=1500 diff --git a/zsh/.zshrc b/zsh/.zshrc index 5d0d54d..ba2b1a6 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -29,8 +29,8 @@ export KEYTIMEOUT=1 # Aliases alias h="cd ~" alias cl="clear" -alias tnh="cd /Volumes/TNHOME" -alias tng="cd /Volumes/TNGROUP" +alias tnh="cd /Volumes/AK127132" +alias tng="cd /Volumes/intern" alias l='eza --color=always --icons -la --group-directories-first' alias n='nvim' alias ne='nvim ~/.zshenv'