From b4b6058abd6b7d32f2f60fee5dd8c794218beab8 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 9 Jun 2023 09:43:26 -0500 Subject: [PATCH 1/2] Swayin' --- host/desktop/sway/config | 4 ++++ os/linux/sway/config | 9 ++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/host/desktop/sway/config b/host/desktop/sway/config index ba0b8d0..f2df311 100644 --- a/host/desktop/sway/config +++ b/host/desktop/sway/config @@ -1,6 +1,8 @@ default_border pixel 1 exec swayidle -w timeout 600 'notify-send "Idling in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on" & maybe-good-morning' before-sleep 'swaylock -f' +gaps inner 10 + output "Samsung Electric Company SyncMaster H1AK500000" position 0,0 output "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" mode 3840x2160@120Hz position 1440,0 @@ -11,4 +13,6 @@ output "Dell Inc. DELL U2720Q CWTM623" position 0,0 output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 1.5 output "Dell Inc. DELL U2720Q D3TM623" position 5280,0 +bindsym $mod+control+equal gaps inner current set 0 + exec firefox diff --git a/os/linux/sway/config b/os/linux/sway/config index 5754b7f..04f5cd2 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -5,11 +5,10 @@ # + Super+Shift+b should balance the size of all selected nodes. set $mod Mod4 -set $default_gap 10 xwayland enable focus_wrapping no -gaps inner $default_gap +gaps inner 0 smart_borders on default_border pixel 3 focus_follows_mouse no @@ -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+k gaps vertical current plus 5 # 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 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.unfocused #100814 #100814 #9b9ebf #100814 #100814 -bar { - swaybar_command waybar -} - # exec /usr/share/sway/scripts/inactive-windows-transparency.py --opacity 0.95 exec mako From d8a5610b20544e5ab7e016698c7b4077c57b430d Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 13 Jun 2023 11:01:08 -0500 Subject: [PATCH 2/2] Not even a little bit scary --- common/htop/rc | 12 +++++++----- common/kitty/kitty.conf | 2 +- os/linux/arch/provision.d/20-install-packages.bash | 2 +- .../arch/provision.d/optional/ui-packages.bash | 14 ++++++++------ os/linux/sway/config | 4 ++-- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/common/htop/rc b/common/htop/rc index 673c659..08287ad 100644 --- a/common/htop/rc +++ b/common/htop/rc @@ -1,15 +1,17 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # 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 fields=0 48 17 18 38 39 40 2 46 47 49 1 hide_kernel_threads=1 hide_userland_threads=1 +hide_running_in_container=0 shadow_other_users=0 show_thread_names=0 show_program_path=0 highlight_base_name=1 highlight_deleted_exe=1 +shadow_distribution_path_prefix=0 highlight_megabytes=1 highlight_threads=1 highlight_changes=0 @@ -22,8 +24,8 @@ screen_tabs=0 detailed_cpu_time=0 cpu_count_from_one=1 show_cpu_usage=1 -show_cpu_frequency=0 -show_cpu_temperature=0 +show_cpu_frequency=1 +show_cpu_temperature=1 degree_fahrenheit=0 update_process_names=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_meter_modes_1=1 2 2 2 tree_view=0 -sort_key=47 +sort_key=46 tree_sort_key=0 sort_direction=-1 tree_sort_direction=1 tree_view_always_by_pid=0 all_branches_collapsed=0 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_view=0 .tree_view_always_by_pid=0 diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index 092db49..6d38962 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -26,7 +26,7 @@ enabled_layouts splits:split_axis=vertical,stack map ctrl+shift+1 change_font_size all 12.5 map ctrl+shift+2 change_font_size all 18.5 map ctrl+shift+3 change_font_size all 26 -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+minus change_font_size all -0.5 diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash index d58a9e9..3d18719 100755 --- a/os/linux/arch/provision.d/20-install-packages.bash +++ b/os/linux/arch/provision.d/20-install-packages.bash @@ -26,7 +26,7 @@ paru -Sy --needed --noconfirm \ htop bottom `# Process Management and System Resources Monitoring` \ openssh mosh `# Remote Access` \ openssl `# Crypto` \ - asdf-vm `# Version Manager` \ + rtx-bin `# Version Manager` \ oath-toolkit `# TOTP Utility` \ pass pass-otp `# Password Management` \ sc-im `# Spreadsheets` \ diff --git a/os/linux/arch/provision.d/optional/ui-packages.bash b/os/linux/arch/provision.d/optional/ui-packages.bash index 3a4d2e8..da25832 100755 --- a/os/linux/arch/provision.d/optional/ui-packages.bash +++ b/os/linux/arch/provision.d/optional/ui-packages.bash @@ -12,6 +12,7 @@ paru -Sy --needed \ xf86-input-libinput libinput libinput-gestures `# Trackpad Settings and Customizations` \ + brightnessctl `# Brightness CLI` \ bluez bluez-libs bluez-utils bluez-tools `# Bluetooth` \ catppuccin-gtk-theme-mocha elementary-icon-theme `# GUI Theme` \ thunar thunar-volman gvfs `# GUI File Manager` \ @@ -25,18 +26,19 @@ paru -Sy --needed \ gammastep `# Screen Color Temp Adjuster` \ firefox `# Web Browser` \ hunspell-en_US `# Firefox Spell Checking` \ - passff-host `# `pass` integration in Firefox` \ + passff-host `# pass integration in Firefox` \ kitty `# Terminal Emulator` \ wezterm `# Terminal Emulator` \ - pavucontrol pamixer libpulse `# Pulseaudio Controls` \ + pulsemixer pavucontrol pamixer libpulse `# Pulseaudio Controls` \ playerctl `# Media Keys Controls` \ feh `# Image Viewer` \ - hyprland hyprpaper `# Window Manager and Wallpaper` \ - polkit-kde-agent `# Privilege Escalation Prompts` \ + sway swaybg `# Window Manager and Wallpaper` \ + wofi `# Launcher` \ + polkit polkit-kde-agent `# Privilege Escalation Prompts` \ swaylock swayidle `# Locking and Idling` \ mako `# Notification Daemon` \ slurp grim wl-clipboard `# Screenshots and Clipboard Utilities` \ 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` \ - eww-wayland `# Bar & Widgets` + eww-wayland `# Bar & Widgets` \ No newline at end of file diff --git a/os/linux/sway/config b/os/linux/sway/config index 04f5cd2..814a554 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -8,9 +8,9 @@ set $mod Mod4 xwayland enable focus_wrapping no -gaps inner 0 +gaps inner 5 smart_borders on -default_border pixel 3 +default_border pixel 2 focus_follows_mouse no mouse_warping none popup_during_fullscreen smart