Compare commits

..

4 commits

Author SHA1 Message Date
81fa7dc931 zsh: add EMACS_SOCKET_NAME 2025-01-30 18:17:55 +01:00
49e9412cda editorconfig: use 2space for .el 2025-01-30 18:16:58 +01:00
743b7a41d5 fonts: use FiraMono, i think 2025-01-30 18:16:38 +01:00
ebd226e0b4 emacs: update init.el 2025-01-30 18:15:59 +01:00
4 changed files with 109 additions and 35 deletions

View file

@ -31,7 +31,59 @@
:config :config
(load-theme 'monokai t)) (load-theme 'monokai t))
(use-package nerd-icons)
(use-package nerd-icons-dired
:hook
(dired-mode . nerd-icons-dired-mode))
(use-package doom-modeline
:init (doom-modeline-mode 1))
;; configure packages ;; configure packages
(use-package vertico
:bind
(:map vertico-map
(
"<tab>" . vertico-insert
)
)
:custom
(vertico-resize t)
(vertico-cycle t)
:config
(vertico-mode))
(use-package marginalia
:after vertico
:custom
(marginalia-align 'right)
(marginalia-max-relative-age 0)
(marginalia-annotators
'(marginalia-annotators-heavy marginalia-annotators-light nil))
:config
(marginalia-mode))
(use-package embark-consult)
(use-package consult
:after vertico
:bind
(("C-s" . 'consult-line)
("C-c p s" . 'consult-line-multi)
("C-x C-b" . 'consult-buffer)
("C-c b b" . 'consult-buffer)
("C-x b" . 'consult-project-buffer)
("C-x C-S-b" . 'ibuffer)))
(use-package embark
:bind (("C-h B" . embark-bindings)))
(use-package orderless
:custom
(completion-styles '(orderless basic))
(completion-category-defaults nil)
(completion-category-overrides '((file (styles partial-completion)))))
(use-package editorconfig (use-package editorconfig
:config :config
(editorconfig-mode 1)) (editorconfig-mode 1))
@ -41,12 +93,8 @@
(use-package company (use-package company
:config :config
(add-hook 'after-init-hook 'global-company-mode)) (add-hook 'after-init-hook 'global-company-mode))
(use-package company-box
(use-package counsel) :hook (company-mode . company-box-mode))
(use-package swiper)
(use-package ivy
:config
(ivy-mode 1))
(use-package flycheck (use-package flycheck
:config :config
@ -57,24 +105,32 @@
(add-hook 'prog-mode-hook 'highlight-indent-guides-mode) (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
(add-hook 'yaml-mode-hook 'highlight-indent-guides-mode) (add-hook 'yaml-mode-hook 'highlight-indent-guides-mode)
(add-hook 'yaml-ts-mode-hook 'highlight-indent-guides-mode) (add-hook 'yaml-ts-mode-hook 'highlight-indent-guides-mode)
:config :custom
(setq highlight-indent-guides-method 'character)) (highlight-indent-guides-method 'character))
(use-package golden-ratio
:config
(golden-ratio-mode 1))
(use-package yaml-mode (use-package yaml-mode
:config :config
(add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode)) (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
(add-to-list 'auto-mode-alist '("\\.yaml\\'" . yaml-mode))) (add-to-list 'auto-mode-alist '("\\.yaml\\'" . yaml-mode)))
(use-package markdown-mode (use-package markdown-mode
:hook (markdown-mode . visual-line-mode)) :hook (markdown-mode . visual-line-mode))
(use-package web-mode) (use-package web-mode)
(add-to-list 'auto-mode-alist '("\\.j2\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.j2\\'" . web-mode))
(use-package nerd-icons) ;; MEOW MODE
(load-file "~/.config/emacs/meow-setup.el")
(use-package meow
:init
(meow-global-mode 1)
:config
(meow-setup))
;; config ;; config
;; defaults ;; modes
(auto-save-mode -1) (auto-save-mode -1)
(global-display-line-numbers-mode 1) (global-display-line-numbers-mode 1)
(menu-bar-mode -1) (menu-bar-mode -1)
@ -83,42 +139,51 @@
(delete-selection-mode +1) (delete-selection-mode +1)
(column-number-mode +1) (column-number-mode +1)
(global-auto-revert-mode +1) (global-auto-revert-mode +1)
(recentf-mode 1) (recentf-mode 1)
(use-package savehist
:ensure nil
:config
(savehist-mode))
;; font
(add-to-list 'default-frame-alist (add-to-list 'default-frame-alist
'(font . "JetBrainsMono Nerd Font Mono-10")) ;; '(font . "JetBrainsMono Nerd Font Mono-10"))
'(font . "FiraMono Nerd Font-11")
'(alpha-background . 95))
(setq ;; options
inhibit-startup-message t (setq inhibit-startup-message t)
ring-bell-function 'ignore (setq ring-bell-function 'ignore)
frame-resize-pixelwise t (setq frame-resize-pixelwise t)
confirm-kill-processes nil (setq confirm-kill-processes nil)
create-lockfiles nil (setq create-lockfiles nil)
backup-directory-alist '(("." . "~/emacs.d/backup")) (setq backup-directory-alist '(("." . "~/emacs.d/backup"))
auto-revert-interval 2 (setq auto-revert-interval 2)
auto-revert-check-vc-info t (setq auto-revert-check-vc-info t)
global-auto-revert-non-file-buffers t (setq global-auto-revert-non-file-buffers t)
auto-revert-verbose nil (setq auto-revert-verbose nil)
custom-file "~/.config/emacs/init.custom.el") (setq custom-file "~/.config/emacs/init.custom.el")
;; parentheses
(use-package paren (use-package paren
:ensure nil :ensure nil
:init (setq show-paren-delay 0) :custom
:config (show-paren-mode +1)) (setq show-paren-delay 0)
:config
(show-paren-mode +1))
;; scrolling ;; scrolling
(autoload 'View-scroll-half-page-forward "view")
(autoload 'View-scroll-half-page-backward "view")
(global-set-key (kbd "C-v") 'View-scroll-half-page-forward)
(global-set-key (kbd "M-v") 'View-scroll-half-page-backward)
(setq (setq
scroll-margin 0 scroll-margin 0
scroll-conservatively 101 scroll-conservatively 101
scroll-preserve-screen-position t scroll-preserve-screen-position t
auto-window-vscroll nil) auto-window-vscroll nil)
(use-package mwheel
:ensure nil
:config (setq mouse-wheel-scroll-amount '(2 ((shift) . 1))
mouse-wheel-progressive-speed nil))
;; keybinds ;; keybinds
(provide 'init) (provide 'init)

View file

@ -36,13 +36,18 @@
</edit> </edit>
</match> </match>
<alias>
<family>nerd-icons-font-family</family>
<prefer><family>JetBrainsMono Nerd Font Mono</family></prefer>
</alias>
<!-- Set default fonts --> <!-- Set default fonts -->
<match target="pattern"> <match target="pattern">
<test name="family" qual="any"> <test name="family" qual="any">
<string>monospace</string> <string>monospace</string>
</test> </test>
<edit name="family" mode="prepend" binding="strong"> <edit name="family" mode="prepend" binding="strong">
<string>JetBrains Mono</string> <string>JetBrainsMono Nerd Font Mono</string>
</edit> </edit>
</match> </match>
<match> <match>

View file

@ -9,7 +9,10 @@ insert_final_newline = true
indent_size = 4 indent_size = 4
indent_style = space indent_style = space
[*.{yml,yaml}] [*.el]
indent_size = 2 indent_size = 2
indent_style = space indent_style = space
[*.{yml,yaml}]
indent_size = 2
indent_style = space

View file

@ -48,4 +48,5 @@ fi
export XBPS_DISTDIR="$HOME/git/void-packages" export XBPS_DISTDIR="$HOME/git/void-packages"
export SVDIR="$HOME/sv" export SVDIR="$HOME/sv"
export EMACS_SOCKET_NAME=$USER-emacsd