From d162d9daa7d4c4434bc6e346a864f1398e83706b Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Fri, 26 May 2017 16:37:27 +0530 Subject: [PATCH] Update for making things work on Fedora 25 --- i3/config | 2 +- imapfilter/config.lua | 4 ++-- msmtprc | 8 ++++---- mutt/muttrc | 6 +----- offlineimap.py | 6 ++++-- offlineimaprc | 6 +++--- spacemacs | 11 ++++++----- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/i3/config b/i3/config index 902b15d..fc5f010 100644 --- a/i3/config +++ b/i3/config @@ -28,7 +28,7 @@ font pango:System San Francisco Display 8 floating_modifier $mod # start a terminal -bindsym $mod+Return exec i3-sensible-terminal +bindsym $mod+Return exec gnome-terminal # kill focused window bindsym $mod+Shift+q kill diff --git a/imapfilter/config.lua b/imapfilter/config.lua index 4cca196..bda5322 100644 --- a/imapfilter/config.lua +++ b/imapfilter/config.lua @@ -168,7 +168,7 @@ function get_imap_password(file) end function get_pwd_victor() - local cmd = "gpg --use-agent --quiet --batch --decrypt ~/.victor.gpg" + local cmd = "gpg2 --use-agent --quiet --batch --decrypt ~/.victor.gpg" local fd = io.popen(cmd, 'r') pass = fd:read("*a") fd:close() @@ -176,7 +176,7 @@ function get_pwd_victor() end function get_pwd_sanchayan() - local cmd = "gpg --use-agent --quiet --batch --decrypt ~/.sanchayan.gpg" + local cmd = "gpg2 --use-agent --quiet --batch --decrypt ~/.sanchayan.gpg" local fd = io.popen(cmd, 'r') pass = fd:read("*a") fd:close() diff --git a/msmtprc b/msmtprc index 4e88500..46bb2ce 100644 --- a/msmtprc +++ b/msmtprc @@ -5,25 +5,25 @@ port 587 protocol smtp auth on tls on -tls_trust_file /etc/ssl/certs/ca-certificates.crt +tls_trust_file /etc/ssl/certs/ca-bundle.crt account Sanchayan host smtp.gmail.com from maitysanchayan@gmail.com user maitysanchayan@gmail.com -passwordeval "gpg --use-agent --batch --quiet --no-greeting --no-tty --for-your-eyes-only --homedir /home/sanchayan/.gnupg --decrypt ~/.sanchayan.gpg" +passwordeval "gpg2 --use-agent --batch --quiet --no-greeting --no-tty --for-your-eyes-only --homedir /home/sanchayan/.gnupg --decrypt ~/.sanchayan.gpg" account Victor host smtp.gmail.com from victorascroft@gmail.com user victorascroft@gmail.com -passwordeval "gpg --use-agent --batch --quiet --no-greeting --no-tty --for-your-eyes-only --homedir /home/sanchayan/.gnupg --decrypt ~/.victor.gpg" +passwordeval "gpg2 --use-agent --batch --quiet --no-greeting --no-tty --for-your-eyes-only --homedir /home/sanchayan/.gnupg --decrypt ~/.victor.gpg" account Toradex host smtp.office365.com from sanchayan.maity@toradex.com user sanchayan.maity@toradex.com -passwordeval "gpg --use-agent --batch --quiet --no-greeting --no-tty --for-your-eyes-only --homedir /home/sanchayan/.gnupg --decrypt ~/.toradex.gpg" +passwordeval "gpg2 --use-agent --batch --quiet --no-greeting --no-tty --for-your-eyes-only --homedir /home/sanchayan/.gnupg --decrypt ~/.toradex.gpg" # Set a default account account default : Sanchayan diff --git a/mutt/muttrc b/mutt/muttrc index 42620fb..3e1fdfd 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -48,14 +48,11 @@ macro index 'c' '?^K=' set send_charset="us-ascii:utf-8" set send_charset="utf-8" -set editor="nano" +set editor="emacsclient -t" set date_format="%y-%m-%d %T" set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s" -folder-hook *[sS]ent* 'set index_format="%2C | %Z [%d] %-30.30t (%-4.4c) %s"' -folder-hook ! *[sS]ent* 'set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s"' - set sleep_time = 0 set mailcap_path = ~/.mutt/mailcap @@ -81,4 +78,3 @@ set header_cache=~/Mail/mutt_cache/ # a much faster opening of mailboxes... macro index D "+/ACCOUNT/[Gmail].Trash" "Move message to the trash" -source /etc/Muttrc.gpg.dist diff --git a/offlineimap.py b/offlineimap.py index 7aaa4dc..c0cc499 100644 --- a/offlineimap.py +++ b/offlineimap.py @@ -1,10 +1,12 @@ +#!/usr/bin/python3 import subprocess +import sys def mailpasswd(account): path = "/home/sanchayan/.%s.gpg" % account - args = ["gpg", "--use-agent", "--quiet", "--batch", "-d", path] + args = ["gpg2", "--use-agent", "--quiet", "--batch", "-d", path] try: - return subprocess.check_output(["gpg", "--batch", "-d", path]).strip() + return subprocess.check_output(["gpg2", "--batch", "-d", path]).strip() except subprocess.CalledProcessError: return "" diff --git a/offlineimaprc b/offlineimaprc index 8c6890e..d238f46 100644 --- a/offlineimaprc +++ b/offlineimaprc @@ -35,7 +35,7 @@ type = Gmail remoteuser = maitysanchayan@gmail.com remotepasseval = mailpasswd("sanchayan") realdelete = yes -sslcacertfile = /etc/ssl/certs/ca-certificates.crt +sslcacertfile = /etc/ssl/certs/ca-bundle.crt folderfilter = lambda foldername: foldername not in ['[Gmail]/All Mail','[Gmail]/Trash'] [Repository Victor-Remote] @@ -43,7 +43,7 @@ type = Gmail remoteuser = victorascroft@gmail.com remotepasseval = mailpasswd("victor") realdelete = yes -sslcacertfile = /etc/ssl/certs/ca-certificates.crt +sslcacertfile = /etc/ssl/certs/ca-bundle.crt folderfilter = lambda foldername: foldername not in ['[Gmail]/All Mail', '[Gmail]/Trash'] [Repository Toradex-Remote] @@ -52,7 +52,7 @@ remotehost = outlook.office365.com remoteuser = sanchayan.maity@toradex.com remotepasseval = mailpasswd("toradex") realdelete = yes -sslcacertfile = /etc/ssl/certs/ca-certificates.crt +sslcacertfile = /etc/ssl/certs/ca-bundle.crt folderfilter = lambda folder: folder in ['INBOX', 'Sent'] postsynchook = notmuch new diff --git a/spacemacs b/spacemacs index f3cdf08..0dade4c 100644 --- a/spacemacs +++ b/spacemacs @@ -18,6 +18,7 @@ values." ;; of a list then all discovered layers will be installed. dotspacemacs-configuration-layers '( + shell-scripts python asm ;; ---------------------------------------------------------------- @@ -37,7 +38,7 @@ values." ;; syntax-checking ;; version-control c-c++ - clojure + rust haskell gtags latex @@ -84,19 +85,19 @@ values." ;; List of themes, the first of the list is loaded when spacemacs starts. ;; Press T n to cycle to the next theme in the list (works great ;; with 2 themes variants, one dark and one light) - dotspacemacs-themes '(spacemacs-dark + dotspacemacs-themes '(monokai + spacemacs-dark spacemacs-light solarized-light solarized-dark - monokai leuven zenburn) ;; If non nil the cursor color matches the state color. dotspacemacs-colorize-cursor-according-to-state t ;; Default font. `powerline-scale' allows to quickly tweak the mode-line ;; size to make separators look not too crappy. - dotspacemacs-default-font '("Source Code Pro" - :size 13 + dotspacemacs-default-font '("Cantarell" + :size 16 :weight normal :width normal :powerline-scale 1.1)