This commit is contained in:
Marat 2024-10-14 00:46:34 +06:00
parent 72a567ed38
commit 23d84ae1c0
15 changed files with 193 additions and 66 deletions

View File

@ -1,12 +1,12 @@
font_size 12
font_family JetBrainsMonoNl Nerd Font Mono
# font_family Firacode Nerd Font
# font_family JetBrainsMonoNl Nerd Font Mono
font_family Firacode Nerd Font
bold_font auto
italic_font auto
bold_italic_font auto
# brackground_opacity 1
background_opacity 0.91
# background_opacity 1
background_opacity 0.9
window_padding_width 15
allow_remote_control yes
enable_audio_bell no
@ -24,8 +24,9 @@ map ctrl+m paste_from_clipboard
# include current-theme.conf
# include solarized_light.conf
# include ayu.conf
# iinclude tomorrow-night.conf
# include tomorrow-night.conf
include gruvbox.conf
# include gruvbox_light.conf
# include everforset-theme.conf
# include nord.conf
# include everforset-theme.conf

View File

@ -9,12 +9,12 @@ set.softtabstop = 0
set.shiftwidth = 4
set.expandtab = true
set.smarttab = true
set.cursorline = true
-- set.cursorline = true
set.clipboard = 'unnamed,unnamedplus'
set.list = true
-- set.lcs='space:·'
set.lcs='space:·'
g.mapleader='\\'
vim.o.termguicolors = true

View File

@ -30,6 +30,8 @@ local function custom_file_search()
})
end
-- -not \( -path "./dir1" -o -path "./dir2/*" \)
-- lualine
vim.o.showtabline = 2
require('lualine').setup()
@ -176,10 +178,10 @@ vim.g.ale_echo_msg_format = '[%linter%] %s [%severity%]'
-- vim.keymap.set('x','y','"+y')
-- vim.keymap.set('x','Y','"+Y')
vim.keymap.set('n','yy','"gg+yy')
vim.keymap.set('n','Y','"gg+yG')
vim.keymap.set('x','y','"+y')
vim.keymap.set('x','Y','"+Y')
-- vim.keymap.set('n','yy','"gg+yy')
-- vim.keymap.set('n','Y','"gg+yG')
-- vim.keymap.set('x','y','"+y')
-- vim.keymap.set('x','Y','"+Y')
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 })

View File

