This commit is contained in:
Marat 2024-09-12 22:43:09 +06:00
parent 3a06751bb8
commit a9f2abe177
3 changed files with 44 additions and 19 deletions

View File

@ -46,7 +46,7 @@ if not status_ok then
end end
configs.setup({ configs.setup({
ensure_installed = {"python", "lua", "http", "json"}, ensure_installed = {"python", "lua", "http", "json", "go"},
ignore_install = { "" }, -- List of parsers to ignore installing ignore_install = { "" }, -- List of parsers to ignore installing
sync_install = true, sync_install = true,
auto_install = true, auto_install = true,
@ -87,6 +87,16 @@ require("harpoon").setup({
} }
}) })
-- golang
vim.api.nvim_create_autocmd("FileType", {
pattern = "go",
callback = function()
vim.bo.tabstop = 4
vim.bo.shiftwidth = 4
vim.bo.expandtab = false
end,
})
-- ---------------------- -- ----------------------
-- lsp -- lsp
-- ---------------------- -- ----------------------

View File

@ -34,6 +34,7 @@
- [[#org-agenda][org agenda]] - [[#org-agenda][org agenda]]
- [[#org-image][Org Image]] - [[#org-image][Org Image]]
- [[#programming][PROGRAMMING]] - [[#programming][PROGRAMMING]]
- [[#snipets][snipets]]
- [[#python][python]] - [[#python][python]]
- [[#go][go]] - [[#go][go]]
- [[#decorations][decorations]] - [[#decorations][decorations]]
@ -225,12 +226,11 @@ https://github.com/emacs-evil/evil
(key-chord-define evil-insert-state-map "jk" 'evil-normal-state) (key-chord-define evil-insert-state-map "jk" 'evil-normal-state)
(key-chord-define evil-insert-state-map "kj" 'evil-normal-state) (key-chord-define evil-insert-state-map "kj" 'evil-normal-state)
(advice-add 'evil-scroll-up :after #'evil-scroll-line-to-center)
(advice-add 'evil-scroll-down :after #'evil-scroll-line-to-center)
(define-key evil-normal-state-map (kbd ",") 'evil-scroll-up) (define-key evil-normal-state-map (kbd ",") 'evil-scroll-up)
(define-key evil-normal-state-map (kbd ".") 'evil-scroll-down) (define-key evil-normal-state-map (kbd ".") 'evil-scroll-down)
(define-key evil-normal-state-map (kbd "'") 'evil-execute-macro)
(spc-leader (spc-leader
"l l" 'evil-scroll-line-to-center) "l l" 'evil-scroll-line-to-center)
#+end_src #+end_src
@ -653,7 +653,6 @@ hot keys
** Magit ** Magit
#+begin_src emacs-lisp #+begin_src emacs-lisp
(require 'magit) (require 'magit)
(spc-leader (spc-leader
"g" '(:ignore t :wk "git") "g" '(:ignore t :wk "git")
@ -686,7 +685,6 @@ hot keys
* ORG settings * ORG settings
** org hot key ** org hot key
#+begin_src emacs-lisp #+begin_src emacs-lisp
(spc-leader (spc-leader
"o" '(:ignore t :wk "org hot key") "o" '(:ignore t :wk "org hot key")
"o c" '(org-time-stamp :wk "calendar paste date") "o c" '(org-time-stamp :wk "calendar paste date")
@ -772,6 +770,14 @@ hot keys
* PROGRAMMING * PROGRAMMING
** snipets
#+begin_src emacs-lisp
(use-package yasnippet
:ensure t
:config
(yas-global-mode 1))
#+end_src
** python ** python
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun load-python-config () (defun load-python-config ()
@ -800,24 +806,24 @@ hot keys
(custom-set-faces (custom-set-faces
'(line-number ((t (:foreground "white")))) ; Цвет отображения номера строки '(line-number ((t (:foreground "white")))) ; Цвет отображения номера строки
'(line-number-current-line ((t (:foreground "white"))))) ; Цвет текущей строки '(line-number-current-line ((t (:foreground "white"))))) ; Цвет текущей строки
;'(line-number ((t (:foreground "black")))) ; Цвет отображения номера строки ;; '(line-number ((t (:foreground "black")))) ; Цвет отображения номера строки
;'(line-number-current-line ((t (:foreground "black"))))) ; Цвет текущей строки ;; '(line-number-current-line ((t (:foreground "black"))))) ; Цвет текущей строки
; (load-theme 'doom-nord t) ; (load-theme 'doom-nord t)
; (load-theme 'doom-nord-aurora t) ;; (load-theme 'doom-nord-aurora t)
; (load-theme 'doom-nord-light t) ; (load-theme 'doom-nord-light t)
; (load-theme 'doom-one-light t) ; (load-theme 'doom-one-light t)
; (load-theme 'doom-gruvbox-light t) ;; (load-theme 'doom-gruvbox-light t)
(load-theme 'doom-gruvbox t) (load-theme 'doom-gruvbox t)
; (load-theme 'doom-ayu-dark t) ; (load-theme 'doom-ayu-dark t)
; (load-theme 'doom-dracula t) ; (load-theme 'doom-dracula t)
; (load-theme 'doom-tomorrow-night t) ;; (load-theme 'doom-tomorrow-night t)
; (load-theme 'doom-one t) ;; (load-theme 'doom-one t)
; (load-theme 'doom-opera t) ; (load-theme 'doom-opera t)
; (load-theme 'doom-monokai-pro t) ; (load-theme 'doom-monokai-pro t)
; (load-theme 'doom-spacegrey t) ; (load-theme 'doom-spacegrey t)
; (load-theme 'doom-tokyo-night t) ;; (load-theme 'doom-tokyo-night t)
; (load-theme 'doom-xcode t) ; (load-theme 'doom-xcode t)
; (load-theme 'doom-solarized-light t) ;; (load-theme 'doom-solarized-light t)
; (add-to-list 'custom-theme-load-path "~/.emacs.d/everforest-theme") ; (add-to-list 'custom-theme-load-path "~/.emacs.d/everforest-theme")
; (load-theme 'everforest-hard-dark t) ; (load-theme 'everforest-hard-dark t)
@ -825,7 +831,7 @@ hot keys
; (add-to-list 'custom-theme-load-path "~/.emacs.d/atom-one-dark-theme") ; (add-to-list 'custom-theme-load-path "~/.emacs.d/atom-one-dark-theme")
; (load-theme 'atom-one-dark t) ; (load-theme 'atom-one-dark t)
; ;
(set-frame-parameter nil 'alpha-background 91) (set-frame-parameter nil 'alpha-background 100)
#+end_src #+end_src
** diff ** diff
@ -924,8 +930,11 @@ names, e.g. #0000ff is displayed in white with a blue background.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(require 'nyan-mode) (require 'nyan-mode)
(nyan-mode +1) (nyan-mode +1)
(setq nyan-toggle-wavy-trail t) ;; (nyan-toggle-wavy-trail)
(setq nyan-start-animation t) ;; (nyan-start-animation)
(setq nyan-wavy-trail t)
(setq nyan-animate-nyancat t)
#+end_src #+end_src
** evil-snipe ** evil-snipe

View File

@ -270,10 +270,16 @@ bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
# --- touchpad # --- touchpad
# get identifier "swaymsg -t get_inputs" # get identifier "swaymsg -t get_inputs"
input "1267:12410:ELAN1203:00_04F3:307A_Touchpad" { # input "1267:12410:ELAN1203:00_04F3:307A_Touchpad" {
# dwt enabled
# tap enabled
# middle_emulation enabled
# }
input "type:touchpad" {
dwt enabled dwt enabled
dwtp enabled
tap enabled tap enabled
middle_emulation enabled tap_button_map lrm
} }
# --- theme --- # --- theme ---