refactor

hypr/animation.conf

@@ -1,3 +1,5 @@
+
+#--------- animations ---------------------------------------
 animations {
     enabled = true
     animation = windows, 1, 2, default
@@ -7,3 +9,4 @@ animations {
     animation = fade, 1, 2, default
     animation = workspaces, 1, 4, default,slidefade 20%
 }
+#------------------------------------------------------------

hypr/decoration.conf

@@ -1,3 +1,5 @@
+
+#-------- decorations ------------
 decoration {
     rounding = 10
 
@@ -14,4 +16,4 @@ decoration {
     shadow_render_power = 3
     col.shadow = rgba(1a1a1aee)
 }
-
+#---------------------------------

hypr/environment.conf

@@ -1,10 +1,19 @@
 #------------- default env vars -----------------------------------------------
-env = XCURSOR_SIZE,24
+
+#------------- QT ------------------
 env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that
 env = QT_QPA_PLATFORM,wayland
 env = QT_SCALE_FACTOR,1
+#-----------------------------------
+
+#---------- GTK ---------------
 env = GTK_THEME,Adwaita-dark
+#------------------------------
+
+#-------------------- hyprcursor ------------
 env = HYPRCURSOR_THEME,Bibata-Modern-Ice
 env = HYPRCURSOR_SIZE,24
+#--------------------------------------------
+
 #------------------------------------------------------------------------------
 

hypr/hyprlock.conf

@@ -1,5 +1,5 @@
-hyprlock.conf
-------------------------------------------------------
+# hyprlock.conf
+# ------------------------------------------------------
 # HyprLock
 # ........
 
@@ -56,4 +56,4 @@ label {
     halign = center
     valign = center
 }
------------------------------------------------------
+# ------------------------------------------------------

hypr/keybinds.conf

@@ -1,55 +1,73 @@
 #-------------------------- keybinds ------------------------------
 
+#--- modkey ---
 $mainMod = ALT
+#--------------
 
+#---------------- applications ---------------------
 bind = $mainMod, Return, exec, $terminal
-bind = $mainMod, Q, killactive,
-bind = $mainMod  SHIFT, M, exit,
 bind = $mainMod, T, exec, $fileManager
-bind = $mainMod, V, togglefloating,
 bind = $mainMod, D, exec, $menu
-bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod, F, fullscreen,
 bind = $mainMod, B, exec, $locker
 bind = $mainMod, G, exec, $browser
 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
+bind = $mainMod, Y, exec, $calculator
+bind = $mainMod, E, exec, $emojipicker
+#---------------------------------------------------
+
+#-------------- windows --------------------------
+# bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, F, fullscreen,
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, Q, killactive,
+#-------------------------------------------------
+
+#-------- quit from Hyprland ---------
+bind = $mainMod  SHIFT, E, exit,
+#-------------------------------------
+
+#---------------- 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, C, exec, $clipboard
-bind = $mainMod SHIFT, P, exec, $powermenu
+#--------------------------------------------------------------------
+
+#--------------- pamixer --------------------
 bind = $mainMod, I, exec, pamixer -i 10
 bind = $mainMod, minus, exec, pamixer -d 10
+bind = $mainMod SHIFT, M, exec, pamixer -t
+#--------------------------------------------
+
+#--------------- playerctl ---------------------------
 bind = $mainMod, space, exec, playerctl play-pause
-bind = $mainMod, K, exec, $onscreenkeyboard
 bind = , Pause, exec, playerctl play-pause
+#-----------------------------------------------------
+
 # ------------------- for xf86AudioVolumes -----------
 bind = , XF86AudioLowerVolume, exec, pamixer -d 5
 bind = , XF86AudioRaiseVolume, exec, pamixer -i 5
 # ----------------------------------------------------
+
 # ------------ for xf86MonBrightness -----------------
 bind = , XF86MonBrightnessDown, exec, brightnessctl s 10%-
 bind = , XF86MonBrightnessUp, exec, brightnessctl s 10%+
 # ----------------------------------------------------
-bind = $mainMod SHIFT, M, exec, pamixer -t
-bind = $mainMod, S, exec, spotify
-bind = $mainMod, Y, exec, gnome-calculator
-bind = $mainMod, E, exec, $emojipicker
-
-bind = $mainMod SHIFT, f, exec, fuzzel
-bind = $mainMod, H, exec, startapp
-
-bind = $mainMod, X, exec, xpad --show
-bind = $mainMod SHIFT, X, exec, xpad --new
-
-bind = $mainMod SHIFT, B, exec, copyq show
 
 #----------------- 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, u
+bind = $mainMod, K, movefocus, d
+bind = $mainMod, H, movefocus, l
+bind = $mainMod, L, movefocus, r
 #---------------------------------------
 
 #---- Move windows ---------------------------
@@ -57,6 +75,11 @@ 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, u
+bind = $mainMod SHIFT, K, movewindow, d
+bind = $mainMod SHIFT, H, movewindow, l
+bind = $mainMod SHIFT, L, movewindow, r
 #---------------------------------------------
 
 #--------- Switch workspaces -------------------------
@@ -70,7 +93,12 @@ bind = $mainMod, 7, workspace, 7
 bind = $mainMod, 8, workspace, 8
 bind = $mainMod, 9, workspace, 9
 bind = $mainMod, 0, workspace, 10
-#----------------------------------------------------
+
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+bind = Control_L $mainMod, Right, workspace, e+1
+bind = Control_L $mainMod, Left, workspace, e-1
+#-----------------------------------------------------
 
 #------------- Move active window to a workspace ---
 bind = $mainMod SHIFT, 1, movetoworkspace, 1
@@ -83,17 +111,20 @@ bind = $mainMod SHIFT, 7, movetoworkspace, 7
 bind = $mainMod SHIFT, 8, movetoworkspace, 8
 bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
-#--------------------------------------------------
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-bind = Control_L $mainMod, Right, workspace, e+1
-bind = Control_L $mainMod, Left, workspace, e-1
+#---------------------------------------------------
 
 #------------ Move/resize windows ----------
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
+
+bind=$mainMod, R, submap, resize
+submap=resize
+binde= , H, resizeactive, -30 0
+binde= , L, resizeactive, 30 0
+binde= , J, resizeactive, 0 -30
+binde= , K, resizeactive, 0 30 
+bind= , escape, submap, reset
+submap=reset
 #-------------------------------------------
 
 #-------------- special workspace (scratchpad) ---------------

hypr/keyboard.conf

@@ -19,4 +19,4 @@ input {
 
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-# --------------------------------------------------
+# ------------------------------------------------

hypr/programs.conf

@@ -8,4 +8,5 @@ $browser = google-chrome-stable
 $clipboard = ~/dotfiles/rofi/clipboard/clipboard.sh 
 $emojipicker = ~/dotfiles/rofi/emoji/rofimoji.sh
 $onscreenkeyboard = ~/dotfiles/toggle_keyboard.sh
+$calculator = gnome-calculator
 #----------------------------------------------------------------

hypr/startup.conf

@@ -1,17 +1,29 @@
 #---------- on startup ------------------------------------------------------------
+
+#----------- wallpaper -----------------
 exec-once = hyprpaper
 exec-once = ~/dotfiles/background.sh
 exec-once = waybar
 #exec-once = swww init
 #exec-once = ~/dotfiles/background-swww.sh
+#---------------------------------------
+
 exec-once = lxpolkit
+
+#------------------------------ GTK settings ------------------------------------
 exec-once = gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'
 exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 exec-once = gsettings set org.gnome.desktop.interface icon-theme 'Papirus-Dark'
+#------------------------------ GTK settings ------------------------------------
+
+#-------------------------- XDG settings --------------------------------------------------------
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+#------------------------------------------------------------------------------------------------
+
 exec-once = mako
 exec-once = nm-applet --indicator
 exec-once = greenclip daemon
 exec-once = uxplay
-#---------------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------------

hypr/windowrules.conf

@@ -1,22 +1,33 @@
 #------------------- windowrules --------------------------------------------------
+
+#---------------------- float ---------------------------------------------------
 windowrulev2 = float, title: Properties
 windowrulev2 = float, class: ^(thunar)$, title: ^(File Operation Progress)$
 windowrulev2 = float, class: ^(thunar)$, title: ^(Confirm to replace files)$
 windowrule = float, org.pulseaudio.pavucontrol
 windowrule = float, ^(nm-connection-editor)$
 windowrule = float, ^(GParted)$
+windowrule = float, startapp
+windowrule = float, virtualbox
+windowrule = float, Bubbletime
+windowrule = float, Calculator
+#--------------------------------------------------------------------------------
+
+#--------------- opacity ---------------------------------
 windowrule = opacity 0.90, sublime
-windowrule = workspace 2, firefox
 windowrule = opacity 0.90, firefox
 windowrule = opacity 0.80, thunar
 windowrule = opacity 0.8, foot
 windowrulev2 = opacity 0.80 0.80, class:^(org.telegram.desktop)$
-windowrule = float, startapp
-windowrule = float, virtualbox
 windowrule = opacity 0.9, balenaEtcher
 windowrule = opacity 0.95, planify
-windowrule = float, Calculator
 windowrule = opacity 0.8, kitty
 windowrulev2 = opacity 0.95, class: ^(Google-chrome)$
-windowrule = float, Bubbletime
+#---------------------------------------------------------
+
+#---------------- workspace ------------------------------
+windowrule = workspace 2, firefox
+windowrulev2 = workspace 2, class: ^(Google-chrome)$
+#---------------------------------------------------------
+
 #----------------------------------------------------------------------------------

install_scripts/install-arch.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 # ---- colors ----
 RESET='\033[0m'

install_scripts/install-deps.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 # ---- colors ----
 RESET='\033[0m'

install_scripts/install.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 # ---- colors ----
 RESET='\033[0m'

lfs/mkinitramfs/mkinitramfs

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file based in part on the mkinitramfs script for the LFS LiveCD
 # written by Alexander E. Patrakov and Jeremy Huntwork.
 

lfs/mount-virt.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 function mountbind
 {

lfs/version-check.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # A script to list version numbers of critical development tools
 
 # If you have tools installed in other directories, adjust PATH here AND

mako/config

@@ -2,12 +2,12 @@
 #   man 5 mako
 # To view all configuration options.
 
-font=Cozette 11
+font=JetBrainsMono Nerd Font Mono 11
 format=<b>%a ⏵</b> %s\n%b
 sort=-time
 output=DP-2
 layer=overlay
-# anchor=bottom-center
+anchor=bottom-center
 background-color=#000000
 width=300
 height=110

picom/picom.conf

@@ -12,14 +12,15 @@ shadow-exclude = [
   "class_g = 'Cairo-clock'",
   "_GTK_FRAME_EXTENTS@:c"
 ];
+#################################
 
 #################################
 #           Fading              #
 #################################
-
 fading = true;
 fade-in-step = 0.03;
 fade-out-step = 0.03;
+#################################
 
 #################################
 #   Transparency / Opacity      #
@@ -28,6 +29,7 @@ inactive-opacity = 0.95;
 frame-opacity = 0.9;
 inactive-opacity-override = false;
 focus-exclude = [ "class_g = 'Cairo-clock'" ];
+#################################
 
 #################################
 #           Corners             #
@@ -37,6 +39,7 @@ rounded-corners-exclude = [
   "window_type = 'dock'",
   "window_type = 'desktop'"
 ];
+#################################
 
 #################################
 #     Background-Blurring       #
@@ -47,6 +50,7 @@ blur-background-exclude = [
   "window_type = 'desktop'",
   "_GTK_FRAME_EXTENTS@:c"
 ];
+#################################
 
 #################################
 #       General Settings        #
@@ -70,3 +74,4 @@ wintypes:
   popup_menu = { opacity = 0.8; }
   dropdown_menu = { opacity = 0.8; }
 };
+#################################

ranger/rc.conf

@@ -1,2 +1,4 @@
+#------- preview images ----------
 set preview_images true
 set preview_images_method kitty
+#---------------------------------

rofi/emoji/rofimoji.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env zsh
 
 rofi -modi "emoji:rofimoji" -show emoji -theme ~/dotfiles/rofi/clipboard/clipboard.rasi
 

rofi/launcher/launcher.sh

@@ -1,14 +1,4 @@
-#!/usr/bin/env bash
-
-## Author : Aditya Shakya (adi1090x)
-## Github : @adi1090x
-#
-## Rofi   : Launcher (Modi Drun, Run, File Browser, Window)
-#
-## Available Styles
-#
-## style-1     style-2     style-3     style-4     style-5
-## style-6     style-7     style-8     style-9     style-10
+#!/bin/sh
 
 dir="~/dotfiles/rofi/launcher"
 theme='launchpad'

rofi/powermenu/powermenu.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 ## Author : Aditya Shakya (adi1090x)
 ## Github : @adi1090x
@@ -65,7 +65,7 @@ run_cmd() {
 			amixer set Master mute
 			systemctl suspend
 		elif [[ $1 == '--logout' ]]; then
-		   systemctl restart ly 
+		   	killall Hyprland
         fi
 	else
 		exit 0

uxplay/install_uxplay.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 sudo pacman -S avahi
 paru -S uxplay # uxplay-git

uxplay/runuxplay.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 sudo systemctl restart avahi-daemon
 uxplay

waybar/config

@@ -7,10 +7,25 @@
     "modules-right": ["privacy", "mpris", "cava", "pulseaudio/slider", "pulseaudio", "network", "backlight", "keyboard-state", "hyprland/language", "battery", "battery#bat2", "clock", "tray", "custom/power"],
     "hyprland/workspaces": {
         "format": "{icon}",
+        // "format-icons": {
+        //     "1": "",
+        //     "2": "",
+        //     "3": "",
+        //     "4": "",
+        //     "default": "", // "",
+        //     "focused": "",
+        //     "urgent": ""
+        // },
+        // "icon-size": 20,
         "all-outputs": true,
         "on-scroll-up": "hyprctl dispatch workspace e+1",
         "on-scroll-down": "hyprctl dispatch workspace e-1"
     },
+    "hyprland/window": {
+        "format": "{}",
+        "icon": true,
+        "icon-size" : 20
+    },
     "keyboard-state": {
         "numlock": true,
         "capslock": true,
@@ -20,6 +35,11 @@
             "unlocked": ""
         }
     },
+    "hyprland/language": {
+        "format": "{}",
+        "format-en": "US",
+        "format-ru": "RU"
+    },
     "tray": {
         "spacing": 10
     },
@@ -33,7 +53,7 @@
         "tooltip": false
     },
     "memory": {
-        "format": "{}% "
+        "format": "{}% "
     },
     "temperature": {
         "critical-threshold": 80,
@@ -115,7 +135,7 @@
         "format": "{}",
         "tooltip": true,
         "interval": 3600,
-        "exec": "wttrbar",
+        "exec": "wttrbar --location tomsk",
         "return-type": "json"
     },
     "custom/pacman": {

waybar/style.css

@@ -47,7 +47,11 @@ button {
     color: #ffffff;
     margin: 2px 2px;
     border-radius: 25px;
-    transition: 0.3s;
+    transition: 0.3s;    
+}
+
+#workspaces button label {
+    /* font-size: 20px; */
 }
 
 #workspaces button:hover {