From 9fff280ec10e0a041ecfbbd1b2e95e82aa16333e Mon Sep 17 00:00:00 2001 From: Andre Schaf Date: Wed, 20 May 2026 23:08:47 +0200 Subject: [PATCH] applied again with evil --- .gitignore | 5 +++-- init.el | 59 +++++++++++++++++++++++++----------------------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 3ce20a8..07d593c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,11 @@ # Emacs internals auto-save-list/ -custom +custom.el eln-cache/ elpa/ .lsp-session-v1 transient/ +projects tutorial/ -.init.el.~undo-tree~ \ No newline at end of file +*~undo-tree~ \ No newline at end of file diff --git a/init.el b/init.el index 691d438..2c25a37 100644 --- a/init.el +++ b/init.el @@ -1,8 +1,9 @@ (setq custom-file "./custom") (setq display-line-numbers-type 'relative) (global-display-line-numbers-mode 1) -;;(tool-bar-mode 0) +(tool-bar-mode 0) (menu-bar-mode 0) +(scroll-bar-mode 0) (column-number-mode 1) (setq select-enable-clipboard t) @@ -10,24 +11,32 @@ auto-save-default nil) ;; keys -(global-set-key (kbd "C-x c") 'comment-line) +(global-set-key (kbd "C-c C-c") 'comment-line) -;; packages (require 'package) (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("gnu" . "https://elpa.gnu.org/packages/"))) (package-initialize) (unless package-archive-contents (package-refresh-contents)) - -;; install use-package if missing -(unless (package-installed-p 'use-package) - (package-install 'use-package)) - -;; make use-package auto-install by default (setq use-package-always-ensure t) (require 'use-package) +(setq evil-want-C-u-scroll t + evil-want-keybinding nil + evil-want-integration t + evil-undo-system 'undo-tree) + +(use-package undo-tree + :config + (global-undo-tree-mode)) + +(use-package evil + :config + (evil-mode 1)) + +(add-to-list 'evil-emacs-state-modes 'dired-mode) + (use-package fzf :bind ;; Don't forget to set keybinds! @@ -43,36 +52,22 @@ fzf/position-bottom t fzf/window-height 15)) -(global-set-key (kbd "C-x p f") 'fzf-git-files) - (use-package tree-sitter-langs :config (global-undo-tree-mode)) -(use-package undo-tree - :config - (global-undo-tree-mode)) - ;; window-management (use-package zoom-window :ensure t :config - (setq zoom-window-mode-line-color "DarkGreen") - :bind ("C-x w z" . zoom-window-zoom)) -;; keys -(global-set-key (kbd "C-x w l") 'windmove-right) -(global-set-key (kbd "C-x w h") 'windmove-left) -(global-set-key (kbd "C-x w j") 'windmove-down) -(global-set-key (kbd "C-x w k") 'windmove-up) + (setq zoom-window-mode-line-color "DarkGreen")) + ;; :bind ("C-w z" . zoom-window-zoom)) -(use-package doom-themes - :config - ;; Global settings (defaults) - (setq doom-themes-enable-bold t - doom-themes-enable-italic t) - (load-theme 'doom-laserwave t) - ;; Enable flashing mode-line on errors - (doom-themes-visual-bell-config) - ;; Corrects (and improves) org-mode's native fontification. - (doom-themes-org-config)) +(global-set-key (kbd "C-x C-w") 'kill-region) ;; move original action +(global-set-key (kbd "C-w") nil) ;; free C-w as prefix +(define-key global-map (kbd "C-w z") 'zoom-window-zoom) +(define-key global-map (kbd "C-c f f") 'fzf-find-file) +(define-key global-map (kbd "C-c f b") 'ibuffer) + +(load-theme 'misterioso)