From e8f2e69335bcfc59fbff30b9822299e25605442b Mon Sep 17 00:00:00 2001 From: TolaMironcenko Date: Thu, 21 Nov 2024 17:34:07 +0700 Subject: [PATCH] more comments --- hypr/environment.conf | 8 +-- hypr/hyprland.conf | 24 +++---- hypr/keybinds.conf | 143 +++++++++++++++++++++--------------------- shell/source.sh | 140 ++++++++++++++++++++--------------------- 4 files changed, 154 insertions(+), 161 deletions(-) diff --git a/hypr/environment.conf b/hypr/environment.conf index 4028d4d..646d2c4 100644 --- a/hypr/environment.conf +++ b/hypr/environment.conf @@ -7,13 +7,13 @@ env = QT_SCALE_FACTOR,1 #----------------------------------- #---------- GTK --------------- -env = GTK_THEME,Adwaita-dark -env = GTK2_RC_FILES,~/.config/gtk-2.0/gtkrc +env = GTK_THEME,Adwaita-dark # setting up gtk theme +env = GTK2_RC_FILES,/home/tola/dotfiles/gtk-2.0/gtkrc # setting up gtk2 theme #------------------------------ #-------------------- hyprcursor ------------ -env = HYPRCURSOR_THEME,Bibata-Modern-Ice -env = HYPRCURSOR_SIZE,24 +env = HYPRCURSOR_THEME,Bibata-Modern-Ice # settings up hyprcursor theme +env = HYPRCURSOR_SIZE,24 # setting up hyprcursor size #-------------------------------------------- #------------------------------------------------------------------------------ diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 02c2b40..015369d 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,16 +1,13 @@ # Hypland config created by Anatoly Mironcenko -source=~/.config/hypr/programs.conf -source=~/.config/hypr/keybinds.conf -source=~/dotfiles/hypr/hyprgrass.conf -source=~/.config/hypr/windowrules.conf -source=~/.config/hypr/startup.conf - -source=~/dotfiles/hypr/monitors.conf - -source=~/dotfiles/hypr/environment.conf - -source=~/dotfiles/hypr/keyboard.conf +source=~/.config/hypr/programs.conf # import programs configuration +source=~/.config/hypr/keybinds.conf # import keybinds configuration +source=~/dotfiles/hypr/hyprgrass.conf # import hyprgrass configuration +source=~/.config/hypr/windowrules.conf # import windowrules configuration +source=~/.config/hypr/startup.conf # import startup configuration +source=~/dotfiles/hypr/monitors.conf # import monitors configuration +source=~/dotfiles/hypr/environment.conf # import environments configuration +source=~/dotfiles/hypr/keyboard.conf # import keyboard configuration #----------------------- system config --------------------------------- general { @@ -26,9 +23,8 @@ general { #apply_sens_to_raw = 0 } -source=~/dotfiles/hypr/decoration.conf - -source=~/dotfiles/hypr/animation.conf +source=~/dotfiles/hypr/decoration.conf # import decoration configuration +source=~/dotfiles/hypr/animation.conf # import animation configuration dwindle { pseudotile = false diff --git a/hypr/keybinds.conf b/hypr/keybinds.conf index 87bac25..01e4a85 100644 --- a/hypr/keybinds.conf +++ b/hypr/keybinds.conf @@ -5,126 +5,123 @@ $mainMod = ALT #-------------- #---------------- applications --------------------- -bind = $mainMod, Return, exec, $terminal -bind = $mainMod, T, exec, $fileManager -bind = $mainMod, D, exec, $menu -bind = , XF86LaunchB, exec, $menu -bind = $mainMod, B, exec, $locker -bind = $mainMod, G, exec, $browser -bind = $mainMod SHIFT, F, exec, firefox -bind = $mainMod, A, exec, telegram-desktop -bind = $mainMod, P, exec, $dashboard -bind = $mainMod, C, exec, $clipboard -bind = $mainMod SHIFT, P, exec, $powermenu -bind = $mainMod SHIFT, O, exec, $onscreenkeyboard -bind = $mainMod, S, exec, spotify-launcher -bind = $mainMod, Y, exec, $calculator -bind = $mainMod, E, exec, $emojipicker -bind = $mainMod, M, exec, ~/dotfiles/ags/media/toggle_media -bind = $mainMod, Z, exec, swaync-client -t -bind = $mainMod SHIFT, R, exec, swaync-client -R -bind = $mainMod, U, exec, ~/dotfiles/hypr/bin/startupdate.sh -bind = $mainMod, O, exec, code ~/dotfiles -bind = $mainMod SHIFT, A, exec, hyprwall -bind = $mainMod SHIFT, G, exec, hyprgui +bind = $mainMod, Return, exec, $terminal # open default terminal +bind = $mainMod, T, exec, $fileManager # open default file manager +bind = $mainMod, D, exec, $menu # open applications menu +bind = , XF86LaunchB, exec, $menu # open applications menu +bind = $mainMod, B, exec, $locker # open locker +bind = $mainMod, G, exec, $browser # open default browser +bind = $mainMod SHIFT, F, exec, firefox # open firefox +bind = $mainMod, A, exec, telegram-desktop # open telegram +bind = $mainMod, P, exec, $dashboard # open dashboard +bind = $mainMod, C, exec, $clipboard # open clipboard +bind = $mainMod SHIFT, P, exec, $powermenu # open powermenu +bind = $mainMod SHIFT, O, exec, $onscreenkeyboard # open onscreenkeyboard +bind = $mainMod, S, exec, spotify-launcher # open spotify +bind = $mainMod, Y, exec, $calculator # open calculator +bind = $mainMod, E, exec, $emojipicker # open emojipicker +bind = $mainMod, Z, exec, swaync-client -t # toggle swaync +bind = $mainMod SHIFT, R, exec, swaync-client -R # reload swaync configuration +bind = $mainMod, U, exec, ~/dotfiles/hypr/bin/startupdate.sh # start upgrade system +bind = $mainMod, O, exec, code ~/dotfiles # open vscode to edit configuration directory +bind = $mainMod SHIFT, A, exec, hyprwall # run hyprwall application +bind = $mainMod SHIFT, G, exec, hyprgui # run hyprgui application #--------------------------------------------------- #-------------- windows -------------------------- # bind = $mainMod, J, togglesplit, # dwindle -bind = $mainMod, F, fullscreen, -bind = $mainMod, V, togglefloating, -bind = $mainMod, Q, killactive, +bind = $mainMod, F, fullscreen, # toggle fullscreen window +bind = $mainMod, V, togglefloating, # toggle floating window +bind = $mainMod, Q, killactive, # close window #------------------------------------------------- #-------- quit from Hyprland --------- -bind = $mainMod SHIFT, E, exit, +bind = $mainMod SHIFT, E, exit, # exit from hyprland #------------------------------------- #---------------- screenshot ---------------------------------------- -bind = $mainMod SHIFT, C, exec, grim -g "$(slurp -d)" - | wl-copy -bind = $mainMod, P, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +%Y%m%d-%H%M%S).png -bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy +bind = $mainMod SHIFT, C, exec, grim -g "$(slurp -d)" - | wl-copy # get screenshot and copy to clipboard +bind = $mainMod, P, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +%Y%m%d-%H%M%S).png # get screenshot and save to screenshot directory +bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy # get screenshot and copy to clipboard #-------------------------------------------------------------------- #--------------- pamixer -------------------- # bind = $mainMod, equal, exec, pamixer -i 10 # bind = $mainMod, minus, exec, pamixer -d 10 # bind = $mainMod SHIFT, M, exec, pamixer -t -bind = $mainMod, equal, exec, swayosd-client --output-volume raise -bind = $mainMod, minus, exec, swayosd-client --output-volume lower -bind = $mainMod SHIFT, M, exec, swayosd-client --output-volume mute-toggle +bind = $mainMod, equal, exec, swayosd-client --output-volume raise # raise volume +bind = $mainMod, minus, exec, swayosd-client --output-volume lower # lower volume +bind = $mainMod SHIFT, M, exec, swayosd-client --output-volume mute-toggle # toggle mute volume #------------------- for xf86AudioVolumes ----------- # bind = , XF86AudioLowerVolume, exec, pamixer -d 5 # bind = , XF86AudioRaiseVolume, exec, pamixer -i 5 # bind = , XF86AudioMicMute, exec, pamixer --default-source -m # bind = , XF86AudioMute, exec, pamixer -t -bind = , XF86AudioLowerVolume, exec, swayosd-client --output-volume lower -bind = , XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise -bind = , XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle -bind = , XF86AudioMute, exec, swayosd-client --output-volume mute-toggle +bind = , XF86AudioLowerVolume, exec, swayosd-client --output-volume lower # lower volume +bind = , XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise # raise volume +bind = , XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle # toggle mute mic +bind = , XF86AudioMute, exec, swayosd-client --output-volume mute-toggle # toggle mute volume -bind = , XF86AudioPlay, exec, playerctl play-pause -bind = , XF86AudioPause, exec, playerctl play-pause -bind = , XF86AudioNext, exec, playerctl next -bind = , XF86AudioPrev, exec, playerctl previous +bind = , XF86AudioPlay, exec, playerctl play-pause # play pause music +bind = , XF86AudioPause, exec, playerctl play-pause # play pause music +bind = , XF86AudioNext, exec, playerctl next # next song player +bind = , XF86AudioPrev, exec, playerctl previous # previous song player -bind = $mainMod, bracketleft, exec, playerctl previous -bind = $mainMod, bracketright, exec, playerctl next -bind = $mainMod, backslash, exec, playerctl play-pause +bind = $mainMod, bracketleft, exec, playerctl previous # previous song player +bind = $mainMod, bracketright, exec, playerctl next # next song player +bind = $mainMod, backslash, exec, playerctl play-pause # play pause music #---------------------------------------------------- #-------------------------------------------- #--------------- playerctl --------------------------- -bind = $mainMod, space, exec, playerctl play-pause -bind = , Pause, exec, playerctl play-pause +bind = $mainMod, space, exec, playerctl play-pause # play pause music +bind = , Pause, exec, playerctl play-pause # play puse music #----------------------------------------------------- #------------------ brightness ---------------------- # bind = $mainMod SHIFT, minus, exec, brightnessctl s 10%- # bind = $mainMod SHIFT, equal, exec, brightnessctl s 10%+ -bind = $mainMod SHIFT, minus, exec, swayosd-client --brightness lower -bind = $mainMod SHIFT, equal, exec, swayosd-client --brightness raise +bind = $mainMod SHIFT, minus, exec, swayosd-client --brightness lower # lower screen brightness +bind = $mainMod SHIFT, equal, exec, swayosd-client --brightness raise # rause screen brightness #------------ for xf86MonBrightness ----------------- # bind = , XF86MonBrightnessDown, exec, brightnessctl s 10%- # bind = , XF86MonBrightnessUp, exec, brightnessctl s 10%+ -bind = , XF86MonBrightnessDown, exec, swayosd-client --brightness lower -bind = , XF86MonBrightnessUp, exec, swayosd-client --brightness raise +bind = , XF86MonBrightnessDown, exec, swayosd-client --brightness lower # lower screen brightness +bind = , XF86MonBrightnessUp, exec, swayosd-client --brightness raise # raise screen brightness #---------------------------------------------------- #-------------- for XF86KbdBrightness keyboard brightness --------------- -bind = , XF86KbdBrightnessUp, exec, brightnessctl --device smc::kbd_backlight s 10%+ -bind = , XF86KbdBrightnessDown, exec, brightnessctl --device smc::kbd_backlight s 10%- +bind = , XF86KbdBrightnessUp, exec, brightnessctl --device smc::kbd_backlight s 10%+ # raise keyboard brightness +bind = , XF86KbdBrightnessDown, exec, brightnessctl --device smc::kbd_backlight s 10%- # lower keyboard brightness #------------------------------------------------------------------------ #---------------------------------------------------- #----------------- Move focus ---------- -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - -bind = $mainMod, J, movefocus, d -bind = $mainMod, K, movefocus, u -bind = $mainMod, H, movefocus, l -bind = $mainMod, L, movefocus, r +bind = $mainMod, left, movefocus, l # move focus to left window +bind = $mainMod, right, movefocus, r # move focus to right window +bind = $mainMod, up, movefocus, u # move focus to up window +bind = $mainMod, down, movefocus, d # move focus to down window +bind = $mainMod, J, movefocus, d # move focus to down window +bind = $mainMod, K, movefocus, u # move focus to up window +bind = $mainMod, H, movefocus, l # move focus to left window +bind = $mainMod, L, movefocus, r # move focus to right window #--------------------------------------- #---- Move windows --------------------------- -bind = $mainMod SHIFT, lift, movewindow, l -bind = $mainMod SHIFT, right, movewindow, r -bind = $mainMod SHIFT, up, movewindow, u -bind = $mainMod SHIFT, down, movewindow, d - -bind = $mainMod SHIFT, J, movewindow, d -bind = $mainMod SHIFT, K, movewindow, u -bind = $mainMod SHIFT, H, movewindow, l -bind = $mainMod SHIFT, L, movewindow, r +bind = $mainMod SHIFT, lift, movewindow, l # move window to left +bind = $mainMod SHIFT, right, movewindow, r # move window to right +bind = $mainMod SHIFT, up, movewindow, u # move window to up +bind = $mainMod SHIFT, down, movewindow, d # move window to down +bind = $mainMod SHIFT, J, movewindow, d # move window to down +bind = $mainMod SHIFT, K, movewindow, u # move window to up +bind = $mainMod SHIFT, H, movewindow, l # move window to left +bind = $mainMod SHIFT, L, movewindow, r # move window to right #--------------------------------------------- #--------- Switch workspaces ------------------------- -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 1, workspace, 1 # switch to first workspace +bind = $mainMod, 2, workspace, 2 # switch to second workspace +bind = $mainMod, 3, workspace, 3 # switch to third workspace +bind = $mainMod, 4, workspace, 4 # switch to fourth workspace bind = $mainMod, 5, workspace, 5 bind = $mainMod, 6, workspace, 6 bind = $mainMod, 7, workspace, 7 diff --git a/shell/source.sh b/shell/source.sh index 2684afc..3acded3 100644 --- a/shell/source.sh +++ b/shell/source.sh @@ -1,11 +1,11 @@ #--- path --- export PATH=$PATH:~/dotfiles/bin:~/dotfiles/hypr/bin:~/dotfiles/dwm/bin/:~/.cargo/bin -export GTK2_RC_FILES=~/.config/gtk-2.0/gtkrc +export GTK2_RC_FILES=~/.config/gtk-2.0/gtkrc # gtk2 theme #------------ #--- colors --- -. ~/dotfiles/shell/colors.sh +. ~/dotfiles/shell/colors.sh # include bash colors #-------------- #--- sys --- @@ -19,85 +19,85 @@ alias una='uname -a' # system name alias ifcnf='ifconfig' # ifconfig alias sudo='sudo -p "Give me your fucking password: "' # sudo prompt alias #--- pacman --- -alias p='sudo pacman' # pacman -alias psy='sudo pacman -Sy' # update repositories -alias psyu='sudo pacman -Syu' # upgrade system -alias pi='sudo pacman -S' # install package -alias psc='sudo pacman -Ss' # search package in repository -alias pqdtq='sudo pacman -Qdtq' # list files without dependencies -alias pq='sudo pacman -Q' # list installed packages -alias pql='sudo pacman -Ql' # list files in packages -alias prm='sudo pacman -R' # delete pacman package -alias prns='sudo pacman -Rns' # delete pacman package with all dependencies +alias p='sudo pacman' # pacman +alias psy='sudo pacman -Sy' # update repositories +alias psyu='sudo pacman -Syu' # upgrade system +alias pi='sudo pacman -S' # install package +alias psc='sudo pacman -Ss' # search package in repository +alias pqdtq='sudo pacman -Qdtq' # list files without dependencies +alias pq='sudo pacman -Q' # list installed packages +alias pql='sudo pacman -Ql' # list files in packages +alias prm='sudo pacman -R' # delete pacman package +alias prns='sudo pacman -Rns' # delete pacman package with all dependencies #-------------- #--- apt --- -alias aptu='sudo apt update' # update apt repositories -alias apti='sudo apt install -y' # install apt package -alias aptui='sudo apt upgrade -y' # upgrade apt packages -alias aptrm='sudo apt remove -y' # remove apt package -alias aptautorm='sudo apt autoremove -y' # remove apt package with dependencies +alias aptu='sudo apt update' # update apt repositories +alias apti='sudo apt install -y' # install apt package +alias aptui='sudo apt upgrade -y' # upgrade apt packages +alias aptrm='sudo apt remove -y' # remove apt package +alias aptautorm='sudo apt autoremove -y' # remove apt package with dependencies #----------- -alias ipr='ip route' # show routes -alias ipa='ip addr' # show addresses -alias ipl='ip link' # show links -alias sctl='systemctl' # systemctl -alias sctls='systemctl start' # service start -alias sctlst='systemctl status' # service status -alias sctlp='systemctl stop' # service stop -alias H='Hyprland' # start Hyprland -alias sx='startx' # startx - start xorg +alias ipr='ip route' # show routes +alias ipa='ip addr' # show addresses +alias ipl='ip link' # show links +alias sctl='systemctl' # systemctl +alias sctls='systemctl start' # service start +alias sctlst='systemctl status' # service status +alias sctlp='systemctl stop' # service stop +alias H='Hyprland' # start Hyprland +alias sx='startx' # startx - start xorg #----------- #--- git --- -alias g='git' # git -alias ga='git add' # add unstaged changes -alias gaa='git add --all' # add all unstaged changes -alias gb='git branch' # create branch -alias gba='git branch --all' # list all branches -alias gbd='git branch --delete' # delete branch -alias gbD='git branch --delete --force' # force delete branch -alias gco='git checkout' # checkout to another branch -alias gcb='git checkout -b' # checkout and create branch -alias gc='git clone' # clone from remote repository -alias gcl='git clone --recursive' # clone recursive with submodules -alias gcam='git commit --all --message' # commit with commit message -alias gd='git diff' # create diff -alias gcf='git config --list' # show config -alias gf='git fetch' # fetch from remote repository -alias ghh='git help' # help -alias glgg='git log --graph' # log with graph -alias glg='git log --stat' # log with stat -alias gm='git merge' # merge branches -alias gl='git pull' # pull from upstream repository -alias gpr='git pull --rebase' # pull from upstream repository and rebase local changes -alias gp='git push' # push to upstream repository -alias gpo='git push --set-upstream origin' # push to upstream repository and set upstream branch -alias gra='git remote add' # add remote repository -alias grrm='git remote remove' # remove remote repository -alias gstall='git stash --all' # stash all in repository -alias gstc='git stash clear' # clear git stash -alias gst='git status' # status repository +alias g='git' # git +alias ga='git add' # add unstaged changes +alias gaa='git add --all' # add all unstaged changes +alias gb='git branch' # create branch +alias gba='git branch --all' # list all branches +alias gbd='git branch --delete' # delete branch +alias gbD='git branch --delete --force' # force delete branch +alias gco='git checkout' # checkout to another branch +alias gcb='git checkout -b' # checkout and create branch +alias gc='git clone' # clone from remote repository +alias gcl='git clone --recursive' # clone recursive with submodules +alias gcam='git commit --all --message' # commit with commit message +alias gd='git diff' # create diff +alias gcf='git config --list' # show config +alias gf='git fetch' # fetch from remote repository +alias ghh='git help' # help +alias glgg='git log --graph' # log with graph +alias glg='git log --stat' # log with stat +alias gm='git merge' # merge branches +alias gl='git pull' # pull from upstream repository +alias gpr='git pull --rebase' # pull from upstream repository and rebase local changes +alias gp='git push' # push to upstream repository +alias gpo='git push --set-upstream origin' # push to upstream repository and set upstream branch +alias gra='git remote add' # add remote repository +alias grrm='git remote remove' # remove remote repository +alias gstall='git stash --all' # stash all in repository +alias gstc='git stash clear' # clear git stash +alias gst='git status' # status repository #----------- #--- docker --- -alias dpa='docker ps -a' # list all docker containers -alias dp='docker ps' # list active docker containers -alias dia='docker images -a' # list all docker images -alias di='docker images' # list docker images -alias dcrm='docker container rm' # remove docker container -alias dirm='docker image rm' # remove docker image -alias dr='docker run' # run docker image as container -alias ds='docker start' # start docker container -alias dst='docker stop' # stop docker container -alias dspa='docker system prune -a' # delete all docker data -alias dcaq='docker ps -aq' # stop all containers +alias dpa='docker ps -a' # list all docker containers +alias dp='docker ps' # list active docker containers +alias dia='docker images -a' # list all docker images +alias di='docker images' # list docker images +alias dcrm='docker container rm' # remove docker container +alias dirm='docker image rm' # remove docker image +alias dr='docker run' # run docker image as container +alias ds='docker start' # start docker container +alias dst='docker stop' # stop docker container +alias dspa='docker system prune -a' # delete all docker data +alias dcaq='docker ps -aq' # stop all containers #-------------- #--- bluetooth --- -alias bctl="bluetoothctl" -alias bctlc="bluetoothctl connect" -alias bctld="bluetoothctl disconnect" -alias bctll="bluetoothctl devices" -alias bctls="bluetoothctl scan on" +alias bctl="bluetoothctl" # bluetoothctl +alias bctlc="bluetoothctl connect" # connect bluetooth device +alias bctld="bluetoothctl disconnect" # disconnect bluetooth device +alias bctll="bluetoothctl devices" # show bluetooth devices +alias bctls="bluetoothctl scan on" # scan bluetooth devices #-----------------