From 9338997d03bc4862659bc4f46d3049faaa238e56 Mon Sep 17 00:00:00 2001 From: hesam-init Date: Wed, 4 Dec 2024 19:18:09 +0330 Subject: [PATCH] chore: new packages for setup shell script --- README.md | 4 +- hypr-configs/dotfiles/wayfire/wayfire.ini | 468 +++++++++++++++++----- linux-configs | 2 +- setup.sh | 39 +- 4 files changed, 395 insertions(+), 118 deletions(-) diff --git a/README.md b/README.md index 8d3fa6a..dcd02ef 100644 --- a/README.md +++ b/README.md @@ -63,12 +63,12 @@ Follow these steps to install Hyprland on your Void Linux system: 1. Clone this repository: ```bash - git clone https://github.com/void-land/hyprland-void-dots.git ~/.dots-hyprland --recursive + git clone https://github.com/void-land/hyprland-void-dots.git ~/.dots --recursive ``` 2. Change into the repository directory: ```bash - cd ~/.dots-hyprland + cd ~/.dots ``` > ! Warning: Before executing the following command to sync configurations, ensure you have backed up your data to prevent any unintended loss. diff --git a/hypr-configs/dotfiles/wayfire/wayfire.ini b/hypr-configs/dotfiles/wayfire/wayfire.ini index fa8706c..c079ed4 100644 --- a/hypr-configs/dotfiles/wayfire/wayfire.ini +++ b/hypr-configs/dotfiles/wayfire/wayfire.ini @@ -1,129 +1,405 @@ -# Core configuration -[core] -close_top_view = KEY_C -plugins = simple-tile alpha autostart command cube decoration expo fast-switcher fisheye grid idle invert move place resize switcher vswitch wm-actions wobbly wrot zoom -xwayland = true -max_render_time = 7 -vheight = 3 -vwidth = 3 - -# Input settings -[input] -tap_to_click = true -natural_scroll = true -disable_while_typing = true -cursor_theme = Adwaita -cursor_size = 24 +[alpha] +min_value = 0.800000 +modifier = [animate] -close_animation = fire -open_animation = fire +close_animation = fade +duration = 400ms circle +enabled_for = (type equals "toplevel" | (type equals "x-or" & focusable equals true)) +fade_duration = 400ms circle +fade_enabled_for = type equals "overlay" +fire_color = \#B22303FF +fire_duration = 300ms linear +fire_enabled_for = none +fire_particle_size = 16.000000 +fire_particles = 2000 +open_animation = zoom +random_fire_color = false +startup_duration = 600ms linear +zoom_duration = 500ms circle +zoom_enabled_for = none -# Autostart applications [autostart] ; autostart_wf_shell = true -; panel = waybar -; notifications = mako ; idle = swayidle before-sleep swaylock +; notifications = mako ; portal = /usr/libexec/xdg-desktop-portal +autostart_wf_shell = true + +[blur] +blur_by_default = type is "toplevel" +blur_degrade = 1 +blur_passes = 3 +blur_strength = 3 +bokeh_degrade = 1 +bokeh_iterations = 15 +bokeh_offset = 5.000000 +box_degrade = 1 +box_iterations = 2 +box_offset = 1.000000 +gaussian_degrade = 1 +gaussian_iterations = 2 +gaussian_offset = 1.000000 +kawase_degrade = 3 +kawase_iterations = 2 +kawase_offset = 1.700000 +method = kawase +saturation = 1.000000 +toggle = none + +[command] +binding_0 = KEY_R +binding_restart = KEY_R +binding_terminal = KEY_ENTER +binding_toggle_fullscreen = KEY_F +binding_toggle_maximize = KEY_F +command_0 = rofi -show drun +command_restart = wayfire --restart +command_terminal = alacritty +command_toggle_fullscreen = wtype -M super -M shift -P f +command_toggle_maximize = wtype -M super -P f + +[core] +background_color = \#1A1A1AFF +close_top_view = KEY_C +focus_button_with_modifiers = false +focus_buttons = BTN_LEFT | BTN_MIDDLE | BTN_RIGHT +focus_buttons_passthrough = true +max_render_time = 7 +plugins = simple-tile alpha autostart command cube decoration expo fast-switcher fisheye idle move place resize switcher vswitch wm-actions wobbly wrot zoom blur animate invert +preferred_decoration_mode = client +transaction_timeout = 100 +vheight = 3 +vwidth = 3 +xwayland = true + +[cube] +activate = BTN_LEFT +background = \#1A1A1AFF +background_mode = simple +cubemap_image = +deform = 0 +initial_animation = 350ms circle +light = true +rotate_left = none +rotate_right = none +skydome_mirror = true +skydome_texture = +speed_spin_horiz = 0.020000 +speed_spin_vert = 0.020000 +speed_zoom = 0.070000 +zoom = 0.100000 + +[decoration] +active_color = \#999999FF +border_part_size = 4 +border_size = 4 +button_order = minimize maximize close +font = sans-serif +ignore_views = none +inactive_color = \#333333DD +shadows = true +title_height = 0 + +[expo] +background = \#1A1A1AFF +duration = 300ms circle +inactive_brightness = 0.700000 +keyboard_interaction = true +offset = 10 +toggle = KEY_O +transition_length = 200 + +[extra-gestures] +close_fingers = 20 +move_delay = 500 +move_fingers = 3 + +[fast-switcher] +activate = KEY_ESC +activate_backward = KEY_ESC +inactive_alpha = 0.700000 + +[fisheye] +radius = 450.000000 +toggle = KEY_F +zoom = 7.000000 + +[foreign-toplevel] + +[grid] +duration = 300ms circle +restore = KEY_DOWN | KEY_KP0 +slot_b = KEY_KP2 +slot_bl = KEY_KP1 +slot_br = KEY_KP3 +slot_c = KEY_UP | KEY_KP5 +slot_l = KEY_LEFT | KEY_KP4 +slot_r = KEY_RIGHT | KEY_KP6 +slot_t = KEY_KP8 +slot_tl = KEY_KP7 +slot_tr = KEY_KP9 +type = crossfade + +[gtk-shell] + +[idle] +cube_max_zoom = 1.500000 +cube_rotate_speed = 1.000000 +cube_zoom_speed = 1000 +disable_initially = false +disable_on_fullscreen = true +dpms_timeout = -1 +screensaver_timeout = 3600 +toggle = none + +[input] +click_method = default +cursor_size = 24 +cursor_theme = Adwaita +disable_touchpad_while_mouse = false +disable_touchpad_while_typing = false +disable_while_typing = true +drag_lock = false +gesture_sensitivity = 1.000000 +kb_capslock_default_state = false +kb_numlock_default_state = false +kb_repeat_delay = 400 +kb_repeat_rate = 40 +left_handed_mode = false +middle_emulation = false +modifier_binding_timeout = 400 +mouse_accel_profile = default +mouse_cursor_speed = -1.000000 +mouse_natural_scroll = false +mouse_scroll_speed = 1.000000 +natural_scroll = true +scroll_method = default +tablet_motion_mode = default +tap_to_click = true +touchpad_accel_profile = default +touchpad_cursor_speed = 0.000000 +touchpad_scroll_speed = 1.000000 +xkb_layout = us +xkb_model = +xkb_options = +xkb_rules = evdev +xkb_variant = + +[input-device] +output = + +[input-method-v1] +enable_text_input_v1 = true +enable_text_input_v3 = true + +[invert] +preserve_hue = false +toggle = KEY_I + +[ipc] + +[ipc-rules] -# Window management [move] activate = BTN_LEFT enable_snap = true +enable_snap_off = true +join_views = false +preview_base_border = \#404080CC +preview_base_color = \#8080FF80 +preview_border_width = 3 +quarter_snap_threshold = 50 +snap_off_threshold = 10 snap_threshold = 10 +workspace_switch_after = -1 + +[oswitch] +next_output = KEY_O +next_output_with_win = KEY_O +prev_output = +prev_output_with_win = + +[output] +depth = 8 +mode = auto +position = auto +scale = 1.000000 +transform = normal +vrr = false + +[place] +; duration = 200 +; restore = KEY_R +; slot_b = KEY_COMMA +; slot_bl = KEY_M +; slot_br = KEY_PERIOD +; slot_c = KEY_K +; slot_l = KEY_J +; slot_r = KEY_L +; slot_t = KEY_I +; slot_tl = KEY_U +; slot_tr = KEY_O +mode = cascade + +[preserve-output] +last_output_focus_timeout = 10000 [resize] activate = BTN_RIGHT +activate_preserve_aspect = none -[switcher] -next_view = Tab -prev_view = Tab -speed = 500 -view_thumbnail_scale = 1.0 +[scale] +allow_zoom = false +bg_color = \#1A1A1AE6 +close_on_new_view = false +duration = 750ms circle +inactive_alpha = 0.750000 +include_minimized = false +middle_click_close = false +minimized_alpha = 0.450000 +outer_margin = 0 +spacing = 50 +text_color = \#CCCCCCFF +title_font_size = 16 +title_overlay = all +title_position = center +toggle = KEY_P +toggle_all = -[expo] -toggle = KEY_O +[scale-title-filter] +bg_color = \#00000080 +case_sensitive = false +font_size = 30 +overlay = true +share_filter = false +text_color = \#CCCCCCCC -# Workspace management with better keybindings -[vswitch] -binding_left = KEY_LEFT -binding_right = KEY_RIGHT -binding_up = KEY_UP -binding_down = KEY_DOWN -; with_win_left = KEY_LEFT -; with_win_right = KEY_RIGHT -; with_win_up = KEY_UP -; with_win_down = KEY_DOWN +[session-lock] + +[shortcuts-inhibit] +break_grab = none +ignore_views = none +inhibit_by_default = none [simple-tile] -tile_by_default = all +animation_duration = 400ms circle +button_move = BTN_LEFT +button_resize = BTN_RIGHT +inner_gap_size = 5 keep_fullscreen_on_adjacent = true -# button_move = BTN_LEFT -# button_resize = BTN_RIGHT -key_toggle = KEY_T +key_focus_above = KEY_UP +key_focus_below = KEY_DOWN +key_focus_down = KEY_DOWN key_focus_left = KEY_LEFT key_focus_right = KEY_RIGHT key_focus_up = KEY_TOP -key_focus_down = KEY_DOWN +key_toggle = KEY_T key_toggle_split = KEY_E -inner_gap_size = 5 outer_gap_size = 5 -animation_duration = 400 +outer_horiz_gap_size = 0 +outer_vert_gap_size = 0 +preview_base_border = \#404080CC +preview_base_color = \#8080FF80 +preview_border_width = 3 +tile_by_default = all -# Place windows in a tiling layout by default -[place] -mode = cascade +[switcher] +next_view = KEY_TAB +prev_view = KEY_TAB +speed = 500ms circle +view_thumbnail_rotation = 30 +view_thumbnail_scale = 1.000000 -# Grid for manual tiling -; [grid] -; slot_bl = KEY_M -; slot_b = KEY_COMMA -; slot_br = KEY_PERIOD -; slot_l = KEY_J -; slot_c = KEY_K -; slot_r = KEY_L -; slot_tl = KEY_U -; slot_t = KEY_I -; slot_tr = KEY_O -; restore = KEY_R -; duration = 200 +[vswipe] +background = \#1A1A1AFF +delta_threshold = 24.000000 +duration = 180ms circle +enable_free_movement = false +enable_horizontal = true +enable_smooth_transition = false +enable_vertical = true +fingers = 4 +gap = 32.000000 +speed_cap = 0.050000 +speed_factor = 256.000000 +threshold = 0.350000 +[vswitch] +; with_win_down = KEY_DOWN +; with_win_left = KEY_LEFT +; with_win_right = KEY_RIGHT +; with_win_up = KEY_UP +background = \#1A1A1AFF +binding_down = KEY_DOWN +binding_last = +binding_left = KEY_LEFT +binding_right = KEY_RIGHT +binding_up = KEY_UP +duration = 300ms circle +gap = 20 +send_win_down = +send_win_last = +send_win_left = +send_win_right = +send_win_up = +with_win_down = +with_win_last = +with_win_left = KEY_LEFT +with_win_right = KEY_RIGHT +with_win_up = KEY_UP +wraparound = false -# Window states -[command] -binding_toggle_maximize = KEY_F -command_toggle_maximize = wtype -M super -P f +[wayfire-shell] +toggle_menu = -binding_toggle_fullscreen = KEY_F -command_toggle_fullscreen = wtype -M super -M shift -P f - -binding_terminal = KEY_ENTER -command_terminal = alacritty - -binding_restart = KEY_R -command_restart = wayfire --restart - -# Appearance -[decoration] -border_size = 4 -title_height = 0 -active_color = 0.6 0.6 0.6 1.0 -inactive_color = rgba(565f89, 0.9) -border_part_size = 4 -shadows = true - -[blur] -method = kawase -blur_passes = 3 -blur_degrade = 1 -blur_strength = 3 - -[alpha] -min_value = 0.8 -modifier = - -# Additional window rules for better tiling [window-rules] +maximize_by_default = all sticky_external = true -maximize_by_default = all \ No newline at end of file + +[wm-actions] +minimize = none +send_to_back = none +toggle_always_on_top = none +toggle_fullscreen = none +toggle_maximize = none +toggle_showdesktop = none +toggle_sticky = none + +[wobbly] +friction = 3.000000 +grid_resolution = 6 +spring_k = 8.000000 + +[workarounds] +all_dialogs_modal = true +app_id_mode = stock +discard_command_output = true +dynamic_repaint_delay = false +enable_input_method_v2 = false +enable_opaque_region_damage_optimizations = false +enable_so_unloading = false +force_preferred_decoration_mode = false +remove_output_limits = false +use_external_output_configuration = false + +[wrot] +activate = BTN_RIGHT +activate-3d = BTN_RIGHT +invert = false +reset = KEY_R +reset-one = KEY_R +reset_radius = 25.000000 +sensitivity = 24 + +[wsets] +label_duration = 2000ms linear + +[xdg-activation] + +[zoom] +interpolation_method = 0 +modifier = +smoothing_duration = 300ms linear +speed = 0.010000 + diff --git a/linux-configs b/linux-configs index baaeb1c..b59dc63 160000 --- a/linux-configs +++ b/linux-configs @@ -1 +1 @@ -Subproject commit baaeb1c4697344f98430e8234ee9d8fc981b7950 +Subproject commit b59dc63a4b02c1b7ba92c2805062287c715dec56 diff --git a/setup.sh b/setup.sh index 6f302fe..61a853d 100755 --- a/setup.sh +++ b/setup.sh @@ -1,7 +1,6 @@ #!/bin/bash UPDATE_PKGS=false -CLEAR_CACHE=false DISABLE_GRUB_MENU=false TTF_FONTS_DIR="host/ui/fonts/TTF" @@ -10,15 +9,22 @@ GREEN='\033[0;32m' BLUE='\033[0;34m' NC='\033[0m' -declare -a ORDERS_LIST=("CONTAINER_PACKAGES" "BASE_PACKAGES" "DEVEL_PACKAGES" "AMD_DRIVERS" "HYPRLAND_PACKAGES" "SYSTEM_APPS") +declare -a ORDERS_LIST=( + # "CONTAINER_PACKAGES" + "BASE_PACKAGES" + "AMD_DRIVERS" + "HYPRLAND_PACKAGES" + "DEVEL_PACKAGES" + "SYSTEM_APPS" +) declare -A PACKAGES_LIST=( ["CONTAINER_PACKAGES"]="podman podman-compose catatonit" - ["BASE_PACKAGES"]="inetutils v4l2loopback bind-utils zellij bat dust aria2 fzf neofetch bat zsh fish-shell brightnessctl bluez cronie git stow eza dbus seatd elogind polkit NetworkManager gnome-keyring polkit-gnome pipewire wireplumber libspa-bluetooth inotify-tools xorg gnome-keyring polkit-gnome mtpfs ffmpeg libnotify" - ["DEVEL_PACKAGES"]="glib pango-devel gdk-pixbuf-devel libdbusmenu-gtk3-devel glib-devel gtk+3-devel gtk-layer-shell-devel base-devel startup-notification-devel cairo-devel xcb-util-devel xcb-util-cursor-devel xcb-util-xrm-devel xcb-util-wm-devel" ["AMD_DRIVERS"]="opencv Vulkan-Headers Vulkan-Tools Vulkan-ValidationLayers-32bit mesa-vulkan-radeon mesa-vulkan-radeon-32bit vulkan-loader vulkan-loader-32bit libspa-vulkan libspa-vulkan-32bit amdvlk mesa-dri mesa-vaapi" - ["HYPRLAND_PACKAGES"]="noto-fonts-emoji socat eww nerd-fonts-symbols-ttf Waybar avizo dunst swaybg mpvpaper grim jq slurp cliphist wl-clipboard swayidle pavucontrol nemo eog pavucontrol evince xorg-server-xwayland xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-utils xdg-user-dirs xdg-user-dirs-gtk qt5-x11extras qt5-wayland qt6-wayland" - ["SYSTEM_APPS"]="alacritty octoxbps blueman wifish wpa_gui glow" + ["DEVEL_PACKAGES"]="glib pango-devel gdk-pixbuf-devel libdbusmenu-gtk3-devel glib-devel gtk+3-devel gtk-layer-shell-devel base-devel startup-notification-devel cairo-devel xcb-util-devel xcb-util-cursor-devel xcb-util-xrm-devel xcb-util-wm-devel" + ["BASE_PACKAGES"]="curl wget inetutils v4l2loopback bind-utils zellij bat dust aria2 fzf neofetch bat fish-shell brightnessctl bluez cronie git stow eza dbus seatd elogind polkit NetworkManager polkit-gnome rtkit pipewire wireplumber libspa-bluetooth inotify-tools xorg gnome-keyring polkit-gnome mtpfs ffmpeg libnotify fontconfig-32bit fontconfig" + ["SYSTEM_APPS"]="alacritty octoxbps blueman glow" + ["HYPRLAND_PACKAGES"]="noto-fonts-emoji socat eww nerd-fonts-symbols-ttf Waybar dunst swaybg mpvpaper grim jq slurp cliphist wl-clipboard swayidle pavucontrol nemo eog pavucontrol evince xorg-server-xwayland xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-utils xdg-user-dirs xdg-user-dirs-gtk qt5-x11extras qt5-wayland qt6-wayland qt6ct nwg-look" ) declare -a SERVICES_LIST=( @@ -32,8 +38,15 @@ declare -a SERVICES_LIST=( ) declare -a GROUPS_LIST=( - "_seatd" + "wheel" + "audio" + "video" + "network" + "input" "bluetooth" + "rtkit" + "_pipewire" + "_seatd" ) trap exit_trap SIGINT SIGTERM @@ -102,18 +115,6 @@ display_help() { echo " -f Install host fonts" } -clear_cache() { - if [ $CLEAR_CACHE = true ]; then - log "Clear package manager cache" - sudo xbps-remove -yO - sudo xbps-remove -yo - sudo vkpurge rm all - log "Package manager cache cleared" - else - log "Skipping package manager cache clearance" - fi -} - update_xbps() { log "Update xbps package manager ..."