From a9a94840e975cb3261df7e49e1d4f9c6b0edc70a Mon Sep 17 00:00:00 2001 From: Trysdyn Black Date: Mon, 5 Jun 2023 22:39:21 -0700 Subject: [PATCH] Big spaces-to-tabs config reflow Moving to doing tabs in things. No functional changes. --- .config/dunst/dunstrc | 130 +++++++++++++++++++-------------------- .config/htop/htoprc | 4 +- .config/sway/config | 36 +++++------ .config/waybar/config | 54 ++++++++-------- .config/waybar/style.css | 24 ++++---- .gitconfig | 32 +++++----- .profile | 4 +- 7 files changed, 142 insertions(+), 142 deletions(-) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 985ae11..f6b39a7 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -1,88 +1,88 @@ [global] - font = "Sans 12" - origin = top-left - width = 600 - height = 100 - offset = 0x0 - padding = 1 - horizontal_padding = 1 - notification_limit = 20 - shrink = no - follow = mouse - indicate_hidden = yes - transparency = 0 - frame_width = 2 - sort = no - idle_threshold = 1 - markup = full - alignment = left + font = "Sans 12" + origin = top-left + width = 600 + height = 100 + offset = 0x0 + padding = 1 + horizontal_padding = 1 + notification_limit = 20 + shrink = no + follow = mouse + indicate_hidden = yes + transparency = 0 + frame_width = 2 + sort = no + idle_threshold = 1 + markup = full + alignment = left - # The format of the message. Possible variables are: - # %a appname - # %s summary - # %b body - # %i iconname (including its path) - # %I iconname (without its path) - # %p progress value if set ([ 0%] to [100%]) or nothing - # %n progress value if set without any extra characters - # %% Literal % - # Markup is allowed - format = "%s\n%b" + # The format of the message. Possible variables are: + # %a appname + # %s summary + # %b body + # %i iconname (including its path) + # %I iconname (without its path) + # %p progress value if set ([ 0%] to [100%]) or nothing + # %n progress value if set without any extra characters + # %% Literal % + # Markup is allowed + format = "%s\n%b" - show_age_threshold = 60 - word_wrap = true - ellipsize = end - ignore_newline = yes - stack_duplicates = false - hide_duplicate_count = false - show_indicators = yes + show_age_threshold = 60 + word_wrap = true + ellipsize = end + ignore_newline = yes + stack_duplicates = false + hide_duplicate_count = false + show_indicators = yes - icon_position = left - min_icon_size = 0 - max_icon_size = 32 - icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ + icon_position = left + min_icon_size = 0 + max_icon_size = 32 + icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ - sticky_history = yes - history_length = 100 + sticky_history = yes + history_length = 100 - browser = /bin/x-www-browser - dmenu = /usr/bin/rofi -dmenu -p dunst + browser = /bin/x-www-browser + dmenu = /usr/bin/rofi -dmenu -p dunst - mouse_left_click = close_current - mouse_right_click = do_action, close_current - mouse_middle_click = close_all + mouse_left_click = close_current + mouse_right_click = do_action, close_current + mouse_middle_click = close_all - # Define the title of the windows spawned by dunst - title = Dunst + # Define the title of the windows spawned by dunst + title = Dunst - # Define the class of the windows spawned by dunst - class = Dunst + # Define the class of the windows spawned by dunst + class = Dunst - corner_radius = 0 + corner_radius = 0 - # Ignore the dbus closeNotification message. - # Useful to enforce the timeout set by dunst configuration. Without this - # parameter, an application may close the notification sent before the - # user defined timeout. - ignore_dbusclose = true + # Ignore the dbus closeNotification message. + # Useful to enforce the timeout set by dunst configuration. Without this + # parameter, an application may close the notification sent before the + # user defined timeout. + ignore_dbusclose = true # %%base16_template: dunst##default %% frame_color = "#f0f0f0" separator_color = "#f0f0f0" [base16_low] - msg_urgency = low - background = "#202020" - foreground = "#606060" + msg_urgency = low + background = "#202020" + foreground = "#606060" [base16_normal] - msg_urgency = normal - background = "#311647" - foreground = "#f0f0f0" + msg_urgency = normal + background = "#311647" + foreground = "#f0f0f0" [base16_critical] - msg_urgency = critical - background = "#ed008c" - foreground = "#c0c0c0" + msg_urgency = critical + background = "#ed008c" + foreground = "#c0c0c0" # %%base16_template_end%% diff --git a/.config/htop/htoprc b/.config/htop/htoprc index b0a3d1d..5a5b2cc 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -41,14 +41,14 @@ column_meter_modes_1=1 column_meters_2=Memory LoadAverage NetworkIO DiskIO Tasks Uptime Systemd column_meter_modes_2=1 1 1 2 2 2 2 tree_view=0 -sort_key=46 +sort_key=47 tree_sort_key=47 sort_direction=-1 tree_sort_direction=-1 tree_view_always_by_pid=1 all_branches_collapsed=1 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command -.sort_key=PERCENT_CPU +.sort_key=PERCENT_MEM .tree_sort_key=PERCENT_MEM .tree_view=0 .tree_view_always_by_pid=1 diff --git a/.config/sway/config b/.config/sway/config index f6bf171..2b27f63 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -149,27 +149,27 @@ bindsym $mod+minus scratchpad show # resize window (you can also use the mouse for that) mode "resize" { - # These bindings trigger as soon as you enter the resize mode + # These bindings trigger as soon as you enter the resize mode - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym semicolon resize grow width 10 px or 10 ppt - # same bindings, but for the arrow keys - bindsym Left resize shrink width 1 px or 1 ppt - bindsym Down resize grow height 1 px or 1 ppt - bindsym Up resize shrink height 1 px or 1 ppt - bindsym Right resize grow width 1 px or 1 ppt + # same bindings, but for the arrow keys + bindsym Left resize shrink width 1 px or 1 ppt + bindsym Down resize grow height 1 px or 1 ppt + bindsym Up resize shrink height 1 px or 1 ppt + bindsym Right resize grow width 1 px or 1 ppt - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" } bindsym $mod+r mode "resize" diff --git a/.config/waybar/config b/.config/waybar/config index 8f52e4b..cb5339b 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,40 +1,40 @@ { - "layer": "top", - "position": "bottom", - "spacing": 8, + "layer": "top", + "position": "bottom", + "spacing": 8, "height": 22, "output": ["DP-2", "HDMI-A-2"], "fixed-center": false, - "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad"], - "modules-center": [], - "modules-right": ["custom/timer", "custom/nagios", "custom/task", "custom/weather", "custom/aqi", "memory", "cpu", "clock", "tray"], - "sway/scratchpad": { - "format": "{icon} {count}", - "show-empty": false, - "format-icons": ["", ""], - "tooltip": true, - "tooltip-format": "{app}: {title}" - }, - "tray": { - "spacing": 4 - }, - "clock": { + "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad"], + "modules-center": [], + "modules-right": ["custom/timer", "custom/nagios", "custom/task", "custom/weather", "custom/aqi", "memory", "cpu", "clock", "tray"], + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", ""], + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + "tray": { + "spacing": 4 + }, + "clock": { "interval": 5, "format": "{:%a %b %d %H:%M:%S}", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": " {usage:02d}%", - "tooltip": true - }, - "memory": { - "format": " {}%", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": " {usage:02d}%", + "tooltip": true + }, + "memory": { + "format": " {}%", "states": { "warning": 80, "critical": 90 } - }, + }, "custom/aqi": { "exec": "$HOME/workspace/foxstatus/modules/airnow.py", "max-length": 20, diff --git a/.config/waybar/style.css b/.config/waybar/style.css index bf7782d..e85097f 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,16 +1,16 @@ * { - font-family: monospace; - font-size: 14px; + font-family: monospace; + font-size: 14px; min-height: 0; } window#waybar { - background-color: #000; - color: #f0f0f0; + background-color: #000; + color: #f0f0f0; } window#waybar.hidden { - opacity: 0.2; + opacity: 0.2; } widget { @@ -22,19 +22,19 @@ widget label { } #workspaces button { - background-color: transparent; - color: #f0f0f0; + background-color: transparent; + color: #f0f0f0; padding: 0; border: 1px solid #666; border-radius: 0px; } #workspaces button.focused { - background-color: #311647; + background-color: #311647; } #workspaces button.urgent { - background-color: #eb4d4b; + background-color: #eb4d4b; } #window { @@ -52,10 +52,10 @@ widget label { } #tray > .passive { - -gtk-icon-effect: dim; + -gtk-icon-effect: dim; } #tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; + -gtk-icon-effect: highlight; + background-color: #eb4d4b; } diff --git a/.gitconfig b/.gitconfig index 10978d5..3554b50 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,34 +1,34 @@ [apply] - whitespace = fix + whitespace = fix [core] - # Declare erroenous the same whitespace errors vim does - whitespace = space-before-tab,-indent-with-non-tab,trailing-space - editor = vim + # Declare erroenous the same whitespace errors vim does + whitespace = space-before-tab,-indent-with-non-tab,trailing-space + editor = vim [diff] - # Detect both copies and renames in diffs - renames = copies - tool = vimdiff + # Detect both copies and renames in diffs + renames = copies + tool = vimdiff [difftool] - prompt = false + prompt = false [merge] - # Log merge activities to output - log = true - tool = vimdiff + # Log merge activities to output + log = true + tool = vimdiff [pretty] - terse = format:%C(auto,yellow)%h%C(auto,reset) %s %C(auto,green)(%cr) %C(auto,bold blue) %an %C(auto,reset)%C(auto,red)%d%C(auto,reset) + terse = format:%C(auto,yellow)%h%C(auto,reset) %s %C(auto,green)(%cr) %C(auto,bold blue) %an %C(auto,reset)%C(auto,red)%d%C(auto,reset) [push] - # Reinforce git 2.0 default behavior for consistency - default = simple - followTags = true + # Reinforce git 2.0 default behavior for consistency + default = simple + followTags = true [alias] - tlog = log --pretty=terse + tlog = log --pretty=terse # A gross fix for the fact that I need two different [user] blocks depending on # what system I'm on. The local file will only contian [user]. diff --git a/.profile b/.profile index 6613d30..e6eaeb2 100644 --- a/.profile +++ b/.profile @@ -2,7 +2,7 @@ export LANG=en_US.UTF-8 # Start keychain only on my personal system if [ -z "$SSH_CLIENT" ] && [ -z "$SSH_TTY" ]; then - eval `keychain --eval id_ed25519` + eval `keychain --eval id_ed25519` fi # These are pretty safe to assume exist @@ -12,7 +12,7 @@ export VISUAL=$EDITOR # Figure out my pager; these don't necessarily exist if [ -e /usr/bin/bat ]; then - export PAGER="bat --plain" + export PAGER="bat --plain" elif [ -e /usr/bin/most ]; then export PAGER=most fi