new stuff
This commit is contained in:
parent
5f1247a7a2
commit
31b34ea116
2 changed files with 67 additions and 51 deletions
102
.emacs.d/init.el
102
.emacs.d/init.el
|
@ -13,6 +13,13 @@
|
||||||
(setq use-package-always-ensure t)
|
(setq use-package-always-ensure t)
|
||||||
(setq native-comp-async-report-warnings-errors 'silent)
|
(setq native-comp-async-report-warnings-errors 'silent)
|
||||||
|
|
||||||
|
;; Fix: Ensure tree-sitter and language grammars are available
|
||||||
|
(when (executable-find "tree-sitter")
|
||||||
|
(use-package tree-sitter
|
||||||
|
:hook (prog-mode . tree-sitter-mode))
|
||||||
|
(use-package tree-sitter-langs
|
||||||
|
:after tree-sitter))
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; APPEARANCE & THEMES ;;
|
;; APPEARANCE & THEMES ;;
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
@ -21,26 +28,21 @@
|
||||||
(add-to-list 'default-frame-alist '(alpha . (95 . 95)))
|
(add-to-list 'default-frame-alist '(alpha . (95 . 95)))
|
||||||
|
|
||||||
(use-package doom-themes
|
(use-package doom-themes
|
||||||
:ensure t)
|
:ensure t
|
||||||
(load-theme 'doom-palenight t)
|
:config
|
||||||
|
(load-theme 'doom-palenight t))
|
||||||
;; (load-theme 'modus-vivendi-tritanopia t)
|
;; (load-theme 'modus-vivendi-tritanopia t)
|
||||||
|
|
||||||
(menu-bar-mode -1)
|
(menu-bar-mode -1)
|
||||||
;;(tab-bar-mode -1)
|
|
||||||
(tool-bar-mode -1)
|
(tool-bar-mode -1)
|
||||||
(scroll-bar-mode -1)
|
(scroll-bar-mode -1)
|
||||||
|
|
||||||
(use-package rainbow-mode
|
(use-package rainbow-mode
|
||||||
:ensure t
|
|
||||||
:hook (prog-mode . rainbow-mode))
|
:hook (prog-mode . rainbow-mode))
|
||||||
|
|
||||||
;; (setq display-line-numbers-type 'relative)
|
|
||||||
(global-display-line-numbers-mode t)
|
(global-display-line-numbers-mode t)
|
||||||
|
|
||||||
(setq ring-bell-function 'ignore)
|
(setq ring-bell-function 'ignore)
|
||||||
|
|
||||||
;;(set-face-attribute 'default nil :font "Cozette-15")
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; UI & INTERFACE ;;
|
;; UI & INTERFACE ;;
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
@ -49,9 +51,11 @@
|
||||||
inhibit-startup-echo-area-message t)
|
inhibit-startup-echo-area-message t)
|
||||||
|
|
||||||
(use-package all-the-icons
|
(use-package all-the-icons
|
||||||
:if (display-graphic-p))
|
:if (display-graphic-p)
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
(use-package doom-modeline
|
(use-package doom-modeline
|
||||||
|
:ensure t
|
||||||
:init (doom-modeline-mode 1)
|
:init (doom-modeline-mode 1)
|
||||||
:config
|
:config
|
||||||
(setq doom-modeline-height 15
|
(setq doom-modeline-height 15
|
||||||
|
@ -59,25 +63,32 @@
|
||||||
doom-modeline-enable-word-count t))
|
doom-modeline-enable-word-count t))
|
||||||
|
|
||||||
(use-package elcord
|
(use-package elcord
|
||||||
|
:ensure t
|
||||||
:config (elcord-mode))
|
:config (elcord-mode))
|
||||||
|
|
||||||
(use-package minimap)
|
(use-package minimap
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
(use-package neotree
|
(use-package neotree
|
||||||
|
:ensure t
|
||||||
:bind ([f9] . neotree-toggle))
|
:bind ([f9] . neotree-toggle))
|
||||||
|
|
||||||
(use-package vertico
|
(use-package vertico
|
||||||
|
:ensure t
|
||||||
:init (vertico-mode))
|
:init (vertico-mode))
|
||||||
|
|
||||||
(use-package marginalia
|
(use-package marginalia
|
||||||
|
:ensure t
|
||||||
:after vertico
|
:after vertico
|
||||||
:hook (vertico-mode . marginalia-mode))
|
:hook (vertico-mode . marginalia-mode))
|
||||||
|
|
||||||
(use-package consult
|
(use-package consult
|
||||||
|
:ensure t
|
||||||
:bind (("C-s" . consult-line)
|
:bind (("C-s" . consult-line)
|
||||||
("C-x b" . consult-buffer)))
|
("C-x b" . consult-buffer)))
|
||||||
|
|
||||||
(use-package which-key
|
(use-package which-key
|
||||||
|
:ensure t
|
||||||
:config (which-key-mode))
|
:config (which-key-mode))
|
||||||
|
|
||||||
(use-package centaur-tabs
|
(use-package centaur-tabs
|
||||||
|
@ -95,36 +106,31 @@
|
||||||
;; EDITOR BEHAVIOR ;;
|
;; EDITOR BEHAVIOR ;;
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
;; (use-package evil
|
|
||||||
;; :config (evil-mode 1))
|
|
||||||
|
|
||||||
(use-package swiper
|
|
||||||
:bind (("C-s" . swiper)
|
|
||||||
("C-M-s" . isearch-forward)))
|
|
||||||
|
|
||||||
(use-package company
|
(use-package company
|
||||||
|
:ensure t
|
||||||
:hook (prog-mode . company-mode))
|
:hook (prog-mode . company-mode))
|
||||||
|
|
||||||
(use-package yasnippet
|
(use-package yasnippet
|
||||||
|
:ensure t
|
||||||
:hook (prog-mode . yas-minor-mode))
|
:hook (prog-mode . yas-minor-mode))
|
||||||
|
|
||||||
(use-package flycheck
|
(use-package flycheck
|
||||||
|
:ensure t
|
||||||
:hook (prog-mode . flycheck-mode))
|
:hook (prog-mode . flycheck-mode))
|
||||||
|
|
||||||
(use-package lsp-mode
|
(use-package lsp-mode
|
||||||
|
:ensure t
|
||||||
|
:commands lsp
|
||||||
|
:init
|
||||||
|
(setq lsp-keymap-prefix "C-c l")
|
||||||
:hook ((lua-mode . lsp)
|
:hook ((lua-mode . lsp)
|
||||||
(java-mode . lsp)
|
(java-mode . lsp)
|
||||||
(c-mode . lsp)
|
(c-mode . lsp)
|
||||||
(sh-mode . lsp))
|
(sh-mode . lsp)))
|
||||||
:commands lsp)
|
|
||||||
|
|
||||||
(use-package lsp-ui
|
(use-package lsp-ui
|
||||||
|
:ensure t
|
||||||
:commands lsp-ui-mode)
|
:commands lsp-ui-mode)
|
||||||
;;treesitter and syntax!
|
|
||||||
(use-package tree-sitter
|
|
||||||
:hook (prog-mode . tree-sitter-mode))
|
|
||||||
|
|
||||||
(use-package tree-sitter-langs)
|
|
||||||
|
|
||||||
(use-package vterm
|
(use-package vterm
|
||||||
:ensure t
|
:ensure t
|
||||||
|
@ -135,28 +141,44 @@
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(use-package nix-mode
|
(use-package nix-mode
|
||||||
|
:ensure t
|
||||||
:mode "\\.nix\\'")
|
:mode "\\.nix\\'")
|
||||||
|
|
||||||
(use-package lua-mode)
|
(use-package lua-mode
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
(use-package fennel-mode
|
(use-package fennel-mode
|
||||||
:mode "\\.fnl\\'"
|
:ensure t
|
||||||
|
:mode "\\.fnl\\'")
|
||||||
|
|
||||||
|
(use-package macrostep
|
||||||
|
:ensure t
|
||||||
:hook (fennel-mode . macrostep-mode))
|
:hook (fennel-mode . macrostep-mode))
|
||||||
|
|
||||||
(use-package macrostep)
|
(use-package cc-mode
|
||||||
|
:ensure t)
|
||||||
(use-package cc-mode)
|
|
||||||
|
|
||||||
(use-package lsp-java
|
(use-package lsp-java
|
||||||
:after lsp)
|
:ensure t
|
||||||
|
:after lsp
|
||||||
|
:config
|
||||||
|
(require 'lsp-java-boot)
|
||||||
|
(add-hook 'java-mode-hook #'lsp))
|
||||||
|
|
||||||
(use-package gradle-mode)
|
(use-package gradle-mode
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
(use-package sh-script)
|
(use-package sh-script
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;; make sure packages are proper, on first run
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
(when (not (package-installed-p 'lsp-java))
|
||||||
;; written by coasteen! :3
|
(package-install 'lsp-java))
|
||||||
|
|
||||||
|
(when (not (package-installed-p 'tree-sitter-langs))
|
||||||
|
(package-install 'tree-sitter-langs))
|
||||||
|
|
||||||
|
;; Custom settings
|
||||||
(custom-set-variables
|
(custom-set-variables
|
||||||
;; custom-set-variables was added by Custom.
|
;; custom-set-variables was added by Custom.
|
||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
|
@ -165,14 +187,8 @@
|
||||||
'(custom-safe-themes
|
'(custom-safe-themes
|
||||||
'("0325a6b5eea7e5febae709dab35ec8648908af12cf2d2b569bedc8da0a3a81c1"
|
'("0325a6b5eea7e5febae709dab35ec8648908af12cf2d2b569bedc8da0a3a81c1"
|
||||||
default))
|
default))
|
||||||
'(package-selected-packages
|
'(package-selected-packages nil))
|
||||||
'(centaur-tabs company consult dired-filter dired-sidebar
|
|
||||||
doom-modeline doom-themes elcord evil fennel-mode
|
|
||||||
flycheck gradle-mode gruvbox-theme lsp-java lsp-ui
|
|
||||||
lua-mode macrostep marginalia melancholy-theme
|
|
||||||
minimap moody neotree nix-mode rainbow-mode swiper
|
|
||||||
tree-sitter-langs treemacs-all-the-icons
|
|
||||||
treemacs-projectile vertico vterm yasnippet)))
|
|
||||||
(custom-set-faces
|
(custom-set-faces
|
||||||
;; custom-set-faces was added by Custom.
|
;; custom-set-faces was added by Custom.
|
||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
|
|
4
.zshrc
4
.zshrc
|
@ -14,10 +14,10 @@ comp_options+=(globdots)
|
||||||
ZSH_THEME="gentoo" && export ZSH=$HOME/.oh-my-zsh && source $ZSH/oh-my-zsh.sh
|
ZSH_THEME="gentoo" && export ZSH=$HOME/.oh-my-zsh && source $ZSH/oh-my-zsh.sh
|
||||||
#source
|
#source
|
||||||
source "$HOME/.config/shell/aliases" && source "$HOME/.config/shell/exports" && source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh && fpath=(/usr/share/zsh/site-functions $fpath) && source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
source "$HOME/.config/shell/aliases" && source "$HOME/.config/shell/exports" && source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh && fpath=(/usr/share/zsh/site-functions $fpath) && source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||||
#evaluere
|
|
||||||
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
|
||||||
#farver
|
#farver
|
||||||
autoload -U colors && colors && setopt prompt_subst
|
autoload -U colors && colors && setopt prompt_subst
|
||||||
|
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=5"
|
||||||
|
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=12"
|
||||||
#prompt
|
#prompt
|
||||||
[ "$(id -u)" = 0 ] && PS1ICON="#" || PS1ICON='%' && PROMPT='%{$(echo -e "\e[38;2;254;128;25m")%}[%{$(echo -e "\e[38;2;235;219;178m")%}%n%{$(echo -e "\e[38;2;200;200;200m")%}@%{$(echo -e "\e[38;2;131;165;152m")%}coast %{$(echo -e "\e[38;2;235;219;178m")%}%~%{$(echo -e "\e[38;2;254;128;25m")%}]%$PS1ICON%{$(echo -e "\e[0m")%} '
|
[ "$(id -u)" = 0 ] && PS1ICON="#" || PS1ICON='%' && PROMPT='%{$(echo -e "\e[38;2;254;128;25m")%}[%{$(echo -e "\e[38;2;235;219;178m")%}%n%{$(echo -e "\e[38;2;200;200;200m")%}@%{$(echo -e "\e[38;2;131;165;152m")%}coast %{$(echo -e "\e[38;2;235;219;178m")%}%~%{$(echo -e "\e[38;2;254;128;25m")%}]%$PS1ICON%{$(echo -e "\e[0m")%} '
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue