Compare commits
No commits in common. "aa9696b9600be74282873637d2306a9e4c751c33" and "e64a4c0f86f391b26f266f3dcfdf7ed0c0ea741a" have entirely different histories.
aa9696b960
...
e64a4c0f86
2 changed files with 3 additions and 229 deletions
227
emacs/init.el
227
emacs/init.el
|
|
@ -1,227 +0,0 @@
|
||||||
(setq inhibit-startup-message t) ; Disable startup message
|
|
||||||
|
|
||||||
(scroll-bar-mode -1)
|
|
||||||
(tool-bar-mode -1)
|
|
||||||
(tooltip-mode -1)
|
|
||||||
(set-fringe-mode 10)
|
|
||||||
|
|
||||||
(menu-bar-mode -1)
|
|
||||||
|
|
||||||
(setq visible-bell t)
|
|
||||||
|
|
||||||
; Maybe set some font like Fira Code
|
|
||||||
|
|
||||||
(require 'package) ; Bring into scope all the package
|
|
||||||
|
|
||||||
(setq package-archives '(("melpa" . "https://melpa.org/packages/")
|
|
||||||
("org" . "https://orgmode.org/elpa/")
|
|
||||||
("elpa" . "https://elpa.gnu.org/packages/")))
|
|
||||||
|
|
||||||
(package-initialize)
|
|
||||||
|
|
||||||
(unless package-archive-contents
|
|
||||||
(package-refresh-contents))
|
|
||||||
|
|
||||||
(unless (package-installed-p 'use-package)
|
|
||||||
(package-install 'use-package))
|
|
||||||
|
|
||||||
(require 'use-package)
|
|
||||||
(setq use-package-always-ensure t)
|
|
||||||
|
|
||||||
(use-package command-log-mode)
|
|
||||||
|
|
||||||
(global-set-key (kbd "<escape>") 'keyboard-escape-quit)
|
|
||||||
|
|
||||||
(use-package ivy
|
|
||||||
:diminish
|
|
||||||
:bind (("C-s" . swiper)
|
|
||||||
:map ivy-minibuffer-map
|
|
||||||
("TAB" . ivy-alt-done)
|
|
||||||
("C-l" . ivy-alt-done)
|
|
||||||
("C-j" . ivy-next-line)
|
|
||||||
("C-k" . ivy-previous-line)
|
|
||||||
:map ivy-switch-buffer-map
|
|
||||||
("C-k" . ivy-previous-line)
|
|
||||||
("C-l" . ivy-done)
|
|
||||||
:map ivy-reverse-i-search-map
|
|
||||||
("C-k" . ivy-previous-line)
|
|
||||||
("C-d" . ivy-reverse-i-search-kill))
|
|
||||||
:config
|
|
||||||
(ivy-mode 1))
|
|
||||||
|
|
||||||
; define-key defines a keybinding but only for a certain keymap, for a certain mode.
|
|
||||||
; (define-key emacs-lisp-mode-map (kbd "C-x M-t") 'counsel-load-theme)
|
|
||||||
|
|
||||||
(use-package general
|
|
||||||
:config
|
|
||||||
;(general-evil-setup t)
|
|
||||||
(general-create-definer rune/leader-keys
|
|
||||||
;:keymaps '(normal insert visual emacs)
|
|
||||||
;:prefix "SPC"
|
|
||||||
:prefix "C-SPC")
|
|
||||||
|
|
||||||
(global-unset-key (kbd "C-SPC"))
|
|
||||||
|
|
||||||
(rune/leader-keys
|
|
||||||
"t" '(:ignore t :which-key "toggles")
|
|
||||||
"tt" '(counsel-load-theme :which-key "choose theme")
|
|
||||||
"p" '(:ignore t :which-key "projectile")
|
|
||||||
"ps" '(counsel-projectile-rg :which-key "search project with rg")
|
|
||||||
"pf" '(counsel-projectile-find-file :which-key "find file in project")
|
|
||||||
"pp" '(counsel-projectile-switch-project :which-key "switch project")
|
|
||||||
"m" '(:ignore t :which-key "magit")
|
|
||||||
"mm" '(magit-status :which-key "magit status")
|
|
||||||
"." '(find-file :which-key "find file"))
|
|
||||||
|
|
||||||
(general-define-key
|
|
||||||
"C-M-j" 'counsel-switch-buffer))
|
|
||||||
|
|
||||||
(use-package counsel
|
|
||||||
:bind (("M-x" . counsel-M-x)
|
|
||||||
("C-x b" . counsel-ibuffer)
|
|
||||||
("C-x C-f" . counsel-find-file)
|
|
||||||
:map minibuffer-local-map
|
|
||||||
("C-r" . 'counsel-minibuffer-history))
|
|
||||||
:config
|
|
||||||
(setq ivy-initial-inputs-alist nil))
|
|
||||||
|
|
||||||
(use-package doom-modeline
|
|
||||||
:ensure t
|
|
||||||
:init (doom-modeline-mode 1)
|
|
||||||
:custom (doom-modeline-height 15))
|
|
||||||
|
|
||||||
(column-number-mode)
|
|
||||||
(global-display-line-numbers-mode t)
|
|
||||||
|
|
||||||
(dolist (mode '(org-mode-hook
|
|
||||||
term-mode-hook
|
|
||||||
eshell-mode-hook))
|
|
||||||
(add-hook mode (lambda () (display-line-numbers-mode 0))))
|
|
||||||
|
|
||||||
(use-package rainbow-delimiters
|
|
||||||
:hook (prog-mode . rainbow-delimiters-mode))
|
|
||||||
|
|
||||||
(use-package which-key
|
|
||||||
:init (which-key-mode) ; init is done even if the package is not loaded
|
|
||||||
:diminish which-key-mode
|
|
||||||
:config (setq which-key-idle-delay 0.3)) ; config is done when the package is loaded
|
|
||||||
|
|
||||||
(use-package ivy-rich
|
|
||||||
:init (ivy-rich-mode 1))
|
|
||||||
|
|
||||||
(use-package helpful
|
|
||||||
:ensure t
|
|
||||||
:custom
|
|
||||||
(counsel-describe-function-function #'helpful-callable)
|
|
||||||
(counsel-describe-variable-function #'helpful-variable)
|
|
||||||
:bind
|
|
||||||
([remap describe-function] . counsel-describe-function)
|
|
||||||
([remap describe-command] . helpful-command)
|
|
||||||
([remap describe-variable] . counsel-describe-variable)
|
|
||||||
([remap describe-key] . helpful-key))
|
|
||||||
|
|
||||||
(use-package doom-themes
|
|
||||||
:init (load-theme 'doom-gruvbox t))
|
|
||||||
|
|
||||||
(use-package all-the-icons)
|
|
||||||
|
|
||||||
(setq select-enable-clipboard t)
|
|
||||||
(setq select-enable-primary t)
|
|
||||||
(setq save-interprogram-paste-before-kill t)
|
|
||||||
|
|
||||||
(defun rune/evil-hook ()
|
|
||||||
(dolist (mode '(custom-mode
|
|
||||||
eshell-mode
|
|
||||||
git-rebase-mode
|
|
||||||
erc-mode
|
|
||||||
circe-server-mode
|
|
||||||
circe-chat-mode
|
|
||||||
circe-query-mode
|
|
||||||
sauron-mode
|
|
||||||
term-mode))
|
|
||||||
(add-to-list 'evil-emacs-state-modes mode)))
|
|
||||||
|
|
||||||
(use-package evil
|
|
||||||
:init
|
|
||||||
(setq evil-want-integration t)
|
|
||||||
(setq evil-want-keybinding nil)
|
|
||||||
(setq evil-want-C-u-scroll t)
|
|
||||||
(setq evil-want-C-i-jump nil)
|
|
||||||
:config
|
|
||||||
(evil-mode 1)
|
|
||||||
(define-key evil-insert-state-map (kbd "C-g") 'evil-normal-state)
|
|
||||||
(define-key evil-insert-state-map (kbd "C-h") 'evil-delete-backward-char-and-join)
|
|
||||||
|
|
||||||
;; Use visual line motions even outside of visual-line-mode buffers
|
|
||||||
(evil-global-set-key 'motion "j" 'evil-next-visual-line)
|
|
||||||
(evil-global-set-key 'motion "k" 'evil-previous-visual-line)
|
|
||||||
|
|
||||||
(evil-set-initial-state 'messages-buffer-mode 'normal)
|
|
||||||
(evil-set-initial-state 'dashboard-mode 'normal))
|
|
||||||
|
|
||||||
|
|
||||||
(use-package evil-collection
|
|
||||||
:after evil
|
|
||||||
:config
|
|
||||||
(evil-collection-init))
|
|
||||||
|
|
||||||
(use-package projectile
|
|
||||||
:diminish projectile-mode
|
|
||||||
:config (projectile-mode)
|
|
||||||
:custom ((projectile-completion-system 'ivy))
|
|
||||||
:bind-keymap
|
|
||||||
("C-c p" . projectile-command-map)
|
|
||||||
:init
|
|
||||||
(when (file-directory-p "~/Projects")
|
|
||||||
(setq projectile-project-search-path '("~/Projects")))
|
|
||||||
(setq projectile-switch-project-action #'projectile-dired))
|
|
||||||
|
|
||||||
(use-package ripgrep
|
|
||||||
:ensure t)
|
|
||||||
|
|
||||||
(use-package rg
|
|
||||||
:ensure t)
|
|
||||||
|
|
||||||
(use-package counsel-projectile
|
|
||||||
:init
|
|
||||||
(unless (fboundp 'projectile-ignored-files-rel)
|
|
||||||
(defalias 'projectile-ignored-files-rel
|
|
||||||
(if (fboundp 'projectile-ignored-files-relative)
|
|
||||||
#'projectile-ignored-files-relative
|
|
||||||
#'projectile-ignored-files)))
|
|
||||||
:after (projectile counsel)
|
|
||||||
:config (counsel-projectile-mode 1))
|
|
||||||
|
|
||||||
(defun rune/counsel-rg-project ()
|
|
||||||
"Search the current project using counsel-rg."
|
|
||||||
(interactive)
|
|
||||||
(counsel-rg nil (projectile-project-root)))
|
|
||||||
|
|
||||||
(rune/leader-keys
|
|
||||||
"p" '(:ignore t :which-key "projectile")
|
|
||||||
"ps" '(rune/counsel-rg-project :which-key "search project with rg")
|
|
||||||
"pf" '(counsel-projectile-find-file :which-key "find file in project")
|
|
||||||
"pp" '(counsel-projectile-switch-project :which-key "switch project"))
|
|
||||||
|
|
||||||
(use-package magit
|
|
||||||
:commands (magit-status magit-get-current-branch)
|
|
||||||
:custom
|
|
||||||
(magit-display-buffer-functioni #'magit-display-buffer-same-window-except-diff-v1))
|
|
||||||
|
|
||||||
(use-package evil-collection
|
|
||||||
:after magit evil)
|
|
||||||
|
|
||||||
(setq auth-sources '("~/.authinfo"))
|
|
||||||
|
|
||||||
(defun marc/org-mode-setup ()
|
|
||||||
(org-indent-mode)
|
|
||||||
(variable-pitch-mode 1)
|
|
||||||
(auto-fill-mode 0)
|
|
||||||
(visual-line-mode 1)
|
|
||||||
(setq evil-auto-indent nil))
|
|
||||||
|
|
||||||
(use-package org
|
|
||||||
:hook (org-mode . marc/org-mode-setup)
|
|
||||||
:config
|
|
||||||
(setq org-ellipsis " ▼"
|
|
||||||
org-hide-emphasis-markers t))
|
|
||||||
|
|
@ -107,11 +107,12 @@ alias bsc="sudo openfortivpn gw.bsc.es:443 -u mmarcos"
|
||||||
|
|
||||||
. "$HOME/.cargo/env"
|
. "$HOME/.cargo/env"
|
||||||
|
|
||||||
export PATH=/home/mmarcos/.opencode/bin:$PATH
|
export PATH=/home/marcmarcos/.opencode/bin:$PATH
|
||||||
export PATH=/home/mmarcos/tools/zig-x86_64-linux-0.17.0-dev.1509+bb296ab9b:$PATH
|
|
||||||
|
|
||||||
export EDITOR=/usr/bin/vim
|
export EDITOR=/usr/bin/vim
|
||||||
|
|
||||||
|
module use /home/marcmarcos/modules/
|
||||||
|
|
||||||
upload() {
|
upload() {
|
||||||
if [ -f "$1" ]; then
|
if [ -f "$1" ]; then
|
||||||
echo "Uploading $1..."
|
echo "Uploading $1..."
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue