Merge remote-tracking branch 'origin/main'

This commit is contained in:
Daniel Flanagan 2023-06-16 14:07:18 -05:00
commit 5ad5889709
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
6 changed files with 24 additions and 21 deletions

View file

@ -1,15 +1,17 @@
# Beware! This file is rewritten by htop when settings are changed in the interface. # Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly. # The parser is also very primitive, and not human-friendly.
htop_version=3.2.1 htop_version=3.2.2
config_reader_min_version=3 config_reader_min_version=3
fields=0 48 17 18 38 39 40 2 46 47 49 1 fields=0 48 17 18 38 39 40 2 46 47 49 1
hide_kernel_threads=1 hide_kernel_threads=1
hide_userland_threads=1 hide_userland_threads=1
hide_running_in_container=0
shadow_other_users=0 shadow_other_users=0
show_thread_names=0 show_thread_names=0
show_program_path=0 show_program_path=0
highlight_base_name=1 highlight_base_name=1
highlight_deleted_exe=1 highlight_deleted_exe=1
shadow_distribution_path_prefix=0
highlight_megabytes=1 highlight_megabytes=1
highlight_threads=1 highlight_threads=1
highlight_changes=0 highlight_changes=0
@ -22,8 +24,8 @@ screen_tabs=0
detailed_cpu_time=0 detailed_cpu_time=0
cpu_count_from_one=1 cpu_count_from_one=1
show_cpu_usage=1 show_cpu_usage=1
show_cpu_frequency=0 show_cpu_frequency=1
show_cpu_temperature=0 show_cpu_temperature=1
degree_fahrenheit=0 degree_fahrenheit=0
update_process_names=0 update_process_names=0
account_guest_in_cpu_meter=0 account_guest_in_cpu_meter=0
@ -37,14 +39,14 @@ column_meter_modes_0=1 1 1
column_meters_1=RightCPUs2 Tasks LoadAverage Uptime column_meters_1=RightCPUs2 Tasks LoadAverage Uptime
column_meter_modes_1=1 2 2 2 column_meter_modes_1=1 2 2 2
tree_view=0 tree_view=0
sort_key=47 sort_key=46
tree_sort_key=0 tree_sort_key=0
sort_direction=-1 sort_direction=-1
tree_sort_direction=1 tree_sort_direction=1
tree_view_always_by_pid=0 tree_view_always_by_pid=0
all_branches_collapsed=0 all_branches_collapsed=0
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
.sort_key=PERCENT_MEM .sort_key=PERCENT_CPU
.tree_sort_key=PID .tree_sort_key=PID
.tree_view=0 .tree_view=0
.tree_view_always_by_pid=0 .tree_view_always_by_pid=0

View file

@ -28,7 +28,7 @@ map ctrl+shift+2 change_font_size all 18.5
map ctrl+shift+3 change_font_size all 26 map ctrl+shift+3 change_font_size all 26
map ctrl+shift+4 change_font_size all 32 map ctrl+shift+4 change_font_size all 32
map ctrl+shift+5 change_font_size all 48 map ctrl+shift+5 change_font_size all 48
map ctrl+shift+o launch --type=tab --stdin-source=@screen_scrollback hx map ctrl+shift+o launch --type=tab --stdin-source=@screen_scrollback $EDITOR
map ctrl+shift+equal change_font_size all +0.5 map ctrl+shift+equal change_font_size all +0.5
map ctrl+shift+minus change_font_size all -0.5 map ctrl+shift+minus change_font_size all -0.5

View file

@ -8,6 +8,8 @@ exec swayidle -w \
resume 'swaymsg "output * dpms on" & maybe-good-morning' \ resume 'swaymsg "output * dpms on" & maybe-good-morning' \
before-sleep 'swaylock -f' before-sleep 'swaylock -f'
gaps inner 10
output "Samsung Electric Company SyncMaster H1AK500000" position 0,0 output "Samsung Electric Company SyncMaster H1AK500000" position 0,0
output "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" mode 3840x2160@120Hz position 1440,0 output "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" mode 3840x2160@120Hz position 1440,0
@ -18,4 +20,6 @@ output "Dell Inc. DELL U2720Q CWTM623" position 5280,0
output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 1.5 output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 1.5
output "Dell Inc. DELL U2720Q D3TM623" position 0,0 output "Dell Inc. DELL U2720Q D3TM623" position 0,0
bindsym $mod+control+equal gaps inner current set 0
exec firefox exec firefox

View file

@ -26,7 +26,7 @@ paru -Sy --needed --noconfirm \
htop bottom `# Process Management and System Resources Monitoring` \ htop bottom `# Process Management and System Resources Monitoring` \
openssh mosh `# Remote Access` \ openssh mosh `# Remote Access` \
openssl `# Crypto` \ openssl `# Crypto` \
asdf-vm `# Version Manager` \ rtx-bin `# Version Manager` \
oath-toolkit `# TOTP Utility` \ oath-toolkit `# TOTP Utility` \
pass pass-otp `# Password Management` \ pass pass-otp `# Password Management` \
sc-im `# Spreadsheets` \ sc-im `# Spreadsheets` \

View file

@ -12,6 +12,7 @@
paru -Sy --needed \ paru -Sy --needed \
xf86-input-libinput libinput libinput-gestures `# Trackpad Settings and Customizations` \ xf86-input-libinput libinput libinput-gestures `# Trackpad Settings and Customizations` \
brightnessctl `# Brightness CLI` \
bluez bluez-libs bluez-utils bluez-tools `# Bluetooth` \ bluez bluez-libs bluez-utils bluez-tools `# Bluetooth` \
catppuccin-gtk-theme-mocha elementary-icon-theme `# GUI Theme` \ catppuccin-gtk-theme-mocha elementary-icon-theme `# GUI Theme` \
thunar thunar-volman gvfs `# GUI File Manager` \ thunar thunar-volman gvfs `# GUI File Manager` \
@ -25,18 +26,19 @@ paru -Sy --needed \
gammastep `# Screen Color Temp Adjuster` \ gammastep `# Screen Color Temp Adjuster` \
firefox `# Web Browser` \ firefox `# Web Browser` \
hunspell-en_US `# Firefox Spell Checking` \ hunspell-en_US `# Firefox Spell Checking` \
passff-host `# `pass` integration in Firefox` \ passff-host `# pass integration in Firefox` \
kitty `# Terminal Emulator` \ kitty `# Terminal Emulator` \
wezterm `# Terminal Emulator` \ wezterm `# Terminal Emulator` \
pavucontrol pamixer libpulse `# Pulseaudio Controls` \ pulsemixer pavucontrol pamixer libpulse `# Pulseaudio Controls` \
playerctl `# Media Keys Controls` \ playerctl `# Media Keys Controls` \
feh `# Image Viewer` \ feh `# Image Viewer` \
hyprland hyprpaper `# Window Manager and Wallpaper` \ sway swaybg `# Window Manager and Wallpaper` \
polkit-kde-agent `# Privilege Escalation Prompts` \ wofi `# Launcher` \
polkit polkit-kde-agent `# Privilege Escalation Prompts` \
swaylock swayidle `# Locking and Idling` \ swaylock swayidle `# Locking and Idling` \
mako `# Notification Daemon` \ mako `# Notification Daemon` \
slurp grim wl-clipboard `# Screenshots and Clipboard Utilities` \ slurp grim wl-clipboard `# Screenshots and Clipboard Utilities` \
pipewire pipewire-pulse wireplumber `# Audio` \ pipewire pipewire-pulse wireplumber `# Audio` \
xdg-desktop-portal xdg-desktop-portal-hyprland-git `# Screensharing` \ xdg-desktop-portal xdg-desktop-portal-wlr `# Screensharing` \
obs-studio `# Live Streaming` \ obs-studio `# Live Streaming` \
eww-wayland `# Bar & Widgets` eww-wayland `# Bar & Widgets`

View file

@ -5,13 +5,12 @@
# + Super+Shift+b should balance the size of all selected nodes. # + Super+Shift+b should balance the size of all selected nodes.
set $mod Mod4 set $mod Mod4
set $default_gap 10
xwayland enable xwayland enable
focus_wrapping no focus_wrapping no
gaps inner $default_gap gaps inner 5
smart_borders on smart_borders on
default_border pixel 3 default_border pixel 2
focus_follows_mouse no focus_follows_mouse no
mouse_warping none mouse_warping none
popup_during_fullscreen smart popup_during_fullscreen smart
@ -123,7 +122,7 @@ bindsym $mod+control+alt+l gaps horizontal current plus 5
bindsym $mod+control+alt+j gaps vertical current minus 5 bindsym $mod+control+alt+j gaps vertical current minus 5
bindsym $mod+control+alt+k gaps vertical current plus 5 bindsym $mod+control+alt+k gaps vertical current plus 5
# TODO: this should also reset the horizontal and vertical gaps? # TODO: this should also reset the horizontal and vertical gaps?
bindsym $mod+control+equal gaps inner current set $default_gap bindsym $mod+control+equal gaps inner current set 0
bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
@ -176,10 +175,6 @@ client.focused #74c7ec #74c7ec #74c7ec #74c7ec #74c7ec
client.focused_inactive #100814 #100814 #9b9ebf #100814 #100814 client.focused_inactive #100814 #100814 #9b9ebf #100814 #100814
client.unfocused #100814 #100814 #9b9ebf #100814 #100814 client.unfocused #100814 #100814 #9b9ebf #100814 #100814
bar {
swaybar_command waybar
}
# exec /usr/share/sway/scripts/inactive-windows-transparency.py --opacity 0.95 # exec /usr/share/sway/scripts/inactive-windows-transparency.py --opacity 0.95
exec mako exec mako