@ -19,9 +19,10 @@
- [[#doom-modeline][doom-modeline]]
- [[#perfect-margin][Perfect margin]]
- [[#neotree][NeoTree]]
- [[#latex-pdf][Latex (pdf)]]
- [[#keybinds][KeyBinds]]
- [[#file][file]]
- [[#marks][marks]]
- [[#marks--org-tangle][marks / org tangle]]
- [[#buffer--bookmarks--harpoon][buffer & bookmarks & harpoon]]
- [[#project][project]]
- [[#sudo-edit--code-sudo-editsplitperfect-marginjson][Sudo Edit & code (sudo edit/split/perfect margin/json)]]
@ -48,10 +49,12 @@
- [[#evil-snipe][evil-snipe]]
- [[#org-chckbox-hl][org chckbox hl]]
- [[#hl-todo][hl-todo]]
- [[#music][Music]]
- [[#emms][emms]]
- [[#scripts][scripts]]
- [[#add-projectile-project][add projectile project]]
- [[#rest][REST]]
- [[#results_output][results_output]]
- [[#insert-some-text][insert some text]]
- [[#open-terminal][open terminal]]
- [[#tood][TOOD]]
@ -144,7 +147,7 @@
(setq default-buffer-file-coding-system 'utf-8) ; Установка системы кодирования файловых буферов на UTF-8
(setq scroll-conservatively 10000) ; Установка плавного скроллинга без резкого перемещения экрана
(electric-pair-mode 1) ; автоматически закрывать скопки
(global-hl-line-mode 1) ; cursor line
;; (global-hl-line-mode 1) ; cursor line
(add-hook 'before-save-hook 'delete-trailing-whitespace) ; Удаление пустых пробелов в конце строк перед сохранением файла
(blink-cursor-mode 0) ; cursorline
(setq display-fill-column-indicator nil) ; отключить вертикальные линии
@ -270,7 +273,30 @@ https://github.com/emacs-evil/evil
(package-refresh-contents)
(package-install 'counsel))
(setq counsel-fzf-cmd "find . -type f -not -path '*/.*' | fzf -f \"%s\"")
;; (setq counsel-fzf-cmd "find . -type f -not -path '*/.*' 2>&1 | grep -v 'Permission denied' | fzf -f '%s'")
;; (setq counsel-fzf-cmd "find . -type f -not -path '*/.*' 2>&1 | grep -v 'Permission denied' | grep -v './env/' | fzf -f '%s'")
(setq counsel-fzf-cmd
(concat
"find . -type f -not -path '*/.*' 2>&1 | "
"grep -v 'Permission denied' | "
"grep -v './env/' | "
"grep -v './fonts/' | "
"grep -v './__pycache__/' | "
"fzf -f '%s'"))
#+end_src
показывать ошибки при rg поиске
#+begin_src emacs-lisp
(with-eval-after-load 'counsel
(advice-add 'counsel-rg
:around
(lambda (func &rest args)
(cl-flet ((filter-func (code) (if (= code 2) 0 code)))
(unwind-protect
(progn (advice-add 'process-exit-status :filter-return #'filter-func)
(apply func args))
(advice-remove 'process-exit-status #'filter-func))))))
#+end_src
** dired
@ -383,7 +409,7 @@ https://github.com/emacs-evil/evil
(openwith-mode t)
(setq openwith-associations
(list (list (openwith-make-extension-regexp '("pdf"))
(list (list (openwith-make-extension-regexp '("pdf" "djvu"))
"atril" '(file))
(list (openwith-make-extension-regexp '("flac" "mp3" "wav"))
"vlc" '(file))
@ -523,6 +549,26 @@ https://github.com/emacs-evil/evil
)
#+end_src
** Latex (pdf)
#+begin_src emacs-lisp
(setq org-latex-pdf-process
'("xelatex -interaction nonstopmode %f"
"xelatex -interaction nonstopmode %f"))
#+end_src
устанавливать такой header для потдержки русского языка
#+begin_quote
#+LATEX_HEADER: \usepackage{fontspec}
#+LATEX_HEADER: \setmainfont{Noto Sans}
\begin{quote}
\textbf{-} Привет! Как дела? \\
\textbf{-} Всё хорошо, спасибо! А у тебя?
\end{quote}
#+end_quote
* KeyBinds
** file
#+begin_src emacs-lisp
@ -541,7 +587,7 @@ If a Dired buffer is already opened, navigate to that buffer."
"f o" '(open-current-directory-in-dired :wk "open in dired"))
#+end_src
** marks
** marks / org tangle
#+begin_src emacs-lisp
(spc-leader
"m" '(:ignore t :wk "marks")
@ -552,7 +598,9 @@ If a Dired buffer is already opened, navigate to that buffer."
;; "m p" '(bm-previous :wk "prev mark")
"m l" '(bm-show :wk "list marks")
"m g" '(lambda () (interactive) (bm-show-goto-bookmark) (recenter) :wk "goto bookmark")
"m c" '(bm-remove-all-all-buffers :wk "claer mark"))
"m c" '(bm-remove-all-all-buffers :wk "claer mark")
"m 8" '(org-babel-tangle :wk "org-babel-tangle"))
(setq bm-marker 'bm-marker-left)
(setq bm-highlight-style nil)
@ -625,8 +673,8 @@ hot keys
"p" '(:ignore t :wk "projectile")
"p a" '(projectile/open-and-switch-project :wk "add project")
"p s" '(projectile-switch-project :wk "switch project")
;; "p g" '(counsel-rg :wk "project tile grep")
"p g" '(lambda () (interactive) (counsel-rg) (recenter) :wk "project tile grep")
"p g" '(counsel-rg :wk "project tile grep")
;; "p g" '(lambda () (interactive) (counsel-rg) (recenter) :wk "project tile grep")
"b i" '(projectile-ibuffer :wk "Switch buffer")
"b n" '(projectile-next-project-buffer :wk "next project buffer")
@ -755,7 +803,6 @@ hot keys
(setq org-confirm-babel-evaluate nil)
#+end_src
** org agenda
#+begin_src emacs-lisp
(custom-set-variables
@ -808,30 +855,31 @@ hot keys
'(line-number-current-line ((t (:foreground "white"))))) ; Цвет текущей строки
;; '(line-number ((t (:foreground "black")))) ; Цвет отображения номера строки
;; '(line-number-current-line ((t (:foreground "black"))))) ; Цвет текущей строки
; (load-theme 'doom-nord t)
;; (load-theme 'doom-nord t)
;; (load-theme 'doom-nord-aurora t)
; (load-theme 'doom-nord-light t)
; (load-theme 'doom-one-light t)
;; (load-theme 'doom-nord-light t)
;; (load-theme 'doom-one-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-ayu-dark t)
;; (load-theme 'doom-dracula 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-opera t)
;; (load-theme 'doom-monokai-pro t)
;; (load-theme 'doom-spacegrey t)
;; (load-theme 'doom-tokyo-night t)
; (load-theme 'doom-xcode t)
;; (load-theme 'doom-xcode t)
;; (load-theme 'doom-solarized-light t)
; (add-to-list 'custom-theme-load-path "~/.emacs.d/everforest-theme")
; (load-theme 'everforest-hard-dark t)
;; (add-to-list 'custom-theme-load-path "~/.emacs.d/everforest-theme")
;; (load-theme 'everforest-hard-dark t)
; (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 100)
;; (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 100)
(set-frame-parameter nil 'alpha-background 92)
#+end_src
** diff
@ -855,17 +903,18 @@ hot keys
(defun set-small-font ()
(interactive)
(set-face-attribute 'default nil
:font "JetBrainsMonoNL Nerd Font"
:font "Firacode Nerd Font"
:height 120
:weight 'medium))
(defun set-big-font ()
(interactive)
(set-face-attribute 'default nil
:font "JetBrainsMonoNL Nerd Font"
:font "Firacode Nerd Font"
:height 150
:weight 'medium))
(set-small-font)
;; (set-big-font)
(spc-leader
"c f" '(:ignore t :wk "font")
"c f s" '(set-small-font :wk "small font")
@ -963,6 +1012,36 @@ names, e.g. #0000ff is displayed in white with a blue background.
;(global-hl-todo-mode +1)
#+end_src
* Music
** emms
#+begin_src emacs-lisp
(use-package emms
:ensure t
:config
(require 'emms-setup)
(emms-all) ;; Загружает все основные модули Emms
(emms-default-players) ;; Определяет плееры
(setq emms-source-file-default-directory "~/Music/") ;; Укажите свою папку с музыкой
;; Отображение текущего трека в mode-line
(use-package emms-mode-line
:config
(emms-mode-line 1))
;; Включить отображение времени проигрывания
(use-package emms-playing-time
:config
(emms-playing-time 1))
;; Горячие клавиши для управления
(global-set-key (kbd "C-c e p") 'emms)
(global-set-key (kbd "C-c e n") 'emms-next)
(global-set-key (kbd "C-c e P") 'emms-previous)
(global-set-key (kbd "C-c e s") 'emms-stop)
(global-set-key (kbd "C-c e SPC") 'emms-pause))
#+end_src
* scripts
** add projectile project
#+begin_src emacs-lisp
@ -975,6 +1054,7 @@ names, e.g. #0000ff is displayed in white with a blue background.
(write-region "" nil projectile-file)
(message ".projectile file created successfully."))))
#+end_src
** REST
#+begin_src emacs-lisp
(defun send-easy-http ()
@ -982,6 +1062,7 @@ names, e.g. #0000ff is displayed in white with a blue background.
(let (
(output-buffer (get-buffer-create "*Rest Output*"))
(command (concat "python /home/fs/bin/easy_http.py " buffer-file-name " " (projectile-project-root))))
;; (command (concat "/home/fs/bin/http " buffer-file-name " " (projectile-project-root))))
(save-buffer)
(unless (get-buffer-window output-buffer)
(split-window-right)
@ -1005,15 +1086,28 @@ names, e.g. #0000ff is displayed in white with a blue background.
)
#+end_src
** results_output
** insert some text
*** insert results output
#+begin_src emacs-lisp
(defun insert-results-output ()
(interactive)
(insert " :results output")
)
#+end_src
*** insert org babel tangle
#+begin_src emacs-lisp
(defun insert-org-tangle ()
(interactive)
(insert " :tangle change_file.ext")
)
#+end_src
*** keybind
#+begin_src emacs-lisp
(spc-leader
"i c r" '(insert-results-output :wk " :results output")
"i c" '(insert-results-output :wk " :results output")
"i m " '(insert-org-tangle :wk " :tangle change_file.ext")
)
#+end_src
@ -1028,6 +1122,7 @@ names, e.g. #0000ff is displayed in white with a blue background.
(vterm)))
(spc-leader
"t" '(:ignore t :wk "terminal")
"t t" '(open-term :wk "terminal")
)
#+end_src

View File

@ -1 +1 @@
/home/fs/Music/8/anime_music
/home/fs/Music/8/anime_music/onsa_media+

View File

@ -1 +1 @@
16111
95994

View File

@ -1,5 +1,5 @@
#EXTM3U
#MOCSERIAL: 1280
#MOCSERIAL: 512
#EXTINF:90,Cleo-chan feat. Blaze - Rapture (Juuni Taisen RUS OP)
/home/fs/Music/8/anime_music/onsa_media+/Cleo-chan feat. Blaze - Rapture (Juuni Taisen RUS OP).mp3
#EXTINF:318,/home/fs/Music/8/anime_music/onsa_media+/[Mobile Suit Gundam SEED на русском] Akatsuki no Kuruma [Onsa Media]-LmVyoxEbiZQ.m4a

View File

@ -1,3 +1,4 @@
import re
import uuid
import random
import os
@ -53,10 +54,12 @@ def set_vars(_body):
if isinstance(value, str):
value = value.replace('{{hex}}', uuid.uuid4().hex)
value = value.replace('{{uuid}}', str(uuid.uuid4()))
if ':code:' in value:
value = value.replace(':code:', '')
value = eval(f"{value}")
print(value)
pattern = r'\{\{uuid\[(\d+)\]\}\}'
def replace_uuid_slice(match):
slice = int(match.group(1))
return uuid.uuid4().hex[:slice]
value = re.sub(pattern, replace_uuid_slice, value)
body[key] = str(value)

View File

@ -12,8 +12,8 @@ if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
fi
else
# Получение списка профилей
while read -r line; do export "$line"; done < /home/fs/scale_vars
dpi="125"
# 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 -dpi $dpi)
if [ ! "$profile" = "" ]; then
firefox -P "$profile";

View File

@ -33,6 +33,8 @@ if len(sys.argv) > 1:
files = [os.path.join(path, f) for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
random_file = random.choice(files)
os.system(command.format(random_file))
exit()
else:
os.system(command.format(sys.argv[1]))
exit()

View File

@ -1,5 +1,5 @@
#!/bin/sh
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
# while read -r line; do export "$line"; done < /home/fs/scale_vars
dpi="100"
rofi -modi drun -show drun Papirus -dpi $dpi -sorting-method fzf -sort -matching fuzzy -show-icons -icon-theme Papirus
# rofi -modi drun -show drun -show-icons -icon-theme Papirus -dpi $dpi -sorting-method fzf -sort -matching fuzzy

View File

@ -26,7 +26,7 @@ if sys.argv[1] == '-s':
elif sys.argv[1] == '-d':
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/.config/chromium-flags.conf', '--force-device-scale-factor=1.25', '--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="125"', 'dpi="100"')

View File

@ -47,3 +47,4 @@ done < "$input_file"
echo "Готово. Логи записаны в $log_file"
# https://img.youtube.com/vi/Bqa3uj7IhuU/maxresdefault.jpg
# https://i.ytimg.com/vi/xcy9fdcQpso/hqdefault.jpg

View File

@ -73,12 +73,21 @@ output * bg /home/fs/Pictures/nord.png fill
bindsym $mod+q kill
# Start your launcher
bindsym $mod+r mode $main_map
mode "$main_map" {
bindsym $mod+r mode $wofi_map
mode "$wofi_map" {
bindsym i exec $menu; mode "default"
bindsym u exec ~/bin/firefox_profiles.sh; mode "default"
}
bindsym $mod+e mode $emacs_map
mode "$emacs_map" {
bindsym e exec "emacsclient -c"; mode "default"
bindsym d exec "emacsclient -c ~/Documents/"; mode "default"
bindsym p exec "emacsclient -c ~/Pictures/"; mode "default"
bindsym v exec "emacsclient -c ~/Videos/"; mode "default"
bindsym m exec "emacsclient -c ~/mnt/"; mode "default"
}
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
# Despite the name, also works for non-floating windows.
@ -154,7 +163,7 @@ output * bg /home/fs/Pictures/nord.png fill
# Switch the current container between different layout styles
bindsym $mod+s layout stacking
bindsym $mod+w layout tabbed
bindsym $mod+e layout toggle split
bindsym $mod+t layout toggle split
# Make the current focus fullscreen
bindsym $mod+f fullscreen
@ -230,9 +239,15 @@ include /etc/sway/config.d/*
exec swaymsg "workspace 1; exec emacs --daemon;"
}
# input type:keyboard {
# xkb_layout us,ru
# xkb_options grp:ctrl_alt_toggle,caps:ctrl_modifier
# }
input type:keyboard {
xkb_layout us,ru
xkb_options grp:ctrl_alt_toggle,caps:ctrl_modifier
xkb_options grp:ctrl_alt_toggle,caps:ctrl_modifier,grp:alt_space_toggle
}
# --- bar ---
@ -255,7 +270,7 @@ bindsym XF86AudioMute exec "pactl set-sink-mute 0 toggle"
# waybar,wofi,sway,grim,brightnessctl
bindsym $mod+p exec ~/bin/screen.sh
bindsym $mod+i exec "emacsclient -c"
# bindsym $mod+i exec "emacsclient -c"
bindsym Mod4+u exec "mocp --seek -5"
bindsym Mod4+i exec "mocp --seek +5"
bindsym Mod4+j exec "mocp --previous"

View File

@ -1,12 +1,20 @@
# Generated by nwg-displays on 2024-09-02 at 13:06:54. Do not edit manually.
# Generated by nwg-displays on 2024-10-13 at 20:17:30. Do not edit manually.
output "HDMI-A-1" {
mode 3840x2160@60.0Hz
pos 0 0
output "eDP-1" {
mode 1920x1080@60.004Hz
pos 2480 1800
transform normal
scale 1.5
scale_filter smart
scale 1.0
scale_filter nearest
adaptive_sync off
dpms on
}
output "HDMI-A-1" {
mode 3840x2160@60.0Hz
pos 1888 0
transform normal
scale 1.2
scale_filter linear
adaptive_sync off
dpms on
}
output "eDP-1" disable