added evil mode

4 files changed, 50 insertions, 30 deletions

diff --git a/.config/emacs/settings.org b/.config/emacs/settings.org
index f7276fd..696ab10 100644
--- a/.config/emacs/settings.org
+++ b/.config/emacs/settings.org
@@ -50,7 +50,8 @@
 			 cmake-mode
 			 cmake-font-lock
 			 glsl-mode
-			 indent-bars))
+			 indent-bars
+			 evil))
 #+END_SRC
 ** Packages
 #+BEGIN_SRC emacs-lisp
@@ -220,6 +221,23 @@
   (setq dired-subtree-use-backgrounds nil))
 
 #+END_SRC
+* Evil Mode
+#+BEGIN_SRC emacs-lisp
+(use-package evil)
+
+(defun evil-keyboard-quit ()
+  "Keyboard quit and force normal state."
+  (interactive)
+  (and evil-mode (evil-force-normal-state))
+  (keyboard-quit))
+
+(define-key evil-normal-state-map   (kbd "C-g") #'evil-keyboard-quit) 
+(define-key evil-motion-state-map   (kbd "C-g") #'evil-keyboard-quit) 
+(define-key evil-insert-state-map   (kbd "C-g") #'evil-keyboard-quit) 
+(define-key evil-window-map         (kbd "C-g") #'evil-keyboard-quit) 
+(define-key evil-operator-state-map (kbd "C-g") #'evil-keyboard-quit)
+
+#+END_SRC
 * Style
 #+BEGIN_SRC emacs-lisp
 
diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf
index 546a0e3..87aced7 100644
--- a/.config/hypr/binds.conf
+++ b/.config/hypr/binds.conf
@@ -13,12 +13,14 @@ bind = $mainMod, RETURN, exec, $menu
 bind = $mainMod, A, exec, $terminal
 bind = $mainMod, D, killactive,
 bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill
+
 # screenshot (region + full)
-bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%s_grim.png')
-bind = $mainMod, S, exec, grim -o eDP-1 ~/Pictures/Screenshots/$(date +'%s_grim.png')
+bind = $mainMod SHIFT, S, exec, screenshot -save
+bind = $mainMod, S, exec, screenshot -full -save
 # screenshot and copy
-bind = $mainMod CTRL SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
-bind = $mainMod CTRL, S, exec, grim -o eDP-1 - | wl-copy
+bind = $mainMod CTRL SHIFT, S, exec, screenshot
+bind = $mainMod CTRL, S, exec, screenshot -full
+
 bind = $mainMod, V, togglefloating,
 bind = $mainMod CTRL, P, exec, hyprpicker -a
 bind = $mainMod, L, exec, hyprlock
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index a468f9c..bdc74e5 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,6 +1,6 @@
 source=binds.conf
 
-monitor = eDP-1, 1920x1200@144, 0x0, 1
+monitor = eDP-1, 1920x1200@60, 0x0, 1
 
 exec-once = startup
 env = XCURSOR_SIZE,24
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index d6ddca9..58ec3f7 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -1,27 +1,27 @@
 return {
-   'nvim-telescope/telescope.nvim',
-   dependencies = { 'nvim-lua/plenary.nvim' },
-   config = function()
-	  require('telescope').setup({
+	'nvim-telescope/telescope.nvim',
+	dependencies = { 'nvim-lua/plenary.nvim' },
+	config = function()
+		require('telescope').setup({
 			defaults = {
-			   sorting_strategy = "ascending",
-			   layout_strategy = 'bottom_pane',
-			   layout_config = {
-				  height = 10,
-			   },
-			   prompt_prefix = "",
-			   selection_caret = "",
-			   entry_prefix = "",
-			   border = true,
-			   borderchars = { "─", " ", " ", " ", "─", "─", " ", " " },
-			   preview = false,
-            },
-								})
-	  local builtin = require('telescope.builtin')
-	  vim.keymap.set('n', '<leader>f', builtin.find_files, {})
-	  vim.keymap.set('n', '<leader>r', builtin.live_grep, {})
-	  vim.keymap.set('n', '<leader>b', function()
-						builtin.buffers({ sort_mru = true, ignore_current_buffer = true})
-	  end)
-   end
+				sorting_strategy = "ascending",
+				layout_strategy = 'bottom_pane',
+				layout_config = {
+					height = 10,
+				},
+				prompt_prefix = "",
+				selection_caret = "",
+				entry_prefix = "",
+				border = true,
+				borderchars = { "─", " ", " ", " ", "─", "─", " ", " " },
+				preview = false,
+			},
+		})
+		local builtin = require('telescope.builtin')
+		vim.keymap.set('n', '<leader>f', builtin.find_files, {})
+		vim.keymap.set('n', '<leader>r', builtin.live_grep, {})
+		vim.keymap.set('n', '<leader>b', function()
+			builtin.buffers({ sort_mru = true, ignore_current_buffer = true})
+		end)
+	end
 }