From e4b1013cdcb917cabab083679b75b0dcf67e53c1 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:10:07 +0100 Subject: [PATCH 01/21] update mpd and ncmpccp --- config/mpd/.gitignore | 6 ++++++ config/mpd/mpd.conf | 10 +++++----- config/ncmpcpp/config | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 config/mpd/.gitignore diff --git a/config/mpd/.gitignore b/config/mpd/.gitignore new file mode 100644 index 0000000..a8ea207 --- /dev/null +++ b/config/mpd/.gitignore @@ -0,0 +1,6 @@ +database +log +pid +state +sticker.sql +playlists diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index 5eef1af..14a384e 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -12,7 +12,7 @@ # file:// protocol) or streaming files over an accepted protocol. # #music_directory "~/music" -music_directory "/mnt/lexicon/Music" +music_directory "/data/music/" # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use @@ -214,15 +214,15 @@ input { # # An example of an ALSA output: # -#audio_output { -# type "alsa" -# name "My ALSA Device" +audio_output { + type "alsa" + name "My ALSA Device" ## device "hw:0,0" # optional ## mixer_type "hardware" # optional ## mixer_device "default" # optional ## mixer_control "PCM" # optional ## mixer_index "0" # optional -#} +} # # An example of an OSS output: # diff --git a/config/ncmpcpp/config b/config/ncmpcpp/config index fbd8ba8..294234e 100644 --- a/config/ncmpcpp/config +++ b/config/ncmpcpp/config @@ -245,7 +245,6 @@ media_library_primary_tag = genre ## Available values: wrapped, normal. #default_find_mode = wrapped ## Available values: add, select. -default_space_mode = select #default_tag_editor_pattern = %n - %t #header_visibility = yes #statusbar_visibility = yes From c3ee335a095a47b5d67b368c28e8b9f6af0ab4de Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:20:52 +0100 Subject: [PATCH 02/21] bigger font - no powerline yet - lol rofi --- config/Xresources | 86 ++--------------------------------------------- 1 file changed, 2 insertions(+), 84 deletions(-) diff --git a/config/Xresources b/config/Xresources index 9c06296..40ea811 100644 --- a/config/Xresources +++ b/config/Xresources @@ -98,8 +98,8 @@ URxvt.iso14755: false URxvt.iso14755_52: false ! Use a nice truetype font and size by default... -URxvt.font: xft:Source Code Pro for Powerline:size=7 -URxvt.letterSpace: -1 +URxvt.font: xft:Source Code Pro:size=11 +URxvt.letterSpace: 0 ! Foreground and transparent background ([xx] == xx% opacity) URxvt.depth: 32 @@ -123,87 +123,5 @@ xterm*background: rgb:00/00/00 ! Using alt as a meta key. XTerm*metaSendsEscape: true -! rofi configuration -! ------------------ - -rofi.modi: window,run,ssh -rofi.opacity: 100 -rofi.width: 50 -rofi.lines: 15 -rofi.columns: 1 -rofi.font: mono 12 -rofi.fg: rgb:f8/f8/f8 -rofi.bg: rgb:00/00/00 -rofi.color-enabled: false -rofi.color-normal: #fdf6e3,#002b36,#eee8d5,#586e75,#eee8d5 -rofi.color-urgent: #fdf6e3,#dc322f,#eee8d5,#dc322f,#fdf6e3 -rofi.color-active: #fdf6e3,#268bd2,#eee8d5,#268bd2,#fdf6e3 -rofi.color-window: #fdf6e3,#002b36 -rofi.fg-active: #268BD2 -rofi.fg-urgent: #DC322F -rofi.hlfg-active: #FDF6E3 -rofi.hlfg-urgent: #FDF6E3 -rofi.bg-active: #FDF6E3 -rofi.bg-urgent: #FDF6E3 -rofi.hlbg-active: #268BD2 -rofi.hlbg-urgent: #DC322F -rofi.bgalt: rgb:00/00/00 -rofi.hlfg: #EEE8D5 -rofi.hlbg: #586E75 -rofi.bc: #002B36 -rofi.bw: 1 -rofi.location: 0 -rofi.padding: 5 -rofi.yoffset: 0 -rofi.xoffset: 0 -rofi.fixed-num-lines: false -rofi.terminal: urxvtc -rofi.ssh-client: ssh -rofi.ssh-command: {terminal} -e {ssh-client} {host} -rofi.run-command: {cmd} -!rofi.run-list-command: -rofi.run-shell-command: {terminal} -e {cmd} -rofi.disable-history: false -rofi.levenshtein-sort: false -rofi.case-sensitive: false -rofi.sidebar-mode: false -rofi.lazy-filter-limit: 5000 -rofi.eh: 1 -rofi.auto-select: false -rofi.parse-hosts: false -rofi.combi-modi: window,run -rofi.pid: /run/user/1000/rofi.pid -rofi.kb-primary-paste: Control+Shift+v,Shift+Insert -rofi.kb-secondary-paste: Control+v,Insert -rofi.kb-clear-line: Control+u -rofi.kb-move-front: Control+a -rofi.kb-move-end: Control+e -rofi.kb-move-word-back: Alt+b -rofi.kb-move-word-forward: Alt+f -rofi.kb-move-char-back: Left,Control+b -rofi.kb-move-char-forward: Right,Control+f -rofi.kb-remove-word-back: Control+Alt+h -rofi.kb-remove-word-forward: Control+Alt+d -rofi.kb-remove-char-forward: Delete,Control+d -rofi.kb-remove-char-back: BackSpace,Control+h -rofi.kb-accept-entry: Control+j,Control+m,Return,KP_Enter -rofi.kb-accept-custom: Control+Return -rofi.kb-accept-entry-continue: Shift+Return -rofi.kb-mode-next: Shift+Right,Control+Tab -rofi.kb-mode-previous: Shift+Left,Control+Shift+Tab -rofi.kb-toggle-case-sensitivity: grave,dead_grave -rofi.kb-delete-entry: Shift+Delete -rofi.kb-custom-1: Alt+1 -rofi.kb-custom-2: Alt+2 -rofi.kb-custom-3: Alt+3 -rofi.kb-custom-4: Alt+4 -rofi.kb-custom-5: Alt+5 -rofi.kb-custom-6: Alt+6 -rofi.kb-custom-7: Alt+7 -rofi.kb-custom-8: Alt+8 -rofi.kb-custom-9: Alt+9 -!rofi.key-window: -!rofi.key-run: -!rofi.key-ssh: ! vim: foldmethod=marker From 6a7dc71272446f1ab4bcb095759512d0289234ae Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:31:04 +0100 Subject: [PATCH 03/21] qutebrowser --- config/qutebrowser/qutebrowser.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/qutebrowser/qutebrowser.conf b/config/qutebrowser/qutebrowser.conf index 5b722a6..fe4a95e 100644 --- a/config/qutebrowser/qutebrowser.conf +++ b/config/qutebrowser/qutebrowser.conf @@ -717,7 +717,7 @@ indicator-padding = 2,2,0,4 # cache-size (Int): # Size of the HTTP network cache. # Default: 52428800 -download-directory = /home/felix/Temporary +download-directory = /data/temporary prompt-download-directory = true remember-download-directory = true maximum-pages-in-cache = @@ -938,7 +938,7 @@ chars = asdfghjkl min-chars = 1 scatter = true uppercase = false -dictionary = /usr/share/dict/cracklib-small +dictionary = /usr/share/dict/british-english auto-follow = true next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b From e58b66059a96d204e9917e9d1fd67e4cfb52a491 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:31:55 +0100 Subject: [PATCH 04/21] add quitting and dmenu to sxhkd --- config/sxhkd/sxhkd.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/sxhkd/sxhkd.conf b/config/sxhkd/sxhkd.conf index 192e498..7a196c0 100644 --- a/config/sxhkd/sxhkd.conf +++ b/config/sxhkd/sxhkd.conf @@ -8,4 +8,10 @@ super + {_, shift + } {h, t, n, s} nwmctl {focus, push} {left, down, up, right} super + shift + w - killw $(pfw) \ No newline at end of file + killw $(pfw) + +super + shift + q + pkill nwm + +Scroll_Lock + dmenu_run From 8ec47131dc820633937549819db456c28811867e Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:32:29 +0100 Subject: [PATCH 05/21] i do not read this any longer anyway --- local/bin/manga_here_rss.py | 44 ------------------------------------- 1 file changed, 44 deletions(-) delete mode 100755 local/bin/manga_here_rss.py diff --git a/local/bin/manga_here_rss.py b/local/bin/manga_here_rss.py deleted file mode 100755 index edb9c80..0000000 --- a/local/bin/manga_here_rss.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/python - -from pyquery import PyQuery as pq -from pprint import pprint -import sys - -ITEM = """ - - {title} - {description} - {link} -""" - -class Release(object): - - def __init__(self, title, link): - self.title = title - self.link = link - - def __str__(self): - return ITEM.format( - title=self.title, - description="New release: {}".format(self.title), - link=self.link) - - def __contains__(self, string): - return string in self.title or string in self.link - -latest = pq(url="http://www.mangahere.co/latest/") - -print("""\ - - -""") - -for item in map(pq, latest("dd > a")): - release = Release(item.attr("title"), item.attr("href")) - if any(word in release for word in sys.argv): - print(str(release)) - -print(""" - - -""") From 82884cd9b6ce412a10be18e2c7e746710a59f2c9 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:33:01 +0100 Subject: [PATCH 06/21] shame, but I have to give something to voidlinux --- local/bin/titlefilter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local/bin/titlefilter.py b/local/bin/titlefilter.py index 33d857a..e2b72c1 100755 --- a/local/bin/titlefilter.py +++ b/local/bin/titlefilter.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/bin/env python3 # Filter items not containing keywords (given as parameters) from a rss feed. # Reads stdin, writes stdout. From 141212524080156b846e4d3d6bc901033717e87d Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:34:57 +0100 Subject: [PATCH 07/21] no more contrib --- xmonad/xmonad.hs | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index 6da02ea..a9a0974 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -17,9 +17,6 @@ -- import XMonad -import XMonad.Hooks.DynamicLog -import XMonad.Layout.NoBorders -import XMonad.Layout.Grid import Graphics.X11.ExtraTypes.XF86 import Data.Monoid import System.Exit @@ -249,7 +246,19 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $ -- The available layouts. Note that each layout is separated by |||, -- which denotes layout choice. -- -myLayoutHook = smartBorders $ Full ||| GridRatio (4/3) +myLayoutHook = Full ||| tiled + where + -- default tiling algorithm partitions the screen into two panes + tiled = Tall nmaster delta ratio + + -- The default number of windows in the master pane + nmaster = 1 + + -- Default proportion of screen occupied by master pane + ratio = 1/2 + + -- Percent of screen to increment by while resizing panes + delta = 3/100 ------------------------------------------------------------------------ -- Window rules: @@ -321,37 +330,13 @@ myLogHook = return () myStartupHook :: X () myStartupHook = return () ------------------------------------------------------------------------- --- I'm adding the xmobar configuration here. - --- Custom PP, configure it as you like. It determines what is being --- written to the bar. -myPP :: PP -myPP = xmobarPP { ppCurrent = xmobarColor "red" "" - , ppVisible = xmobarColor "orange" "" - , ppHidden = \n -> if n == "NSP" then "" else n - , ppHiddenNoWindows = const "" - , ppUrgent = xmobarColor "green" "" - , ppSep = " - " - , ppWsSep = " " - , ppOrder = \(ws:_) -> [ws] - -- ... - } - --- Key binding to toggle the gap for the bar. -toggleStrutsKey :: XConfig Layout -> (KeyMask, KeySym) -toggleStrutsKey XConfig {XMonad.modMask = m} = (m, xK_b) - --- Bar. -withBar = statusBar "xmobar" myPP toggleStrutsKey - ------------------------------------------------------------------------ -- Now run xmonad with all the defaults we set up. -- Run xmonad with the settings you specify. No need to modify this. -- main :: IO () -main = xmonad =<< withBar defaults +main = xmonad defaults -- A structure containing your configuration settings, overriding -- fields in the default config. Any you don't override, will From 74f4b56456a09266d86ce58cd7fcba7ee104bc05 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:49:22 +0100 Subject: [PATCH 08/21] xinitrc --- xinitrc | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/xinitrc b/xinitrc index 6fc038b..cd2df57 100644 --- a/xinitrc +++ b/xinitrc @@ -36,19 +36,13 @@ forklog() { $* 2>&1 | logger & } -forklog redshift -forklog dunst +# forklog dunst forklog xcape -t 100 -e 'Super_L=Scroll_Lock;Shift_L=Escape' -forklog bash ~/.fehbg +forklog sh ~/.fehbg forklog xautolock -time 1 -locker xsecurelock forklog xset dpms 0 0 50 s off -xmonad - -pkill redshift -pkill dunst -pkill xcape -pkill xautolock - -wait +#forklog sxhkd -c ~/.config/sxhkd/sxhkd.conf +#exec nwm +exec xmonad From 4b3485939a52a7989ebb473c1045d0b06b8c518d Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:54:53 +0100 Subject: [PATCH 09/21] abysmise zshrc --- zshrc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/zshrc b/zshrc index 425b803..175558e 100644 --- a/zshrc +++ b/zshrc @@ -1,6 +1,6 @@ # Lines configured by zsh-newuser-install -HISTFILE=~/.histfile +HISTFILE=~/.local/share/zsh/histfile HISTSIZE=1000 SAVEHIST=1000 setopt appendhistory @@ -33,7 +33,7 @@ alias ls="ls --color=auto" PATH="$HOME/.local/bin":"$PATH" # Cabal -#export PATH="$HOME/.cabal/bin":"$PATH" +export PATH="$HOME/.cabal/bin":"$PATH" # Gems #export PATH="$(ruby -rubygems -e "puts Gem.user_dir")/bin":"$PATH" @@ -42,18 +42,10 @@ PATH="$HOME/.local/bin":"$PATH" # For vim export EDITOR="nvim" #stty -ixon # turn of for vimshell -alias vim="sl" +alias vim="nvim" alias vi="nvim" alias nano="nvim" -# GPG ssh tty -export GPG_TTY=$(tty) -envoy -t gpg-agent -source <(envoy -p) - -# Syntax highlighting -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - # Don't type that config location al the time. alias ncmpcpp="ncmpcpp -c ~/.config/ncmpcpp/config" From 7644adfe64ea1113e42c838de49d540cc6182c1e Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Thu, 17 Mar 2016 00:00:58 +0100 Subject: [PATCH 10/21] add runit user services --- .gitignore | 5 +++++ services/mpd/run | 2 ++ services/urxvtd/conf | 2 ++ services/urxvtd/run | 3 +++ 4 files changed, 12 insertions(+) create mode 100755 services/mpd/run create mode 100644 services/urxvtd/conf create mode 100755 services/urxvtd/run diff --git a/.gitignore b/.gitignore index 8c89a51..57994c6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,10 @@ vim/bundle vim/tmp vim/spell +# runit user services +services/*/supervise +services/*/lock +services/*/current + # other *.pyc diff --git a/services/mpd/run b/services/mpd/run new file mode 100755 index 0000000..a3b2dce --- /dev/null +++ b/services/mpd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec mpd --no-daemon diff --git a/services/urxvtd/conf b/services/urxvtd/conf new file mode 100644 index 0000000..8752e87 --- /dev/null +++ b/services/urxvtd/conf @@ -0,0 +1,2 @@ +#!/bin/sh +export RXVT_SOCKET=/home/noctua/.urxvt/urxvtd-abysm diff --git a/services/urxvtd/run b/services/urxvtd/run new file mode 100755 index 0000000..cc544b0 --- /dev/null +++ b/services/urxvtd/run @@ -0,0 +1,3 @@ +#!/bin/sh +[ -r conf ] && . ./conf +exec /usr/bin/urxvtd -q From f913e5f4e574025e1ef6f46aae655eaadee5bae3 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:07:20 +0100 Subject: [PATCH 11/21] add pip bins --- local/bin/pygmentize | 11 +++++++++++ local/bin/qutebrowser | 10 ++++++++++ 2 files changed, 21 insertions(+) create mode 100755 local/bin/pygmentize create mode 100755 local/bin/qutebrowser diff --git a/local/bin/pygmentize b/local/bin/pygmentize new file mode 100755 index 0000000..fcd5b60 --- /dev/null +++ b/local/bin/pygmentize @@ -0,0 +1,11 @@ +#!/usr/bin/python3.4 + +# -*- coding: utf-8 -*- +import re +import sys + +from pygments.cmdline import main + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/local/bin/qutebrowser b/local/bin/qutebrowser new file mode 100755 index 0000000..b7b8449 --- /dev/null +++ b/local/bin/qutebrowser @@ -0,0 +1,10 @@ +#!/usr/bin/python3.4 +# EASY-INSTALL-ENTRY-SCRIPT: 'qutebrowser==0.5.1','gui_scripts','qutebrowser' +__requires__ = 'qutebrowser==0.5.1' +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.exit( + load_entry_point('qutebrowser==0.5.1', 'gui_scripts', 'qutebrowser')() + ) From f48d588c5ecd13d5e5ccb2a7c4615d4bd07698e7 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 16 Mar 2016 23:39:37 +0100 Subject: [PATCH 12/21] abysmify mail --- mbsyncrc => config/mbsync/config | 15 +++++++-------- zshrc | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) rename mbsyncrc => config/mbsync/config (77%) diff --git a/mbsyncrc b/config/mbsync/config similarity index 77% rename from mbsyncrc rename to config/mbsync/config index 7d19ece..41f0a69 100644 --- a/mbsyncrc +++ b/config/mbsync/config @@ -3,14 +3,14 @@ IMAPAccount gmail Host "imap.gmail.com" User "felix.vanderjeugt@gmail.com" -PassCmd "gpg -u Noctua -q --for-your-eyes-only --no-tty -d ~/.config/passwords.gpg | sed -n 's/gmail=//p'" +PassCmd "gpg2 -u Noctua -q --for-your-eyes-only --no-tty -d ~/.config/passwords.gpg | sed -n 's/gmail=//p'" SSLType "IMAPS" CertificateFile "/etc/ssl/certs/ca-certificates.crt" IMAPAccount ugent Host "owa.ugent.be" User "felix.vanderjeugt@ugent.be" -PassCmd "gpg -u Noctua -q --for-your-eyes-only --no-tty -d ~/.config/passwords.gpg | sed -n 's/ugent=//p'" +PassCmd "gpg2 -u Noctua -q --for-your-eyes-only --no-tty -d ~/.config/passwords.gpg | sed -n 's/ugent=//p'" AuthMechs "PLAIN" SSLTYPE "IMAPS" CertificateFile "/etc/ssl/certs/ca-certificates.crt" @@ -26,14 +26,13 @@ Account "ugent" # Local Stores {{{ MaildirStore gmail-local -Path "/mnt/lexicon/Mail/gmail/" -Inbox "/mnt/lexicon/Mail/gmail/Inbox" +Path "/mail/gmail/" +Inbox "/mail/gmail/Inbox" MaildirStore ugent-local -Path "/mnt/lexicon/Mail/ugent/" -Inbox "/mnt/lexicon/Mail/ugent/Inbox" -Trash "/mnt/lexicon/Mail/ugent/Trash" -SubFolders "Verbatim" +Path "/mail/ugent/" +Inbox "/mail/ugent/Inbox" +Trash "/mail/ugent/Trash" # }}} # Channels {{{ diff --git a/zshrc b/zshrc index 175558e..396792b 100644 --- a/zshrc +++ b/zshrc @@ -48,6 +48,7 @@ alias nano="nvim" # Don't type that config location al the time. alias ncmpcpp="ncmpcpp -c ~/.config/ncmpcpp/config" +alias mbsync="mbsync -c ~/.config/mbsync/config" # Base16 Shell BASE16_SHELL="$HOME/.config/base16-shell/base16-greenscreen.dark.sh" From f5e17a826241349c107fa831e358840ac83aa92c Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 16:42:13 +0100 Subject: [PATCH 13/21] abysmify mail --- gnupg/gpg-agent.conf | 5 +- gnupg/gpg.conf | 122 +++++++------------------------- local/bin/sup | 1 - config/mbsync/config => mbsynrc | 10 +-- sup/.gitignore | 6 ++ sup/config.yaml | 2 +- sup/labels.txt | 4 ++ sup/sources.yaml | 12 ++-- 8 files changed, 51 insertions(+), 111 deletions(-) delete mode 120000 local/bin/sup rename config/mbsync/config => mbsynrc (90%) create mode 100644 sup/.gitignore create mode 100644 sup/labels.txt diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf index 98b2a97..021652c 100644 --- a/gnupg/gpg-agent.conf +++ b/gnupg/gpg-agent.conf @@ -6,9 +6,8 @@ no-grab # pinentry-program /usr/bin/pinentry-curses # pinentry-program /usr/bin/pinentry-qt4 # pinentry-program /usr/bin/pinentry-kwallet -pinentry-program /usr/bin/pinentry-gtk-2 +# pinentry-program /usr/bin/pinentry-gtk-2 # Cache settings -default-cache-ttl 10800 -default-cache-ttl-ssh 10800 +default-cache-ttl 108000 diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf index 8213b89..48edc58 100644 --- a/gnupg/gpg.conf +++ b/gnupg/gpg.conf @@ -1,6 +1,3 @@ -# These first three lines are not copied to the gpg.conf file in -# the users home directory. -# $Id$ # Options for GnuPG # Copyright 1998-2003, 2010 Free Software Foundation, Inc. # Copyright 1998-2003, 2010 Werner Koch @@ -21,23 +18,15 @@ # GnuPG. If the first non white space character of a line is a '#', # this line is ignored. Empty lines are also ignored. # -# See the man page for a list of options. +# See the gpg man page for a list of options. -personal-digest-preferences SHA512 -cert-digest-algo SHA512 -default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed -personal-cipher-preferences TWOFISH CAMELLIA256 AES 3DES -use-agent - -# Uncomment the following option to get rid of the copyright notice - -#no-greeting # If you have more than 1 secret key in your keyring, you may want to # uncomment the following option and set your preferred keyid. #default-key 621CC013 + # If you do not pass a recipient to gpg, it will ask for one. Using # this option you can encrypt to a default key. Key validation will # not be done in this case. The second form uses the default key as @@ -46,37 +35,6 @@ use-agent #default-recipient some-user-id #default-recipient-self -# By default GnuPG creates version 4 signatures for data files as -# specified by OpenPGP. Some earlier (PGP 6, PGP 7) versions of PGP -# require the older version 3 signatures. Setting this option forces -# GnuPG to create version 3 signatures. - -#force-v3-sigs - -# Because some mailers change lines starting with "From " to ">From " -# it is good to handle such lines in a special way when creating -# cleartext signatures; all other PGP versions do it this way too. -# To enable full OpenPGP compliance you may want to use this option. - -#no-escape-from-lines - -# When verifying a signature made from a subkey, ensure that the cross -# certification "back signature" on the subkey is present and valid. -# This protects against a subtle attack against subkeys that can sign. -# Defaults to --no-require-cross-certification. However for new -# installations it should be enabled. - -require-cross-certification - - -# If you do not use the Latin-1 (ISO-8859-1) charset, you should tell -# GnuPG which is the native character set. Please check the man page -# for supported character sets. This character set is only used for -# metadata and not for the actual message which does not undergo any -# translation. Note that future version of GnuPG will change to UTF-8 -# as default character set. - -#charset utf-8 # Group names may be defined like this: # group mynames = paige 0x12345678 joe patti @@ -90,50 +48,21 @@ require-cross-certification #group mynames = paige 0x12345678 joe patti -# Some old Windows platforms require 8.3 filenames. If your system -# can handle long filenames, uncomment this. -#no-mangle-dos-filenames +# GnuPG can automatically locate and retrieve keys as needed using +# this option. This happens when encrypting to an email address (in +# the "user@@example.com" form) and there are no keys matching +# "user@example.com" in the local keyring. This option takes any +# number mechanisms which are tried in the given order. The default +# is "--auto-key-locate local" to search for keys only in the local +# key database. Uncomment the next line to locate a missing key using +# two DNS based mechanisms. -# Lock the file only once for the lifetime of a process. If you do -# not define this, the lock will be obtained and released every time -# it is needed - normally this is not needed. +#auto-key-locate local,pka,dane -#lock-once - -# GnuPG can send and receive keys to and from a keyserver. These -# servers can be HKP, email, or LDAP (if GnuPG is built with LDAP -# support). -# -# Example HKP keyservers: -# hkp://keys.gnupg.net -# -# Example LDAP keyservers: -# ldap://pgp.surfnet.nl:11370 -# -# Regular URL syntax applies, and you can set an alternate port -# through the usual method: -# hkp://keyserver.example.net:22742 -# -# If you have problems connecting to a HKP server through a buggy http -# proxy, you can use keyserver option broken-http-proxy (see below), -# but first you should make sure that you have read the man page -# regarding proxies (keyserver option honor-http-proxy) -# -# Most users just set the name and type of their preferred keyserver. -# Note that most servers (with the notable exception of -# ldap://keyserver.pgp.com) synchronize changes with each other. Note -# also that a single server name may actually point to multiple -# servers via DNS round-robin. hkp://keys.gnupg.net is an example of -# such a "server", which spreads the load over a number of physical -# servers. To see the IP address of the server actually used, you may use -# the "--keyserver-options debug". - -keyserver hkp://keys.gnupg.net -#keyserver http://http-keys.gnupg.net -#keyserver mailto:pgp-public-keys@keys.nl.pgp.net # Common options for keyserver functions: +# (Note that the --keyserver option has been moved to dirmngr.conf) # # include-disabled = when searching, include keys marked as "disabled" # on the keyserver (not all keyservers support this). @@ -145,18 +74,6 @@ keyserver hkp://keys.gnupg.net # Can be used more than once to increase the amount # of information shown. # -# use-temp-files = use temporary files instead of a pipe to talk to the -# keyserver. Some platforms (Win32 for one) always -# have this on. -# -# keep-temp-files = do not delete temporary files after using them -# (really only useful for debugging) -# -# honor-http-proxy = if the keyserver uses HTTP, honor the http_proxy -# environment variable -# -# broken-http-proxy = try to work around a buggy HTTP proxy -# # auto-key-retrieve = automatically fetch keys as needed from the keyserver # when verifying signatures or when importing keys that # have been revoked by a revocation key that is not @@ -167,11 +84,13 @@ keyserver hkp://keys.gnupg.net #keyserver-options auto-key-retrieve + # Uncomment this line to display photo user IDs in key listings and # when a signature from a key with a photo is verified. #show-photos + # Use this program to display photo user IDs # # %i is expanded to a temporary file that contains the photo. @@ -202,3 +121,16 @@ keyserver hkp://keys.gnupg.net # # Use your MIME handler to view photos: # photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG" + + +# Because some mailers change lines starting with "From " to ">From " +# it is good to handle such lines in a special way when creating +# cleartext signatures; all other PGP versions do it this way too. +# To enable full OpenPGP compliance you may want to use this option. + +#no-escape-from-lines + + +# Uncomment the following option to get rid of the copyright notice + +#no-greeting diff --git a/local/bin/sup b/local/bin/sup deleted file mode 120000 index a4b75b3..0000000 --- a/local/bin/sup +++ /dev/null @@ -1 +0,0 @@ -/home/felix/.gem/ruby/2.3.0/bin/sup \ No newline at end of file diff --git a/config/mbsync/config b/mbsynrc similarity index 90% rename from config/mbsync/config rename to mbsynrc index 41f0a69..b62da1c 100644 --- a/config/mbsync/config +++ b/mbsynrc @@ -26,13 +26,13 @@ Account "ugent" # Local Stores {{{ MaildirStore gmail-local -Path "/mail/gmail/" -Inbox "/mail/gmail/Inbox" +Path "/data/mail/gmail/" +Inbox "/data/mail/gmail/Inbox" MaildirStore ugent-local -Path "/mail/ugent/" -Inbox "/mail/ugent/Inbox" -Trash "/mail/ugent/Trash" +Path "/data/mail/ugent/" +Inbox "/data/mail/ugent/Inbox" +Trash "/data/mail/ugent/Trash" # }}} # Channels {{{ diff --git a/sup/.gitignore b/sup/.gitignore new file mode 100644 index 0000000..a067500 --- /dev/null +++ b/sup/.gitignore @@ -0,0 +1,6 @@ +lock +log +sent.mbox +sync-back-ok +xapian +contacts.txt diff --git a/sup/config.yaml b/sup/config.yaml index 39ee9ea..1d99951 100644 --- a/sup/config.yaml +++ b/sup/config.yaml @@ -13,7 +13,7 @@ :jump_to_open_message: true :discard_snippets_from_encrypted_messages: false :load_more_threads_when_scrolling: true -:default_attachment_save_dir: '/home/felix/Temporary/' +:default_attachment_save_dir: '/data/temporary' :sent_source: sup://sent :archive_sent: true :poll_interval: 300 diff --git a/sup/labels.txt b/sup/labels.txt new file mode 100644 index 0000000..1673e3b --- /dev/null +++ b/sup/labels.txt @@ -0,0 +1,4 @@ +12UL +GMail +Sent +UGent diff --git a/sup/sources.yaml b/sup/sources.yaml index f3d33e0..db49808 100644 --- a/sup/sources.yaml +++ b/sup/sources.yaml @@ -1,6 +1,6 @@ --- - !supmua.org,2006-10-01/Redwood/Maildir - uri: maildir:/mnt/lexicon/Mail/gmail/Inbox + uri: maildir:/data/mail/gmail/Inbox usual: true archived: false sync_back: true @@ -8,7 +8,7 @@ labels: - GMail - !supmua.org,2006-10-01/Redwood/Maildir - uri: maildir:/mnt/lexicon/Mail/ugent/Inbox + uri: maildir:/data/mail/ugent/Inbox usual: true archived: false sync_back: true @@ -16,7 +16,7 @@ labels: - UGent - !supmua.org,2006-10-01/Redwood/Maildir - uri: maildir:/mnt/lexicon/Mail/12ul/Inbox + uri: maildir:/data/mail/12ul/Inbox usual: true archived: false sync_back: true @@ -24,7 +24,7 @@ labels: - 12UL - !supmua.org,2006-10-01/Redwood/Maildir - uri: maildir:/mnt/lexicon/Mail/gmail/Sent + uri: maildir:/data/mail/gmail/Sent usual: true archived: true sync_back: true @@ -33,7 +33,7 @@ - GMail - Sent - !supmua.org,2006-10-01/Redwood/Maildir - uri: maildir:/mnt/lexicon/Mail/ugent/Sent + uri: maildir:/data/mail/ugent/Sent usual: true archived: true sync_back: true @@ -42,7 +42,7 @@ - UGent - Sent - !supmua.org,2006-10-01/Redwood/Maildir - uri: maildir:/mnt/lexicon/Mail/12ul/Sent + uri: maildir:/data/mail/12ul/Sent usual: true archived: true sync_back: true From 65a5e45d792748f35bbd5adcd710c659b71be899 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 16:44:53 +0100 Subject: [PATCH 14/21] add ignore to xmonad --- xmonad/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 xmonad/.gitignore diff --git a/xmonad/.gitignore b/xmonad/.gitignore new file mode 100644 index 0000000..80dc786 --- /dev/null +++ b/xmonad/.gitignore @@ -0,0 +1,4 @@ +xmonad-x86_64-linux +xmonad.errors +xmonad.hi +xmonad.o From fa1b31804e18db692adc22120a4e7541c2fee7b8 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 18:15:09 +0100 Subject: [PATCH 15/21] ranger to abysm --- config/ranger/rc.conf | 5 +++-- config/ranger/rifle.conf | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config/ranger/rc.conf b/config/ranger/rc.conf index 8a69c24..d88b3d5 100644 --- a/config/ranger/rc.conf +++ b/config/ranger/rc.conf @@ -163,8 +163,9 @@ set xterm_alt_key false # Examples: # setlocal path=~/downloads sort mtime -setlocal path=~/Temporary sort mtime -setlocal path=~/Temporary sort_directories_first false +setlocal path=/data/temporary sort mtime +setlocal path=/data/temporary sort_directories_first false +setlocal path=~/ show_hidden True # =================================================================== # == Command Aliases in the Console diff --git a/config/ranger/rifle.conf b/config/ranger/rifle.conf index 21a2098..278d7c3 100644 --- a/config/ranger/rifle.conf +++ b/config/ranger/rifle.conf @@ -48,6 +48,12 @@ # Note: When using rifle in ranger, there is an additional flag "c" for # only running the current file even if you have marked multiple files. +#------------------------------------------- +# URLs +#------------------------------------------- +match ^https?://, has qutebrowser, X, flag f = qutebrowser -- "$@" +match ^magnet:, has transmission-remote = qutebrowser -- "$@" + #------------------------------------------- # Websites #------------------------------------------- From 0d5cfc48396873c783bb49e4be795a8023fb9700 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 19:22:41 +0100 Subject: [PATCH 16/21] well, xdg-open --- config/mimeapps.list | 4 ++++ local/share/applications/qutebrowser.desktop | 1 + 2 files changed, 5 insertions(+) create mode 100644 config/mimeapps.list create mode 120000 local/share/applications/qutebrowser.desktop diff --git a/config/mimeapps.list b/config/mimeapps.list new file mode 100644 index 0000000..f31c90c --- /dev/null +++ b/config/mimeapps.list @@ -0,0 +1,4 @@ + +[Default Applications] +x-sheme-handler/http=qutebrowser.desktop +x-sheme-handler/https=qutebrowser.desktop diff --git a/local/share/applications/qutebrowser.desktop b/local/share/applications/qutebrowser.desktop new file mode 120000 index 0000000..fa16ffb --- /dev/null +++ b/local/share/applications/qutebrowser.desktop @@ -0,0 +1 @@ +/data/programming/qutebrowser/qutebrowser.desktop \ No newline at end of file From 55b5b0d47dee9eae213c3b5877f73f43103f65fb Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 19:36:29 +0100 Subject: [PATCH 17/21] magnet links with transmission --- {config => local/share/applications}/mimeapps.list | 0 local/share/applications/transmission.desktop | 11 +++++++++++ 2 files changed, 11 insertions(+) rename {config => local/share/applications}/mimeapps.list (100%) create mode 100644 local/share/applications/transmission.desktop diff --git a/config/mimeapps.list b/local/share/applications/mimeapps.list similarity index 100% rename from config/mimeapps.list rename to local/share/applications/mimeapps.list diff --git a/local/share/applications/transmission.desktop b/local/share/applications/transmission.desktop new file mode 100644 index 0000000..18c3bc4 --- /dev/null +++ b/local/share/applications/transmission.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=transmission +GenericName=Torrent Client +Icon=transmission +Type=Application +Categories=Network; +Exec=transmission-remote --add %u +Terminal=false +StartupNotify=false +MimeType=application/x-bittorrent;x-scheme-handler/magnet; + From c586d542b61e40b4b818a9d39a25e2a90dd1e29b Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 19:37:12 +0100 Subject: [PATCH 18/21] clean path in zshrc --- zshrc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/zshrc b/zshrc index 396792b..8a97bd0 100644 --- a/zshrc +++ b/zshrc @@ -30,14 +30,10 @@ PS1="[%*] %{$fg[red]%}%n@%m%{$reset_color%} %{$fg[green]%}%~%{$reset_color%} "'$ alias ls="ls --color=auto" # Local scripts -PATH="$HOME/.local/bin":"$PATH" - -# Cabal +export PATH="$HOME/.local/bin":"$PATH" export PATH="$HOME/.cabal/bin":"$PATH" - -# Gems -#export PATH="$(ruby -rubygems -e "puts Gem.user_dir")/bin":"$PATH" -#export GEM_HOME="$(ruby -e 'puts Gem.user_dir')" +export PATH="$(ruby -rubygems -e "puts Gem.user_dir")/bin":"$PATH" +export GEM_HOME="$(ruby -e 'puts Gem.user_dir')" # For vim export EDITOR="nvim" From fb4e03200c607422097aeb1803ece15e98dfeaa2 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 19:37:54 +0100 Subject: [PATCH 19/21] urxvtd knows not where to find extensions --- config/Xresources | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/Xresources b/config/Xresources index 40ea811..244fd86 100644 --- a/config/Xresources +++ b/config/Xresources @@ -85,10 +85,11 @@ urxvt.termName: rxvt-unicode ! Perls +URXvt.perl-lib: /home/noctua/.config/urxvt/ext/ URxvt.perl-ext-common: default,matcher,font-size ! matcher: clickable urls -URxvt.url-launcher: /home/felix/.local/bin/open.sh +URxvt.url-launcher: /home/noctua/.local/bin/open.sh URxvt.matcher.button: 1 ! font-size: zooming live From 76f5a6bdbbedeed0697af17e251cf5706544ad55 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 19:39:18 +0100 Subject: [PATCH 20/21] abysmishing transmission --- config/transmission-daemon/settings.json | 126 +++++++++++------------ 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/config/transmission-daemon/settings.json b/config/transmission-daemon/settings.json index 8380030..506a00c 100644 --- a/config/transmission-daemon/settings.json +++ b/config/transmission-daemon/settings.json @@ -1,66 +1,66 @@ { - "alt-speed-down": 50, - "alt-speed-enabled": false, - "alt-speed-time-begin": 540, - "alt-speed-time-day": 127, - "alt-speed-time-enabled": false, - "alt-speed-time-end": 1020, - "alt-speed-up": 50, - "bind-address-ipv4": "0.0.0.0", - "bind-address-ipv6": "::", - "blocklist-enabled": false, - "blocklist-url": "http://www.example.com/blocklist", - "cache-size-mb": 4, - "dht-enabled": true, - "download-dir": "/mnt/lexicon/Temporary", - "download-queue-enabled": true, - "download-queue-size": 5, - "encryption": 1, - "idle-seeding-limit": 30, - "idle-seeding-limit-enabled": false, - "incomplete-dir": "/home/felix/Downloads", - "incomplete-dir-enabled": false, - "lpd-enabled": false, - "message-level": 2, - "peer-congestion-algorithm": "", - "peer-id-ttl-hours": 6, - "peer-limit-global": 200, - "peer-limit-per-torrent": 50, - "peer-port": 51413, - "peer-port-random-high": 65535, - "peer-port-random-low": 49152, - "peer-port-random-on-start": false, - "peer-socket-tos": "default", - "pex-enabled": true, - "port-forwarding-enabled": true, - "preallocation": 1, - "prefetch-enabled": 1, - "queue-stalled-enabled": true, - "queue-stalled-minutes": 30, - "ratio-limit": 1.2000, - "ratio-limit-enabled": true, - "rename-partial-files": true, - "rpc-authentication-required": false, - "rpc-bind-address": "0.0.0.0", - "rpc-enabled": true, - "rpc-password": "{ea038685697d9155c4feac212ab27e76b9738fd5lYASTkIh", - "rpc-port": 9091, - "rpc-url": "/transmission/", - "rpc-username": "", - "rpc-whitelist": "127.0.0.1", - "rpc-whitelist-enabled": true, - "scrape-paused-torrents-enabled": true, - "script-torrent-done-enabled": true, - "script-torrent-done-filename": "/home/felix/.local/bin/torrent_done.sh", - "seed-queue-enabled": false, - "seed-queue-size": 10, - "speed-limit-down": 100, - "speed-limit-down-enabled": false, - "speed-limit-up": 100, - "speed-limit-up-enabled": false, - "start-added-torrents": true, - "trash-original-torrent-files": false, - "umask": 18, - "upload-slots-per-torrent": 14, + "alt-speed-down": 50, + "alt-speed-enabled": false, + "alt-speed-time-begin": 540, + "alt-speed-time-day": 127, + "alt-speed-time-enabled": false, + "alt-speed-time-end": 1020, + "alt-speed-up": 50, + "bind-address-ipv4": "0.0.0.0", + "bind-address-ipv6": "::", + "blocklist-enabled": false, + "blocklist-url": "http://www.example.com/blocklist", + "cache-size-mb": 4, + "dht-enabled": true, + "download-dir": "/data/torrents", + "download-queue-enabled": true, + "download-queue-size": 5, + "encryption": 1, + "idle-seeding-limit": 30, + "idle-seeding-limit-enabled": false, + "incomplete-dir": "/data/torrents", + "incomplete-dir-enabled": false, + "lpd-enabled": false, + "message-level": 2, + "peer-congestion-algorithm": "", + "peer-id-ttl-hours": 6, + "peer-limit-global": 200, + "peer-limit-per-torrent": 50, + "peer-port": 51413, + "peer-port-random-high": 65535, + "peer-port-random-low": 49152, + "peer-port-random-on-start": false, + "peer-socket-tos": "default", + "pex-enabled": true, + "port-forwarding-enabled": true, + "preallocation": 1, + "prefetch-enabled": true, + "queue-stalled-enabled": true, + "queue-stalled-minutes": 30, + "ratio-limit": 1.2000, + "ratio-limit-enabled": true, + "rename-partial-files": true, + "rpc-authentication-required": false, + "rpc-bind-address": "0.0.0.0", + "rpc-enabled": true, + "rpc-password": "{ea038685697d9155c4feac212ab27e76b9738fd5lYASTkIh", + "rpc-port": 9091, + "rpc-url": "/transmission/", + "rpc-username": "", + "rpc-whitelist": "127.0.0.1", + "rpc-whitelist-enabled": true, + "scrape-paused-torrents-enabled": true, + "script-torrent-done-enabled": false, + "script-torrent-done-filename": "BLAH BLABLAH BLAH", + "seed-queue-enabled": false, + "seed-queue-size": 10, + "speed-limit-down": 100, + "speed-limit-down-enabled": false, + "speed-limit-up": 100, + "speed-limit-up-enabled": false, + "start-added-torrents": true, + "trash-original-torrent-files": false, + "umask": 18, + "upload-slots-per-torrent": 14, "utp-enabled": true } From 1d2344f103ddf0933e65a1bba9a230912332ad2c Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 18 Mar 2016 19:39:45 +0100 Subject: [PATCH 21/21] relative is better --- weechat/lua/autoload/matrix.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weechat/lua/autoload/matrix.lua b/weechat/lua/autoload/matrix.lua index 38076e8..e17e5c4 120000 --- a/weechat/lua/autoload/matrix.lua +++ b/weechat/lua/autoload/matrix.lua @@ -1 +1 @@ -/home/felix/.weechat/lua/matrix.lua \ No newline at end of file +../matrix.lua \ No newline at end of file