From 0f3086571f758462467938e37bd7a97aabb19418 Mon Sep 17 00:00:00 2001 From: Marat Date: Mon, 16 Sep 2024 22:32:45 +0600 Subject: [PATCH] update --- .../config/nvim/lua/some/packer_setting.lua | 12 +++++-- roles/dots/files/home/.emacs.d/lan/go-cf.el | 36 +++++++++++++++++++ roles/dots/files/home/.xinitrc | 6 ++-- roles/dots/files/home/bin/firefox_profiles.sh | 6 ++-- roles/dots/files/home/bin/pywall.py | 2 +- roles/dots/files/home/bin/rofi | 4 +-- roles/dots/files/home/bin/scale.py | 14 ++++---- roles/dots/files/home/scale_vars | 4 +-- 8 files changed, 64 insertions(+), 20 deletions(-) create mode 100644 roles/dots/files/home/.emacs.d/lan/go-cf.el 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 ce70baa..bf3fdea 100755 --- a/roles/dots/files/config/nvim/lua/some/packer_setting.lua +++ b/roles/dots/files/config/nvim/lua/some/packer_setting.lua @@ -22,6 +22,13 @@ vim.api.nvim_set_hl(0, 'CursorLine', { underline = true }) vim.cmd('hi linenr guifg=#D3C6AA') -- telescope local builtin = require('telescope.builtin') +-- Функция для поиска файлов, исключая скрытые +local function custom_file_search() + builtin.find_files({ + prompt_title = "< Search without hidden files >", + find_command = { "find", ".", "-type", "f", "-not", "-path", "*/.*" }, + }) +end -- lualine vim.o.showtabline = 2 @@ -178,7 +185,7 @@ vim.api.nvim_set_keymap('n', 'v', 'p', { noremap = true, silent = true }) -- vim.api.nvim_set_keymap('i', 'v', 'pa', { noremap = true, silent = true }) vim.api.nvim_set_keymap('c', 'v', '"', { noremap = true, silent = true }) -vim.keymap.set('n', 'cc', ':NoNeckPain') +vim.keymap.set('n', 'cp', ':NoNeckPain') vim.keymap.set('n', '', 'zz') vim.keymap.set('n', '', 'zz') @@ -242,7 +249,8 @@ vim.keymap.set('n', 'sh', ':vs') vim.keymap.set('n', 'sv', ':sp') -- telescope -vim.keymap.set('n', '', builtin.find_files, {}) +-- vim.keymap.set('n', '', builtin.find_files, {}) +vim.keymap.set('n', '', custom_file_search, {}) vim.keymap.set('n', 'pg', builtin.live_grep, {}) vim.keymap.set('n', 'bb', builtin.buffers, {}) vim.keymap.set('n', 'm', builtin.marks, {}) diff --git a/roles/dots/files/home/.emacs.d/lan/go-cf.el b/roles/dots/files/home/.emacs.d/lan/go-cf.el new file mode 100644 index 0000000..4e6a8a6 --- /dev/null +++ b/roles/dots/files/home/.emacs.d/lan/go-cf.el @@ -0,0 +1,36 @@ +;; Установка и настройка lsp-mode +(use-package lsp-mode + :ensure t + :commands (lsp lsp-deferred) + :init + (setq lsp-keymap-prefix "C-c l") + :config + (lsp-enable-which-key-integration t)) + +;; Установка lsp-ui для улучшенного интерфейса +(use-package lsp-ui + :ensure t + :commands lsp-ui-mode) + +;; Установка company-mode для автодополнения +(use-package company + :ensure t + :config + (setq company-minimum-prefix-length 1 + company-idle-delay 0.0)) ;; Опционально, для немедленного отображения + +;; Настройка Go-mode +(use-package go-mode + :ensure t + :hook ((go-mode . lsp-deferred) + (before-save . lsp-format-buffer) ;; Форматирование перед сохранением + (before-save . lsp-organize-imports))) + +;; Форматирование кода с использованием goimports +(setq gofmt-command "goimports") +(add-hook 'before-save-hook 'gofmt-before-save) + +(add-hook 'go-mode-hook #'lsp-deferred) + +;; Дополнительные настройки для LSP с Go +(setq lsp-go-use-gofumpt t) ;; Использовать gofumpt вместо gofmt diff --git a/roles/dots/files/home/.xinitrc b/roles/dots/files/home/.xinitrc index 05a559d..15ea241 100644 --- a/roles/dots/files/home/.xinitrc +++ b/roles/dots/files/home/.xinitrc @@ -4,8 +4,8 @@ xrandr -r 60.00 xrdb ~/.Xresources slstatus & picom & -# emacs --daemon & -# flameshot & -# dunst & +flameshot & +emacs --daemon & +dunst & # exec ~/bin/startdwm exec dwm diff --git a/roles/dots/files/home/bin/firefox_profiles.sh b/roles/dots/files/home/bin/firefox_profiles.sh index ba28af5..122fee9 100755 --- a/roles/dots/files/home/bin/firefox_profiles.sh +++ b/roles/dots/files/home/bin/firefox_profiles.sh @@ -12,9 +12,9 @@ if [ "$XDG_SESSION_TYPE" == "wayland" ]; then fi else # Получение списка профилей - # while read -r line; do export "$line"; done < /home/fs/scale_vars - dpi="100" - profile=$(grep '\[Profile' -A 2 "$PROFILES_INI" | grep "Name=" | sed 's/Name=//' | rofi -dmenu) +while read -r line; do export "$line"; done < /home/fs/scale_vars +dpi="125" + profile=$(grep '\[Profile' -A 2 "$PROFILES_INI" | grep "Name=" | sed 's/Name=//' | rofi -dmenu -dpi $dpi) if [ ! "$profile" = "" ]; then firefox -P "$profile"; fi diff --git a/roles/dots/files/home/bin/pywall.py b/roles/dots/files/home/bin/pywall.py index df801e6..3fbc807 100755 --- a/roles/dots/files/home/bin/pywall.py +++ b/roles/dots/files/home/bin/pywall.py @@ -12,7 +12,7 @@ server = os.getenv('XDG_SESSION_TYPE') if server == 'wayland': command = 'killall swaybg; swaybg -i "{}" -m fill &' else: - command = 'feh --randomize --bg-fill {}' + command = 'feh --randomize --bg-fill "{}"' minute = 10 diff --git a/roles/dots/files/home/bin/rofi b/roles/dots/files/home/bin/rofi index d2f38ab..d4b8d21 100755 --- a/roles/dots/files/home/bin/rofi +++ b/roles/dots/files/home/bin/rofi @@ -1,5 +1,5 @@ #!/bin/sh -# while read -r line; do export "$line"; done < /home/fs/scale_vars -dpi="100" +while read -r line; do export "$line"; done < /home/fs/scale_vars +dpi="125" rofi -modi drun -show drun Papirus -dpi $dpi -sorting-method fzf -sort -matching fuzzy # rofi -modi drun -show drun -show-icons -icon-theme Papirus -dpi $dpi -sorting-method fzf -sort -matching fuzzy diff --git a/roles/dots/files/home/bin/scale.py b/roles/dots/files/home/bin/scale.py index cb9c323..a2beedd 100755 --- a/roles/dots/files/home/bin/scale.py +++ b/roles/dots/files/home/bin/scale.py @@ -16,17 +16,17 @@ def replace_line_in_file(filename, old_line, new_line): file.writelines(data) if sys.argv[1] == '-s': - replace_line_in_file('/home/fs/.config/kitty/kitty.conf', 'font_size 13', 'font_size 16') - replace_line_in_file('/home/fs/bin/rofi', 'dpi="100"', 'dpi="150"') - replace_line_in_file('/home/fs/.config/chromium-flags.conf', '--force-device-scale-factor=1', '--force-device-scale-factor=1.5') + replace_line_in_file('/home/fs/.config/kitty/kitty.conf', 'font_size 12', 'font_size 16') + replace_line_in_file('/home/fs/bin/rofi', 'dpi="100"', 'dpi="125"') + replace_line_in_file('/home/fs/.config/chromium-flags.conf', '--force-device-scale-factor=1', '--force-device-scale-factor=1.25') replace_line_in_file('/home/fs/bin/rofi', '# while read -r line; do export "$line"; done < /home/fs/scale_vars', 'while read -r line; do export "$line"; done < /home/fs/scale_vars') replace_line_in_file('/home/fs/bin/firefox_profiles.sh', '# while read -r line; do export "$line"; done < /home/fs/scale_vars', 'while read -r line; do export "$line"; done < /home/fs/scale_vars') - replace_line_in_file('/home/fs/bin/firefox_profiles.sh', 'dpi="100"', 'dpi="150"') + replace_line_in_file('/home/fs/bin/firefox_profiles.sh', 'dpi="100"', 'dpi="125"') elif sys.argv[1] == '-d': - replace_line_in_file('/home/fs/.config/kitty/kitty.conf', 'font_size 16', 'font_size 13') - replace_line_in_file('/home/fs/bin/rofi', 'dpi="150"', 'dpi="100"') + replace_line_in_file('/home/fs/.config/kitty/kitty.conf', 'font_size 16', 'font_size 12') + replace_line_in_file('/home/fs/bin/rofi', 'dpi="125"', 'dpi="100"') replace_line_in_file('/home/fs/.config/chromium-flags.conf', '--force-device-scale-factor=1.5', '--force-device-scale-factor=1') replace_line_in_file('/home/fs/bin/rofi', 'while read -r line; do export "$line"; done < /home/fs/scale_vars', '# while read -r line; do export "$line"; done < /home/fs/scale_vars') replace_line_in_file('/home/fs/bin/firefox_profiles.sh', 'while read -r line; do export "$line"; done < /home/fs/scale_vars', '# while read -r line; do export "$line"; done < /home/fs/scale_vars') - replace_line_in_file('/home/fs/bin/firefox_profiles.sh', 'dpi="150"', 'dpi="100"') + replace_line_in_file('/home/fs/bin/firefox_profiles.sh', 'dpi="125"', 'dpi="100"') diff --git a/roles/dots/files/home/scale_vars b/roles/dots/files/home/scale_vars index 03d61d3..74e8881 100644 --- a/roles/dots/files/home/scale_vars +++ b/roles/dots/files/home/scale_vars @@ -1,6 +1,6 @@ QT_AUTO_SCREEN_SET_FACTOR=1 QT_AUTO_SCREEN_SCALE_FACTOR=1 -QT_SCALE_FACTOR=1.5 +QT_SCALE_FACTOR=1.25 QT_FONT_DPI=96 GDK_SCALE=1 -GDK_DPI_SCALE=2 +GDK_DPI_SCALE=1.25