diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 5ad5910..24e1025 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -1,33 +1,37 @@ live_config_reload: true + colors: - bright: - black: "0x5c6370" - blue: "0x61afef" - cyan: "0x56b6c2" - green: "0x98c379" - magenta: "0xc678dd" - red: "0xe06c75" - white: "0xe6efff" - yellow: "0xd19a66" - normal: - black: "0x1e2127" - blue: "0x61afef" - cyan: "0x56b6c2" - green: "0x98c379" - magenta: "0xc678dd" - red: "0xe06c75" - white: "0x828791" - yellow: "0xd19a66" primary: - background: "0x1e2127" - bright_foreground: "0xe6efff" - foreground: "0xabb2bf" + background: "#101010" + foreground: "#C6C6C6" + + normal: + black: "#101010" + red: "#C40233" + green: "#009F6B" + yellow: "#FFD700" + blue: "#0087BD" + magenta: "#9A4EAE" + cyan: "#20B2AA" + white: "#C6C6C6" + bright: + black: "#696969" + red: "#FF2400" + green: "#03C03C" + yellow: "#FDFF00" + blue: "#007FFF" + magenta: "#FF1493" + cyan: "#00CCCC" + white: "#FFFAFA" + cursor: style: blinking: Off shape: Block + env: TERM: xterm-256color + font: size: 11 glyph_offset: @@ -38,22 +42,23 @@ font: offset: x: 1 y: 2 -keyboard: - bindings: - - chars: "\x1f" - key: Slash - mods: Control - - chars: "\0" - key: Space - mods: Control - - chars: "\e" - key: Back - mods: Control + +key_bindings: + - chars: "\x1f" + key: Slash + mods: Control + - chars: "\0" + key: Space + mods: Control + - chars: "\e" + key: Back + mods: Control + - chars: "\u0100" + key: M + mods: Control + window: dynamic_padding: true - dimensions: - columns: 140 - lines: 45 padding: x: 2 y: 2 diff --git a/.config/dunst/dmenu b/.config/dunst/dmenu new file mode 100755 index 0000000..14242dc --- /dev/null +++ b/.config/dunst/dmenu @@ -0,0 +1,19 @@ +#!/bin/bash + +declare -A cases + +while read -r element; do + case "$element" in + "#Open"*) + cases["open"]+=$element + ;; + "#Mark as read"*) + cases["read"]+=$element + ;; + *) cases["$element"]="$element" + esac +done + + +sel="$(for el in "${!cases[@]}"; do echo "$el"; done | dmenu -p 'dunst:')" +[ -n "${sel}" ] && echo "${cases["$sel"]}" diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 8fa52cf..d344829 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -1,403 +1,79 @@ -# 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 = none - - ### Geometry ### - - # dynamic width from 0 to 300 - # width = (0, 300) - # constant width of 300 - width = 400 - - # The maximum height of a single notification, excluding the frame. + width = (100, 400) height = 1000 - - # Position the notification in the top right corner origin = top-right - - # Offset from the origin offset = 12x42 - - # Scale factor. It is auto-detected if value is 0. - scale = 0 - - # 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). + progress_bar = false 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 = 10 - - # Draw a line of "separator_height" pixel height between two - # notifications. - # Set to 0 to disable. separator_height = 2 - # Padding between text and separator. padding = 8 - - # 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 = 1 - # Defines color of the frame around the notification window. - frame_color = "#3e4452" + frame_color = "#3a3a3a" - # 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 = 10 - ### Text ### - font = Mononoki Nerd Font Propo 10 - - # 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: - # bold - # italic - # strikethrough - # underline - # - # For a complete reference see - # . - # - # 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 = "%s\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 = true - - # 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 ### - - # Align icons left/right/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 = 0 - - # Scale larger icons down to this size, set to 0 to disable max_icon_size = 48 - - # Paths to default icons. 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 = 100 - ### Misc/Advanced ### - - # dmenu path. - dmenu = dmenu -p dunst: - - # Browser for opening urls in context menu. + dmenu = ~/.config/dunst/dmenu 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_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 = 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 = close_current mouse_middle_click = do_action, close_current mouse_right_click = context -# 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 = "#282c34" - foreground = "#abb2bf" + background = "#232323" + foreground = "#a0a0a0" timeout = 10 - # Icon for notifications with low urgency, uncomment to enable - #new_icon = /path/to/icon [urgency_normal] - background = "#282c34" - foreground = "#abb2bf" + background = "#232323" + foreground = "#a0a0a0" timeout = 10 - # Icon for notifications with normal urgency, uncomment to enable - #new_icon = /path/to/icon [urgency_critical] - background = "#282c34" - foreground = "#abb2bf" + background = "#232323" + foreground = "#a0a0a0" frame_color = "#ff0000" - timeout = 0 - # Icon for notifications with critical urgency, uncomment to enable - #new_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 -# skip_display -# history_ignore -# action_name -# word_wrap -# ellipsize -# alignment -# -# 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 + timeout = 10 [spotify] appname = "Spotify" @@ -407,39 +83,4 @@ appname = "no-history" history_ignore = yes -#[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/tmux/keybinds.conf b/.config/tmux/keybinds.conf index f06e0f9..d9e3d93 100644 --- a/.config/tmux/keybinds.conf +++ b/.config/tmux/keybinds.conf @@ -1,22 +1,29 @@ # Change prefix key to C-a, found in in GNU Screen unbind-key C-b - set-option -g prefix C-a bind-key C-a send-prefix -# Sane splits +# moving bind u previous-window bind i next-window -bind n new-window -c "#{pane_current_path}" +bind n "new-window -c '#{pane_current_path}'" -bind k split-window -v -c "#{pane_current_path}" -bind l split-window -h -c "#{pane_current_path}" +# splits +bind h "split-window -hb -c '#{pane_current_path}'" +bind j "split-window -v -c '#{pane_current_path}'" +bind k "split-window -v -b -c '#{pane_current_path}'" +bind l "split-window -h -c '#{pane_current_path}'" # Rebind command key to ; -bind \; command-prompt +bind ';' "command-prompt" # Reload config on C-r -bind C-r source-file ~/.config/tmux/tmux.conf +bind C-r "source-file ~/.config/tmux/tmux.conf" + +# session binds +bind C-n "new-session -c '#{pane_current_path}' -s '#{b:pane_current_path}'" +bind C-x "set-option -g detach-on-destroy on; kill-session" +bind X "set-option -g detach-on-destroy off; kill-session; set-option -g detach-on-destroy on" # vim: ft=tmux diff --git a/.config/tmux/plugins.conf b/.config/tmux/plugins.conf index 6e6f90d..679836b 100644 --- a/.config/tmux/plugins.conf +++ b/.config/tmux/plugins.conf @@ -1,4 +1,3 @@ -set -g @plugin 'odedlaz/tmux-onedark-theme' set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-battery' @@ -12,11 +11,6 @@ set -g @batt_icon_charge_tier3 ' ' set -g @batt_icon_charge_tier2 ' ' set -g @batt_icon_charge_tier1 '! !' -# Change date and time format -set -g @onedark_time_format "%I:%M %p" -set -g @onedark_date_format "%D" -set -g @onedark_widgets "#{battery_icon_charge} #{battery_percentage}" - set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.local/share/tmux-plugins' # Run tmux-plugin-manager diff --git a/.config/tmux/theme.conf b/.config/tmux/theme.conf new file mode 100644 index 0000000..caf8dab --- /dev/null +++ b/.config/tmux/theme.conf @@ -0,0 +1,42 @@ +set -g @theme-bg "color0" +set -g @theme-fg "color15" +set -g @theme-active-bg "color8" +set -g @theme-active-fg "color15" +set -g @theme-urgent "red" + +# theme +set -g status-position "bottom" +set -g status-style "bg=#{@theme-bg},fg=#{@theme-fg}" +set -g message-style "bg=#{@theme-bg},fg=#{@theme-fg}" +set -g status-justify "left" + +# status +set -g status-left-length 0 +set -g status-left "#[bg=#{@theme-active-bg},fg=#{@theme-active-fg}]#{?client_prefix,[#{session_name}],#[bg=#{@theme-bg},fg=#{@theme-fg}][#{session_name}]}#[bg=#{@theme-bg},fg=#{@theme-fg}] " +set -g status-right "#{battery_icon_charge} #{battery_percentage} | %a %m/%d %I:%M %P" +set -g window-status-format " #I:#W " +set -g window-status-current-format "#[bg=#{@theme-active-bg},fg=#{@theme-active-fg}, bold]#{?window_zoomed_flag, #I:#W 󰊓 , #I:#W }" +set -g window-status-style "bg=#{@theme-bg},fg=#{@theme-fg}" + +# pane styles +set -g pane-border-style "fg=#{@theme-active-bg}" +set -g pane-active-border-style "fg=#{@theme-active-fg}" + +# copy mode +set -g copy-mode-match-style bg=color227,fg=black +set -g copy-mode-current-match-style bg=color229,fg=black +set -g mode-style bg=color8,fg=black +set -g copy-mode-mark-style default + +# other styles +set -g cursor-style block +set -g clock-mode-style 12 +set -g popup-style default +set -g popup-border-style default + +set -g window-active-style default +set -g window-style default +set -g window-status-activity-style reverse +set -g window-status-bell-style "bg=#{@theme-urgent}" + +# vim: ft=tmux diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index a8f087f..a535e36 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -32,14 +32,10 @@ set -g monitor-activity off setw -g aggressive-resize on # Change history limit -set -g history-limit 4096 - -# Default status bar config (doesn't change the behavior of custom status bars) -set -g status-justify left -set -g status-bg green -set -g status-interval 2 +set -g history-limit 131072 # Source extra configs +source-file ~/.config/tmux/theme.conf source-file ~/.config/tmux/keybinds.conf source-file ~/.config/tmux/plugins.conf source-file ~/.config/tmux/vim.conf diff --git a/.config/tmux/vim.conf b/.config/tmux/vim.conf index 1357408..1a0d04e 100644 --- a/.config/tmux/vim.conf +++ b/.config/tmux/vim.conf @@ -1,9 +1,9 @@ -is_vim="ps -o state= -o comm= -t '#{pane_tty}'| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" +TMUX_IS_VIM="ps -o state= -o comm= -t '#{pane_tty}'| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" -bind-key -n M-h if-shell "$is_vim" "send-keys M-h" "select-pane -L" -bind-key -n M-j if-shell "$is_vim" "send-keys M-j" "select-pane -D" -bind-key -n M-k if-shell "$is_vim" "send-keys M-k" "select-pane -U" -bind-key -n M-l if-shell "$is_vim" "send-keys M-l" "select-pane -R" +bind-key -n M-h if-shell "$TMUX_IS_VIM" "send-keys M-h" "select-pane -L" +bind-key -n M-j if-shell "$TMUX_IS_VIM" "send-keys M-j" "select-pane -D" +bind-key -n M-k if-shell "$TMUX_IS_VIM" "send-keys M-k" "select-pane -U" +bind-key -n M-l if-shell "$TMUX_IS_VIM" "send-keys M-l" "select-pane -R" bind-key -T copy-mode-vi M-h select-pane -L bind-key -T copy-mode-vi M-j select-pane -D diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index ecb2e3f..f4e346c 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -28,12 +28,12 @@ setopt auto_pushd # keybinds bindkey -e bindkey '^[[Z' reverse-menu-complete + bindkey "^[[1;3C" forward-word bindkey "^[[1;5C" forward-word bindkey "^[[1;3D" backward-word bindkey "^[[1;5D" backward-word - bindkey "^[n" backward-word bindkey "^[m" forward-word @@ -56,6 +56,7 @@ alias l="ls -lh" alias la="ls -lah" alias ll="ls -lh" alias tree="ls --tree" +alias lt="l -t" # set bat as help pager alias -g -- --help='--help 2>&1 | batcat --language=help --style=plain' diff --git a/.local/bin/scripts/dmenu b/.local/bin/scripts/dmenu index a7e193e..f638af6 100755 --- a/.local/bin/scripts/dmenu +++ b/.local/bin/scripts/dmenu @@ -1,2 +1,2 @@ -exec /usr/bin/dmenu -fn 'Mononoki Nerd Font Propo:size=12' -nb '#3a3a3a' -nf '#bbbbbb' -sb '#db8402' -sf '#eeeeee' "$@" +exec /usr/bin/dmenu -fn 'Mononoki Nerd Font Propo:size=12' -nb '#232323' -sb '#3a3a3a' -nf '#a0a0a0' -sf '#ffffff' "$@" # vim: ft=sh diff --git a/.local/bin/scripts/printcolors b/.local/bin/scripts/printcolors new file mode 100755 index 0000000..5b76ca2 --- /dev/null +++ b/.local/bin/scripts/printcolors @@ -0,0 +1,16 @@ +#!/bin/bash + +if [ -n "$1" ]; then + cols=6 + offset=-15 + colors=({16..255}) +else + cols=8 + offset=1 + colors=({0..15}) +fi + +for i in "${colors[@]}"; do + printf '\x1b[38;5;%dmcolor%03d\x1b[0m' "$i" "$i" + [ $(((i + offset) % cols)) -eq 0 ] && printf "\n" || printf " " +done diff --git a/.local/share/wallpaper/wallpaper.png b/.local/share/wallpaper/wallpaper.png index 4e4645d..e5e4cc1 100644 Binary files a/.local/share/wallpaper/wallpaper.png and b/.local/share/wallpaper/wallpaper.png differ