From a9f2abe177d1eb2ddff742daf157b2fcf3dc7b58 Mon Sep 17 00:00:00 2001
From: Marat <mars6358@gmail.com>
Date: Thu, 12 Sep 2024 22:43:09 +0600
Subject: [PATCH] updated

---
 .../config/nvim/lua/some/packer_setting.lua   | 12 +++++-
 roles/dots/files/home/.emacs.d/config.org     | 41 +++++++++++--------
 roles/window_managers/files/sway/config       | 10 ++++-
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/roles/dots/files/config/nvim/lua/some/packer_setting.lua b/roles/dots/files/config/nvim/lua/some/packer_setting.lua
index 12263b9..ce70baa 100755
--- a/roles/dots/files/config/nvim/lua/some/packer_setting.lua
+++ b/roles/dots/files/config/nvim/lua/some/packer_setting.lua
@@ -46,7 +46,7 @@ if not status_ok then
 end
 
 configs.setup({
-    ensure_installed = {"python", "lua", "http", "json"},
+    ensure_installed = {"python", "lua", "http", "json", "go"},
     ignore_install = { "" }, -- List of parsers to ignore installing
     sync_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
 -- ----------------------
diff --git a/roles/dots/files/home/.emacs.d/config.org b/roles/dots/files/home/.emacs.d/config.org
index 2ba0ee6..7714d4d 100644
--- a/roles/dots/files/home/.emacs.d/config.org
+++ b/roles/dots/files/home/.emacs.d/config.org
@@ -34,6 +34,7 @@
   - [[#org-agenda][org agenda]]
   - [[#org-image][Org Image]]
 - [[#programming][PROGRAMMING]]
+  - [[#snipets][snipets]]
   - [[#python][python]]
   - [[#go][go]]
 - [[#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  "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-down)
 
+(define-key evil-normal-state-map (kbd "'") 'evil-execute-macro)
+
 (spc-leader
   "l l" 'evil-scroll-line-to-center)
 #+end_src
@@ -653,7 +653,6 @@ hot keys
 
 ** Magit
 #+begin_src emacs-lisp
-
 (require 'magit)
   (spc-leader
     "g" '(:ignore t :wk "git")
@@ -686,7 +685,6 @@ hot keys
 * ORG settings
 ** org hot key
 #+begin_src emacs-lisp
-
 (spc-leader
   "o" '(:ignore t :wk "org hot key")
   "o c" '(org-time-stamp :wk "calendar paste date")
@@ -772,6 +770,14 @@ hot keys
 
 
 * PROGRAMMING
+** snipets
+#+begin_src emacs-lisp
+(use-package yasnippet
+  :ensure t
+  :config
+  (yas-global-mode 1))
+#+end_src
+
 ** python
 #+begin_src emacs-lisp
 (defun load-python-config ()
@@ -800,24 +806,24 @@ hot keys
 (custom-set-faces
 '(line-number ((t (:foreground "white"))))               ; Цвет отображения номера строки
 '(line-number-current-line ((t (:foreground "white"))))) ; Цвет текущей строки
-;'(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-nord t)
-; (load-theme 'doom-nord-aurora t)
+;; (load-theme 'doom-nord-aurora t)
 ; (load-theme 'doom-nord-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-ayu-dark t)
 ; (load-theme 'doom-dracula t)
-; (load-theme 'doom-tomorrow-night t)
-; (load-theme 'doom-one t)
+;; (load-theme 'doom-tomorrow-night t)
+;; (load-theme 'doom-one t)
 ; (load-theme 'doom-opera t)
 ; (load-theme 'doom-monokai-pro 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-solarized-light t)
+;; (load-theme 'doom-solarized-light t)
 
 ; (add-to-list 'custom-theme-load-path "~/.emacs.d/everforest-theme")
 ; (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")
 ; (load-theme 'atom-one-dark t)
 ;
-(set-frame-parameter nil 'alpha-background 91)
+(set-frame-parameter nil 'alpha-background 100)
 #+end_src
 
 ** diff
@@ -924,8 +930,11 @@ names, e.g. #0000ff is displayed in white with a blue background.
 #+begin_src emacs-lisp
 (require 'nyan-mode)
 (nyan-mode +1)
-(setq nyan-toggle-wavy-trail t)
-(setq nyan-start-animation t)
+;; (nyan-toggle-wavy-trail)
+;; (nyan-start-animation)
+
+(setq nyan-wavy-trail t)
+(setq nyan-animate-nyancat t)
 #+end_src
 
 ** evil-snipe
diff --git a/roles/window_managers/files/sway/config b/roles/window_managers/files/sway/config
index d6427fe..fa84b3a 100644
--- a/roles/window_managers/files/sway/config
+++ b/roles/window_managers/files/sway/config
@@ -270,10 +270,16 @@ bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
 
 # --- touchpad
 # 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
+    dwtp enabled
     tap enabled
-    middle_emulation enabled
+    tap_button_map lrm
 }
 
 # --- theme ---