From 07064c697f273525e505ec498b7c9a5859310311 Mon Sep 17 00:00:00 2001 From: Charles Date: Sat, 25 Jul 2020 10:14:30 +0200 Subject: Moving to $HOME/git/dotfiles --- .gitconfig | 3 --- .muttrc | 12 ++++++++++++ .pluggins.vim | 9 ++++++--- .vimrc | 2 +- .zsh_aliases | 14 +++++++------- .zshrc | 7 ++++--- install.sh | 4 +++- xmonad.hs | 4 ++-- 8 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 .muttrc diff --git a/.gitconfig b/.gitconfig index 88672f3..f3d697b 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,9 +1,6 @@ [user] name = Charles email = sircharlesaze@gmail.com -[credential] - helper = store - username = HappyTramp [log] decorate = full [pull] diff --git a/.muttrc b/.muttrc new file mode 100644 index 0000000..7bbcce8 --- /dev/null +++ b/.muttrc @@ -0,0 +1,12 @@ +set from = 'me@cacharle.xyz' +set realname = 'Charles Cabergs' + +set smtp_url = 'smtp://me@cacharle.xyz@mail.cacharle.xyz:587' +set folder = 'imaps://me@cacharle.xyz@mail.cacharle.xyz:993' +set spoolfile = '+INBOX' + +set header_cache = "~/.mutt/cache/headers" +set message_cachedir = "~/.mutt/cache/bodies" +set certificate_file = "~/.mutt/certificates" + +set ssl_force_tls = yes diff --git a/.pluggins.vim b/.pluggins.vim index db233cf..65d0361 100644 --- a/.pluggins.vim +++ b/.pluggins.vim @@ -9,13 +9,16 @@ call plug#begin() Plug 'itchyny/lightline.vim' " minimal status bar Plug 'HappyTramp/vim-syntax-extra' " syntax highlight of C operators Plug 'romainl/vim-cool' " disable highlight after search - Plug 'tikhomirov/vim-glsl' " glsl highlight - Plug 'cespare/vim-toml' " toml highlight + + " syntax highlight for languages that aren't supported by default + Plug 'tikhomirov/vim-glsl' " glsl + Plug 'cespare/vim-toml' " toml + Plug 'ziglang/zig.vim' " zig " s19 at home Plug 'HappyTramp/vim-42header' " 42 header - Plug 'HappyTramp/vim-htheader' " my header + " Plug 'HappyTramp/vim-htheader' " my header " themes " Plug 'joshdick/onedark.vim' " onedark diff --git a/.vimrc b/.vimrc index 6a197c3..c7799b7 100644 --- a/.vimrc +++ b/.vimrc @@ -3,7 +3,7 @@ """""""""" " load pluggins {{{ -source $HOME/dotfiles/.pluggins.vim +source $DOTDIR/.pluggins.vim " }}} """"""""""" diff --git a/.zsh_aliases b/.zsh_aliases index 69975d1..59933df 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -70,21 +70,21 @@ alias gss='git status --short' alias gco='git checkout' alias gsta='git stash push' alias gstp='git stash pop' +alias gpa="git remote | xargs -L1 git push --all" # lpass (lastpass-cli) alias lpassp='lpass show --password --clip' # put password in clipboard # helper to switch between dual and single monitor setup -alias dual='xrandr --output LVDS1 --primary --below VGA1 --output VGA1 --auto' +alias dual='xrandr --output LVDS1 --primary --left-of VGA1 --output VGA1 --auto' alias single='xrandr --output VGA1 --off' # edit config files -alias zshrc="vim $DOTFILES/.zshrc && source $DOTFILES/.zshrc" -alias zshaliasrc="vim $DOTFILES/.zsh_aliases && source $DOTFILES/.zshrc" -alias vimrc="vim $DOTFILES/.vimrc" -alias vimplugrc="vim $DOTFILES/.pluggins.vim" -alias xmonadrc="vim $DOTFILES/xmonad.hs" - +alias zshrc="vim $DOTDIR/.zshrc && source $DOTDIR/.zshrc" +alias zshaliasrc="vim $DOTDIR/.zsh_aliases && source $DOTDIR/.zshrc" +alias vimrc="vim $DOTDIR/.vimrc" +alias vimplugrc="vim $DOTDIR/.pluggins.vim" +alias xmonadrc="vim $DOTDIR/xmonad.hs" # other alias date="date -R" diff --git a/.zshrc b/.zshrc index 59b7a4e..85fa78e 100644 --- a/.zshrc +++ b/.zshrc @@ -2,10 +2,11 @@ # zshrc # ############### -export DOTFILES=$HOME/dotfiles + +[ -z $DOTDIR ] && export DOTDIR=$HOME/git/dotfiles # FIXME have to change path manually if install elsewhere # load aliases -source $DOTFILES/.zsh_aliases +source $DOTDIR/.zsh_aliases # prompt case `tty` in @@ -101,4 +102,4 @@ tabs 4 export LFS=/mnt -export PATH='/usr/local/sbin:/usr/local/bin:/usr/bin' +export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/bin" diff --git a/install.sh b/install.sh index e6cff50..3cbe6a3 100755 --- a/install.sh +++ b/install.sh @@ -15,12 +15,13 @@ create_dotfile_link_same() ########################### # dotfiles directory -[ -z $DOTDIR ] && DOTDIR=`pwd` +[ -z $DOTDIR ] && export DOTDIR=`pwd` # Creating links create_dotfile_link_same .zshrc create_dotfile_link_same .bashrc create_dotfile_link_same .vimrc +create_dotfile_link_same .pluggins.vim [ ! -d $HOME/.vim/plugin ] && mkdir -p $HOME/.vim/plugin create_dotfile_link grep.vim .vim/plugin/grep.vim @@ -30,6 +31,7 @@ create_dotfile_link xmonad.hs .xmonad/xmonad.hs create_dotfile_link_same .gdbinit create_dotfile_link_same .ghci create_dotfile_link_same .gitconfig +create_dotfile_link_same muttrc [ ! -d $HOME/.config ] && mkdir $HOME/.config create_dotfile_link redshift.conf .config/redshift.conf diff --git a/xmonad.hs b/xmonad.hs index a0ac671..bd4b2bd 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -41,7 +41,7 @@ myManageHook = insertPosition End Newer -- insert new window at the end of the myKeys = [ ("", spawn "pulseaudio-ctl up") -- volume up , ("", spawn "pulseaudio-ctl down") -- volume down , ("", spawn "pulseaudio-ctl mute") -- volume mute - , ("", spawn "xbacklight -inc 5") -- backlight up - , ("", spawn "xbacklight -dec 5") -- backlight down + , ("", spawn "light -A 5") -- backlight up + , ("", spawn "light -U 5") -- backlight down , ("", spawn "slock") -- lock screen ] -- cgit From fd76d9129dab827f7143fa180da6d0e4dbad33fa Mon Sep 17 00:00:00 2001 From: Charles Date: Sat, 25 Jul 2020 17:22:53 +0200 Subject: Added .tmux.conf, vim markdown preview plugin --- .pluggins.vim | 1 + .tmux.conf | 13 +++++++++++++ .zsh_aliases | 1 + 3 files changed, 15 insertions(+) create mode 100644 .tmux.conf diff --git a/.pluggins.vim b/.pluggins.vim index 65d0361..66ec0c6 100644 --- a/.pluggins.vim +++ b/.pluggins.vim @@ -9,6 +9,7 @@ call plug#begin() Plug 'itchyny/lightline.vim' " minimal status bar Plug 'HappyTramp/vim-syntax-extra' " syntax highlight of C operators Plug 'romainl/vim-cool' " disable highlight after search + Plug 'iamcco/markdown-preview.vim' " markdown preview in browser " syntax highlight for languages that aren't supported by default Plug 'tikhomirov/vim-glsl' " glsl diff --git a/.tmux.conf b/.tmux.conf new file mode 100644 index 0000000..fc2fcb2 --- /dev/null +++ b/.tmux.conf @@ -0,0 +1,13 @@ +unbind C-b +set -g prefix C-f +bind C-f send-prefix + +set -g default-terminal "screen.xterm-256color" +set -g mouse on +setw -g mode-keys vi + +unbind l +bind k select-pane -U +bind j select-pane -D +bind l select-pane -R +bind h select-pane -L diff --git a/.zsh_aliases b/.zsh_aliases index 59933df..16361af 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -71,6 +71,7 @@ alias gco='git checkout' alias gsta='git stash push' alias gstp='git stash pop' alias gpa="git remote | xargs -L1 git push --all" +alias grv="git remote -v" # lpass (lastpass-cli) alias lpassp='lpass show --password --clip' # put password in clipboard -- cgit From 35f4b5e7d2e190a899e9ab3c58619d03460db53b Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 26 Jul 2020 21:54:02 +0200 Subject: Added mail config with mutt --- .gitmodules | 3 +++ .mailcap | 2 ++ .mbsyncrc | 19 ++++++++++++++ .muttrc | 27 ++++++++++++++++++-- .vimrc | 2 ++ .zsh_aliases | 3 +++ .zshrc | 7 +++--- README.md | 5 ++-- install | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ install.sh | 70 --------------------------------------------------- mutt-colors-solarized | 1 + 11 files changed, 131 insertions(+), 78 deletions(-) create mode 100644 .gitmodules create mode 100644 .mailcap create mode 100644 .mbsyncrc create mode 100755 install delete mode 100755 install.sh create mode 160000 mutt-colors-solarized diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1335b96 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "mutt-colors-solarized"] + path = mutt-colors-solarized + url = https://github.com/altercation/mutt-colors-solarized diff --git a/.mailcap b/.mailcap new file mode 100644 index 0000000..e00e02c --- /dev/null +++ b/.mailcap @@ -0,0 +1,2 @@ +text/html; "$BROWSER" %s &: test=test -n "$DISPLAY"; needsterminal; +text/html; "$BROWSERCLI" -I %{charse} -T text/html; copiousoutput; diff --git a/.mbsyncrc b/.mbsyncrc new file mode 100644 index 0000000..649e823 --- /dev/null +++ b/.mbsyncrc @@ -0,0 +1,19 @@ +IMAPStore cacharle-remote +Host mail.cacharle.xyz +Port 993 +User me +SSLType IMAPS +CertificateFile /etc/ssl/certs/ca-certificates.crt + +MaildirStore cacharle-local +Path ~/Mail/cacharle/ +Inbox ~/Mail/cacharle/INBOX +Subfolders Verbatim + +Channel cacharle +Master :cacharle-remote: +Slave :cacharle-local: +Create Both +Expunge Both +Patterns * +SyncState * diff --git a/.muttrc b/.muttrc index 7bbcce8..dbc07bd 100644 --- a/.muttrc +++ b/.muttrc @@ -1,12 +1,35 @@ +############################################################################### +# muttrc +############################################################################### + set from = 'me@cacharle.xyz' set realname = 'Charles Cabergs' -set smtp_url = 'smtp://me@cacharle.xyz@mail.cacharle.xyz:587' -set folder = 'imaps://me@cacharle.xyz@mail.cacharle.xyz:993' +set smtp_url = 'smtp://me@mail.cacharle.xyz:587' +set folder = 'imaps://me@mail.cacharle.xyz:993' +# set folder = "~/Mail/cacharle" + +auto_view text/html +alternative_order text/plain text/enriched text/html + set spoolfile = '+INBOX' +set record = "+Send" +set trash = "+Trash" +set postponed = "+Drafts" + +mailboxes =INBOX =Sent =Trash =Drafts + +set editor = 'vim' +set sort = 'reverse-date' + +set date_format = "%d/%m %I:%M" +set index_format = "%2C %Z %d %-15.15F %s (%-4.4c)" set header_cache = "~/.mutt/cache/headers" set message_cachedir = "~/.mutt/cache/bodies" set certificate_file = "~/.mutt/certificates" set ssl_force_tls = yes + +# color scheme +source "$DOTDIR/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc" diff --git a/.vimrc b/.vimrc index c7799b7..5faf344 100644 --- a/.vimrc +++ b/.vimrc @@ -216,6 +216,8 @@ nnoremap m :make all " hook {{{ " remove trailing white space on save autocmd BufWritePre * %s/\s\+$//e +" dirty hack to disable this feature on markdown (autocmd! wouldn't work) +autocmd BufReadPre *.md autocmd! BufWritePre " }}} " filetype {{{ diff --git a/.zsh_aliases b/.zsh_aliases index 16361af..b2bbcf1 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -86,6 +86,7 @@ alias zshaliasrc="vim $DOTDIR/.zsh_aliases && source $DOTDIR/.zshrc" alias vimrc="vim $DOTDIR/.vimrc" alias vimplugrc="vim $DOTDIR/.pluggins.vim" alias xmonadrc="vim $DOTDIR/xmonad.hs" +alias muttrc="vim $DOTDIR/.muttrc" # other alias date="date -R" @@ -111,3 +112,5 @@ alias openpdf='zathura `ls -1 *.pdf | dmenu` &' alias cagob='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo build' alias cagor='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo run' + +# alias mutt='neomutt' diff --git a/.zshrc b/.zshrc index 85fa78e..284db68 100644 --- a/.zshrc +++ b/.zshrc @@ -83,10 +83,9 @@ export XDG_DATA_HOME="/home/charles/.data/" export EDITOR="vim" export TERM="st-256color" -# export TERM="xterm-256color" - -# mail -export MAIL='charles.cabergs@gmail.com' +export MAIL='me@cacharle.xyz' +export BROWSER='chromium' +export BROWSERCLI='w3m' # ignore filetypes in autocomplete fignore=(o hi) diff --git a/README.md b/README.md index 28f8cf1..a8a1825 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ## Installation -1. Backup your current configuration files, they will be overwrite +1. Backup your current configuration files, they will be overwritten 2. `cd` in this repo -3. Run the `install.sh` script +3. Run the `install` script ## Tools I use @@ -12,6 +12,7 @@ * [zsh](https://www.zsh.org/) - interactive shell * [xmonad](https://xmonad.org) - window manager * [redshift](https://github.com/jonls/redshift) - change screen color temperature +* [mutt](http://www.mutt.org/) - email client ## School 19 Config diff --git a/install b/install new file mode 100755 index 0000000..8975dd3 --- /dev/null +++ b/install @@ -0,0 +1,70 @@ +#!/bin/sh + +create_dotfile_link() +{ + ln -svf $DOTDIR/$1 $HOME/$2 +} + +create_dotfile_link_same() +{ + create_dotfile_link $1 $1 +} + +########################### +# dotfiles install script # +########################### + +# dotfiles directory +[ -z $DOTDIR ] && export DOTDIR=`pwd` + +# Creating links +create_dotfile_link_same .zshrc +create_dotfile_link_same .bashrc +create_dotfile_link_same .vimrc +create_dotfile_link_same .pluggins.vim +[ ! -d $HOME/.vim/plugin ] && mkdir -p $HOME/.vim/plugin +create_dotfile_link grep.vim .vim/plugin/grep.vim + +[ ! -d $HOME/.xmonad ] && mkdir $HOME/.xmonad +create_dotfile_link xmonad.hs .xmonad/xmonad.hs + +create_dotfile_link_same .gdbinit +create_dotfile_link_same .ghci +create_dotfile_link_same .gitconfig +create_dotfile_link_same .muttrc +create_dotfile_link_same .mailcap +create_dotfile_link_same .xinitrc +create_dotfile_link_same .zprofile + +[ ! -d $HOME/.config ] && mkdir $HOME/.config +create_dotfile_link redshift.conf .config/redshift.conf + +################ +# dependencies # +################ + +[ $# -ge 1 ] || [ "$1" = "--ln" ] && exit 0 +echo "Installing Dependencies" + +# vim Plug +PLUGFILE=$HOME/.vim/autoload/plug.vim +PLUGURL='https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' +[ ! -f $PLUGFILE ] && echo "Downloading plug.vim" && \ + curl -fLo $PLUGFILE --create-dirs $PLUGURL +echo "Installing plug.vim Pluggins" +vim -c "PlugInstall" -c "qa" + +# zsh pluggins +[ ! -d $HOME/.zsh ] && make $HOME/.zsh +# pure theme +[ ! -d $HOME/.zsh/pure ] && echo "Installing zsh pure theme" && \ + git clone https://github.com/sindresorhus/pure \ + $HOME/.zsh/pure +# syntax hightlighting +[ ! -d $HOME/.zsh/zsh-syntax-highlighting ] && echo "Installing zsh syntax highlighting plugin" && \ + git clone https://github.com/zsh-users/zsh-syntax-highlighting \ + $HOME/.zsh/zsh-syntax-highlighting +# you should use +[ ! -d $HOME/.zsh/zsh-you-should-use ] && echo "Installing zsh you should use plugin" && \ + git clone https://github.com/MichaelAquilina/zsh-you-should-use \ + $HOME/.zsh/zsh-you-should-use diff --git a/install.sh b/install.sh deleted file mode 100755 index 3cbe6a3..0000000 --- a/install.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -create_dotfile_link() -{ - ln -svf $DOTDIR/$1 $HOME/$2 -} - -create_dotfile_link_same() -{ - create_dotfile_link $1 $1 -} - -########################### -# dotfiles install script # -########################### - -# dotfiles directory -[ -z $DOTDIR ] && export DOTDIR=`pwd` - -# Creating links -create_dotfile_link_same .zshrc -create_dotfile_link_same .bashrc -create_dotfile_link_same .vimrc -create_dotfile_link_same .pluggins.vim -[ ! -d $HOME/.vim/plugin ] && mkdir -p $HOME/.vim/plugin -create_dotfile_link grep.vim .vim/plugin/grep.vim - -[ ! -d $HOME/.xmonad ] && mkdir $HOME/.xmonad -create_dotfile_link xmonad.hs .xmonad/xmonad.hs - -create_dotfile_link_same .gdbinit -create_dotfile_link_same .ghci -create_dotfile_link_same .gitconfig -create_dotfile_link_same muttrc - -[ ! -d $HOME/.config ] && mkdir $HOME/.config -create_dotfile_link redshift.conf .config/redshift.conf - -ln -sf $DOTDIR/.xinitrc $HOME/.xinitrc -ln -sf $DOTDIR/.zprofile $HOME/.zprofile - -################ -# dependencies # -################ - -[ $# -ge 1 ] || [ "$1" = "--ln" ] && exit 0 -echo "Installing Dependencies" - -# vim Plug -PLUGFILE=$HOME/.vim/autoload/plug.vim -PLUGURL='https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' -[ ! -f $PLUGFILE ] && echo "Downloading plug.vim" && \ - curl -fLo $PLUGFILE --create-dirs $PLUGURL -echo "Installing plug.vim Pluggins" -vim -c "PlugInstall" -c "qa" - -# zsh pluggins -[ ! -d $HOME/.zsh ] && make $HOME/.zsh -# pure theme -[ ! -d $HOME/.zsh/pure ] && echo "Installing zsh pure theme" && \ - git clone https://github.com/sindresorhus/pure \ - $HOME/.zsh/pure -# syntax hightlighting -[ ! -d $HOME/.zsh/zsh-syntax-highlighting ] && echo "Installing zsh syntax highlighting plugin" && \ - git clone https://github.com/zsh-users/zsh-syntax-highlighting \ - $HOME/.zsh/zsh-syntax-highlighting -# you should use -[ ! -d $HOME/.zsh/zsh-you-should-use ] && echo "Installing zsh you should use plugin" && \ - git clone https://github.com/MichaelAquilina/zsh-you-should-use \ - $HOME/.zsh/zsh-you-should-use diff --git a/mutt-colors-solarized b/mutt-colors-solarized new file mode 160000 index 0000000..3b23c55 --- /dev/null +++ b/mutt-colors-solarized @@ -0,0 +1 @@ +Subproject commit 3b23c55eb43849975656dd89e3f35dacd2b93e69 -- cgit From 899b8d4951cfe8f486ee9bc1790519505ad6a0c9 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Mon, 27 Jul 2020 08:50:59 +0200 Subject: Added mutt sidebar and encrypted password, Added git signing key --- .gitconfig | 7 +++++-- .muttrc | 36 +++++++++++++++++++++++++++++------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.gitconfig b/.gitconfig index f3d697b..bb4fef3 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,9 +1,12 @@ [user] - name = Charles - email = sircharlesaze@gmail.com + name = Charles Cabergs + email = me@cacharle.xyz + signingkey = me@cacharle.xyz [log] decorate = full [pull] rebase = false [merge] tool = vimdiff +[commit] + gpgsign = true diff --git a/.muttrc b/.muttrc index dbc07bd..547180e 100644 --- a/.muttrc +++ b/.muttrc @@ -2,13 +2,14 @@ # muttrc ############################################################################### -set from = 'me@cacharle.xyz' -set realname = 'Charles Cabergs' +set from = 'me@cacharle.xyz' # address in new mail +set realname = 'Charles Cabergs' # name in new mail -set smtp_url = 'smtp://me@mail.cacharle.xyz:587' -set folder = 'imaps://me@mail.cacharle.xyz:993' +set smtp_url = 'smtp://me@mail.cacharle.xyz:587' # where to send +set folder = 'imaps://me@mail.cacharle.xyz:993' # mails folder # set folder = "~/Mail/cacharle" +# view html with terminal browser in .mailcap auto_view text/html alternative_order text/plain text/enriched text/html @@ -20,10 +21,28 @@ set postponed = "+Drafts" mailboxes =INBOX =Sent =Trash =Drafts set editor = 'vim' -set sort = 'reverse-date' +set sort = 'reverse-date' # newest at the top set date_format = "%d/%m %I:%M" -set index_format = "%2C %Z %d %-15.15F %s (%-4.4c)" +set index_format = "%2C %Z %d %-15.15F %s (%-4.4c)" # one line format in home + +# from https://github.com/LukeSmithxyz/mutt-wizard/blob/master/share/mutt-wizard.muttrc +set rfc2047_parameters = yes # decode non standard stuff +set sleep_time = 0 # don't pause +set markers = no # no '+' on line wrap +set mark_old = no # don't mark mail as read if not seen +set mime_forward = yes # attachements forwarded +set wait_key = no # no press to continue... +set forward_format = "Fwd: %s" # forward subject +set forward_quote # include previous message in forward + +set sidebar_visible = yes +set sidebar_width = 20 +set sidebar_short_path = yes +set sidebar_next_new_wrap = yes +set mail_check_stats +set sidebar_format = '%B%?F? [%F]?%* %?N?%N/? %?S?%S?' + set header_cache = "~/.mutt/cache/headers" set message_cachedir = "~/.mutt/cache/bodies" @@ -31,5 +50,8 @@ set certificate_file = "~/.mutt/certificates" set ssl_force_tls = yes -# color scheme +# solarized color scheme source "$DOTDIR/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc" + +# password +source "gpg -d $HOME/.config/mutt/passwd.muttrc.gpg 2> /dev/null |" -- cgit From 57d0df7d52bda1ab183a71486659b8dfec40440c Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Tue, 28 Jul 2020 12:41:05 +0200 Subject: Added shortcut to open terminal in project repository --- .zshrc | 7 ++++--- xmonad.hs | 11 ++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.zshrc b/.zshrc index 284db68..edadd25 100644 --- a/.zshrc +++ b/.zshrc @@ -52,11 +52,12 @@ setopt auto_cd # cd without `cd` command setopt list_rows_first # cycle through row first in menu # setopt extendedglob -# executed when changind directory +# executed when changing directory function chpwd() { - content=`ls | wc -l` - ([ $content -lt 30 ] && tree -L 1) || + content=$(ls | wc -l) + ([ "$content" -lt 20 ] && ls -l) || echo "$(pwd) contains $content entries" + touch . # to sort by last cd } # add command-not-found package suggestion diff --git a/xmonad.hs b/xmonad.hs index bd4b2bd..ebe14a6 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -2,7 +2,7 @@ import XMonad import XMonad.Config.Desktop -- Utilities -import XMonad.Util.EZConfig (additionalKeysP) +import XMonad.Util.EZConfig (additionalKeysP, additionalKeys) import XMonad.Util.SpawnOnce -- Layouts @@ -41,7 +41,12 @@ myManageHook = insertPosition End Newer -- insert new window at the end of the myKeys = [ ("", spawn "pulseaudio-ctl up") -- volume up , ("", spawn "pulseaudio-ctl down") -- volume down , ("", spawn "pulseaudio-ctl mute") -- volume mute - , ("", spawn "light -A 5") -- backlight up - , ("", spawn "light -U 5") -- backlight down + , ("", spawn "light -A 5") -- backlight up + , ("", spawn "light -U 5") -- backlight down , ("", spawn "slock") -- lock screen + + , ("M-o", spawn "/home/charles/bin/project-open") + , ("M-S-o", spawn "cd ~/test && st") + , ("M-d", spawn "cd ~/Downloads && st") + , ("M-t", spawn "st -e htop") ] -- cgit From 9976cc7a232927cc4ad7c83e546fbe53820bf859 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Thu, 30 Jul 2020 11:08:18 +0200 Subject: Added newsboat and dunst --- .muttrc | 2 + .newsboat/config | 17 +++ .pluggins.vim | 5 +- .vimrc | 15 +- .xinitrc | 2 + .zsh_aliases | 8 +- .zshrc | 3 +- dunst/dunstrc | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ xmonad.hs | 8 +- 9 files changed, 454 insertions(+), 20 deletions(-) create mode 100644 .newsboat/config create mode 100644 dunst/dunstrc diff --git a/.muttrc b/.muttrc index 547180e..f99d798 100644 --- a/.muttrc +++ b/.muttrc @@ -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() diff --git a/.vimrc b/.vimrc index 5faf344..b867ed2 100644 --- a/.vimrc +++ b/.vimrc @@ -150,7 +150,7 @@ nnoremap l :ls " }}} " vimrc {{{ -nnoremap rc :vsplit $MYVIMRC +nnoremap rc :vsplit $DOTDIR/.vimrc nnoremap src :source $MYVIMRC " }}} @@ -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 q: hmmmm?? " }}} + +" ctrlp-funky {{{ +" let g:ctrlp_funky_syntax_highlight = 1 +" nnoremap :CtrlPFunky +" }}} diff --git a/.xinitrc b/.xinitrc index c3213b0..abb4622 100755 --- a/.xinitrc +++ b/.xinitrc @@ -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 diff --git a/.zshrc b/.zshrc index edadd25..d21278f 100644 --- a/.zshrc +++ b/.zshrc @@ -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: + # 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 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 diff --git a/xmonad.hs b/xmonad.hs index ebe14a6..2d2c630 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -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 = [ ("", spawn "pulseaudio-ctl up") -- volume up @@ -45,8 +40,7 @@ myKeys = [ ("", spawn "pulseaudio-ctl up") -- volume u , ("", spawn "light -U 5") -- backlight down , ("", 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") ] -- cgit