update

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")
 

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 = {
+-- lint.linters_by_ft = {
-    python = {
+--     python = {
-        "pylint",
+--         "pylint",
-        "flake8",
+--         "flake8",
-        "ruff",
+--         "ruff",
-    },
+--     },
-}
+-- }
 
 vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
   group = lint_augroup,

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({
+    ['<cr>'] = cmp.mapping.confirm({select = true}),
+  }),
   snippet = {
     expand = function(args)
       vim.snippet.expand(args.body)

roles/dots/files/config/nvim/lua/some/package/telescope.lua

@@ -6,14 +6,14 @@ telescope.setup({
         prompt_prefix = "> ",
         selection_caret = "> ",
     },
-    -- pickers = {
+    pickers = {
-    --     find_files = {
+        find_files = {
-    --         theme = "dropdown",
+            theme = "dropdown",
-    --     },
+        },
-    --     live_grep = {
+        live_grep = {
-    --         theme = "dropdown",
+            theme = "dropdown",
-    --     },
+        },
-    -- },
+    },
 })
 
 local builtin = require('telescope.builtin')

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 onedark]]
-vim.cmd[[colorscheme gruvbox]]
+-- 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')
+

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)
+(use-package org-bullets
-  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+  :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 ((t (:foreground "white"))))               ; Цвет отображения номера строки
-;; '(line-number-current-line ((t (:foreground "white"))))) ; Цвет текущей строки
+'(line-number-current-line ((t (:foreground "white"))))) ; Цвет текущей строки
 ;; '(org-block-background ((t (:background "#1b1b1b"))))
-'(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-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-small-font)
-(set-big-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)
+(use-package evil-snipe
-(evil-snipe-mode +1)
+  :ensure t
-(evil-snipe-override-mode +1)
+  :after evil
-(setq evil-snipe-smart-case +1)
+  :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)
+(use-package restclient
-(add-to-list 'auto-mode-alist '("\\.http\\'" . restclient-mode))
+  :ensure t
+  :mode ("\\.http\\'" . restclient-mode))
 
 (spc-leader
   "r" '(:ignore t :wk "rest")

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
+  :hook (python-mode . lsp)
-  (elpy-enable))
+  :commands lsp)
-(add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1)))
+
+(use-package lsp-pyright
+  :ensure t
+  :after lsp-mode
+  :hook (python-mode . (lambda ()
+                         (require 'lsp-pyright)
+                         )))

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
+  :hook (python-mode . lsp)
-  (elpy-enable))
+  :commands lsp)
-(add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1)))
+
+(use-package lsp-pyright
+  :ensure t
+  :after lsp-mode
+  :hook (python-mode . (lambda ()
+                         (require 'lsp-pyright)
+                         )))
+
+
 #+end_src
 
 * Cheat sheet

roles/packages/tasks/apps.yml

@@ -55,6 +55,7 @@
     name:
       - go
       - vim
+      - neovim
       - alacritty
       - kitty
       - tmux