From 52b60ef859d97480a97c7c1544647a3e4999e0ff Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 8 Nov 2018 13:06:32 -0600 Subject: [PATCH] Improve gitconfig, update dunst configuration --- apps/git/config | 13 +- apps/qutebrowser/qutebrowser.conf | 2 +- de/bspwm/bspwmrc | 4 + de/compton/compton.conf | 15 +- de/dunst/build_config.bash | 10 - de/dunst/dunstrc | 312 ++++++++++++++++++++++++++++++ scripts/bin/qute | 3 + setup | 1 + shell/bash/aliases | 1 - 9 files changed, 336 insertions(+), 25 deletions(-) delete mode 100755 de/dunst/build_config.bash create mode 100644 de/dunst/dunstrc create mode 100755 scripts/bin/qute diff --git a/apps/git/config b/apps/git/config index 7f1269b..5a8bc8f 100644 --- a/apps/git/config +++ b/apps/git/config @@ -7,17 +7,26 @@ [core] editor = nvim + pager = nvim -c 'silent %sm/\\e.\\{-}m//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'goto 1' - [http "https://gopkg.in"] followRedirects = true + [diff] - tool = vimdiff + tool = nvimdiff + [difftool] prompt = false + [alias] d = difftool + [merge] - tool = vimdiff + tool = nvimdiff conflictstyle = diff3 + [mergetool] prompt = false + +[mergetool "nvimdiff"] + cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' diff --git a/apps/qutebrowser/qutebrowser.conf b/apps/qutebrowser/qutebrowser.conf index 79b08f4..df74f35 100644 --- a/apps/qutebrowser/qutebrowser.conf +++ b/apps/qutebrowser/qutebrowser.conf @@ -1478,7 +1478,7 @@ prompts.selected.bg = #308cc6 # Default: xos4 Terminus, Terminus, Monospace, "DejaVu Sans Mono", # Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", # Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal -_monospace = Iosevka, Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal +_monospace = Iosevka, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal # completion (Font): # Font used in the completion widget. diff --git a/de/bspwm/bspwmrc b/de/bspwm/bspwmrc index e697e88..b370e0f 100755 --- a/de/bspwm/bspwmrc +++ b/de/bspwm/bspwmrc @@ -28,6 +28,10 @@ if command -v urxvtd >/dev/null 2>&1; then urxvtd & fi +if command -v dunst >/dev/null 2>&1; then + dunst & +fi + if command -v sxhkd >/dev/null 2>&1; then # export HIGHLIGHT_COLOR=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*\-\(.*\)$/\1/p' | head -n 1) export NICE_HOME diff --git a/de/compton/compton.conf b/de/compton/compton.conf index 9bf0f3a..c6bace7 100644 --- a/de/compton/compton.conf +++ b/de/compton/compton.conf @@ -1,6 +1,6 @@ shadow = true; no-dnd-shadow = true; -no-dock-shadow = false; +no-dock-shadow = true; clearshadow = true; shadow-radius = 7; shadow-offset-x = -10; @@ -22,9 +22,8 @@ fade-in-step = 0.06; fade-out-step = 0.06; alpha-step = 0.1; inactive-dim = 0.5; -focus-exclude = [ - "n:e:rofi" -] + +focus-exclude = [ "n:e:rofi" ] mark-wmwin-focused = true; mark-ovredir-focused = false; @@ -50,12 +49,6 @@ blur-background-frame = false; wintypes : { - tooltip : - { - fade = true; - shadow = false; - opacity = 0.75; - focus = true; - }; + tooltip : { fade = false; shadow = false; opacity = 0.75; }; }; diff --git a/de/dunst/build_config.bash b/de/dunst/build_config.bash deleted file mode 100755 index 1fca1bc..0000000 --- a/de/dunst/build_config.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd) - -source "$DOTFILES_PATH/de/bar/bar.bash" --just-vars=1 - -export BG_COLOR=$(xrdb -query | sed -ne 's/.*color0:\s*\(.*\).*$/\1/p' | head -n 1) -export FG_COLOR=$(xrdb -query | sed -ne 's/.*color7:\s*\(.*\).*$/\1/p' | head -n 1) - -envsubst < "$DIR/dunst-config.dev.h.template" > "$DIR/config.dev.h" diff --git a/de/dunst/dunstrc b/de/dunst/dunstrc new file mode 100644 index 0000000..658ca5e --- /dev/null +++ b/de/dunst/dunstrc @@ -0,0 +1,312 @@ +[global] + monitor = 0 + follow = keyboard + + # The geometry of the window: + # [{width}]x{height}[+/-{x}+/-{y}] + # The geometry of the message window. + # The height is measured in number of notifications everything else + # in pixels. If the width is omitted but the height is given + # ("-geometry x2"), the message window expands over the whole screen + # (dmenu-like). If width is 0, the window expands to the longest + # message displayed. A positive x is measured from the left, a + # negative from the right side of the screen. Y is measured from + # the top and down respectively. + # The width can be negative. In this case the actual width is the + # screen width minus the width defined in within the geometry option. + geometry = "300x5-30+20" + + # Show how many messages are currently hidden (because of geometry). + indicate_hidden = yes + + # Shrink window if it's smaller than the width. Will be ignored if + # width is 0. + shrink = no + + # 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.). + transparency = 25 + + # The height of the entire notification. If the height is smaller + # than the font height and padding combined, it will be raised + # to the font height and padding. + notification_height = 0 + + # 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 + + # Defines width in pixels of frame around the notification window. + # Set to 0 to disable. + frame_width = 2 + + # Defines color of the frame around the notification window. + frame_color = "#888888" + + # 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. + # Transient notifications ignore this setting. + idle_threshold = 120 + + ### Text ### + + font = Iosevka 12 + + # The spacing between lines. If the height is smaller than the + # font height, it will get raised to the font height. + line_height = 3 + + # 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 + + # Show age of message if message is older than show_age_threshold + # seconds. + # Set to -1 to disable. + show_age_threshold = 60 + + # Split notifications into multiple lines if they don't fit into + # geometry. + word_wrap = yes + + # When word_wrap is set to no, specify where to ellipsize long lines. + # Possible values are "start", "middle" and "end". + ellipsize = middle + + # Ignore newlines '\n' in notifications. + ignore_newline = no + + # Merge multiple notifications with the same content + stack_duplicates = true + + # Hide the count of merged notifications with the same content + hide_duplicate_count = false + + # Display indicators for URLs (U) and actions (A). + show_indicators = yes + + ### Icons ### + + # Align icons left/right/off + icon_position = off + + # Scale larger icons down to this size, set to 0 to disable + max_icon_size = 32 + + # Paths to default icons. + icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/32x32/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/firefox-developer-edition -new-tab + + # 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 = Notification + + # Define the class of the windows spawned by dunst + class = Notification + + # Print a notification on startup. + # This is mainly for error detection, since dbus (re-)starts dunst + # automatically after a crash. + # startup_notification = true + startup_notification = 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 + +# 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 + +[shortcuts] + + # Shortcuts are specified as [modifier+][modifier+]...key + # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", + # "mod3" and "mod4" (windows-key). + # Xev might be helpful to find names for keys. + + # Close notification. + close = ctrl+space + + # Close all notifications. + close_all = ctrl+shift+space + + # Redisplay last message(s). + # On the US keyboard layout "grave" is normally above TAB and left + # of "1". Make sure this key actually exists on your keyboard layout, + # e.g. check output of 'xmodmap -pke' + history = ctrl+grave + + # Context menu. + context = ctrl+mod1+space + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#222222" + foreground = "#aaaaaa" + timeout = 10 + # Icon for notifications with low urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_normal] + background = "#222222" + foreground = "#ffffff" + timeout = 10 + # Icon for notifications with normal urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_critical] + background = "#f92672" + foreground = "#111111" + frame_color = "#c90642" + timeout = 0 + # Icon for notifications with critical urgency, uncomment to enable + #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", "summary", "body", "icon", "category", +# "msg_urgency" and you can override the "timeout", "urgency", "foreground", +# "background", "new_icon" and "format". +# Shell-like globbing will get expanded. +# +# 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: if you don't want a notification to be displayed, set the format +# to "". +# NOTE: It might be helpful to run dunst -print in a terminal in order +# to find fitting options for rules. + +#[espeak] +# summary = "*" +# script = dunst_espeak.sh + +#[script-test] +# summary = "*script*" +# script = dunst_test.sh + +#[ignore] +# # This notification will not be displayed +# summary = "foobar" +# format = "" + +#[history-ignore] +# # This notification will not be saved in history +# summary = "foobar" +# history_ignore = 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 +# +# vim: ft=cfg diff --git a/scripts/bin/qute b/scripts/bin/qute new file mode 100755 index 0000000..1dcbf71 --- /dev/null +++ b/scripts/bin/qute @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec qutebrowser --backend webengine diff --git a/setup b/setup index dc65057..e5ba9b2 100755 --- a/setup +++ b/setup @@ -16,6 +16,7 @@ links=( "$dfp/de/x/profile" "$HOME/.xprofile" "$dfp/de/x/modmap" "$HOME/.xmodmap" "$dfp/de/compton/compton.conf" "$XDG_CONFIG_HOME/compton.conf" + "$dfp/de/dunst/dunstrc" "$XDG_CONFIG_HOME/dunst/dunstrc" "$dfp/scripts/colors/xresources" "$HOME/.Xresources.colors" # shell files diff --git a/shell/bash/aliases b/shell/bash/aliases index e3013b8..d61654a 100644 --- a/shell/bash/aliases +++ b/shell/bash/aliases @@ -67,7 +67,6 @@ alias glf="git ls-files" alias gl="git log --graph --pretty=oneline --abbrev-commit --decorate" # misc aliases -alias qute="qutebrowser --backend webengine" alias p="ping 8.8.8.8" alias C="clear && clear" alias keyrepeat="xset r rate 250 80"