push
This commit is contained in:
coast
parent
0c609481d5
commit
eb8192d42a
2 changed files with 86 additions and 104 deletions
187
.emacs.d/init.el
187
.emacs.d/init.el
|
|
@ -1,147 +1,135 @@
|
|||
;; ---------------------------
|
||||
;; PACKAGE & USE-PACKAGE SETUP
|
||||
;; ---------------------------
|
||||
(require 'package)
|
||||
(setq package-archives
|
||||
'(("melpa" . "https://melpa.org/packages/")
|
||||
("gnu" . "https://elpa.gnu.org/packages/")))
|
||||
(package-initialize)
|
||||
(unless package-archive-contents
|
||||
(package-refresh-contents))
|
||||
(require 'package)
|
||||
(setq package-archives
|
||||
'(("gnu" . "https://elpa.gnu.org/packages/")
|
||||
("melpa" . "https://melpa.org/packages/")))
|
||||
(package-initialize)
|
||||
|
||||
(unless (package-installed-p 'use-package)
|
||||
(package-install 'use-package))
|
||||
(require 'use-package)
|
||||
(setq use-package-always-ensure t)
|
||||
(setq native-comp-async-report-warnings-errors 'silent)
|
||||
;; ---------------------------
|
||||
;; APPEARANCE & THEMES
|
||||
;; ---------------------------
|
||||
(set-frame-parameter (selected-frame) 'alpha '(95 . 95))
|
||||
(add-to-list 'default-frame-alist '(alpha . (95 . 95)))
|
||||
|
||||
(use-package doom-themes
|
||||
:config
|
||||
(load-theme 'doom-tokyo-night t))
|
||||
|
||||
;; THEMES & APPEARANCE
|
||||
(set-frame-parameter (selected-frame) 'alpha '(90 . 90))
|
||||
(add-to-list 'default-frame-alist '(alpha . (90 . 90)))
|
||||
|
||||
(menu-bar-mode -1)
|
||||
(tool-bar-mode -1)
|
||||
(scroll-bar-mode -1)
|
||||
(global-display-line-numbers-mode 1)
|
||||
|
||||
(use-package rainbow-mode
|
||||
:ensure t
|
||||
:hook (prog-mode . rainbow-mode))
|
||||
(rainbow-mode)
|
||||
|
||||
(global-display-line-numbers-mode t)
|
||||
(setq ring-bell-function 'ignore)
|
||||
;; ---------------------------
|
||||
;; UI & INTERFACE
|
||||
;; ---------------------------
|
||||
(setq inhibit-startup-message t
|
||||
inhibit-startup-echo-area-message t)
|
||||
|
||||
(use-package all-the-icons
|
||||
:if (display-graphic-p))
|
||||
:if (display-graphic-p)
|
||||
:ensure t)
|
||||
|
||||
(use-package powerline
|
||||
:ensure t
|
||||
:config
|
||||
(powerline-default-theme))
|
||||
;; UI & INTERFACE
|
||||
(use-package hl-line
|
||||
:hook (after-init . global-hl-line-mode))
|
||||
|
||||
(use-package elcord
|
||||
:config (elcord-mode))
|
||||
:ensure t
|
||||
:config (elcord-mode 1))
|
||||
|
||||
(use-package minimap
|
||||
:ensure t)
|
||||
|
||||
(use-package minimap)
|
||||
(load-theme 'doom-badger t)
|
||||
|
||||
(use-package neotree
|
||||
:bind ([f9] . neotree-toggle))
|
||||
:ensure t
|
||||
:bind ("<f9>" . neotree-toggle))
|
||||
|
||||
(use-package vertico
|
||||
:init (vertico-mode))
|
||||
:ensure t
|
||||
:config (vertico-mode 1))
|
||||
|
||||
(use-package marginalia
|
||||
:after vertico
|
||||
:ensure t
|
||||
:hook (vertico-mode . marginalia-mode))
|
||||
|
||||
(use-package consult
|
||||
:ensure t
|
||||
:bind (("C-s" . consult-line)
|
||||
("C-x b" . consult-buffer)))
|
||||
|
||||
(use-package which-key
|
||||
:config (which-key-mode))
|
||||
;; ---------------------------
|
||||
;; EDITOR BEHAVIOR
|
||||
;; ---------------------------
|
||||
(global-set-key (kbd "C-s") 'swiper)
|
||||
(global-set-key (kbd "C-r") 'swiper-backward)
|
||||
:ensure t
|
||||
:config (which-key-mode 1))
|
||||
|
||||
(use-package swiper)
|
||||
(use-package swiper
|
||||
:ensure t
|
||||
:bind ("C-r" . swiper-backward))
|
||||
|
||||
;; EDITOR BEHAVIOR
|
||||
(use-package company
|
||||
:ensure t
|
||||
:hook (prog-mode . company-mode))
|
||||
|
||||
(use-package yasnippet
|
||||
:ensure t
|
||||
:hook (prog-mode . yas-minor-mode))
|
||||
|
||||
(use-package flycheck
|
||||
:ensure t
|
||||
:hook (prog-mode . flycheck-mode))
|
||||
|
||||
(use-package lsp-mode
|
||||
:ensure t
|
||||
:commands lsp
|
||||
:init
|
||||
(setq lsp-keymap-prefix "C-c l")
|
||||
:hook ((java-mode . lsp)
|
||||
(c-mode . lsp)
|
||||
(sh-mode . lsp)))
|
||||
:init (setq lsp-keymap-prefix "C-c l")
|
||||
:hook ((java-mode c-mode sh-mode python-mode rust-mode go-mode typescript-mode
|
||||
lua-mode zig-mode web-mode) . lsp))
|
||||
|
||||
(use-package lsp-ui
|
||||
:commands lsp-ui-mode)
|
||||
:ensure t)
|
||||
|
||||
(use-package vterm
|
||||
:bind (("C-c t" . ansi-term)))
|
||||
(use-package lsp-java
|
||||
:ensure t
|
||||
:after lsp-mode
|
||||
:hook (java-mode . lsp)
|
||||
:config
|
||||
(require 'lsp-java-boot))
|
||||
|
||||
;; TERMINAL
|
||||
(global-set-key (kbd "C-c t") 'ansi-term)
|
||||
|
||||
;; WEB/HTML/CSS/JS
|
||||
(use-package web-mode
|
||||
:mode "\\.html?\\'"
|
||||
:ensure t
|
||||
:mode ("\\.html?\\'" . web-mode)
|
||||
:config
|
||||
(setq web-mode-enable-auto-pairing t
|
||||
web-mode-enable-auto-closing t
|
||||
web-mode-enable-auto-expanding t))
|
||||
|
||||
(use-package emmet-mode
|
||||
:ensure t
|
||||
:hook ((web-mode html-mode css-mode) . emmet-mode)
|
||||
:config
|
||||
(setq emmet-expand-jsx-className? t))
|
||||
|
||||
;; Pairs
|
||||
(electric-pair-mode 1)
|
||||
|
||||
(setq electric-pair-pairs '(
|
||||
(?\" . ?\")
|
||||
(?\{ . ?\})
|
||||
(?\( . ?\))
|
||||
(?\[ . ?\])
|
||||
(?\< . ?\>)
|
||||
))
|
||||
|
||||
(setq electric-pair-pairs '((?\" . ?\") (?\{ . ?\}) (?\( . ?\)) (?\[ . ?\]) (?\< . ?\>)))
|
||||
(setq electric-pair-text-pairs electric-pair-pairs)
|
||||
|
||||
;; LANGUAGES
|
||||
(use-package nix-mode
|
||||
:ensure t
|
||||
:mode "\\.nix\\'")
|
||||
:mode ("\\.nix\\'" . nix-mode))
|
||||
|
||||
(use-package python
|
||||
:ensure nil
|
||||
:mode ("\\.py\\'" . python-mode))
|
||||
|
||||
(use-package sh-script
|
||||
:ensure nil
|
||||
:mode ("\\.sh\\'" . sh-mode))
|
||||
|
||||
(use-package fennel-mode
|
||||
:ensure t
|
||||
:mode "\\.fnl\\'"
|
||||
:mode ("\\.fnl\\'" . fennel-mode)
|
||||
:hook (fennel-mode . macrostep-mode))
|
||||
|
||||
(use-package macrostep
|
||||
|
|
@ -149,40 +137,35 @@
|
|||
|
||||
(use-package zig-mode
|
||||
:ensure t
|
||||
:mode "\\.zig\\'"
|
||||
:mode ("\\.zig\\'" . zig-mode)
|
||||
:hook (zig-mode . lsp-deferred))
|
||||
|
||||
(use-package cc-mode
|
||||
:ensure nil)
|
||||
(use-package cc-mode)
|
||||
|
||||
(use-package lsp-java
|
||||
:after lsp
|
||||
(use-package markdown-mode
|
||||
:ensure t
|
||||
:config
|
||||
(require 'lsp-java-boot)
|
||||
(add-hook 'java-mode-hook #'lsp))
|
||||
|
||||
;; more bs
|
||||
|
||||
(custom-set-variables
|
||||
;; custom-set-variables was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
'(custom-safe-themes
|
||||
'("0325a6b5eea7e5febae709dab35ec8648908af12cf2d2b569bedc8da0a3a81c1"
|
||||
default))
|
||||
'(package-selected-packages
|
||||
'(all-the-icons company consult doom-themes elcord emmet-mode
|
||||
evil-collection evil-commentary evil-surround
|
||||
fennel-mode flycheck lsp-java lsp-ui macrostep
|
||||
marginalia minimap neotree nix-mode powerline
|
||||
python-mode rainbow-mode swiper vertico vterm
|
||||
web-mode yasnippet zig-mode)))
|
||||
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
)
|
||||
:mode ("\\.md\\'" . markdown-mode))
|
||||
|
||||
(use-package lua-mode
|
||||
:ensure t
|
||||
:mode ("\\.lua\\'" . lua-mode))
|
||||
|
||||
(use-package rust-mode
|
||||
:ensure t
|
||||
:mode ("\\.rs\\'" . rust-mode))
|
||||
|
||||
(use-package go-mode
|
||||
:ensure t
|
||||
:mode ("\\.go\\'" . go-mode))
|
||||
|
||||
(use-package typescript-mode
|
||||
:ensure t
|
||||
:mode ("\\.ts\\'" . typescript-mode))
|
||||
|
||||
(use-package toml-mode
|
||||
:ensure t
|
||||
:mode ("\\.toml\\'" . toml-mode))
|
||||
|
||||
(use-package yaml-mode
|
||||
:ensure t
|
||||
:mode ("\\.ya?ml\\'" . yaml-mode))
|
||||
|
|
|
|||
3
.zshrc
3
.zshrc
|
|
@ -16,6 +16,5 @@ source /usr/share/zsh/site-functions/zsh-autosuggestions.zsh && fpath=(/usr/shar
|
|||
autoload -U colors && colors && setopt prompt_subst
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=5"
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=12"
|
||||
PROMPT="%F{25}[%f%F{25}!%f%F{25}%n%f%F{25}@%f%F{25}%m%f %F{28}%~%f%F{25}]%f%B%F{7}%% %b"
|
||||
|
||||
PROMPT='%F{33}[%f%F{75}!%f%F{33}%n%f%F{33}@%f%F{33}%m%f %F{75}%~%f%F{33}]%f%F{75}%% '
|
||||
source ~/.zprofile
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue