From 24a65daaa609ce06f9b531c4bc76420a21b71aef Mon Sep 17 00:00:00 2001 From: Clay Gomera Date: Mon, 11 Sep 2023 00:39:36 -0400 Subject: [PATCH] updated --- user/.bash_profile | 11 +- user/.config/hypr/hyprland.conf | 221 ++++++++++++++++++-------------- user/.config/vifm/vifmrc | 2 +- user/.config/wofi/style.css | 6 +- user/.winitrc | 25 ++-- 5 files changed, 144 insertions(+), 121 deletions(-) diff --git a/user/.bash_profile b/user/.bash_profile index c8961bfde..aeec893ec 100644 --- a/user/.bash_profile +++ b/user/.bash_profile @@ -13,10 +13,6 @@ then logout fi -# environment variables -export EDITOR="$HOME/.local/bin/lvim" -export VISUAL="neovide --neovim-bin $HOME/.local/bin/lvim" - # clean home export XDG_DATA_HOME="$HOME/.local/share" export XDG_CACHE_HOME="$HOME/.cache" @@ -27,11 +23,16 @@ export WGETRC="$HOME/.config/wget/wgetrc" export INPUTRC="$HOME/.config/inputrc" export LESSHISTFILE=- -# user defined global variables +# user defined environment variables +export WM=Hyprland export MEDIA_DIR="$HOME/Media" export TEMP_DIR="$HOME/Temporal" export RUNNER="wofi --dmenu" export RUNNER_EX="wofi -p ' Run'" +export EDITOR="$HOME/.local/bin/lvim" +export VISUAL="neovide --neovim-bim $HOME/.local/bin/lvim" +export BROWSER="firefox" +export VIEWER="zathura" # bashrc source "$HOME"/.bashrc diff --git a/user/.config/hypr/hyprland.conf b/user/.config/hypr/hyprland.conf index 298d70444..141074537 100644 --- a/user/.config/hypr/hyprland.conf +++ b/user/.config/hypr/hyprland.conf @@ -15,7 +15,7 @@ ### ### ############# {{{{ ############# -# AUTOSTART +# Autostart ## Wayland backend exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP ## Polkit agent @@ -33,88 +33,107 @@ exec-once = swww init exec-once = wl-paste --type text --watch cliphist store #Stores only text data exec-once = wl-paste --type image --watch cliphist store #Stores only image data -# MONITORS +# Monitors monitor=,preferred,auto,1 -# INPUT +# Input config input { - kb_layout = us,es - kb_options = grp:shift_caps_toggle - follow_mouse = 1 - touchpad { - natural_scroll = yes - } - sensitivity = -0.2 # -1.0 - 1.0, 0 means no modification. + kb_layout = us,es + kb_options = grp:shift_caps_toggle + follow_mouse = 1 + scroll_method = 2fg + touchpad { + natural_scroll = yes + disable_while_typing = false + tap-to-click = true + } + sensitivity = -0.2 # -1.0 - 1.0, 0 means no modification. } -# GENERAL -general { - gaps_in = 2 - gaps_out = 4 - border_size = 3 - col.active_border = rgb(cc241d) #rgb(d79921) 45deg - col.inactive_border = rgb(504945) - layout = master +# Trackpoint sensitivity +device:tpps/2-elan-trackpoint { + sensitivity = 1.2 } -# DECORATIONS -decoration { - rounding = 0 # Rounded corners - drop_shadow = yes - shadow_range = 5 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) -} - -# ANIMATIONS -animations { - enabled = yes - bezier = linear,0,0,1,1 - # window creation - animation = windowsIn,1, 3,default,popin - animation = fadeIn,1, 3,default - # window destruction - animation = windowsOut,1, 3,default,popin - animation = fadeOut,1, 3,default - # window movement - animation = windowsMove,1, 3,default,popin - animation = border, 1, 2, linear - animation = borderangle, 1, 25, linear, loop - animation = fade, 1, 7, default - animation = workspaces, 1, 4, default, slide -} - -# DWINDLE LAYOUT CONFIG -dwindle { - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this -} - -# MASTER LAYOUT CONFIG -master { - no_gaps_when_only = false - new_is_master = false - mfact = 0.50 -} - -# TOUCHPAD GESTURES +# Touchpad gestures gestures { - workspace_swipe = on + workspace_swipe = true + workspace_swipe_numbered = false + workspace_swipe_create_new = false + workspace_swipe_direction_lock = false + workspace_swipe_forever = false } -# MISC +# General config +general { + gaps_in = 2 + gaps_out = 4 + border_size = 2 + col.active_border = rgb(cc241d) rgb(d79921) 45deg + col.inactive_border = rgb(504945) + layout = master + no_focus_fallback = true +} + +# Decorations +decoration { + blur { + enabled = true + size = 4 + passes = 2 + new_optimizations = true + noise = 0.2 + brightness = 0.8 + } + rounding = 0 # Rounded corners + drop_shadow = yes + shadow_range = 5 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) +} + +# Animations +animations { + enabled = yes + bezier = linear,0,0,1,1 + # window creation + animation = windowsIn,1, 3,default,popin + animation = fadeIn,1, 3,default + # window destruction + animation = windowsOut,1, 3,default,popin + animation = fadeOut,1, 3,default + # window movement + animation = windowsMove,1, 3,default,popin + animation = border, 1, 2, linear + animation = borderangle, 1, 25, linear, loop + animation = fade, 1, 7, default + animation = workspaces, 1, 4, default, slide +} + +# Layouts +## Dwindle layout +dwindle { + pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = yes # you probably want this +} +## Master & stack layout +master { + no_gaps_when_only = false + new_is_master = false + mfact = 0.50 +} + +# Misc config misc { - disable_hyprland_logo = true - disable_splash_rendering = true - mouse_move_enables_dpms = true - enable_swallow = true - swallow_regex = ^(wezterm)$ + disable_hyprland_logo = true + disable_splash_rendering = true + mouse_move_enables_dpms = true + enable_swallow = true + swallow_regex = ^(wezterm)$ + hide_cursor_on_touch = true + mouse_move_focuses_monitor = true } -# MOUSE SENSITIVITY -device:epic mouse V1 { - sensitivity = -0.5 -} ################################ ### end_________ ___ ____ ### @@ -132,7 +151,7 @@ device:epic mouse V1 { ### ### ############## {{{{ ############### -# WINDOW RULES +# Window rules windowrule = float, ^(qalculate-gtk)$ ## Workspace 1 - Editors @@ -269,28 +288,29 @@ windowrule = workspace 20, ^(org.qbittorrent.qBittorrent)$ ### ### ############## {{{{ ############## -# MODIFIER KEYS VARIABLES +# Mod keys variables $supMod = SUPER $altMod = ALT $conMod = CONTROL # MAIN KEYBINDS -bind = $supMod, RETURN, exec, wezterm # Terminal -bind = $supMod, q, killactive, # Close window -bind = $supMod_$conMod_SHIFT, q, exit, # Exit the compositor -bind = $supMod, b, exec, pkill waybar || waybar # Hide/Show the top bar -bind = $supMod, v, togglefloating, # Toggle floating mode +bind = $supMod, RETURN, exec, wezterm # Terminal +bind = $supMod, q, killactive, # Close window +bind = $supMod_$conMod_SHIFT, q, exit, # Exit the compositor +bind = $supMod, b, exec, pkill waybar || waybar # Hide/Show the top bar +bind = $supMod, f, togglefloating, # Toggle floating mode +bind = $supMod, v, fullscreen, 0 # Toggle full screen mode #bind = $supMod, P, pseudo, # dwindle #bind = $supMod, J, togglesplit, # dwindle -# FOCUS +# Focus ## Cycle focus with supmod + k,j bind = $supMod, k, layoutmsg, cyclenext bind = $supMod, j, layoutmsg, cycleprev ## Focus master window bind = $supMod_SHIFT, RETURN, layoutmsg, focusmaster -# LAYOUT MANIPULATION +# Layout manipulation ## Swap windows bind = $supMod_SHIFT, j, layoutmsg, swapnext bind = $supMod_SHIFT, k, layoutmsg, swapprev @@ -303,15 +323,15 @@ bind = $supMod, d, layoutmsg, removemaster bind = $supMod_SHIFT, l, layoutmsg, orientationnext bind = $supMod_SHIFT, h, layoutmsg, orientationprev ## Window resizing -bind = $supMod_$conMod, l, resizeactive, 30 0 -bind = $supMod_$conMod, h, resizeactive, -30 0 +bind = $supMod, l, resizeactive, 30 0 +bind = $supMod, h, resizeactive, -30 0 bind = $supMod_$conMod, j, resizeactive, 0 30 bind = $supMod_$conMod, k, resizeactive, 0 -30 # Move/resize windows with supmod + lmb/rmb and dragging bindm = $supMod, mouse:272, movewindow bindm = $supMod, mouse:273, resizewindow -# WORKSPACES MANIPULATION +# Workspace manipulation ## Switch workspaces with supmod + [0-9] bind = $supMod, 1, workspace, 1 bind = $supMod, 2, workspace, 2 @@ -333,6 +353,7 @@ bind = $supMod_$conMod, 7, workspace, 17 bind = $supMod_$conMod, 8, workspace, 18 bind = $supMod_$conMod, 9, workspace, 19 bind = $supMod_$conMod, 0, workspace, 20 + ## Move active window to a workspace with supmod + shift + [0-9] bind = $supMod_SHIFT, 1, movetoworkspace, 1 bind = $supMod_SHIFT, 2, movetoworkspace, 2 @@ -354,17 +375,20 @@ bind = $supMod_$conMod_SHIFT, 7, movetoworkspace, 17 bind = $supMod_$conMod_SHIFT, 8, movetoworkspace, 18 bind = $supMod_$conMod_SHIFT, 9, movetoworkspace, 19 bind = $supMod_$conMod_SHIFT, 0, movetoworkspace, 20 + ## Scroll through existing workspaces with supmod + scroll bind = $supMod, mouse_down, workspace, e+1 bind = $supMod, mouse_up, workspace, e-1 + # Scroll through existing workspaces with supmod + arrow keys bind = $supMod, Right, workspace, e+1 bind = $supMod, Left, workspace, e-1 + ## Move active window through existing workspaces with supmod + arrow keys bind = $supMod_SHIFT, Left, movetoworkspace, e+1 bind = $supMod_SHIFT, Right, movetoworkspace, e-1 -# XF86 KEYS +# XF86 keys ## Media control bindl=, XF86AudioRaiseVolume, exec, pamixer -i 5 # Increase volume by 5% bindl=, XF86AudioLowerVolume, exec, pamixer -d 5 # Decrease volume by 5% @@ -378,28 +402,27 @@ bindl=, XF86AudioStop, exec, playerctl stop # Stop playba ## News bindl=, XF86News, exec, wezterm start --class newsboat -- newsboat ## Brightness control -bindl=, XF86MonBrightnessUp, exec, brightnessctl s 10%+ # Increase brightness by 10% -bindl=, XF86MonBrightnessDown, exec, brightnessctl s 10%- # Decrease brightness by 10% +bindl=, XF86MonBrightnessUp, exec, brightnessctl s 5%+ # Increase brightness by 10% +bindl=, XF86MonBrightnessDown, exec, brightnessctl s 5%- # Decrease brightness by 10% ## Display setup bindl=, XF86Display, exec, wdisplays # Open the display config tool (wdisplays) -# ROFI +# Run launcher scripts binde = $supMod_SHIFT, d, exec, pkill wofi || $RUNNER_EX --show drun # Desktop launcher binde = $supMod_SHIFT, r, exec, pkill wofi || $RUNNER_EX --show run # Standard launcher binde = $supMod_SHIFT, w, exec, pkill wofi || $HOME/.local/bin/rs_wall # Wallpaper setup binde = $supMod_SHIFT, i, exec, pkill wofi || $HOME/.local/bin/rs_wifi # Wifi setup binde = $supMod_SHIFT, e, exec, pkill wofi || $HOME/.local/bin/rs_emoji # Emoji picker -binde = $supMod_SHIFT, s, exec, pkill wofi || $HOME/.local/bin/rs_scrot # Screenshot tool -binde = $supMod_$conMod, s, exec, pkill wofi || $HOME/.local/bin/rs_scrot -s # Stop recording (for the screenshot tool) +binde = $supMod_SHIFT, s, exec, killall -s SIGINT wf-recorder || pkill wofi || $HOME/.local/bin/rs_scrot # Screenshot tool binde = $supMod_SHIFT, q, exec, pkill wofi || $HOME/.local/bin/rs_power # Power setup binde = $supMod_SHIFT, b, exec, pkill wofi || $HOME/.local/bin/rs_blue # Bluetooth setup binde = $supMod_SHIFT, m, exec, pkill wofi || $HOME/.local/bin/rs_mount # External drive mount utility binde = $supMod_SHIFT, c, exec, pkill wofi || cliphist list | $RUNNER -p "  Clipboard " | cliphist decode | wl-copy # Clipboard history -# COLOR PICKER -binde = $supMod_$conMod, c, exec, hyprpicker -n -a +# Color picker +binde = $supMod_$conMod_SHIFT, p, exec, hyprpicker -n -a -# QUICK TERMINAL SCRIPTS/COMMANDS +# Quick terminal scripts/commands ## Workspace 3 - Web binde = $supMod_$altMod, r, exec, wezterm start --class newsboat -- newsboat # RSS feed reader binde = $supMod_$altMod, t, exec, wezterm start --class tut -- tut # Mastodon client @@ -415,21 +438,21 @@ binde = $supMod_$altMod, o, exec, wezterm start --class alsamixer -- alsamixer binde = $supMod_$altMod, b, exec, wezterm start --class btop -- btop # Open the system monitor (btop) binde = $supMod_$altMod, h, exec, wezterm start --class htop -- htop # Open the system monitor (htop) -# MAIN APPS +# Main apps ## Workspace 1 - Web -binde = $supMod, w, exec, firefox +binde = $supMod_$conMod, w, exec, firefox ## Workspace 2 - File management -binde = $supMod, f, exec, wezterm start --class file_manager -- vifm +binde = $supMod_$conMod, f, exec, wezterm start --class file_manager -- vifm ## Workspace 3 - Editors -binde = $supMod, e, exec, neovide --neovim-bin $HOME/.local/bin/lvim +binde = $supMod_$conMod, e, exec, neovide --neovim-bin $HOME/.local/bin/lvim ## Workspace 4 - Chat -binde = $supMod, c, exec, signal-desktop +binde = $supMod_$conMod, c, exec, signal-desktop ## Workspace 5 - Audio -binde = $supMod, m, exec, wezterm start --class music_player -- cmus +binde = $supMod_$conMod, m, exec, wezterm start --class music_player -- cmus ## Workspace 9 - Games -binde = $supMod, g, exec, retroarch +binde = $supMod_$conMod, g, exec, retroarch ## Workspace 10 - Extras -binde = $supMod, p, exec, keepassxc +binde = $supMod_$conMod, p, exec, keepassxc ################################## ### end___ _____ _____ ____ ### diff --git a/user/.config/vifm/vifmrc b/user/.config/vifm/vifmrc index 8a9132834..6be34863e 100644 --- a/user/.config/vifm/vifmrc +++ b/user/.config/vifm/vifmrc @@ -13,7 +13,7 @@ " Since emacs is a GUI app and not a terminal app like vim, append the command " with an ampersand (&). -set vicmd=nvim +set vicmd=~/.local/bin/lvim " This makes vifm perform file operations on its own instead of relying on " standard utilities like `cp`. While using `cp` and alike is a more universal diff --git a/user/.config/wofi/style.css b/user/.config/wofi/style.css index 4de8b7ed8..06999973a 100644 --- a/user/.config/wofi/style.css +++ b/user/.config/wofi/style.css @@ -2,7 +2,7 @@ window { margin: 5px; border: 2px solid #cc241d; /* border-radius: 15px; */ -background-color: #282828; +background-color: #1d2021; font-family: mononoki Nerd Font; font-size: 16px; } @@ -23,13 +23,13 @@ background-color: #3c3836; margin: 15px; margin-top: 15px; border: none; -background-color: #282828; +background-color: #1d2021; } #outer-box { margin: 10px; border: none; -background-color: #282828; +background-color: #1d2021; } #scroll { diff --git a/user/.winitrc b/user/.winitrc index fafa0bed1..bd1f0afca 100755 --- a/user/.winitrc +++ b/user/.winitrc @@ -2,7 +2,7 @@ cd "$HOME" || exit 1 -# Log WLR errors and logs to the hyprland log. Recommended +# Log WLR errors and logs to the hyprland log export HYPRLAND_LOG_WLR=1 # GTK shit @@ -14,20 +14,21 @@ export XCURSOR_THEME=Simp1e-Gruvbox-Dark export XCURSOR_SIZE=16 # session settings +export XDG_CURRENT_DESKTOP=Hyprland +export XDG_SESSION_TYPE=wayland +export XDG_SESSION_DESKTOP=Hyprland export GTK_IM_MODULE=fcitx export QT_IM_MODULE=fcitx export XMODIFIERS=@im=fcitx export SDL_IM_MODULE=fcitx export GLFW_IM_MODULE=ibus -export XDG_CURRENT_DESKTOP=Hyprland -export XDG_SESSION_TYPE=wayland export QT_STYLE_OVERRIDE=kvantum -export MOZ_ENABLE_WAYLAND=1 +export QT_QPA_PLATFORM=wayland export GDK_BACKEND=wayland -export WM=Hyprland export SDL_VIDEODRIVER=wayland export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 export XKB_DEFAULT_LAYOUT="us" +export MOZ_ENABLE_WAYLAND=1 # clean home export XDG_DATA_HOME="$HOME/.local/share" @@ -37,19 +38,17 @@ export W3M_DIR="$XDG_DATA_HOME/w3m" export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0" export WGETRC="$HOME/.config/wget/wgetrc" export INPUTRC="$HOME/.config/inputrc" -export GNUPGHOME="$HOME/.local/share/gnupg" export LESSHISTFILE=- -# default apps -export EDITOR="$HOME/.local/bin/lvim" -export VISUAL="neovide --neovim-bim $HOME/.local/bin/lvim" -export BROWSER="qutebrowser" -export VIEWER="zathura" - -# user defined global variables +# user defined enviroment variables +export WM=Hyprland export MEDIA_DIR="$HOME/Media" export TEMP_DIR="$HOME/Temporal" export RUNNER="wofi --dmenu" export RUNNER_EX="wofi -p ' Run'" +export EDITOR="$HOME/.local/bin/lvim" +export VISUAL="neovide --neovim-bim $HOME/.local/bin/lvim" +export BROWSER="firefox" +export VIEWER="zathura" exec Hyprland