1
0
mirror of https://github.com/alrayyes/dotfiles/ synced 2023-11-14 15:56:30 +00:00

feat(emacs): added magit & projectile

This commit is contained in:
Ryan Kes 2021-05-06 19:25:50 +02:00
parent 1f1a1634cf
commit 68bd3d9fb0
3 changed files with 60 additions and 23 deletions

View File

@ -52,12 +52,14 @@ A repository of my personal configuration files.
* Applications installed by script * Applications installed by script
** Applications ** Applications
- [[https://github.com/ggreer/the_silver_searcher][ag]]
- [[https://github.com/sharkdp/bat][bat]] - [[https://github.com/sharkdp/bat][bat]]
- [[https://github.com/tgraf/bmon][bmon]] - [[https://github.com/tgraf/bmon][bmon]]
- [[https://dystroy.org/broot/][broot]] - [[https://dystroy.org/broot/][broot]]
- [[https://brave.com/][brave]] - [[https://brave.com/][brave]]
- [[https://github.com/caffeine-ng/caffeine-ng][caffeine-ng]] - [[https://github.com/caffeine-ng/caffeine-ng][caffeine-ng]]
- [[https://the.exa.website/][exa]] - [[https://the.exa.website/][exa]]
- [[https://github.com/sharkdp/fd][fd]]
- [[https://github.com/pixelb/fslint][fslint]] - [[https://github.com/pixelb/fslint][fslint]]
- [[https://github.com/junegunn/fzf][fzf]] - [[https://github.com/junegunn/fzf][fzf]]
- [[https://gnupg.org/][gnupg]] - [[https://gnupg.org/][gnupg]]

View File

@ -4,8 +4,9 @@
* About * About
My personal Emacs config. My personal Emacs config.
** init.el * init.el
To load this config add the following to ~init.el~ To load this config add the following to ~init.el~
#+begin_example #+begin_example
(org-babel-load-file (org-babel-load-file
(expand-file-name (expand-file-name
@ -24,7 +25,6 @@
(unless package-archive-contents (unless package-archive-contents
(package-refresh-contents)) (package-refresh-contents))
#+end_src #+end_src
** Use-Package ** Use-Package
The ~use-package~ macro allows you to isolate package configuration in your ~.emacs~ file in a way that is both performance-oriented and, well, tidy. The ~use-package~ macro allows you to isolate package configuration in your ~.emacs~ file in a way that is both performance-oriented and, well, tidy.
@ -36,7 +36,6 @@
;; "ensure" packages by default ;; "ensure" packages by default
(setq use-package-always-ensure t) (setq use-package-always-ensure t)
#+end_src #+end_src
** Ensure ** Ensure
The ~:ensure~ keyword causes the package(s) to be installed automatically if not already present on your system The ~:ensure~ keyword causes the package(s) to be installed automatically if not already present on your system
@ -47,7 +46,7 @@
* General Configuration * General Configuration
** User Interface ** User Interface
Start with minimal interface *** Start with minimal interface
#+begin_src emacs-lisp #+begin_src emacs-lisp
(setq inhibit-startup-message t) ;; Disable startup message (setq inhibit-startup-message t) ;; Disable startup message
@ -59,8 +58,7 @@
;; Set up the visible bell ;; Set up the visible bell
(setq visible-bell t) (setq visible-bell t)
#+end_src #+end_src
*** Enable line numbers and customize their format.
Enable line numbers and customize their format.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(column-number-mode) (column-number-mode)
(global-display-line-numbers-mode t) (global-display-line-numbers-mode t)
@ -91,6 +89,7 @@ Enable line numbers and customize their format.
:custom (doom-modeline-height 15)) :custom (doom-modeline-height 15))
#+end_src #+end_src
* Keyboard Bindings * Keyboard Bindings
** Escape Cancels All ** Escape Cancels All
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -98,7 +97,6 @@ Enable line numbers and customize their format.
#+end_src #+end_src
** Evil Mode ** Evil Mode
*** General *** General
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package evil (use-package evil
@ -110,6 +108,7 @@ Enable line numbers and customize their format.
*** Evil Collection *** Evil Collection
Evil Collection is also installed since it adds 'evil' bindings to parts of Emacs that the standard Evil package does not cover, such as: calendar, help-mode and ibuffer. Evil Collection is also installed since it adds 'evil' bindings to parts of Emacs that the standard Evil package does not cover, such as: calendar, help-mode and ibuffer.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package evil-collection (use-package evil-collection
:after evil :after evil
@ -119,6 +118,7 @@ Enable line numbers and customize their format.
** General Keybindings ** General Keybindings
[[https://github.com/noctuid/general.el][general.el]] provides a more convenient way to bind keys in emacs for both evil and non-evil users. ~general-define-key~ allows defining multiple keys at once, implicitly wrapping key strings with (kbd ...), having named prefix key sequences (like the leader key in vim), and more. [[https://github.com/noctuid/general.el][general.el]] provides a more convenient way to bind keys in emacs for both evil and non-evil users. ~general-define-key~ allows defining multiple keys at once, implicitly wrapping key strings with (kbd ...), having named prefix key sequences (like the leader key in vim), and more.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package general (use-package general
:config :config
@ -131,13 +131,15 @@ Enable line numbers and customize their format.
#+end_src #+end_src
** Keybinding Panel (which-key) ** Keybinding Panel (which-key)
[[https://github.com/justbur/emacs-which-key][which-key]] shows an overview of what keybindings are available based on the prefix keys you entered. [[https://github.com/justbur/emacs-which-key][which-key]] shows an overview of what keybindings are available based on the prefix keys you entered.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package which-key (use-package which-key
:init (which-key-mode) :init (which-key-mode)
:config(setq which-key-idle-delay 0.3)) :config(setq which-key-idle-delay 0.3))
#+end_src #+end_src
* Ivy * Ivy
** General ** General
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -161,7 +163,8 @@ Enable line numbers and customize their format.
#+end_src #+end_src
** Ivy-rich ** Ivy-rich
[[https://github.com/Yevgnen/ivy-rich][ivy-rich]] comes with rich transformers for commands from ~ivy~ and ~counsel~. [[https://github.com/Yevgnen/ivy-rich][ivy-rich]] comes with rich transformers for commands from ~ivy~ and ~counsel~.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package ivy-rich (use-package ivy-rich
:after counsel :after counsel
@ -170,9 +173,8 @@ Enable line numbers and customize their format.
#+end_src #+end_src
** Counsel ** Counsel
~ivy-mode~ ensures that any Emacs command using ~completing-read-function~ uses ivy for completion. ~ivy-mode~ ensures that any Emacs command using ~completing-read-function~ uses ivy for completion. Counsel takes this further, providing versions of common Emacs commands that are customised to make the best use of Ivy. For example, ~counsel-find-file~ has some additional keybindings. Pressing ~DEL~ will move you to the parent directory.
Counsel takes this further, providing versions of common Emacs commands that are customised to make the best use of Ivy. For example, ~counsel-find-file~ has some additional keybindings. Pressing ~DEL~ will move you to the parent directory.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package counsel (use-package counsel
:demand t :demand t
@ -189,27 +191,60 @@ Counsel takes this further, providing versions of common Emacs commands that are
(setq ivy-initial-inputs-alist nil)) ;; Don't start searches with ^ (setq ivy-initial-inputs-alist nil)) ;; Don't start searches with ^
#+end_src #+end_src
* Development * Development
** Languages ** Languages
*** Emacs Lisp *** Emacs Lisp
**** Helpful **** Helpful
[[https://github.com/Wilfred/helpful][Helpful]] is an alternative to the built-in Emacs help that provides much more contextual information. [[https://github.com/Wilfred/helpful][Helpful]] is an alternative to the built-in Emacs help that provides much more contextual information.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package helpful (use-package helpful
:custom :custom
(counsel-describe-function-function #'helpful-callable) (counsel-describe-function-function #'helpful-callable)
(counsel-describe-variable-function #'helpful-variable) (counsel-describe-variable-function #'helpful-variable)
:bind :bind
([remap describe-function] . helpful-function) ([remap describe-function] . helpful-function)
([remap describe-symbol] . helpful-symbol) ([remap describe-symbol] . helpful-symbol)
([remap describe-variable] . helpful-variable) ([remap describe-variable] . helpful-variable)
([remap describe-command] . helpful-command) ([remap describe-command] . helpful-command)
([remap describe-key] . helpful-key)) ([remap describe-key] . helpful-key))
#+end_src #+end_src
** Productivity ** Productivity
*** Rainbow Delimiters *** Rainbow Delimiters
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package rainbow-delimiters (use-package rainbow-delimiters
:hook (prog-mode . rainbow-delimiters-mode)) :hook (prog-mode . rainbow-delimiters-mode))
#+end_src #+end_src
***
** Projectile
[[https://github.com/bbatsov/projectile][Projectile]] is a project interaction library for Emacs. Its goal is to provide a nice set of features operating on a project level without introducing external dependencies (when feasible). For instance - finding project files has a portable implementation written in pure Emacs Lisp without the use of GNU ~find~ (but for performance sake an indexing mechanism backed by external commands exists as well).
#+begin_src emacs-lisp
(use-package projectile
:ensure t
:init
(projectile-mode +1)
(setq projectile-project-search-path '("~/devel/" "~/dotfiles/" "~/Documents/"))
:bind (:map projectile-mode-map
("s-p" . projectile-command-map)
("C-c p" . projectile-command-map)))
#+end_src
*** Counsel-projectile
[[https://github.com/bbatsov/projectile][Projectile]] has native support for using [[https://github.com/abo-abo/swiper][ivy]] as its completion system. [[https://github.com/ericdanan/counsel-projectile][Counsel-projectile]] provides further ivy integration into projectile by taking advantage of ivy's support for selecting from a list of actions and applying an action without leaving the completion session. Concretely, counsel-projectile defines replacements for existing projectile commands as well as new commands that have no projectile counterparts. A minor mode is also provided that adds key bindings for all these commands on top of the projectile key bindings.
#+begin_src emacs-lisp
(use-package counsel-projectile
:after projectile
:config
(counsel-projectile-mode))
#+end_src
** Git
*** Magit
[[https://magit.vc/][Magit]] is a complete text-based user interface to Git. It fills the glaring gap between the Git command-line interface and various GUIs, letting you perform trivial as well as elaborate version control tasks with just a couple of mnemonic key presses.
#+begin_src emacs-lisp
(use-package magit)
#+end_src

View File

@ -1,7 +1,7 @@
#!/usr/bin/env fish #!/usr/bin/env fish
# Prerequisite & inistalled apps # Prerequisite & inistalled apps
set prerequisiteApps bat bmon broot brave caffeine-ng exa fslint fzf graphviz isync imagemagick lightdm-gtk-greeter mailcap neofetch npm pandoc-bin pamixer playerctl pulseaudio pulsemixer python pywal ripgrep stow sxiv tldr trayer udisks2 unclutter xbanish xwallpaper yarn xprop zathura set prerequisiteApps bat bmon broot brave caffeine-ng exa fslint fzf graphviz isync imagemagick lightdm-gtk-greeter mailcap neofetch npm pandoc-bin pamixer playerctl pulseaudio pulsemixer python pywal ripgrep stow sxiv tldr trayer udisks2 unclutter xbanish xwallpaper yarn xprop zathura the_silver_searcher fd
set prerequisiteFonts ttf-linux-libertine noto-fonts noto-fonts-emoji ttf-liberation nerd-fonts-hack set prerequisiteFonts ttf-linux-libertine noto-fonts noto-fonts-emoji ttf-liberation nerd-fonts-hack
set prerequisiteLibraries libxft-bgra set prerequisiteLibraries libxft-bgra
set configuredApps alacritty bspwm castero emacs firejail git gnupg gtk lf dunst mpd mpv mpv-mpris ncmpcpp neomutt neovim picom redshift sxhkd tmux tuir weechat set configuredApps alacritty bspwm castero emacs firejail git gnupg gtk lf dunst mpd mpv mpv-mpris ncmpcpp neomutt neovim picom redshift sxhkd tmux tuir weechat