From 4aa95231ea1292b9b77b713118bc122ce442c214 Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Tue, 6 May 2025 22:02:36 +0300 Subject: [PATCH 1/4] another change --- .config/nvim | 2 +- .github/README.md | 2 +- .ideavimrc | 86 +++++++++++++--------------- .system-config-backup/aurpkglist.txt | 2 - 4 files changed, 42 insertions(+), 50 deletions(-) diff --git a/.config/nvim b/.config/nvim index a932e3d..91e823f 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit a932e3d7d0f5f9313ee44d5f8ae0cb85745e09e0 +Subproject commit 91e823f32b6a04e1863e93238b1a71f7d259bb8f diff --git a/.github/README.md b/.github/README.md index 0b54cbd..ccb249b 100644 --- a/.github/README.md +++ b/.github/README.md @@ -168,7 +168,7 @@ repository. Or you can donate. [![Star History Chart](https://api.star-history.com/svg?repos=CelticBoozer/dotfiles&type=Timeline&theme=dark)](https://star-history.com/#CelticBoozer/dotfiles&Timeline) ### :coin: Donation - + | ![USDT-TRC20](assets/USDT.jpg) | ![BTC](assets/BTC.jpg) | ![ETH](assets/ETH.jpg) | |:----------------------------------:|:------------------------------------------:|:------------------------------------------:| | USDT TRC20 | BTC | ETH | diff --git a/.ideavimrc b/.ideavimrc index 183c8db..39addf5 100644 --- a/.ideavimrc +++ b/.ideavimrc @@ -47,15 +47,20 @@ let g:WhichKeyDesc_tool_git = "tg Git window" let g:WhichKeyDesc_tool_commit = "tc Commit window" let g:WhichKeyDesc_tool_problem = "tl Problems window" let g:WhichKeyDesc_tool_run = "tr Run window" -let g:WhichKeyDesc_tool_database = "td Database window" +let g:WhichKeyDesc_tool_database = "tb Database window" +let g:WhichKeyDesc_tool_structure = "to Outline structure window" let g:WhichKeyDesc_tool_maven = "tm Maven window" let g:WhichKeyDesc_tool_checkstyle = "ts Checkstyle window" +let g:WhichKeyDesc_tool_debug = "td Debug window" let g:WhichKeyDesc_execution = "e Execution menu" let g:WhichKeyDesc_execution_run = "er Run" let g:WhichKeyDesc_execution_run_config = "eR Choose run configuration" -let g:WhichKeyDesc_execution_debug = "ed Debug" -let g:WhichKeyDesc_execution_stop = "es Stop" +let g:WhichKeyDesc_execution_stop = "eS Stop" + +let g:WhichKeyDesc_debug = "d Debug menu" +let g:WhichKeyDesc_debug_start = "de Strat debug" +let g:WhichKeyDesc_debug_add_breakpoint = "db Add Breakpoint" let g:WhichKeyDesc_split = "w Split menu" let g:WhichKeyDesc_split_vertically = "ws Split vertically" @@ -63,37 +68,30 @@ let g:WhichKeyDesc_split_horizontally = "wS Split horizontally" let g:WhichKeyDesc_refactor = "r Refactor menu" let g:WhichKeyDesc_refactor_rename = "rn Rename element" -let g:WhichKeyDesc_refactor_intention_action = "ri Show intention actions" -let g:WhichKeyDesc_refactor_extract_method = "rm Extract method" -let g:WhichKeyDesc_refactor_introduce_variable = "rv Introduce variable" -let g:WhichKeyDesc_refactor_introduce_field = "ra Introduce field" let g:WhichKeyDesc_refactor_reformat_code = "rf Reformat code" -let g:WhichKeyDesc_refactor_change_signature = "rs Change signature" let g:WhichKeyDesc_refactor_action_list = "rr Actions list" -let g:WhichKeyDesc_go_to = "g Go to menu" -let g:WhichKeyDesc_go_to_declaration = "gd Go to declaration" -let g:WhichKeyDesc_go_to_type_declaration = "gy Go to type declaration" -let g:WhichKeyDesc_go_to_implementation = "gi Go to implementation" -let g:WhichKeyDesc_go_to_usages = "gu Show usages" -let g:WhichKeyDesc_go_to_test = "gt Go to test" -let g:WhichKeyDesc_go_to_back = "gb Go back" -let g:WhichKeyDesc_go_to_forward = "gn Go forward" +let g:WhichKeyDesc_go_to = "g Go to menu" +let g:WhichKeyDesc_go_to_declaration = "gd Go to declaration" +let g:WhichKeyDesc_go_to_type_declaration = "gy Go to type declaration" +let g:WhichKeyDesc_go_to_implementation = "gi Go to implementation" +let g:WhichKeyDesc_go_to_test = "gt Go to test" +let g:WhichKeyDesc_go_to_back = "gb Go back" +let g:WhichKeyDesc_go_to_forward = "gn Go forward" let g:WhichKeyDesc_action = "a Actions" -let g:WhichKeyDesc_action_context = "am Show intention actions" -let g:WhichKeyDesc_action_search = "as Search everywhere" +let g:WhichKeyDesc_action_context = "aa Show intention actions" let g:WhichKeyDesc_action_generate = "ag Generate" + +let g:WhichKeyDesc_search = "f Search" +let g:WhichKeyDesc_search_all = "ff Search everywhere" +let g:WhichKeyDesc_search_references = "fr Search references" + let g:WhichKeyDesc_comment = "c Comment" let g:WhichKeyDesc_comment_line = "cc Comment line" let g:WhichKeyDesc_comment_block = "cb Comment block" -let g:WhichKeyDesc_folding = "z Folding" -let g:WhichKeyDesc_folding_fold = "zc Collapse region" -let g:WhichKeyDesc_folding_expand = "ze Expand region" -let g:WhichKeyDesc_folding_fold_all = "zC Collapse all" -let g:WhichKeyDesc_folding_expand_all = "zE Expand all" " ================================================================================================== " To get actions list, use " General @@ -108,51 +106,47 @@ map tg (ActivateVersionControlToolWindow) map tc (ActivateCommitToolWindow) map tl (ActivateProblemsViewToolWindow) map tr (ActivateRunToolWindow) -map td (ActivateDatabaseToolWindow) +map tb (ActivateDatabaseToolWindow) +map to (ActivateStructureToolWindow) map tm (ActivateMavenToolWindow) map ts (ActivateCheckStyleToolWindow) +map td (ActivateDebugToolWindow) map (RecentFiles) " Code execution map er (Run) map eR (ChooseRunConfiguration) -map ed (Debug) map es (Stop) +" Debug +map db (ToggleLineBreakpoint) +map de (Debug) + " Window splits map ws (SplitVertically) map wS (SplitHorizontally) " Refactoring map rn (RenameElement) -map ri (ShowIntentionActions) -map rm (ExtractMethod) -map rv (IntroduceVariable) -map ra (IntroduceField) map rf (ReformatCode) -map rs (ChangeSignature) map rr (Refactorings.QuickListPopupAction) " Go to code -map gd (GotoDeclaration) -map gy (GotoTypeDeclaration) -map gi (GotoImplementation) -map gu (ShowUsages) -map gt (GotoTest) -map gb (Back) -map gn (Forward) +map gd (GotoDeclaration) +map gy (GotoTypeDeclaration) +map gi (GotoImplementation) +map gt (GotoTest) +map gb (Back) +map gn (Forward) " Actions -map am (ShowIntentionActions) -map as (SearchEverywhere) +map aa (ShowIntentionActions) map ag (Generate) +" Search +map ff (SearchEverywhere) +map fr (ShowUsages) + " Comments map cc (CommentByLineComment) -map cb (CommentByBlockComment) - -" Folding -map zc (CollapseRegion) -map ze (ExpandRegion) -map zC (CollapseAllRegions) -map zE (ExpandAllRegions) +map cb (CommentByBlockComment) \ No newline at end of file diff --git a/.system-config-backup/aurpkglist.txt b/.system-config-backup/aurpkglist.txt index e57f69d..ddc9697 100644 --- a/.system-config-backup/aurpkglist.txt +++ b/.system-config-backup/aurpkglist.txt @@ -16,13 +16,11 @@ pkgtools postman-bin python-commitizen python-decli -python-pythondialog python-questionary python-xlsx2csv rate-mirrors reiserfsprogs rmlint -rmlint-shredder rofi-power-menu rofi-ttv-git swaykbdd From 44b3001294d50a94873f60d2b997ddea98098d7e Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Tue, 6 May 2025 22:09:31 +0300 Subject: [PATCH 2/4] fix install script --- .bin/initial-installation.sh | 8 +++++--- .config/nvim | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.bin/initial-installation.sh b/.bin/initial-installation.sh index 610f9f0..9d61398 100755 --- a/.bin/initial-installation.sh +++ b/.bin/initial-installation.sh @@ -54,9 +54,11 @@ print_log_message $info_color "prerequisites check..." # Files check check_file "${HOME}/.system-config-backup/pacman/pacman.conf" check_file "${HOME}/.system-config-backup/pkglist.txt" -check_file "${HOME}/.system-config-backup/pacman/create-backup.hook" -check_file "${HOME}/.system-config-backup/pacman/create-aur-backup.hook" -check_file "${HOME}/.system-config-backup/pacman/electron.hook" +check_file "${HOME}/.system-config-backup/pacman/91-create-backup.hook" +check_file "${HOME}/.system-config-backup/pacman/92-create-aur-backup.hook" +check_file "${HOME}/.system-config-backup/pacman/93-electron.hook" +check_file "${HOME}/.system-config-backup/pacman/94-check-pacnew.hook" +check_file "${HOME}/.system-config-backup/pacman/95-backup-configs.hook" check_file "${HOME}/.system-config-backup/systemd/logind.conf" check_file "${HOME}/.system-config-backup/tlp.conf" check_file "${HOME}/.system-config-backup/config.toml" diff --git a/.config/nvim b/.config/nvim index 91e823f..b6c21d9 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 91e823f32b6a04e1863e93238b1a71f7d259bb8f +Subproject commit b6c21d94e233ba8ab6319312d34f387e791504e2 From 4000712633aeee8d163c7c58a0a0570ddc3b6488 Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Tue, 6 May 2025 22:13:29 +0300 Subject: [PATCH 3/4] another change --- .bin/initial-installation.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.bin/initial-installation.sh b/.bin/initial-installation.sh index 9d61398..bd3f174 100755 --- a/.bin/initial-installation.sh +++ b/.bin/initial-installation.sh @@ -60,9 +60,10 @@ check_file "${HOME}/.system-config-backup/pacman/93-electron.hook" check_file "${HOME}/.system-config-backup/pacman/94-check-pacnew.hook" check_file "${HOME}/.system-config-backup/pacman/95-backup-configs.hook" check_file "${HOME}/.system-config-backup/systemd/logind.conf" -check_file "${HOME}/.system-config-backup/tlp.conf" -check_file "${HOME}/.system-config-backup/config.toml" -check_file "${HOME}/.system-config-backup/reflector.conf" +check_file "${HOME}/.system-config-backup/systemd/resolved.conf" +check_file "${HOME}/.system-config-backup/tlp/tlp.conf" +check_file "${HOME}/.system-config-backup/greetd/config.toml" +check_file "${HOME}/.system-config-backup/reflector/reflector.conf" #Packages check check_package "git" From f010d363fdd9c62fa1105fa809906f328274660c Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Wed, 7 May 2025 04:30:59 +0300 Subject: [PATCH 4/4] another change --- .bin/initial-installation.sh | 2 +- .config/nvim | 2 +- .config/sway/config.d/keybinds.conf | 3 --- .github/README.md | 2 +- .system-config-backup/aurpkglist.txt | 4 ---- .system-config-backup/pkglist.txt | 1 + 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.bin/initial-installation.sh b/.bin/initial-installation.sh index bd3f174..ba289a5 100755 --- a/.bin/initial-installation.sh +++ b/.bin/initial-installation.sh @@ -29,7 +29,7 @@ print_log_message() { } printf "\e[36mPlease, make sure you move all files to your home directory.\e[0m\n" -printf "\e[36mAlso, the computer must have internet access and git must be installed.\e[0m\n" +printf "\e[36mComputer must have internet access and git must be installed with ssh-keys.\e[0m\n" while true; do read -rp "Do you want to continue? (y/n): " choice diff --git a/.config/nvim b/.config/nvim index b6c21d9..e373d13 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit b6c21d94e233ba8ab6319312d34f387e791504e2 +Subproject commit e373d13f0c76a239c874e521d0d998e9e39240b9 diff --git a/.config/sway/config.d/keybinds.conf b/.config/sway/config.d/keybinds.conf index 904e581..c751270 100644 --- a/.config/sway/config.d/keybinds.conf +++ b/.config/sway/config.d/keybinds.conf @@ -142,6 +142,3 @@ bindsym --to-code $mod+t exec $term -e yazi bindsym --to-code $mod+Shift+Return exec cool-retro-term bindsym --to-code $mod+Escape exec swaylock bindsym --to-code $mod+n exec swaync-client -t -sw -R -rs - -# Other -bindsym --to-code $mod+Shift+d exec rofi-ttv diff --git a/.github/README.md b/.github/README.md index ccb249b..ecfbc56 100644 --- a/.github/README.md +++ b/.github/README.md @@ -141,7 +141,7 @@ If you want to install my dotfiles, here are some tips and recommendations. 1. You need to install Arch Linux (please follow the official [guide](https://wiki.archlinux.org/title/Installation_guide)). 2. Establish a stable internet connection. -3. Install git. You can do this by running the `pacman -S git` command. +3. Install `git` and `base-devel` packages. 4. Copy this repository to your $HOME directory. 5. Run the initial-installation script `sh .bin/initial-installation.sh`. This script will install all the necessary packages and move all the necessary diff --git a/.system-config-backup/aurpkglist.txt b/.system-config-backup/aurpkglist.txt index ddc9697..08f94e6 100644 --- a/.system-config-backup/aurpkglist.txt +++ b/.system-config-backup/aurpkglist.txt @@ -2,7 +2,6 @@ advcpmv ddcui debtap google-chrome -grimshot gruvbox-material-gtk-theme-git gruvbox-material-icon-theme-git intellij-idea-ultimate-edition @@ -11,7 +10,6 @@ lazyjournal luajit-tiktoken-bin pacnews-neovim-git paru -paru-debug pkgtools postman-bin python-commitizen @@ -22,14 +20,12 @@ rate-mirrors reiserfsprogs rmlint rofi-power-menu -rofi-ttv-git swaykbdd swaylock-effects swayosd-git sworkstyle sysz vesktop-bin -viber waybar-crypto waybar-module-pacman-updates-git wg-cmd diff --git a/.system-config-backup/pkglist.txt b/.system-config-backup/pkglist.txt index 9e8043c..0d62959 100644 --- a/.system-config-backup/pkglist.txt +++ b/.system-config-backup/pkglist.txt @@ -125,6 +125,7 @@ steam sudo swappy sway +sway-contrib swaybg swayidle swaync