diff options
| -rw-r--r-- | .Xresources | 84 | ||||
| -rw-r--r-- | .aliases | 2 | ||||
| -rw-r--r-- | .bashrc | 7 | ||||
| -rw-r--r-- | .msmtprc | 16 | ||||
| -rw-r--r-- | .mutt/muttrc | 43 | ||||
| -rw-r--r-- | .offlineimaprc | 54 | ||||
| -rw-r--r-- | .panocopyrc | 1 | ||||
| -rw-r--r-- | .rtorrent.rc | 122 | ||||
| -rwxr-xr-x | .ssh/config | 34 |
9 files changed, 285 insertions, 78 deletions
diff --git a/.Xresources b/.Xresources index 5aafa92..486825e 100644 --- a/.Xresources +++ b/.Xresources @@ -13,7 +13,7 @@ URxvt*cursorBlink: true URxvt*underlineColor: #808080 URxvt.boldFont: xft:hack:bold:size=13 URxvt*font: xft:hack:medium:size=13 -!URxvt.letterSpace: -1 +URxvt.letterSpace: -1 URxvt*depth: 32 Urxvt*transparent: true URxvt*background: rgba:0000/0000/0200/c800 @@ -29,8 +29,6 @@ URxvt.perl-ext-common: default,matcher,fullscreen URxvt.matcher.button: 1 URxvt.keysym.F11: perl:fullscreen:switch -!! drop in Solarized colorscheme for Xresources/Xdefaults - !!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB !!--------- ------- ---- ------- ----------- ---------- ----------- ----------- !!base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 @@ -50,6 +48,67 @@ URxvt.keysym.F11: perl:fullscreen:switch !!cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 !!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 +!#define S_base03 #002b36 +!#define S_base02 #073642 +!#define S_base01 #586e75 +!#define S_base00 #657b83 +!#define S_base0 #839496 +!#define S_base1 #93a1a1 +!#define S_base2 #eee8d5 +!#define S_base3 #fdf6e3 +!#define S_yellow #b58900 +!#define S_orange #cb4b16 +!#define S_red #dc322f +!#define S_magenta #d33682 +!#define S_violet #6c71c4 +!#define S_blue #268bd2 +!#define S_cyan #2aa198 +!#define S_green #859900 +! +!*background: S_base02 +!*foreground: S_base00 +!*cursorColor: S_base1 +!*pointerColorBackground:S_base01 +!*pointerColorForeground:S_base1 +! +!!! black dark/light +!*color0: S_base02 +!*color8: S_base03 +! +!!! red dark/light +!*color1: S_red +!*color9: S_orange +! +!!! green dark/light +!*color2: S_green +!*color10: S_base01 +! +!!! yellow dark/light +!*color3: S_yellow +!*color11: S_base00 +! +!!! blue dark/light +!*color4: S_blue +!*color12: S_base0 +! +!!! magenta dark/light +!*color5: S_magenta +!*color13: S_violet +! +!!! cyan dark/light +!*color6: S_cyan +!*color14: S_base1 +! +!!! white dark/light +!*color7: S_base2 +!*color15: S_base3 + + +! xterm +xterm.boldFont: xft:hack:bold:size=13 +xterm*font: xft:hack:medium:size=13 + +! solarized light #define S_base03 #002b36 #define S_base02 #073642 #define S_base01 #586e75 @@ -58,6 +117,14 @@ URxvt.keysym.F11: perl:fullscreen:switch #define S_base1 #93a1a1 #define S_base2 #eee8d5 #define S_base3 #fdf6e3 + +*background: S_base3 +*foreground: S_base00 +*fadeColor: S_base3 +*cursorColor: S_base01 +*pointerColorBackground:S_base1 +*pointerColorForeground:S_base01 + #define S_yellow #b58900 #define S_orange #cb4b16 #define S_red #dc322f @@ -67,12 +134,6 @@ URxvt.keysym.F11: perl:fullscreen:switch #define S_cyan #2aa198 #define S_green #859900 -*background: S_base02 -*foreground: S_base00 -*cursorColor: S_base1 -*pointerColorBackground:S_base01 -*pointerColorForeground:S_base1 - !! black dark/light *color0: S_base02 *color8: S_base03 @@ -104,8 +165,3 @@ URxvt.keysym.F11: perl:fullscreen:switch !! white dark/light *color7: S_base2 *color15: S_base3 - - -! xterm -xterm*font:xft:Inconsolata:size=15:style=Regular:antialias=true -xterm.boldFont: xft:Inconsolata:Bold:size=14 @@ -2,7 +2,7 @@ alias egrep='egrep --color=auto' alias tmux="tmux -2" -alias v="vim " +alias v="nvim " #alias vim="nvim " alias dmenu="dmenu_run " alias thunar="pcmanfm-qt" @@ -1,9 +1,10 @@ #basics stty -ixon -#export BROWSER="firefox-developer-edition" -export BROWSER="qutebrowser" +export BROWSER="firefox-developer-edition" +export MOZ_DBUS_REMOTE=1 +#export BROWSER="qutebrowser" #export BROWSER="vivaldi-stable" -export EDITOR="vim" +export EDITOR="nvim" export NOTES_DIR="$HOME/notes" export TERM="screen-256color" export GREP_COLOR='00;38;5;166' @@ -1,23 +1,17 @@ -account luxagraf@fastmail.fm -host mail.messagingengine.com +account sng@luxagraf.net +host smtp.migadu.com port 587 protocol smtp auth on from sng@luxagraf.net -user luxagraf@fastmail.fm -passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/fastmail.com.gpg" +user sng@luxagraf.net +passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/sng@luxagraf.net.gpg" tls on #tls_trust_file ~/.mutt/DigiCertHighAssuranceEVRootCA.crt tls_trust_file /etc/ssl/certs/ca-certificates.crt logfile ~/.msmtp.log -account default : luxagraf@fastmail.fm - -account Fastmailwired : luxagraf@fastmail.fm -from scott_gilbertson@wired.com - -account Fastmaillhp: luxagraf@fastmail.fm -from scott@longhandpixels.net +account default : sng@luxagraf.net tls on tls_nocertcheck diff --git a/.mutt/muttrc b/.mutt/muttrc index 97a7433..3bdcfc8 100644 --- a/.mutt/muttrc +++ b/.mutt/muttrc @@ -32,7 +32,7 @@ set meta_key=yes # since control-j/k don't work use meta # Need trash patch for this to work ------------------- -set trash = "+fastmail/trash" +set trash = "+migadu/Trash" # Status Bar ----------------------------------------- set status_chars = " *%A" @@ -49,25 +49,36 @@ hdr_order from: to: cc: date: subject: # and in this order # Account Settings ----------------------------------- # Default inbox. -set spoolfile = "+fastmail/INBOX" +set spoolfile = "+migadu/INBOX" # Alternate email addresses. alternates "luxagraf@gmail.com|scott_gilbertson@condenast.com" # Mailboxes to show -set folder = ~/mail/fastmail +set folder = ~/mail/migadu mailboxes =INBOX \ - +archive \ - +starred \ - +trash \ - +bookmarks \ - +sent \ - +darktable \ - +drafts \ + +Archive \ + +Trash \ + +Bookmarks \ + +Sent \ + +Junk \ + +'Old Mail.2008' \ + +'Old Mail.2009' \ + +'Old Mail.2010' \ + +'Old Mail.2011' \ + +'Old Mail.2012' \ + +'Old Mail.2013' \ + +'Old Mail.2014' \ + +'Old Mail.2015' \ + +'Old Mail.2016' \ + +'Old Mail.2017' \ + +'Old Mail.2018' \ + +'Old Mail.2019' \ + +Drafts \ +temporary/search \ # Other special folders. -set mbox = "+fastmail/archive" -set postponed = "+drafts" +set mbox = "+migadu/Archive" +set postponed = "+Drafts" alias sng Scott Gilbertson <sng@luxagraf.net> @@ -103,13 +114,13 @@ macro index i "<shell-escape>offlineimap -qf INBOX<enter>" "run offlineimap to s macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox" # Gmail style archiving and starring -macro index,pager a "<save-message>=archive<enter><sync-mailbox>" "Archive" +macro index,pager a "<save-message>=Archive<enter><sync-mailbox>" "Archive" macro index,pager s "<save-message>=starred<enter><sync-mailbox>" "Starred" macro index,pager gi "<change-folder>=INBOX<enter>" "Go to inbox" -macro index,pager ga "<change-folder>=archive<enter>" "Go to all mail" +macro index,pager ga "<change-folder>=Archive<enter>" "Go to all mail" macro index,pager gb "<change-folder>=bookmarks<enter>" "Go to Bookmarks" #macro index,pager gs "<change-folder>=starred<enter>" "Go to starred messages" -macro index,pager gs "<change-folder>=sent<enter>" "Go to starred messages" +macro index,pager gs "<change-folder>=Sent<enter>" "Go to starred messages" #Save a message to my notes folder macro index,pager N "<pipe-message>~/bin/mqq.sh " @@ -164,7 +175,7 @@ set reverse_name # reply as whomever it was to set include # include message in replies set forward_quote # include message in forwards -set editor = "vim" # Use terminal Vim to compose email. +set editor = "nvim" # Use terminal Vim to compose email. set from = "sng@luxagraf.net" set sendmail = "/usr/bin/msmtp" diff --git a/.offlineimaprc b/.offlineimaprc index a18fe9d..b5c711c 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -1,9 +1,14 @@ [general] ui = ttyui -accounts = Fastmail +accounts = Migadu pythonfile=~/.mutt/offlineimap.py fsync = False +[Account Migadu] +localrepository = MigaduLocal +remoterepository = MigaduRemote +postsynchook = notmuch new + [Account Fastmail] localrepository = FMLocal remoterepository = FMRemote @@ -21,7 +26,6 @@ nametrans = lambda folder: {'drafts': 'INBOX.Drafts', 'recipes': 'INBOX.Recipes', 'bookmarks': 'INBOX.Bookmarks', 'quickbridge': 'INBOX.quickbridge', - }.get(folder, folder) @@ -49,34 +53,18 @@ nametrans = lambda folder: {'INBOX.Drafts': 'drafts', folderfilter = lambda folder: folder in ['INBOX.Drafts', 'INBOX.Starred', 'INBOX.Sent Items', 'INBOX.barcode', 'INBOX', 'INBOX.Trash', 'INBOX.Bookmarks', 'INBOX.Archive'] -#[Account Condemail] -#localrepository = CondeLocal -#remoterepository = CondeRemote -#postsynchook = notmuch new -# -#[Repository CondeLocal] -#type = Maildir -#localfolders = ~/mail/condemail -##nametrans = lambda folder: {'drafts': 'INBOX.Drafts', -## 'trash': 'INBOX.Trash', -## 'sent': 'INBOX.Sent Items', -## 'starred': 'INBOX.Starred', -## 'archive': 'INBOX.Archive', -## 'darktable': 'INBOX.Darktable', -## 'recipes': 'INBOX.Recipes', -## 'bookmarks': 'INBOX.Bookmarks', -## 'quickbridge': 'INBOX.quickbridge', -## -## }.get(folder, folder) -# -# -#[Repository CondeRemote] -#maxconnections = 1 -#sslcacertfile = /etc/ssl/certs/ca-certificates.crt -#type = Gmail -#ssl_version=tls1_2 -#remotehost = imap.gmail.com -#remoteport = 993 -#remoteuser = scott_gilbertson3@condenast.com -#ssl = yes -#remotepasseval = get_password("condemail") +[Repository MigaduRemote] +maxconnections = 1 +sslcacertfile = /etc/ssl/certs/ca-certificates.crt +ssl_versions = tls1_2 +type = IMAP +remotehost = imap.migadu.com +remoteport = 993 +remoteuser = sng@luxagraf.net +ssl = yes +remotepasseval = get_password("sng@luxagraf.net") +folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Bookmarks', 'Archive', 'Drafts'] + +[Repository MigaduLocal] +type = Maildir +localfolders = ~/mail/migadu diff --git a/.panocopyrc b/.panocopyrc new file mode 100644 index 0000000..4aa2968 --- /dev/null +++ b/.panocopyrc @@ -0,0 +1 @@ +P1260988.RW2
\ No newline at end of file diff --git a/.rtorrent.rc b/.rtorrent.rc new file mode 100644 index 0000000..9f4a3ff --- /dev/null +++ b/.rtorrent.rc @@ -0,0 +1,122 @@ +############################################################################# +# A minimal rTorrent configuration that provides the basic features +# you want to have in addition to the built-in defaults. +# +# See https://github.com/rakshasa/rtorrent/wiki/CONFIG-Template +# for an up-to-date version. +############################################################################# + + +## Instance layout (base paths) +method.insert = cfg.basedir, private|const|string, (cat,"/home/lxf/temp/rtorrent/") +method.insert = cfg.download, private|const|string, (cat,(cfg.basedir),"download/") +method.insert = cfg.logs, private|const|string, (cat,(cfg.basedir),"log/") +method.insert = cfg.logfile, private|const|string, (cat,(cfg.logs),"rtorrent-",(system.time),".log") +method.insert = cfg.session, private|const|string, (cat,(cfg.basedir),".session/") +method.insert = cfg.watch, private|const|string, (cat,(cfg.basedir),"watch/") + + +## Create instance directories +execute.throw = sh, -c, (cat,\ + "mkdir -p \"",(cfg.download),"\" ",\ + "\"",(cfg.logs),"\" ",\ + "\"",(cfg.session),"\" ",\ + "\"",(cfg.watch),"/load\" ",\ + "\"",(cfg.watch),"/start\" ") + + +## Listening port for incoming peer traffic (fixed; you can also randomize it) +network.port_range.set = 50000-50000 +network.port_random.set = no + + +## Tracker-less torrent and UDP tracker support +## (conservative settings for 'private' trackers, change for 'public') +dht.mode.set = disable +protocol.pex.set = no + +trackers.use_udp.set = no + + +## Peer settings +throttle.max_uploads.set = 100 +throttle.max_uploads.global.set = 250 + +throttle.min_peers.normal.set = 20 +throttle.max_peers.normal.set = 60 +throttle.min_peers.seed.set = 30 +throttle.max_peers.seed.set = 80 +trackers.numwant.set = 80 + +protocol.encryption.set = allow_incoming,try_outgoing,enable_retry + + +## Limits for file handle resources, this is optimized for +## an `ulimit` of 1024 (a common default). You MUST leave +## a ceiling of handles reserved for rTorrent's internal needs! +network.http.max_open.set = 50 +network.max_open_files.set = 600 +network.max_open_sockets.set = 300 + + +## Memory resource usage (increase if you have a large number of items loaded, +## and/or the available resources to spend) +pieces.memory.max.set = 1800M +network.xmlrpc.size_limit.set = 4M + + +## Basic operational settings (no need to change these) +session.path.set = (cat, (cfg.session)) +directory.default.set = (cat, (cfg.download)) +log.execute = (cat, (cfg.logs), "execute.log") +#log.xmlrpc = (cat, (cfg.logs), "xmlrpc.log") +execute.nothrow = sh, -c, (cat, "echo >",\ + (session.path), "rtorrent.pid", " ",(system.pid)) + + +## Other operational settings (check & adapt) +encoding.add = utf8 +system.umask.set = 0027 +system.cwd.set = (directory.default) +network.http.dns_cache_timeout.set = 25 +schedule2 = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M)) +#pieces.hash.on_completion.set = no +#view.sort_current = seeding, greater=d.ratio= +#keys.layout.set = qwerty +#network.http.capath.set = "/etc/ssl/certs" +#network.http.ssl_verify_peer.set = 0 +#network.http.ssl_verify_host.set = 0 + + +## Some additional values and commands +method.insert = system.startup_time, value|const, (system.time) +method.insert = d.data_path, simple,\ + "if=(d.is_multi_file),\ + (cat, (d.directory), /),\ + (cat, (d.directory), /, (d.name))" +method.insert = d.session_file, simple, "cat=(session.path), (d.hash), .torrent" + + +## Watch directories (add more as you like, but use unique schedule names) +## Add torrent +schedule2 = watch_load, 11, 10, ((load.verbose, (cat, (cfg.watch), "load/*.torrent"))) +## Add & download straight away +schedule2 = watch_start, 10, 10, ((load.start_verbose, (cat, (cfg.watch), "start/*.torrent"))) + + +## Run the rTorrent process as a daemon in the background +## (and control via XMLRPC sockets) +#system.daemon.set = true +#network.scgi.open_local = (cat,(session.path),rpc.socket) +#execute.nothrow = chmod,770,(cat,(session.path),rpc.socket) + + +## Logging: +## Levels = critical error warn notice info debug +## Groups = connection_* dht_* peer_* rpc_* storage_* thread_* tracker_* torrent_* +print = (cat, "Logging to ", (cfg.logfile)) +log.open_file = "log", (cfg.logfile) +log.add_output = "info", "log" +#log.add_output = "tracker_debug", "log" + +### END of rtorrent.rc ### diff --git a/.ssh/config b/.ssh/config new file mode 100755 index 0000000..fd18e01 --- /dev/null +++ b/.ssh/config @@ -0,0 +1,34 @@ +Host lux + Hostname 149.28.230.188 + user lxf + Port 24598 + CheckHostIP yes + TCPKeepAlive yes + ForwardX11 yes + IdentityFile ~/.ssh/id_ed25519 + +Host lxf + Hostname 149.28.44.132 + user lxf + Port 24598 + CheckHostIP yes + TCPKeepAlive yes + ForwardX11 yes + IdentityFile ~/.ssh/id_ed25519 + +Host luxgit + Hostname 149.28.44.132 + user git + Port 24598 + CheckHostIP yes + TCPKeepAlive yes + IdentityFile ~/.ssh/id_ed25519 + +Host wlp + Hostname 149.28.112.177 + user wlp + Port 24598 + CheckHostIP yes + TCPKeepAlive yes + #IdentityFile ~/.ssh/id_ed25519 + |