From 1b321f5dfaf1b4ee7e0194b4164f18d309afeb88 Mon Sep 17 00:00:00 2001 From: array-in-a-matrix Date: Tue, 24 Jan 2023 16:50:50 -0500 Subject: [PATCH] update --- private_dot_config/private_htop/htoprc | 18 ++++---- private_dot_config/sway/config | 3 ++ private_dot_config/swaync/config.json | 50 +++++++++++++++++++++ private_dot_config/swaync/style.css | 40 +++++++++++++++++ private_dot_config/waybar/config | 20 ++++++++- private_dot_config/waybar/style.css | 4 ++ private_dot_config/zsh/alias | 2 +- private_dot_config/zsh/executable_dot_zshrc | 5 +++ 8 files changed, 130 insertions(+), 12 deletions(-) create mode 100644 private_dot_config/swaync/config.json create mode 100644 private_dot_config/swaync/style.css diff --git a/private_dot_config/private_htop/htoprc b/private_dot_config/private_htop/htoprc index d07fddb..730bcf3 100644 --- a/private_dot_config/private_htop/htoprc +++ b/private_dot_config/private_htop/htoprc @@ -8,7 +8,7 @@ hide_userland_threads=0 shadow_other_users=0 show_thread_names=0 show_program_path=1 -highlight_base_name=0 +highlight_base_name=1 highlight_deleted_exe=1 highlight_megabytes=1 highlight_threads=1 @@ -16,14 +16,14 @@ highlight_changes=0 highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 -show_merged_command=1 +show_merged_command=0 header_margin=1 screen_tabs=0 -detailed_cpu_time=0 +detailed_cpu_time=1 cpu_count_from_one=0 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,15 +37,15 @@ column_meter_modes_0=1 1 1 column_meters_1=RightCPUs Tasks LoadAverage Uptime column_meter_modes_1=1 2 2 2 tree_view=0 -sort_key=47 -tree_sort_key=47 +sort_key=46 +tree_sort_key=46 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 -.tree_sort_key=PERCENT_MEM +.sort_key=PERCENT_CPU +.tree_sort_key=PERCENT_CPU .tree_view=0 .tree_view_always_by_pid=0 .sort_direction=-1 diff --git a/private_dot_config/sway/config b/private_dot_config/sway/config index 4af7fea..8087b6f 100644 --- a/private_dot_config/sway/config +++ b/private_dot_config/sway/config @@ -247,12 +247,15 @@ bindsym $mod+Shift+e mode "$mode_system" #notification # exec mako +exec swaync +bindsym $mod+Shift+n exec swaync-client -t -sw #runs waybar exec_always "killall waybar; waybar" #new theme exec --no-startup-id ~/.config/sway/colors.sh +bindsym $mod+Shift+m exec --no-startup-id ~/.config/sway/colors.sh #brightness control with brightness fn keys bindsym XF86MonBrightnessUp exec brightnessctl -q set +1% diff --git a/private_dot_config/swaync/config.json b/private_dot_config/swaync/config.json new file mode 100644 index 0000000..8eb3d4f --- /dev/null +++ b/private_dot_config/swaync/config.json @@ -0,0 +1,50 @@ +{ + "$schema": "/etc/xdg/swaync/configSchema.json", + "positionX": "left", + "positionY": "top", + "layer": "top", + "cssPriority": "application", + "control-center-margin-top": 0, + "control-center-margin-bottom": 0, + "control-center-margin-right": 0, + "control-center-margin-left": 0, + "notification-icon-size": 64, + "notification-body-image-height": 100, + "notification-body-image-width": 200, + "timeout": 10, + "timeout-low": 5, + "timeout-critical": 0, + "fit-to-screen": true, + "control-center-width": 400, + "control-center-height": 600, + "notification-window-width": 400, + "keyboard-shortcuts": true, + "image-visibility": "when-available", + "transition-time": 200, + "hide-on-clear": false, + "hide-on-action": true, + "script-fail-notify": true, + "widgets": [ + "title", + "dnd", + "notifications" + ], + "widget-config": { + "title": { + "text": "Notifications", + "clear-all-button": true, + "button-text": "Clear" + }, + "dnd": { + "text": "Do Not Disturb" + }, + "label": { + "max-lines": 5, + "text": "Label Text" + }, + "mpris": { + "image-size": 96, + "image-radius": 12 + } + } +} diff --git a/private_dot_config/swaync/style.css b/private_dot_config/swaync/style.css new file mode 100644 index 0000000..7b6efbe --- /dev/null +++ b/private_dot_config/swaync/style.css @@ -0,0 +1,40 @@ + +@import "../../.cache/wal/colors-waybar.css"; +/* +@foreground +@background +@cursor +@color[0-15] +*/ + +*, body { + border: none; + border-radius: 4px; + font-family: Hack, Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; + margin: 1px 4px; + +} + +.control-center { + background-color: @background; + border-bottom: 3px solid @foreground; + color: @color7; +} + +.notification { + border-radius: 12px; + margin: 6px 12px; + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), 0 1px 3px 1px rgba(0, 0, 0, 0.7), + 0 2px 6px 2px rgba(0, 0, 0, 0.3); + padding: 0; +} +.notification-row:focus, +.notification-row:hover { + background: @foreground; +} +.notification-content { + background: @color3; + padding: 6px; + border-radius: 12px; +} \ No newline at end of file diff --git a/private_dot_config/waybar/config b/private_dot_config/waybar/config index f29bae8..bd614d9 100644 --- a/private_dot_config/waybar/config +++ b/private_dot_config/waybar/config @@ -3,7 +3,7 @@ "position": "top", "height": 30, - "modules-left": ["sway/workspaces", "sway/mode", "sway/window"], + "modules-left": [ "custom/notification", "sway/workspaces", "sway/mode", "sway/window"], "modules-center": [], "modules-right": ["custom/cmus", "idle_inhibitor", "network", "pulseaudio", "battery", "clock", "custom/themer"], @@ -80,5 +80,21 @@ "interval": 1, "on-click": "exec ~/.config/sway/colors.sh", "on-click-right": "exec ~/.config/sway/colors.sh" - } + }, + "custom/notification": { + "tooltip": false, + "format": "{icon}", + "format-icons": { + "notification": "", + "none": "", + "dnd-notification": "", + "dnd-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true + }, } diff --git a/private_dot_config/waybar/style.css b/private_dot_config/waybar/style.css index 9492c53..bc74bfa 100644 --- a/private_dot_config/waybar/style.css +++ b/private_dot_config/waybar/style.css @@ -75,3 +75,7 @@ button.focused { animation-iteration-count: infinite; animation-direction: alternate; } + +#custom-notification { + font-family: "NotoSansMono Nerd Font"; +} diff --git a/private_dot_config/zsh/alias b/private_dot_config/zsh/alias index fb3ed50..6b31957 100644 --- a/private_dot_config/zsh/alias +++ b/private_dot_config/zsh/alias @@ -11,7 +11,7 @@ alias rm="trash" alias radeontop="radeontop -c" alias speedometer="speedometer -l -r wlo1 -t wlo1 -m $(( 1024 * 1024 * 3 / 2 ))" alias tty-clock="tty-clock -scBxbn" -alias auth="eval $(ssh-agent) ssh-add $HOME/.ssh/null@void $HOME/.ssh/ubuntu@vector" +alias auth="eval $(ssh-agent) ssh-add $HOME/.ssh/ubuntu@vector" alias vector="screen -S vector mosh ubuntu@arrayinamatrix.xyz --ssh='ssh -p 6969'" alias share='f() { curl --progress-bar --upload-file "$1" https://share.arrayinamatrix.xyz/ | tee /dev/null; echo };f' alias cat="bat --paging=never" diff --git a/private_dot_config/zsh/executable_dot_zshrc b/private_dot_config/zsh/executable_dot_zshrc index ce5dc6d..32d35bb 100644 --- a/private_dot_config/zsh/executable_dot_zshrc +++ b/private_dot_config/zsh/executable_dot_zshrc @@ -56,3 +56,8 @@ eval "$(zoxide init zsh --cmd cd)" # bun completions [ -s "/home/linux/.bun/_bun" ] && source "/home/linux/.bun/_bun" + +# pnpm +export PNPM_HOME="/home/linux/.local/share/pnpm" +export PATH="$PNPM_HOME:$PATH" +# pnpm end \ No newline at end of file