.config/emacs/init.el

@@ -31,59 +31,7 @@
     :config
     (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
-(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
     :config
     (editorconfig-mode 1))
@@ -93,8 +41,12 @@
 (use-package company
     :config
     (add-hook 'after-init-hook 'global-company-mode))
-(use-package company-box
+
-    :hook (company-mode . company-box-mode))
+(use-package counsel)
+(use-package swiper)
+(use-package ivy
+    :config
+    (ivy-mode 1))
 
 (use-package flycheck
     :config
@@ -105,32 +57,24 @@
   (add-hook 'prog-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)
-  :custom
-  (highlight-indent-guides-method 'character))
-
-(use-package golden-ratio
   :config
-    (golden-ratio-mode 1))
+  (setq highlight-indent-guides-method 'character))
 
 (use-package yaml-mode
     :config
     (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
     (add-to-list 'auto-mode-alist '("\\.yaml\\'" . yaml-mode)))
+
 (use-package markdown-mode
     :hook (markdown-mode . visual-line-mode))
+
 (use-package web-mode)
 (add-to-list 'auto-mode-alist '("\\.j2\\'" . web-mode))
 
-;; MEOW MODE
+(use-package nerd-icons)
-(load-file "~/.config/emacs/meow-setup.el")
-(use-package meow
-    :init
-    (meow-global-mode 1)
-    :config
-    (meow-setup))
 
 ;; config
-;; modes
+;; defaults
 (auto-save-mode -1)
 (global-display-line-numbers-mode 1)
 (menu-bar-mode -1)
@@ -139,51 +83,42 @@
 (delete-selection-mode +1)
 (column-number-mode +1)
 (global-auto-revert-mode +1)
+
 (recentf-mode 1)
 
-(use-package savehist
-    :ensure nil
-    :config
-    (savehist-mode))
-
-;; font
 (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))
 
-;; options
+(setq
-(setq inhibit-startup-message t)
+    inhibit-startup-message t
-(setq ring-bell-function 'ignore)
+    ring-bell-function 'ignore
-(setq frame-resize-pixelwise t)
+    frame-resize-pixelwise t
-(setq confirm-kill-processes nil)
+    confirm-kill-processes nil
-(setq create-lockfiles nil)
+    create-lockfiles nil
-(setq backup-directory-alist '(("." . "~/emacs.d/backup"))
+    backup-directory-alist '(("." . "~/emacs.d/backup"))
-(setq auto-revert-interval 2)
+    auto-revert-interval 2
-(setq auto-revert-check-vc-info t)
+    auto-revert-check-vc-info t
-(setq global-auto-revert-non-file-buffers t)
+    global-auto-revert-non-file-buffers t
-(setq auto-revert-verbose nil)
+    auto-revert-verbose nil
-(setq custom-file "~/.config/emacs/init.custom.el")
+    custom-file "~/.config/emacs/init.custom.el")
 
-;; parentheses
 (use-package paren
     :ensure nil
-    :custom
+    :init (setq show-paren-delay 0)
-    (setq show-paren-delay 0)
+    :config (show-paren-mode +1))
-    :config
-    (show-paren-mode +1))
 
 ;; 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
     scroll-margin 0
     scroll-conservatively 101
     scroll-preserve-screen-position t
     auto-window-vscroll nil)
 
+(use-package mwheel
+    :ensure nil
+    :config (setq mouse-wheel-scroll-amount '(2 ((shift) . 1))
+                mouse-wheel-progressive-speed nil))
+
 ;; keybinds
 
 (provide 'init)

.config/fontconfig/fonts.conf

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

.editorconfig

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

.void.zprofile

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