From e91e544b7dcf2f863b062058e26b007eced65837 Mon Sep 17 00:00:00 2001
From: nigel barink <nigelbarink@hotmail.com>
Date: Tue, 21 Jan 2025 20:33:51 +0100
Subject: [PATCH] new emacs config

---
 emacs/.emacs        | 32 ----------------
 emacs/dot-emacs     | 90 +++++++++++++++++++++++++++++++++++++++++++++
 scripts/activate.sh |  2 +
 3 files changed, 92 insertions(+), 32 deletions(-)
 delete mode 100644 emacs/.emacs
 create mode 100644 emacs/dot-emacs

diff --git a/emacs/.emacs b/emacs/.emacs
deleted file mode 100644
index bab8ebe..0000000
--- a/emacs/.emacs
+++ /dev/null
@@ -1,32 +0,0 @@
-; set variables
-(setq ido-enable-flex-matching t)
-(setq ido-everywhere t)
-(setq inhibit-splash-screen t)
-(setq tab-width 4)
-(setq custom-file "~/emacs-custom.el")
-(setq display-line-numbers 'relative)
-
-; Toggle modes
-(ido-mode 1)
-(tool-bar-mode -1)
-(toggle-scroll-bar -1)
-(menu-bar-mode -1)
-(global-display-line-numbers-mode 1)
-
-; Install and load packages
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
-(package-initialize)
-(require 'package)
-(use-package catppuccin-theme :ensure)
-(use-package magit :ensure)
-(use-package paredit :ensure)
-
-; Activate font and theme
-(add-to-list 'default-frame-alist '(font .  "SF Mono"))
-(set-face-attribute 'default t :font "SF Mono")
-(load-theme 'catppuccin :no-confirm)
-(setq catppuccin-flavor 'frappe)
-(set-frame-parameter nil 'alpha-background 80)
-(add-to-list 'default-frame-alist '(alpha-background . 80))
-
-(load custom-file)
diff --git a/emacs/dot-emacs b/emacs/dot-emacs
new file mode 100644
index 0000000..ff94b3d
--- /dev/null
+++ b/emacs/dot-emacs
@@ -0,0 +1,90 @@
+; set variables
+(setq ido-enable-flex-matching t)
+(setq ido-everywhere t)
+(setq inhibit-splash-screen t)
+(setq tab-width 4)
+(setq custom-file "~/emacs-custom.el")
+(setq display-line-numbers 'relative)
+
+; Toggle modes
+(ido-mode 1)
+(tool-bar-mode -1)
+(toggle-scroll-bar -1)
+(menu-bar-mode -1)
+(global-display-line-numbers-mode 1)
+
+; Install and load packages
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
+(package-initialize)
+
+(require 'use-package-ensure)
+(setq use-package-always-ensure t)
+
+(use-package catppuccin-theme)
+(use-package magit)
+(use-package paredit)
+
+
+(use-package evil
+  :init
+  (setq evil-want-integration t)
+  (setq evil-want-keybinding nil)
+  :config
+  (evil-mode 1)
+  )
+
+(use-package evil-collection
+  :pin melpa
+  :after evil
+  :config
+  (evil-collection-init))
+
+(use-package all-the-icons)
+(use-package nerd-icons)
+  
+(use-package lsp-mode
+  :commands (lsp lsp-deferred)
+  :init
+  (setq lsp-keymap-prefix "C-c l")
+  )
+
+(use-package lsp-ui
+  :after lsp-mode
+  :hook (lsp-mode . lsp-ui-mode)
+  :custom
+  (lsp-ui-doc-position 'bottom))
+
+(use-package fzf
+  :bind
+  :config
+  (setq fzf/args "-x --color bw --print-query --margin=1,0 --no-hscroll"
+	fzf/executable "fzf"
+	fzf/git-grep-args "-i --line-number %s"
+	fzf/grep-command "grep -nrH"
+	fzf/position-bottom t
+	fzf/window-height 15))
+
+(use-package consult
+  :bind
+  ;; Keybindings
+  :hook (completion-list-mode . consult-preview-at-point-mode)
+  :init
+  (setq register-preview-delay 0.5)
+  (setq xref-show-xrefs-function #'consult-xref
+	xref-show-definitions-function #'consult-xref)) 
+
+(use-package magit-delta
+  :hook (magit-mode . magit-delta-mode)
+  )
+
+
+; activate font and theme
+(add-to-list 'default-frame-alist '(font .  "SF Mono"))
+(set-face-attribute 'default t :font "SF Mono")
+(load-theme 'catppuccin :no-confirm)
+(setq catppuccin-flavor 'frappe)
+(set-frame-parameter nil 'alpha-background 80)
+(add-to-list 'default-frame-alist '(alpha-background . 80))
+
+(load custom-file)
diff --git a/scripts/activate.sh b/scripts/activate.sh
index 112ddbb..b8a3441 100644
--- a/scripts/activate.sh
+++ b/scripts/activate.sh
@@ -9,3 +9,5 @@ mkdir -p $HOME/.config/polybar && stow --dotfiles polybar -t $HOME/.config/polyb
 stow --dotfiles starship -t $HOME/.config
 stow --dotfiles starship -t $HOME/.config
 stow --dotfiles picom -t $HOME/.config
+stow --dotfiles emacs -t $HOME/.config
+