diff options
| -rw-r--r-- | .muttrc | 2 | ||||
| -rw-r--r-- | .newsboat/config | 17 | ||||
| -rw-r--r-- | .pluggins.vim | 5 | ||||
| -rw-r--r-- | .vimrc | 15 | ||||
| -rwxr-xr-x | .xinitrc | 2 | ||||
| -rw-r--r-- | .zsh_aliases | 8 | ||||
| -rw-r--r-- | .zshrc | 3 | ||||
| -rw-r--r-- | dunst/dunstrc | 414 | ||||
| -rw-r--r-- | xmonad.hs | 8 |
9 files changed, 454 insertions, 20 deletions
@@ -50,6 +50,8 @@ set certificate_file = "~/.mutt/certificates" set ssl_force_tls = yes +set send_charset = 'utf-8' + # solarized color scheme source "$DOTDIR/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc" diff --git a/.newsboat/config b/.newsboat/config new file mode 100644 index 0000000..78d0e1d --- /dev/null +++ b/.newsboat/config @@ -0,0 +1,17 @@ +auto-reload yes # reload feeds at startup + +bind-key j down +bind-key k up +bind-key g home +bind-key G end + +pager vim + +# solarized color-scheme +color background default default +color listnormal default default +color listnormal_unread default default +color listfocus black cyan +color listfocus_unread black cyan +color info default black +color article default default diff --git a/.pluggins.vim b/.pluggins.vim index 66ec0c6..78de3f7 100644 --- a/.pluggins.vim +++ b/.pluggins.vim @@ -19,8 +19,6 @@ call plug#begin() " s19 at home Plug 'HappyTramp/vim-42header' " 42 header - " Plug 'HappyTramp/vim-htheader' " my header - " themes " Plug 'joshdick/onedark.vim' " onedark " Plug 'dracula/vim', {'as': 'vim'} " dracula @@ -29,4 +27,7 @@ call plug#begin() " intresting but not used " Plug 'sheerun/vim-polyglot' " better syntax highlight " Plug 'unblevable/quick-scope' " highlight first char to jump to word + " Plug 'jez/vim-superman' " man pages in vim (too slow) + " Plug 'vim-scripts/rfc-syntax' " rfc + " Plug 'tacahiroy/ctrlp-funky' " extension to search function call plug#end() @@ -150,7 +150,7 @@ nnoremap <leader>l :ls<CR> " }}} " vimrc {{{ -nnoremap <leader>rc :vsplit $MYVIMRC<cr> +nnoremap <leader>rc :vsplit $DOTDIR/.vimrc<cr> nnoremap <leader>src :source $MYVIMRC<cr> " }}} @@ -245,12 +245,17 @@ let g:ctrlp_working_path_mode = 'rw' " }}} " quick-scope {{{ -let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] +" let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] " }}} " man-plugin {{{ -runtime! ftplugin/man.vim -let g:ft_man_open_mode = 'vert' " open in a vertical split -let g:ft_man_no_sect_fallback = 2 " if page specified fallback to page 2 (syscall pages) +" runtime! ftplugin/man.vim +" let g:ft_man_open_mode = 'vert' " open in a vertical split +" let g:ft_man_no_sect_fallback = 2 " if page specified fallback to page 2 (syscall pages) " autocmd Filetype man unmap <buffer> q: hmmmm?? " }}} + +" ctrlp-funky {{{ +" let g:ctrlp_funky_syntax_highlight = 1 +" nnoremap <C-f> :CtrlPFunky<CR> +" }}} @@ -1,2 +1,4 @@ +xinput disable 'ETPS/2 Elantech Touchpad' & redshift -c /home/charles/.config/redshift.conf & +dunst & exec xmonad diff --git a/.zsh_aliases b/.zsh_aliases index b2bbcf1..b77ab60 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -10,7 +10,8 @@ alias valgrindc='colour-valgrind' # common commands alias less='less -N' # enable line number -alias v='vim' +alias v='nvim' +alias vim='nvim' alias mkdir='mkdir -p' alias gdb='gdb -q' # disable long intro message alias sudo='sudo ' # enable color (the search for aliases continues) @@ -38,10 +39,6 @@ alias ma="man" alias ma1="man 1" alias ma2="man 2" alias ma3="man 3" -alias manv="man -P 'vim -M +MANPAGER -'" # vim has man pager -alias manv2="man 2 -P 'vim -M +MANPAGER -'" -alias manv3="man 3 -P 'vim -M +MANPAGER -'" -alias manv5="man 5 -P 'vim -M +MANPAGER -'" # make alias m='make' @@ -72,6 +69,7 @@ alias gsta='git stash push' alias gstp='git stash pop' alias gpa="git remote | xargs -L1 git push --all" alias grv="git remote -v" +alias gra="git remote add" # lpass (lastpass-cli) alias lpassp='lpass show --password --clip' # put password in clipboard @@ -57,7 +57,7 @@ function chpwd() { content=$(ls | wc -l) ([ "$content" -lt 20 ] && ls -l) || echo "$(pwd) contains $content entries" - touch . # to sort by last cd + [ "$(stat -c "%U" .)" = "$USER" ] && touch . # to sort by last cd } # add command-not-found package suggestion @@ -103,3 +103,4 @@ tabs 4 export LFS=/mnt export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/bin" +export PATH="$PATH:$HOME/.vim/plugged/vim-superman/bin" diff --git a/dunst/dunstrc b/dunst/dunstrc new file mode 100644 index 0000000..12198ed --- /dev/null +++ b/dunst/dunstrc @@ -0,0 +1,414 @@ +[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 = mouse + + # 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 = "0x0-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 = 0 + + # 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 = "#aaaaaa" + + # 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 = auto + + # 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 8 + + # 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 + # <http://developer.gnome.org/pango/stable/PangoMarkupFormat.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>%s</b>\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 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 = 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/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/firefox -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 = Dunst + + # Define the class of the windows spawned by dunst + class = Dunst + + # Print a notification on startup. + # This is mainly for error detection, since dbus (re-)starts dunst + # automatically after a crash. + startup_notification = false + + # Manage dunst's desire for talking + # Can be one of the following values: + # crit: Critical features. Dunst aborts + # warn: Only non-fatal warnings + # mesg: Important Messages + # info: all unimportant stuff + # debug: all less than unimportant stuff + verbosity = mesg + + # 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 + + ### 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 action of mouse event + # Possible values are: + # * none: Don't do anything. + # * do_action: If the notification has exactly one action, or one is marked as default, + # invoke it. If there are multiple and no default, open the context menu. + # * close_current: Close current notification. + # * close_all: Close all notifications. + mouse_left_click = close_current + mouse_middle_click = do_action + 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 + +[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+shift+period + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#222222" + foreground = "#888888" + timeout = 10 + # Icon for notifications with low urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_normal] + background = "#285577" + foreground = "#ffffff" + timeout = 10 + # Icon for notifications with normal urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_critical] + background = "#900000" + foreground = "#ffffff" + frame_color = "#ff0000" + 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 (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 +# timeout +# urgency +# +# 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: 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. + +# 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" +# format = "" + +#[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 @@ -21,7 +21,6 @@ main = xmonad $ desktopConfig , manageHook = myManageHook , modMask = mod4Mask -- mod key to super , borderWidth = 1 - , startupHook = myStartupHook , focusFollowsMouse = False -- don't change window based on mouse position (need to click) , workspaces = ["code", "compile", "web"] ++ map show [4..9] } `additionalKeysP` myKeys @@ -32,10 +31,6 @@ myLayouts = tiledBigMaster -- bigger master for code and smaller slave fo where tiledBigMaster = Tall 1 (3 / 100) (3 / 5) tiledEven = Tall 1 (3 / 100) (1 / 2) -myStartupHook = do - spawnOnce "xinput disable 'ETPS/2 Elantech Touchpad' &" -- disable touchpad - spawnOnce "redshift -c /home/charles/.config/redshift.conf &" -- start redshift - myManageHook = insertPosition End Newer -- insert new window at the end of the current layout myKeys = [ ("<XF86AudioRaiseVolume>", spawn "pulseaudio-ctl up") -- volume up @@ -45,8 +40,7 @@ myKeys = [ ("<XF86AudioRaiseVolume>", spawn "pulseaudio-ctl up") -- volume u , ("<XF86MonBrightnessDown>", spawn "light -U 5") -- backlight down , ("<XF86ScreenSaver>", spawn "slock") -- lock screen - , ("M-o", spawn "/home/charles/bin/project-open") + , ("M-o", spawn "/home/charles/bin/project-open") -- TODO could could be generalized , ("M-S-o", spawn "cd ~/test && st") , ("M-d", spawn "cd ~/Downloads && st") - , ("M-t", spawn "st -e htop") ] |