summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Jamison <jackqjamison@gmail.com>2025-09-03 13:52:24 -0400
committerJack Jamison <jackqjamison@gmail.com>2025-09-03 13:52:24 -0400
commit9b91697b98b15c360d590d0e736c781957859ca1 (patch)
tree2700d22902efaf23cb903fb2b5a1b3e36a7e7716
parentf85b4a67f6d4a679c06be01199cca8a84db48a19 (diff)
simlock and projectile
-rw-r--r--.config/emacs/settings.org48
-rw-r--r--.config/hypr/binds.conf23
-rw-r--r--.config/hypr/hypridle.conf2
3 files changed, 40 insertions, 33 deletions
diff --git a/.config/emacs/settings.org b/.config/emacs/settings.org
index 0e8de39..9ea533a 100644
--- a/.config/emacs/settings.org
+++ b/.config/emacs/settings.org
@@ -52,7 +52,8 @@
glsl-mode
indent-bars
evil
- evil-collection))
+ evil-collection
+ projectile))
#+END_SRC
** Packages
#+BEGIN_SRC emacs-lisp
@@ -336,25 +337,6 @@
#+END_SRC
-* Misc Binds
-#+BEGIN_SRC emacs-lisp
-
-;; shortcuts
-(use-package consult
- :custom
- ;; Disable preview
- (consult-preview-key nil)
- :bind
- (("C-x b" . 'consult-buffer) ;; Switch buffer, including recentf and bookmarks
- ("M-l" . 'consult-git-grep) ;; Search inside a project
- ("M-y" . 'consult-yank-pop) ;; Paste by selecting the kill-ring
- ("M-s" . 'consult-line) ;; Search current buffer, like swiper
- ("C-c i" . 'consult-imenu) ;; Search the imenu
- ))
-
-(global-set-key (kbd "C-c f") 'ff-find-other-file)
-
-#+END_SRC
* Development
** Magit
#+BEGIN_SRC emacs-lisp
@@ -468,6 +450,10 @@
#+END_SRC
+** Projectile
+#+BEGIN_SRC emacs-lisp
+(use-package projectile)
+#+END_SRC
** C-like settings
#+BEGIN_SRC emacs-lisp
@@ -501,3 +487,25 @@
(use-package glsl-mode)
#+END_SRC
+
+* Misc Binds
+#+BEGIN_SRC emacs-lisp
+
+;; shortcuts
+(use-package consult
+ :custom
+ ;; Disable preview
+ (consult-preview-key nil)
+ :bind
+ (("C-x b" . 'consult-buffer) ;; Switch buffer, including recentf and bookmarks
+ ("M-l" . 'consult-git-grep) ;; Search inside a project
+ ("M-y" . 'consult-yank-pop) ;; Paste by selecting the kill-ring
+ ("M-s" . 'consult-line) ;; Search current buffer, like swiper
+ ("C-c i" . 'consult-imenu) ;; Search the imenu
+ ))
+
+(global-set-key (kbd "C-c f") 'ff-find-other-file)
+(global-set-key (kbd "C-c g") 'projectile-ripgrep)
+(global-set-key (kbd "C-c F") 'projectile-find-file)
+
+#+END_SRC
diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf
index e3a4112..07849a8 100644
--- a/.config/hypr/binds.conf
+++ b/.config/hypr/binds.conf
@@ -8,25 +8,24 @@ $menu = wmenu-run
$appMenu = fuzzel | xargs hyprctl dispatch exec --
# main binds
-bind = $mainMod, A, exec, $terminal
bind = $mainMod, D, killactive,
-bind = $mainMod, R, exec, $menu
-bind = $mainMod, RETURN, exec, $appMenu
-bind = $mainMod, F, fullscreen
bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill
-
-# more binds
bind = $mainMod, V, togglefloating,
-bind = $mainMod CTRL, P, exec, hyprpicker -a
-bind = $mainMod, L, exec, hyprlock
+bind = $mainMod, F, fullscreen
+bind = $mainMod, SPACE, layoutmsg, swapwithmaster
bind = $mainMod, G, fullscreenstate, 0 3
+bind = $mainMod, R, exec, $menu
+bind = $mainMod, RETURN, exec, $appMenu
+bind = $mainMod SHIFT, Q, exit,
+
+# app and util binds
+bind = $mainMod, A, exec, $terminal
bind = $mainMod, W, exec, $browser
+bind = $mainMod, E, exec, emacsclient -c
+bind = $mainMod CTRL, P, exec, hyprpicker -a
+bind = $mainMod, L, exec, simlock
bind = $mainMod, K, exec, $terminal -e htop
bind = $mainMod SHIFT, B, exec, /bin/sh -c "pidof waybar && pkill -x waybar || waybar"
-bind = $mainMod SHIFT, Q, exit,
-bind = $mainMod, SPACE, layoutmsg, swapwithmaster
-bind = $mainMod, E, exec, emacsclient -c
-bind = $mainMod, K, exec, hyprpicker
# screenshot (region + full)
bind = $mainMod SHIFT, S, exec, screenshot -save
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
index 8a4a3c0..96dfaa7 100644
--- a/.config/hypr/hypridle.conf
+++ b/.config/hypr/hypridle.conf
@@ -1,5 +1,5 @@
general {
- before_sleep_cmd = pidof hyprlock || hyprlock
+ before_sleep_cmd = pidof simlock || simlock
after_sleep_cmd = hyprctl dispatch dpms on
}