diff options
| -rw-r--r-- | alacritty/alacritty.yml (renamed from alacritty/.alacritty.yml) | 4 | ||||
| -rw-r--r-- | bash/.bash/01-aliases.bash | 52 | ||||
| -rw-r--r-- | bash/.bash_profile | 4 | ||||
| -rw-r--r-- | dunst/dunst/dunstrc (renamed from config/dunst/dunstrc) | 0 | ||||
| -rw-r--r-- | dunst/dunstrc | 454 | ||||
| -rw-r--r-- | htop/htop/htoprc (renamed from config/htop/htoprc) | 0 | ||||
| -rw-r--r-- | htop/htoprc | 61 | ||||
| -rw-r--r-- | tmux/tmux.conf (renamed from tmux/.tmux.conf) | 0 | ||||
| -rwxr-xr-x | update.sh | 9 | ||||
| -rw-r--r-- | x/.Xmodmap | 4 | ||||
| -rw-r--r-- | x/.xinitrc | 8 |
11 files changed, 566 insertions, 30 deletions
diff --git a/alacritty/.alacritty.yml b/alacritty/alacritty.yml index 5710c56..4172dbf 100644 --- a/alacritty/.alacritty.yml +++ b/alacritty/alacritty.yml @@ -14,6 +14,10 @@ font: size: 11 + offset: + x: 0 + y: 1 + window: padding: x: 7 diff --git a/bash/.bash/01-aliases.bash b/bash/.bash/01-aliases.bash index b0d4060..514ba56 100644 --- a/bash/.bash/01-aliases.bash +++ b/bash/.bash/01-aliases.bash @@ -12,24 +12,27 @@ alias sudo="doas" alias l='ls' alias sl='ls' -# grep colors +# always run with args alias grep='grep --color=auto' alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' - -# ls color and shortcuts alias ls='ls --color=auto' alias la='ls -a' -alias lsd='ls -lh' - -# copy an entire file -alias copy='xclip -sel c <' +alias ll='ls -lh' +alias cp='cp -iv' +alias mv='mv -iv' +alias g++='g++ --std=c++20' +alias vim='vim -p' +alias gs='gs -dNOSAFER' # cd shortcuts alias ..='cd ..' alias ...='cd ../..' alias ....='cd ../../..' -alias back='cd -' +alias b='cd -' + +# copy an entire file +alias copy='xclip -sel c <' # local apps alias carmine-impact='cd /home/bryson/git/cardboard && ./cardboard_unix' @@ -39,35 +42,27 @@ alias friday-night-funkin='cd /home/bryson/apps/friday-night-funkin && ./Funkin' alias overland='cd /home/bryson/apps/overland && ./Overland.x86_64' alias sm64ex='cd /home/bryson/git/sm64ex/build/us_pc/./sm64.us.f3dex2e' -# binary renames +# binary substitutions alias java='/usr/local/java/jdk-18.0.1.1/bin/java' alias java11='/usr/bin/java' alias python='python3' -alias g++='g++ --std=c++20' -alias j='autojump' -alias vim='vim -p' -alias gs='gs -dNOSAFER' -#alias gdb="gdb --tui" -#alias spt="spotifyd && spt" - -# quick important file edits -alias todo='vim ~/.todo/TODO.org' +alias ed='fzf --height=15 --layout=reverse | sed "s/^/\"/g;s/$/\"/g" | xargs -ro vim' # common combinations -alias django='python manage.py' +alias dj='python manage.py' alias smci='sudo make clean install' alias smi='sudo make install' -alias library='xrandr --output HDMI-A-0 --auto --set TearFree on --output eDP --off && xset r rate 300 50' -alias nolibrary='xrandr --output HDMI-A-0 --off --output eDP --auto' +alias lib='xrandr --output HDMI-A-0 --auto --output eDP --off && xset r rate 300 50' +alias nolib='xrandr --output HDMI-A-0 --off --output eDP --auto' # bash navigation -alias add-alias='vim ~/.bash/01-aliases.bash; . ~/.bash_profile' +alias aa='vim ~/.bash/01-aliases.bash; . ~/.bash_profile' -search() { +s() { find . -type f -exec grep ${1} {} \; } -sshpixel() { +ssh-pixel() { ssh -p 8022 uO_14O@${1} } @@ -76,9 +71,16 @@ alias package.use='sudo vim /etc/portage/package.use' alias make.conf='sudo vim /etc/portage/make.conf' alias package.license='sudo vim /etc/portage/package.license' -# other garbage +# fixes alias fixwifi='sudo rc-service wpa_supplicant restart' alias fixaudio='pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stereo' +alias fixjava='export _JAVA_AWT_WM_NONREPARENTING=1 && export AWT_TOOLKIT=MToolkit && wmname LG3D' + +# auto elevate +alias mount='sudo mount' +alias umount='sudo umount' + +# other garbage alias macos="cd /home/bryson/git/macOS-Simple-KVM && ./basic.sh" alias server="python3 /home/bryson/git/webserver/server.py" alias emerge-update="sudo emerge --ask --verbose --update --deep --changed-use @world" diff --git a/bash/.bash_profile b/bash/.bash_profile index c5cb988..3ad634e 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -15,4 +15,6 @@ export PATH complete -cf doas export PATH=$PATH:/home/bryson/.spicetify export EDITOR=/usr/bin/vim -#source "/home/bryson/git/emsdk/emsdk_env.sh" +source /usr/share/autojump/autojump.bash +source /usr/share/bash-completion/completions/fzf +source /usr/share/fzf/key-bindings.bash diff --git a/config/dunst/dunstrc b/dunst/dunst/dunstrc index 7956a71..7956a71 100644 --- a/config/dunst/dunstrc +++ b/dunst/dunst/dunstrc diff --git a/dunst/dunstrc b/dunst/dunstrc new file mode 100644 index 0000000..7956a71 --- /dev/null +++ b/dunst/dunstrc @@ -0,0 +1,454 @@ +# See dunst(5) for all configuration options + +[global] + ### Display ### + + # Which monitor should the notifications be displayed on. + monitor = 0 + + # Display notification on focused monitor. Possible modes are: + # mouse: follow mouse pointer + # keyboard: follow window with keyboard focus + # none: don't follow anything + # + # "keyboard" needs a window manager that exports the + # _NET_ACTIVE_WINDOW property. + # This should be the case for almost all modern window managers. + # + # If this option is set to mouse or keyboard, the monitor option + # will be ignored. + follow = keyboard + + ### Geometry ### + + # dynamic width from 0 to 300 + # width = (0, 300) + # constant width of 300 + width = 300 + + # The maximum height of a single notification, excluding the frame. + height = 300 + + # Position the notification in the top right corner + origin = top-right + + # Offset from the origin + offset = 0x18 + + # Scale factor. It is auto-detected if value is 0. + scale = 1.3 + + # Maximum number of notification (0 means no limit) + notification_limit = 0 + + ### Progress bar ### + + # Turn on the progess bar. It appears when a progress hint is passed with + # for example dunstify -h int:value:12 + progress_bar = true + + # Set the progress bar height. This includes the frame, so make sure + # it's at least twice as big as the frame width. + progress_bar_height = 10 + + # Set the frame width of the progress bar + progress_bar_frame_width = 1 + + # Set the minimum width for the progress bar + progress_bar_min_width = 150 + + # Set the maximum width for the progress bar + progress_bar_max_width = 300 + + + # Show how many messages are currently hidden (because of + # notification_limit). + indicate_hidden = yes + + # The transparency of the window. Range: [0; 100]. + # This option will only work if a compositing window manager is + # present (e.g. xcompmgr, compiz, etc.). (X11 only) + transparency = 0 + + # Draw a line of "separator_height" pixel height between two + # notifications. + # Set to 0 to disable. + # If gap_size is greater than 0, this setting will be ignored. + separator_height = 2 + + # Padding between text and separator. + padding = 11 + + # Horizontal padding. + horizontal_padding = 8 + + # Padding between text and icon. + text_icon_padding = 0 + + # Defines width in pixels of frame around the notification window. + # Set to 0 to disable. + frame_width = 3 + + # Defines color of the frame around the notification window. + frame_color = "#928374" + + # Size of gap to display between notifications - requires a compositor. + # If value is greater than 0, separator_height will be ignored and a border + # of size frame_width will be drawn around each notification instead. + # Click events on gaps do not currently propagate to applications below. + gap_size = 3 + + # Define a color for the separator. + # possible values are: + # * auto: dunst tries to find a color fitting to the background; + # * foreground: use the same color as the foreground; + # * frame: use the same color as the frame; + # * anything else will be interpreted as a X color. + separator_color = frame + + # Sort messages by urgency. + sort = yes + + # Don't remove messages, if the user is idle (no mouse or keyboard input) + # for longer than idle_threshold seconds. + # Set to 0 to disable. + # A client can set the 'transient' hint to bypass this. See the rules + # section for how to disable this if necessary + # idle_threshold = 120 + + ### Text ### + + font = Monospace 11 + + # The spacing between lines. If the height is smaller than the + # font height, it will get raised to the font height. + line_height = 0 + + # Possible values are: + # full: Allow a small subset of html markup in notifications: + # <b>bold</b> + # <i>italic</i> + # <s>strikethrough</s> + # <u>underline</u> + # + # For a complete reference see + # <https://docs.gtk.org/Pango/pango_markup.html>. + # + # strip: This setting is provided for compatibility with some broken + # clients that send markup even though it's not enabled on the + # server. Dunst will try to strip the markup but the parsing is + # simplistic so using this option outside of matching rules for + # specific applications *IS GREATLY DISCOURAGED*. + # + # no: Disable markup parsing, incoming notifications will be treated as + # plain text. Dunst will not advertise that it has the body-markup + # capability if this is set as a global setting. + # + # It's important to note that markup inside the format option will be parsed + # regardless of what this is set to. + markup = full + + # 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 = "<b><u>%s</u></b>\n%b" + + # Alignment of message text. + # Possible values are "left", "center" and "right". + alignment = left + + # Vertical alignment of message text and icon. + # Possible values are "top", "center" and "bottom". + vertical_alignment = center + + # Show age of message if message is older than show_age_threshold + # seconds. + # Set to -1 to disable. + show_age_threshold = 60 + + # Specify where to make an ellipsis in long lines. + # Possible values are "start", "middle" and "end". + ellipsize = middle + + # Ignore newlines '\n' in notifications. + ignore_newline = no + + # Stack together notifications with the same content + stack_duplicates = false + + # Hide the count of stacked notifications with the same content + hide_duplicate_count = false + + # Display indicators for URLs (U) and actions (A). + show_indicators = no + + ### Icons ### + + # Recursive icon lookup. You can set a single theme, instead of having to + # define all lookup paths. + enable_recursive_icon_lookup = true + + # Set icon theme (only used for recursive icon lookup) + icon_theme = Adwaita + # You can also set multiple icon themes, with the leftmost one being used first. + # icon_theme = "Adwaita, breeze" + + # Align icons left/right/top/off + icon_position = left + + # Scale small icons up to this size, set to 0 to disable. Helpful + # for e.g. small files or high-dpi screens. In case of conflict, + # max_icon_size takes precedence over this. + min_icon_size = 32 + + # Scale larger icons down to this size, set to 0 to disable + max_icon_size = 48 + + # Paths to default icons (only neccesary when not using recursive icon lookup) + icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ + + ### History ### + + # Should a notification popped up from history be sticky or timeout + # as if it would normally do. + sticky_history = yes + + # Maximum amount of notifications kept in history + history_length = 20 + + ### Misc/Advanced ### + + # dmenu path. + dmenu = /usr/bin/dmenu -p dunst: + + # Browser for opening urls in context menu. + browser = /usr/bin/xdg-open + + # Always run rule-defined scripts, even if the notification is suppressed + always_run_script = true + + # Define the title of the windows spawned by dunst + title = Dunst + + # Define the class of the windows spawned by dunst + class = Dunst + + # Define the corner radius of the notification window + # in pixel size. If the radius is 0, you have no rounded + # corners. + # The radius will be automatically lowered if it exceeds half of the + # notification height to avoid clipping text and/or icons. + 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 = false + + ### Wayland ### + # These settings are Wayland-specific. They have no effect when using X11 + + # Uncomment this if you want to let notications appear under fullscreen + # applications (default: overlay) + # layer = top + + # Set this to true to use X11 output on Wayland. + force_xwayland = false + + ### Legacy + + # Use the Xinerama extension instead of RandR for multi-monitor support. + # This setting is provided for compatibility with older nVidia drivers that + # do not support RandR and using it on systems that support RandR is highly + # discouraged. + # + # By enabling this setting dunst will not be able to detect when a monitor + # is connected or disconnected which might break follow mode if the screen + # layout changes. + force_xinerama = false + + ### mouse + + # Defines list of actions for each mouse event + # Possible values are: + # * none: Don't do anything. + # * do_action: Invoke the action determined by the action_name rule. If there is no + # such action, open the context menu. + # * open_url: If the notification has exactly one url, open it. If there are multiple + # ones, open the context menu. + # * close_current: Close current notification. + # * close_all: Close all notifications. + # * context: Open context menu for the notification. + # * context_all: Open context menu for all notifications. + # These values can be strung together for each mouse event, and + # will be executed in sequence. + mouse_left_click = do_action, close_current + mouse_middle_click = do_action, close_current + mouse_right_click = close_all + +# Experimental features that may or may not work correctly. Do not expect them +# to have a consistent behaviour across releases. +[experimental] + # Calculate the dpi to use on a per-monitor basis. + # If this setting is enabled the Xft.dpi value will be ignored and instead + # dunst will attempt to calculate an appropriate dpi value for each monitor + # using the resolution and physical size. This might be useful in setups + # where there are multiple screens with very different dpi values. + per_monitor_dpi = false + + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#3c3836" + foreground = "#ebdbb2" + timeout = 10 + # Icon for notifications with low urgency, uncomment to enable + #default_icon = /path/to/icon + +[urgency_normal] + background = "#504945" + foreground = "#ebdbb2" + timeout = 10 + # Icon for notifications with normal urgency, uncomment to enable + #default_icon = /path/to/icon + +[urgency_critical] + background = "#cc241d" + foreground = "#ebdbb2" + frame_color = "#fb4934" + timeout = 0 + # Icon for notifications with critical urgency, uncomment to enable + #default_icon = /path/to/icon + +# Every section that isn't one of the above is interpreted as a rules to +# override settings for certain messages. +# +# Messages can be matched by +# appname (discouraged, see desktop_entry) +# body +# category +# desktop_entry +# icon +# match_transient +# msg_urgency +# stack_tag +# summary +# +# and you can override the +# background +# foreground +# format +# frame_color +# fullscreen +# new_icon +# set_stack_tag +# set_transient +# set_category +# timeout +# urgency +# icon_position +# skip_display +# history_ignore +# action_name +# word_wrap +# ellipsize +# alignment +# hide_text +# +# Shell-like globbing will get expanded. +# +# Instead of the appname filter, it's recommended to use the desktop_entry filter. +# GLib based applications export their desktop-entry name. In comparison to the appname, +# the desktop-entry won't get localized. +# +# SCRIPTING +# You can specify a script that gets run when the rule matches by +# setting the "script" option. +# The script will be called as follows: +# script appname summary body icon urgency +# where urgency can be "LOW", "NORMAL" or "CRITICAL". +# +# NOTE: It might be helpful to run dunst -print in a terminal in order +# to find fitting options for rules. + +# Disable the transient hint so that idle_threshold cannot be bypassed from the +# client +#[transient_disable] +# match_transient = yes +# set_transient = no +# +# Make the handling of transient notifications more strict by making them not +# be placed in history. +#[transient_history_ignore] +# match_transient = yes +# history_ignore = yes + +# fullscreen values +# show: show the notifications, regardless if there is a fullscreen window opened +# delay: displays the new notification, if there is no fullscreen window active +# If the notification is already drawn, it won't get undrawn. +# pushback: same as delay, but when switching into fullscreen, the notification will get +# withdrawn from screen again and will get delayed like a new notification +#[fullscreen_delay_everything] +# fullscreen = delay +#[fullscreen_show_critical] +# msg_urgency = critical +# fullscreen = show + +#[espeak] +# summary = "*" +# script = dunst_espeak.sh + +#[script-test] +# summary = "*script*" +# script = dunst_test.sh + +#[ignore] +# # This notification will not be displayed +# summary = "foobar" +# skip_display = true + +#[history-ignore] +# # This notification will not be saved in history +# summary = "foobar" +# history_ignore = yes + +#[skip-display] +# # This notification will not be displayed, but will be included in the history +# summary = "foobar" +# skip_display = yes + +#[signed_on] +# appname = Pidgin +# summary = "*signed on*" +# urgency = low +# +#[signed_off] +# appname = Pidgin +# summary = *signed off* +# urgency = low +# +#[says] +# appname = Pidgin +# summary = *says* +# urgency = critical +# +#[twitter] +# appname = Pidgin +# summary = *twitter.com* +# urgency = normal +# +#[stack-volumes] +# appname = "some_volume_notifiers" +# set_stack_tag = "volume" +# +# vim: ft=cfg diff --git a/config/htop/htoprc b/htop/htop/htoprc index 1ed5711..1ed5711 100644 --- a/config/htop/htoprc +++ b/htop/htop/htoprc diff --git a/htop/htoprc b/htop/htoprc new file mode 100644 index 0000000..1ed5711 --- /dev/null +++ b/htop/htoprc @@ -0,0 +1,61 @@ +# 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 +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=0 +shadow_other_users=0 +show_thread_names=0 +show_program_path=1 +highlight_base_name=0 +highlight_deleted_exe=1 +highlight_megabytes=1 +highlight_threads=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +header_margin=1 +screen_tabs=1 +detailed_cpu_time=0 +cpu_count_from_one=0 +show_cpu_usage=1 +show_cpu_frequency=0 +show_cpu_temperature=0 +degree_fahrenheit=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=0 +enable_mouse=1 +delay=15 +hide_function_bar=0 +header_layout=two_50_50 +column_meters_0=LeftCPUs Memory Swap +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=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_CPU +.tree_sort_key=PID +.tree_view=0 +.tree_view_always_by_pid=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 +screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE +.sort_key=IO_RATE +.tree_sort_key=PID +.tree_view=0 +.tree_view_always_by_pid=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 diff --git a/tmux/.tmux.conf b/tmux/tmux.conf index 1b0d4fe..1b0d4fe 100644 --- a/tmux/.tmux.conf +++ b/tmux/tmux.conf @@ -1,19 +1,20 @@ #!/bin/sh # important config files -cp ~/.alacritty.yml ./alacritty/.alacritty.yml +cp ~/.config/alacritty.yml ./alacritty/alacritty.yml cp -r ~/.bash ./bash cp ~/.bash_profile ./bash cp ~/.bashrc ./bash -cp ~/.tmux.conf ./tmux +cp ~/.config/tmux/tmux.conf ./tmux cp ~/.vimrc ./vim cp ~/.vim/coc-settings.json ./vim cp ~/.xinitrc* ./x cp ~/.Xresources ./x +cp ~/.Xmodmap ./x # other config files -cp -r ~/.config/dunst/ ./config -cp -r ~/.config/htop/ ./config +cp -r ~/.config/dunst/ ./dunst +cp -r ~/.config/htop/ ./htop # update submodules git submodule update --remote --merge diff --git a/x/.Xmodmap b/x/.Xmodmap new file mode 100644 index 0000000..2aeb810 --- /dev/null +++ b/x/.Xmodmap @@ -0,0 +1,4 @@ +clear Lock +remove Lock = Caps_Lock +keycode 66 = Escape +keycode 9 = Caps_Lock @@ -71,6 +71,14 @@ keepassxc ~/.passwords/Passwords.kdbx & #wallpapers.sh & feh --bg-fill git/wallpapers-exorcist/gruvbox/canyon.jpg git/wallpapers-exorcist/gruvbox/canyon.jpg & +# if unicomp keyboard detected, turn alt into super +if $(lsusb | grep -qi "Unicomp"); then + xmodmap -e "remove mod1 = Alt_L" + xmodmap -e "remove mod4 = Super_L" + xmodmap -e "remove mod1 = Super_L" + xmodmap -e "remove mod4 = Alt_L" +fi + # start dwm redshift & xset r rate 300 50 |