This commit is contained in:
Marat 2024-09-16 22:32:45 +06:00
parent a9f2abe177
commit 0f3086571f
8 changed files with 64 additions and 20 deletions

View File

@ -22,6 +22,13 @@ vim.api.nvim_set_hl(0, 'CursorLine', { underline = true })
vim.cmd('hi linenr guifg=#D3C6AA') vim.cmd('hi linenr guifg=#D3C6AA')
-- telescope -- telescope
local builtin = require('telescope.builtin') 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 -- lualine
vim.o.showtabline = 2 vim.o.showtabline = 2
@ -178,7 +185,7 @@ vim.api.nvim_set_keymap('n', '<Space>v', 'p', { noremap = true, silent = true })
-- vim.api.nvim_set_keymap('i', '<Space>v', '<Esc>pa', { noremap = true, silent = true }) -- vim.api.nvim_set_keymap('i', '<Space>v', '<Esc>pa', { noremap = true, silent = true })
vim.api.nvim_set_keymap('c', '<Space>v', '<C-r>"<CR>', { noremap = true, silent = true }) vim.api.nvim_set_keymap('c', '<Space>v', '<C-r>"<CR>', { noremap = true, silent = true })
vim.keymap.set('n', '<Space>cc', ':NoNeckPain<CR>') vim.keymap.set('n', '<Space>cp', ':NoNeckPain<CR>')
vim.keymap.set('n', '<M-d>', '<C-d>zz') vim.keymap.set('n', '<M-d>', '<C-d>zz')
vim.keymap.set('n', '<M-u>', '<C-u>zz') vim.keymap.set('n', '<M-u>', '<C-u>zz')
@ -242,7 +249,8 @@ vim.keymap.set('n', '<Space>sh', ':vs<CR>')
vim.keymap.set('n', '<Space>sv', ':sp<CR>') vim.keymap.set('n', '<Space>sv', ':sp<CR>')
-- telescope -- telescope
vim.keymap.set('n', '<Space><Space>', builtin.find_files, {}) -- vim.keymap.set('n', '<Space><Space>', builtin.find_files, {})
vim.keymap.set('n', '<Space><Space>', custom_file_search, {})
vim.keymap.set('n', '<Space>pg', builtin.live_grep, {}) vim.keymap.set('n', '<Space>pg', builtin.live_grep, {})
vim.keymap.set('n', '<Space>bb', builtin.buffers, {}) vim.keymap.set('n', '<Space>bb', builtin.buffers, {})
vim.keymap.set('n', '<Space>m', builtin.marks, {}) vim.keymap.set('n', '<Space>m', builtin.marks, {})

View File

@ -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

View File

@ -4,8 +4,8 @@ xrandr -r 60.00
xrdb ~/.Xresources xrdb ~/.Xresources
slstatus & slstatus &
picom & picom &
# emacs --daemon & flameshot &
# flameshot & emacs --daemon &
# dunst & dunst &
# exec ~/bin/startdwm # exec ~/bin/startdwm
exec dwm exec dwm

View File

@ -12,9 +12,9 @@ if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
fi fi
else else
# Получение списка профилей # Получение списка профилей
# while read -r line; do export "$line"; done < /home/fs/scale_vars while read -r line; do export "$line"; done < /home/fs/scale_vars
dpi="100" dpi="125"
profile=$(grep '\[Profile' -A 2 "$PROFILES_INI" | grep "Name=" | sed 's/Name=//' | rofi -dmenu) profile=$(grep '\[Profile' -A 2 "$PROFILES_INI" | grep "Name=" | sed 's/Name=//' | rofi -dmenu -dpi $dpi)
if [ ! "$profile" = "" ]; then if [ ! "$profile" = "" ]; then
firefox -P "$profile"; firefox -P "$profile";
fi fi

View File

@ -12,7 +12,7 @@ server = os.getenv('XDG_SESSION_TYPE')
if server == 'wayland': if server == 'wayland':
command = 'killall swaybg; swaybg -i "{}" -m fill &' command = 'killall swaybg; swaybg -i "{}" -m fill &'
else: else:
command = 'feh --randomize --bg-fill {}' command = 'feh --randomize --bg-fill "{}"'
minute = 10 minute = 10

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/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
dpi="100" dpi="125"
rofi -modi drun -show drun Papirus -dpi $dpi -sorting-method fzf -sort -matching fuzzy 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 # rofi -modi drun -show drun -show-icons -icon-theme Papirus -dpi $dpi -sorting-method fzf -sort -matching fuzzy

View File

@ -16,17 +16,17 @@ def replace_line_in_file(filename, old_line, new_line):
file.writelines(data) file.writelines(data)
if sys.argv[1] == '-s': 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/.config/kitty/kitty.conf', 'font_size 12', 'font_size 16')
replace_line_in_file('/home/fs/bin/rofi', 'dpi="100"', 'dpi="150"') 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.5') 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/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', '# 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': 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/.config/kitty/kitty.conf', 'font_size 16', 'font_size 12')
replace_line_in_file('/home/fs/bin/rofi', 'dpi="150"', 'dpi="100"') 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/.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/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', '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"')

View File

@ -1,6 +1,6 @@
QT_AUTO_SCREEN_SET_FACTOR=1 QT_AUTO_SCREEN_SET_FACTOR=1
QT_AUTO_SCREEN_SCALE_FACTOR=1 QT_AUTO_SCREEN_SCALE_FACTOR=1
QT_SCALE_FACTOR=1.5 QT_SCALE_FACTOR=1.25
QT_FONT_DPI=96 QT_FONT_DPI=96
GDK_SCALE=1 GDK_SCALE=1
GDK_DPI_SCALE=2 GDK_DPI_SCALE=1.25