From d50d4715dfc38949ac6b5c13fd690bdc8d2ffcc8 Mon Sep 17 00:00:00 2001 From: Klotz Date: Wed, 3 Sep 2025 09:08:21 +0200 Subject: [PATCH 1/4] Added vterm --- emacs/init.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/emacs/init.el b/emacs/init.el index f5c507f..f621a91 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -124,9 +124,12 @@ "ff" '(counsel-find-file :which-key "find file") "fg" '(counsel-git :which-key "find file git") "fb" '(counsel-switch-buffer :which-key "find buffers") + "fd" '(dired :which-key "dired") "gf" '(counsel-ag :which-key "grep") "gF" '(counsel-git-grep :which-key "git grep") "gg" '(magit-status :whichkey "magit") + "o" '(:ignore o :which-key "open") + "ot" '(vterm :which-key "vterm") "t" '(:ignore t :which-key "toggles") "tt" '(counsel-load-theme :which-key "choose theme") "p" '(projectile-command-map :which-key "projectile") @@ -134,6 +137,7 @@ "bf" '(counsel-switch-buffer :which-key "find buffers") "bn" '(next-buffer :which-key "next buffer") "be" '(eval-buffer :which-key "eval buffer") + "bk" '(kill-buffer :which-key "kill buffer") "bp" '(previous-buffer :which-key "previous buffer"))) (general-define-key @@ -180,3 +184,6 @@ (use-package magit :custom (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) + +(use-package vterm + :ensure t) From 7d30ca2b09178a4abfb26f96ac106a6ce2f68d2b Mon Sep 17 00:00:00 2001 From: Klotz Date: Wed, 3 Sep 2025 10:04:56 +0200 Subject: [PATCH 2/4] Enabled tab mode and added hotkeys --- emacs/init.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index f621a91..21b246a 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -3,6 +3,7 @@ (tooltip-mode -1) (tool-bar-mode -1) (scroll-bar-mode -1) +(tab-bar-mode 1) (setq ring-bell-function 'ignore) (add-to-list 'default-frame-alist '(fullscreen . maximized)) (setq make-backup-files nil) @@ -130,8 +131,11 @@ "gg" '(magit-status :whichkey "magit") "o" '(:ignore o :which-key "open") "ot" '(vterm :which-key "vterm") - "t" '(:ignore t :which-key "toggles") - "tt" '(counsel-load-theme :which-key "choose theme") + "t" '(:ignore t :which-key "tabs") + "tt" '(tab-new :which-key "new tab") + "tf" '(tab-bar-select-by-name :which-key "switch tab using name") + "tc" '(tab-close :which-key "close tab") + "tr" '(tab-rename :which-key "rename tab") "p" '(projectile-command-map :which-key "projectile") "b" '(:ignore b :which-key "buffers") "bf" '(counsel-switch-buffer :which-key "find buffers") From 961ac654834f4c7096a56abd537dc23bb3831a57 Mon Sep 17 00:00:00 2001 From: Klotz Date: Wed, 3 Sep 2025 10:19:23 +0200 Subject: [PATCH 3/4] Added meta key handling for macos --- emacs/init.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index 21b246a..6a84609 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -18,10 +18,14 @@ (cond ((eq system-type 'darwin) - (set-face-attribute 'default nil :font "Fira Code" :height 165)) + ;; macOS-specific settings + (set-face-attribute 'default nil :font "Fira Code" :height 165) + (setq ns-alternate-modifier 'alt + ns-command-modifier 'meta + ns-function-modifier 'hyper + ns-right-alternate-modifier nil)) ;; Act as AltGR, for "|" ((eq system-type 'gnu/linux) - -(set-face-attribute 'default nil :font "JetBrains Mono" :height 130))) + (set-face-attribute 'default nil :font "JetBrains Mono" :height 130))) (global-set-key (kbd "") 'keyboard-escape-quit) From 6df046dd24cc26dfd331707fbc83641e4ef41628 Mon Sep 17 00:00:00 2001 From: Klotz Date: Wed, 10 Sep 2025 19:30:51 +0200 Subject: [PATCH 4/4] nvim and tmux updates --- nvim/init.lua | 22 ++++++++++++++++++++++ tmux/tmux.conf | 2 ++ 2 files changed, 24 insertions(+) diff --git a/nvim/init.lua b/nvim/init.lua index 0f74e79..3fa633f 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -36,6 +36,7 @@ require('lazy').setup({ -- Detect tabstop and shiftwidth automatically 'tpope/vim-sleuth', + 'christoomey/vim-tmux-navigator', -- NOTE: This is where your plugins related to LSP can be installed. -- The configuration is done below. Search for lspconfig to find it below. { @@ -196,6 +197,12 @@ require('lazy').setup({ { 'github/copilot.vim', }, + { + 'stevearc/oil.nvim', + opts = {}, + -- Optional dependencies + dependencies = { "nvim-tree/nvim-web-devicons" }, + }, }, {}) @@ -285,6 +292,18 @@ require('telescope').setup { }, } +require("oil").setup({ + default_file_explorer = true, + columns = { + "icon", + "size", + "mtime", + "permissions" + }, + view_options = { + show_hidden = true, + } +}) -- Enable telescope fzf native, if installed pcall(require('telescope').load_extension, 'fzf') @@ -444,6 +463,9 @@ local on_attach = function(_, bufnr) nmap('K', vim.lsp.buf.hover, 'Hover Documentation') nmap('', vim.lsp.buf.signature_help, 'Signature Documentation') + vim.api.nvim_set_keymap('n', '', ':bnext', { noremap = true, silent = true }) + vim.api.nvim_set_keymap('n', '', ':bprev', { noremap = true, silent = true }) + -- Lesser used LSP functionality nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 5e49f81..4d7add7 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -2,6 +2,8 @@ set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'catppuccin/tmux#v2.1.3' # See https://github.com/catppuccin/tmux/tags for additional tags +set -g @plugin 'christoomey/vim-tmux-navigator' +set -g @plugin 'laktak/extrakto' setw -g mode-keys vi set -g @catppuccin_flavor 'frappe'