Updating some keybindings around projectile to be more platform agnostic

4 files changed, 31 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index dd0a5c7..fbf1e1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,6 @@ org-roam.db
 bookmarks
 tramp
 request
-games
\ No newline at end of file
+games
+eln-cache
+.projectile
\ No newline at end of file
diff --git a/README.md b/README.md
index 79a8f59..b0a5719 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Emacs Configuration file
-Emacs configuration file
+My emacs configuration file. This configuration only works with Emacs version 28.
 
 ## Keybinds
 ### General
@@ -8,19 +8,20 @@ Emacs configuration file
 - Paste: `C-y`
 - Jump to symbol: `M-.`
 - Jump back from symbol: `M-,`
-- Open project: `s-o`
-- Find file in project: `s-p`
-- Grep in project: `s-F`
+- Open project: `C-c p o`
+- Find file in project: `C-c p p`
+- Grep in project: `C-c p f`
 - Refactor : `F2`
 - Move line up/down: `M-<UP/DOWN>`
 - Find references: `M-?`
 - Kill buffer: `C-x k`
+- Toggle tree: `C-c ;`
 
 ## Fonts
 - I make use of `monaco` and `iosevka`.
 
 ## Org mode
-- The configuration assumes that you have an `~/OrgRoam` folder at the root of your home directory.
+- The configuration assumes that you have an `~/OrgRoam` folder and an `~/OrgRoam/daily` folder at the root of your home directory.
 
 ## Per-language Features
 
diff --git a/init.el b/init.el
index 551dc56..fa210d5 100644
--- a/init.el
+++ b/init.el
@@ -4,13 +4,6 @@
 ;; Load path
 (add-to-list 'load-path "~/.emacs.d/lisp/")
 
-(unless (package-installed-p 'use-package)
-  (package-refresh-contents)
-  (package-install 'use-package))
-(eval-and-compile
-  (setq use-package-always-ensure t
-        use-package-expand-minimally t))
-
 ;; Melpa support
 (require 'package)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
@@ -18,6 +11,13 @@
 ;; https://stackoverflow.com/questions/31079204/emacs-package-install-script-in-init-file
 (package-initialize)
 
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+(eval-and-compile
+  (setq use-package-always-ensure t
+        use-package-expand-minimally t))
+
 ;; The default is 800 kilobytes.  Measured in bytes.
 (setq gc-cons-threshold (* 50 1000 1000))
 
@@ -71,7 +71,8 @@
    '("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default))
  '(package-selected-packages
    '(helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box eglot drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
- '(safe-local-variable-values '((js-indent-level . 4))))
+ '(safe-local-variable-values '((js-indent-level . 4)))
+ '(warning-suppress-types '((comp))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/lisp/general.el b/lisp/general.el
index 79a85b3..5173070 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -139,9 +139,9 @@
   (add-to-list 'projectile-globally-ignored-directories "dist")
   (add-to-list 'projectile-project-root-files "package.json")
   (add-to-list 'projectile-globally-ignored-files "package-lock.json")
-  (define-key projectile-mode-map (kbd "s-F") 'projectile-ripgrep)
-  (define-key projectile-mode-map [?\s-o] 'projectile-switch-project)
-  (define-key projectile-mode-map [?\s-p] 'projectile-find-file)
+  (define-key projectile-mode-map (kbd "C-c p f") 'projectile-ripgrep)
+  (define-key projectile-mode-map (kbd "C-c p o") 'projectile-switch-project)
+  (define-key projectile-mode-map (kbd "C-c p p") 'projectile-find-file)
 
   )
 
@@ -183,15 +183,15 @@
   :ensure t)
 
 ;; Emojis
-(use-package emojify
-  :ensure t
-  :config
-  (when (member "Segoe UI Emoji" (font-family-list))
-    (set-fontset-font
-     t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend))
-  (setq emojify-display-style 'unicode)
-  (setq emojify-emoji-styles '(unicode))
-  (bind-key* (kbd "C-c e") #'emojify-insert-emoji)) ; override binding in any mode
+;; (use-package emojify
+;;   :ensure t
+;;   :config
+;;   (when (member "Segoe UI Emoji" (font-family-list))
+;;     (set-fontset-font
+;;      t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend))
+;;   (setq emojify-display-style 'unicode)
+;;   (setq emojify-emoji-styles '(unicode))
+;;   (bind-key* (kbd "C-c e") #'emojify-insert-emoji)) ; override binding in any mode
 
 ;; icons
 (use-package all-the-icons
@@ -201,7 +201,7 @@
 ;; Global key binds
 (bind-key* (kbd "M-.") 'xref-find-definitions)
 (bind-key* (kbd "C-x k") 'kill-this-buffer)
-(bind-key* (kbd "C-;") 'treemacs)
+(bind-key* (kbd "C-C ;") 'treemacs)
 
 (defun my-create-file (filename)
   "Create a file and refresh neotree.  FILENAME File to create."