From 09c625cb61416536b3dcda80adb92ef01149a9eb Mon Sep 17 00:00:00 2001 From: Marat Date: Sat, 26 Apr 2025 11:41:01 +0600 Subject: [PATCH] update --- .../dots/files/config/nvim/lua/some/init.lua | 2 +- .../files/config/nvim/lua/some/lsp/linter.lua | 14 ++--- .../files/config/nvim/lua/some/lsp/lsp.lua | 4 +- .../nvim/lua/some/package/telescope.lua | 16 +++--- .../dots/files/config/nvim/lua/some/theme.lua | 5 +- roles/dots/files/home/.emacs.d/config.org | 56 ++++++++++++------- .../dots/files/home/.emacs.d/lan/python-cf.el | 20 +++++-- .../files/home/.emacs.d/lan/python-cf.org | 25 +++++++-- roles/packages/tasks/apps.yml | 1 + 9 files changed, 95 insertions(+), 48 deletions(-) diff --git a/roles/dots/files/config/nvim/lua/some/init.lua b/roles/dots/files/config/nvim/lua/some/init.lua index ff87ec9..aad554c 100644 --- a/roles/dots/files/config/nvim/lua/some/init.lua +++ b/roles/dots/files/config/nvim/lua/some/init.lua @@ -5,7 +5,7 @@ require("some.lazy") require("some.lsp.lsp") require("some.lsp.linter") -require("some.lsp.mason") +-- require("some.lsp.mason") require("some.theme") diff --git a/roles/dots/files/config/nvim/lua/some/lsp/linter.lua b/roles/dots/files/config/nvim/lua/some/lsp/linter.lua index 40b680a..9beecff 100644 --- a/roles/dots/files/config/nvim/lua/some/lsp/linter.lua +++ b/roles/dots/files/config/nvim/lua/some/lsp/linter.lua @@ -5,13 +5,13 @@ require('lint').linters.your_linter_name = { ignore_exitcode = true, -- set this to true if the linter exits with a code != 0 and that's considered normal. } -lint.linters_by_ft = { - python = { - "pylint", - "flake8", - "ruff", - }, -} +-- lint.linters_by_ft = { +-- python = { +-- "pylint", +-- "flake8", +-- "ruff", +-- }, +-- } vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { group = lint_augroup, diff --git a/roles/dots/files/config/nvim/lua/some/lsp/lsp.lua b/roles/dots/files/config/nvim/lua/some/lsp/lsp.lua index 674de75..d74517d 100644 --- a/roles/dots/files/config/nvim/lua/some/lsp/lsp.lua +++ b/roles/dots/files/config/nvim/lua/some/lsp/lsp.lua @@ -40,7 +40,9 @@ cmp.setup({ sources = { {name = 'nvim_lsp'}, }, - mapping = cmp.mapping.preset.insert({}), + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.confirm({select = true}), + }), snippet = { expand = function(args) vim.snippet.expand(args.body) diff --git a/roles/dots/files/config/nvim/lua/some/package/telescope.lua b/roles/dots/files/config/nvim/lua/some/package/telescope.lua index 595159b..e4ce2a9 100644 --- a/roles/dots/files/config/nvim/lua/some/package/telescope.lua +++ b/roles/dots/files/config/nvim/lua/some/package/telescope.lua @@ -6,14 +6,14 @@ telescope.setup({ prompt_prefix = "> ", selection_caret = "> ", }, - -- pickers = { - -- find_files = { - -- theme = "dropdown", - -- }, - -- live_grep = { - -- theme = "dropdown", - -- }, - -- }, + pickers = { + find_files = { + theme = "dropdown", + }, + live_grep = { + theme = "dropdown", + }, + }, }) local builtin = require('telescope.builtin') diff --git a/roles/dots/files/config/nvim/lua/some/theme.lua b/roles/dots/files/config/nvim/lua/some/theme.lua index 3143ca6..ff85b6c 100644 --- a/roles/dots/files/config/nvim/lua/some/theme.lua +++ b/roles/dots/files/config/nvim/lua/some/theme.lua @@ -1,6 +1,6 @@ vim.o.background = 'dark' -- 'dark' or 'light' --- vim.cmd[[colorscheme onedark]] -vim.cmd[[colorscheme gruvbox]] +vim.cmd[[colorscheme onedark]] +-- vim.cmd[[colorscheme gruvbox]] -- цвет номеров строк vim.cmd('hi linenr guifg=white') @@ -8,3 +8,4 @@ vim.cmd('hi linenr guifg=white') -- vim.cmd('highlight Normal guibg=#000000 ctermbg=black') -- vim.api.nvim_set_hl(0, 'CursorLine', { underline = true }) -- vim.cmd('highlight Normal guibg=none ctermbg=none') + diff --git a/roles/dots/files/home/.emacs.d/config.org b/roles/dots/files/home/.emacs.d/config.org index 2bfa503..7f4a90d 100644 --- a/roles/dots/files/home/.emacs.d/config.org +++ b/roles/dots/files/home/.emacs.d/config.org @@ -132,6 +132,13 @@ ;; web-mode ;; )) +;; sudo-edit +;; dired-subtree +;; magit +;; org-bullets +;; hl-todo +;; rainbow-mode + ;; Список пакетов для установки. (defvar my-required-packages '(org-download @@ -780,7 +787,9 @@ hot keys *** KeyBind #+begin_src emacs-lisp -(require 'sudo-edit) +(use-package sudo-edit + :ensure t) + (spc-leader "c" '(:ignore t :wk "code") "c s" '(sudo-edit :wk "sudo-edit") @@ -876,16 +885,17 @@ hot keys (add-hook 'org-mode-hook 'org-indent-mode) ; (setq toc-org-max-depth 2) -(require 'org-bullets) - (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) +(use-package org-bullets + :ensure t + :hook (org-mode . org-bullets-mode)) -(require 'org-bullets) +(use-package which-key + :ensure t + :config (which-key-mode 1) - - (setq which-key-min-display-lines 13) + (setq which-key-min-display-lines 13)) (require 'org-tempo) - ;;(electric-indent-mode -1) (setq org-edit-src-content-indentation 0) #+end_src @@ -981,12 +991,15 @@ hot keys * decorations ** colorthemes #+begin_src emacs-lisp +(use-package doom-themes + :ensure t) + (custom-set-faces -;; '(line-number ((t (:foreground "white")))) ; Цвет отображения номера строки -;; '(line-number-current-line ((t (:foreground "white"))))) ; Цвет текущей строки +'(line-number ((t (:foreground "white")))) ; Цвет отображения номера строки +'(line-number-current-line ((t (:foreground "white"))))) ; Цвет текущей строки ;; '(org-block-background ((t (:background "#1b1b1b")))) -'(line-number ((t (:foreground "black")))) ; Цвет отображения номера строки -'(line-number-current-line ((t (:foreground "black"))))) ; Цвет текущей строки +;; '(line-number ((t (:foreground "black")))) ; Цвет отображения номера строки +;; '(line-number-current-line ((t (:foreground "black"))))) ; Цвет текущей строки ;; (load-theme 'doom-1337 t) ;; (load-theme 'doom-nord t) ;; (load-theme 'doom-nord-aurora t) @@ -1078,8 +1091,8 @@ hot keys :height 200 :weight 'medium)) ;; (set-small-font-wayland) -;; (set-small-font) -(set-big-font) +(set-small-font) +;; (set-big-font) (spc-leader "c f" '(:ignore t :wk "font") "c f s" '(set-small-font :wk "small font") @@ -1154,10 +1167,14 @@ names, e.g. #0000ff is displayed in white with a blue background. ** evil-snipe #+begin_src emacs-lisp -(require 'evil-snipe) -(evil-snipe-mode +1) -(evil-snipe-override-mode +1) -(setq evil-snipe-smart-case +1) +(use-package evil-snipe + :ensure t + :after evil + :config + (evil-snipe-mode +1) + (evil-snipe-override-mode +1) + (setq evil-snipe-smart-case t)) ; логическое значение, не число + #+end_src ** org chckbox hl @@ -1501,8 +1518,9 @@ left=2cm, right=2cm, top=2.5cm, bottom=2.5cm — отступы от левой, (goto-char (point-max))) (message command))) -(require 'restclient) -(add-to-list 'auto-mode-alist '("\\.http\\'" . restclient-mode)) +(use-package restclient + :ensure t + :mode ("\\.http\\'" . restclient-mode)) (spc-leader "r" '(:ignore t :wk "rest") diff --git a/roles/dots/files/home/.emacs.d/lan/python-cf.el b/roles/dots/files/home/.emacs.d/lan/python-cf.el index 4f207a9..dd3d244 100644 --- a/roles/dots/files/home/.emacs.d/lan/python-cf.el +++ b/roles/dots/files/home/.emacs.d/lan/python-cf.el @@ -25,8 +25,20 @@ (flycheck-mode) ))) -(use-package elpy +;; (use-package elpy +;; :ensure t +;; :init +;; (elpy-enable)) +;; (add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1))) + +(use-package lsp-mode :ensure t - :init - (elpy-enable)) -(add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1))) + :hook (python-mode . lsp) + :commands lsp) + +(use-package lsp-pyright + :ensure t + :after lsp-mode + :hook (python-mode . (lambda () + (require 'lsp-pyright) + ))) diff --git a/roles/dots/files/home/.emacs.d/lan/python-cf.org b/roles/dots/files/home/.emacs.d/lan/python-cf.org index 58295b8..8583456 100644 --- a/roles/dots/files/home/.emacs.d/lan/python-cf.org +++ b/roles/dots/files/home/.emacs.d/lan/python-cf.org @@ -4,7 +4,6 @@ (require 'use-package) #+end_src - ** tree-sitter #+begin_src emacs-lisp (add-hook 'python-mode-hook #'tree-sitter-mode +1) @@ -42,13 +41,27 @@ ))) #+end_src -** elpy +** lsp elpy #+begin_src emacs-lisp -(use-package elpy +;; (use-package elpy +;; :ensure t +;; :init +;; (elpy-enable)) +;; (add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1))) + +(use-package lsp-mode :ensure t - :init - (elpy-enable)) -(add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1))) + :hook (python-mode . lsp) + :commands lsp) + +(use-package lsp-pyright + :ensure t + :after lsp-mode + :hook (python-mode . (lambda () + (require 'lsp-pyright) + ))) + + #+end_src * Cheat sheet diff --git a/roles/packages/tasks/apps.yml b/roles/packages/tasks/apps.yml index 551eb59..8394f95 100644 --- a/roles/packages/tasks/apps.yml +++ b/roles/packages/tasks/apps.yml @@ -55,6 +55,7 @@ name: - go - vim + - neovim - alacritty - kitty - tmux