diff options
| -rw-r--r-- | .bashrc | 2 | ||||
| -rw-r--r-- | .config/alacritty/alacritty.yml | 4 | ||||
| -rw-r--r-- | .config/emacs/Emacs.org | 3 | ||||
| -rw-r--r-- | .config/emacs/init.el | 218 | ||||
| -rw-r--r-- | .config/fastfetch/config.jsonc | 33 | ||||
| -rw-r--r-- | .config/hypr/binds.conf | 24 | ||||
| -rw-r--r-- | .config/mpd/mpd.pid | 2 | ||||
| -rw-r--r-- | .gitignore | 1 |
8 files changed, 162 insertions, 125 deletions
@@ -4,7 +4,7 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return - +fastfetch alias ls='ls --color=auto' alias grep='grep --color=auto' PS1='\[\033[1;1m\]\u\[\033[00m\]@\[\033[34m\]\h \[\033[32m\]\w \[\033[35m\]$(git-ps1)\[\033[00m\]\$ ' diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 79c905e..ce5abcd 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -47,8 +47,8 @@ window: # Blank space added around the window in pixels. This padding is scaled # by DPI and the specified value is always added at both opposing sides. padding: - x: 0 - y: 0 + x: 5 + y: 5 # Spread additional padding evenly around the terminal content. dynamic_padding: false diff --git a/.config/emacs/Emacs.org b/.config/emacs/Emacs.org index 8ecb98e..5865bcc 100644 --- a/.config/emacs/Emacs.org +++ b/.config/emacs/Emacs.org @@ -480,7 +480,8 @@ best git frontend ever (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) - +(use-package tagedit) + #+end_src ** multiple cursors diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 09dace5..5f1978e 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -331,114 +331,116 @@ (global-set-key "\M-f" 'next-word) (use-package lsp-mode - :init - (setq lsp-keymap-prefix "C-c l" - lsp-headerline-breadcrumb-enable nil - lsp-headerline-breadcrumb-icons-enable nil - lsp-keep-workspace-alive nil - lsp-enable-snippet nil - lsp-lens-enable nil) - :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) - (c-mode . lsp) - (c++-mode . lsp) - (python-mode . lsp-deferred) - (csharp-mode . lsp) - ;; if you want which-key integration - (lsp-mode . lsp-enable-which-key-integration)) - :commands lsp) - - -(use-package consult-lsp - :after lsp) - -(defun my-c-mode-common-hook () - ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode - (c-set-offset 'substatement-open 0) - ;; other customizations can go here - - (setq c++-tab-always-indent t) - (setq c-basic-offset 4) ;; Default is 2 - (setq c-indent-level 4) ;; Default is 2 - - (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) - (setq tab-width 4) - (setq indent-tabs-mode t) ; use spaces only if nil - ) - -(add-hook 'c-mode-common-hook 'my-c-mode-common-hook) - -(use-package lsp-ui - :after lsp - :diminish lsp-lens-mode - :config - (setq lsp-ui-sideline-update-mode 'point) - (setq lsp-ui-sideline-show-diagnostics t) - (setq lsp-ui-sideline-ignore-duplicate t)) - -(use-package hydra) - -(use-package lsp-treemacs - :ensure t - :commands lsp-treemacs-errors-list) - -(use-package expand-region) -(global-set-key (kbd "C-=") 'er/expand-region) - -;; company -(use-package company - :ensure t - :diminish - :config - (setq company-show-numbers t - company-minimum-prefix-length 1 - company-idle-delay 0.2 - company-backends - '((company-files - company-keywords - company-capf - company-yasnippet) - (company-abbrev company-dabbrev))) - (global-company-mode +1)) - -(use-package clang-format) -(use-package clang-format+) - - -(use-package company-box - :ensure t - :diminish - :after company - :hook (company-mode . company-box-mode)) - -;; flycheck -(use-package flycheck - :diminish flycheck-mode - :config - (setq flycheck-error-message-buffer " *Flycheck error messages*") - (setq-default flycheck-emacs-lisp-load-path 'inherit) - (global-flycheck-mode 1)) - -(use-package flycheck-pos-tip - :ensure t - :after flycheck - :config - (flycheck-pos-tip-mode)) - -(use-package ccls - :ensure t - :config - :hook ((c-mode c++-mode objc-mode cuda-mode) . - (lambda () (require 'ccls) (lsp))) - (setq ccls-executable "/usr/local/bin/ccls") - (setq ccls-initialization-options - '(:index (:comments 2) :completion (:detailedLabel t)))) - -(use-package srefactor - :ensure t - :config - (semantic-mode 1) - (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) - (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) + :init + (setq lsp-keymap-prefix "C-c l" + lsp-headerline-breadcrumb-enable nil + lsp-headerline-breadcrumb-icons-enable nil + lsp-keep-workspace-alive nil + lsp-enable-snippet nil + lsp-lens-enable nil) + :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) + (c-mode . lsp) + (c++-mode . lsp) + (python-mode . lsp-deferred) + (csharp-mode . lsp) + ;; if you want which-key integration + (lsp-mode . lsp-enable-which-key-integration)) + :commands lsp) + + + (use-package consult-lsp + :after lsp) + + (defun my-c-mode-common-hook () + ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode + (c-set-offset 'substatement-open 0) + ;; other customizations can go here + + (setq c++-tab-always-indent t) + (setq c-basic-offset 4) ;; Default is 2 + (setq c-indent-level 4) ;; Default is 2 + + (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) + (setq tab-width 4) + (setq indent-tabs-mode t) ; use spaces only if nil + ) + + (add-hook 'c-mode-common-hook 'my-c-mode-common-hook) + + (use-package lsp-ui + :after lsp + :diminish lsp-lens-mode + :config + (setq lsp-ui-sideline-update-mode 'point) + (setq lsp-ui-sideline-show-diagnostics t) + (setq lsp-ui-sideline-ignore-duplicate t)) + + (use-package hydra) + + (use-package lsp-treemacs + :ensure t + :commands lsp-treemacs-errors-list) + + (use-package expand-region) + (global-set-key (kbd "C-=") 'er/expand-region) + + ;; company + (use-package company + :ensure t + :diminish + :config + (setq company-show-numbers t + company-minimum-prefix-length 1 + company-idle-delay 0.2 + company-backends + '((company-files + company-keywords + company-capf + company-yasnippet) + (company-abbrev company-dabbrev))) + (global-company-mode +1)) + + (use-package clang-format) + (use-package clang-format+) + + + (use-package company-box + :ensure t + :diminish + :after company + :hook (company-mode . company-box-mode)) + + ;; flycheck + (use-package flycheck + :diminish flycheck-mode + :config + (setq flycheck-error-message-buffer " *Flycheck error messages*") + (setq-default flycheck-emacs-lisp-load-path 'inherit) + (global-flycheck-mode 1)) + + (use-package flycheck-pos-tip + :ensure t + :after flycheck + :config + (flycheck-pos-tip-mode)) + + (use-package ccls + :ensure t + :config + :hook ((c-mode c++-mode objc-mode cuda-mode) . + (lambda () (require 'ccls) (lsp))) + (setq ccls-executable "/usr/local/bin/ccls") + (setq ccls-initialization-options + '(:index (:comments 2) :completion (:detailedLabel t)))) + + (use-package srefactor + :ensure t + :config + (semantic-mode 1) + (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) + (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) + +(use-package tagedit) (use-package multiple-cursors :bind (:map global-map diff --git a/.config/fastfetch/config.jsonc b/.config/fastfetch/config.jsonc new file mode 100644 index 0000000..52344a9 --- /dev/null +++ b/.config/fastfetch/config.jsonc @@ -0,0 +1,33 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "modules": [ + "title", + "separator", + "os", + "host", + "kernel", + "uptime", + "packages", + "shell", + "display", + "de", + "wm", + "wmtheme", + "theme", + "icons", + "font", + "cursor", + "terminal", + "terminalfont", + "cpu", + "gpu", + "memory", + "swap", + "disk", + "battery", + "poweradapter", + "locale", + "break", + "colors" + ] +} diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 62d15a3..54c04b5 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -33,19 +33,19 @@ bind = $mainMod, SPACE, layoutmsg, swapwithmaster bind = $mainMod, E, exec, emacsclient -c # Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, n, cyclenext, prev -bind = $mainMod, p, cyclenext -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d +binde = $mainMod, left, movefocus, l +binde = $mainMod, right, movefocus, r +binde = $mainMod, n, cyclenext, prev +binde = $mainMod, p, cyclenext +binde = $mainMod, up, movefocus, u +binde = $mainMod, down, movefocus, d -bind = $mainMod SHIFT,left ,movewindow, l -bind = $mainMod SHIFT,right ,movewindow, r -bind = $mainMod SHIFT, n, swapnext, prev -bind = $mainMod SHIFT, p, swapnext -bind = $mainMod SHIFT,up ,movewindow, u -bind = $mainMod SHIFT,down ,movewindow, d +binde = $mainMod SHIFT,left ,movewindow, l +binde = $mainMod SHIFT,right ,movewindow, r +binde = $mainMod SHIFT, n, swapnext, prev +binde = $mainMod SHIFT, p, swapnext +binde = $mainMod SHIFT,up ,movewindow, u +binde = $mainMod SHIFT,down ,movewindow, d # controls binde = , xf86monbrightnessup , exec, brightnessctl set 10%+ diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index c4425ac..ea29ccd 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1395 +1362 @@ -1,3 +1,4 @@ /.config/emacs/recentf /.config/emacs/undotreefiles/ /.config/emacs/elpa/ +.config/emacs/init.el |