diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/emacs/init.el | 2 | ||||
| -rw-r--r-- | .config/emacs/org/config.org | 138 | ||||
| -rw-r--r-- | .config/fish/alias.fish | 8 | ||||
| -rw-r--r-- | .config/fish/config.fish | 7 | ||||
| -rw-r--r-- | .config/nvim/init.vim | 2 | ||||
| -rw-r--r-- | .config/vim/vimrc | 6 | ||||
| -rw-r--r-- | .config/x11/xinitrc | 3 | ||||
| -rw-r--r-- | .config/x11/xresources | 3 |
8 files changed, 29 insertions, 140 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 49c9f30..79b9924 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -36,7 +36,7 @@ '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95")) '(objed-cursor-color "#ff5370") '(package-selected-packages - '(cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode vterm symon toc-org evil-org org-bullets yaml-mode twittering-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key golden-ratio dmenu mingus lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-mu4e evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe mu4e-alert web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode)) + '(cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode vterm symon toc-org evil-org org-bullets yaml-mode twittering-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key golden-ratio dmenu mingus lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode)) '(pdf-view-midnight-colors (cons "#EEFFFF" "#292D3E")) '(pos-tip-background-color "#2E2A29") '(pos-tip-foreground-color "#d4d4d6") diff --git a/.config/emacs/org/config.org b/.config/emacs/org/config.org index 2438bc6..7d15587 100644 --- a/.config/emacs/org/config.org +++ b/.config/emacs/org/config.org @@ -36,8 +36,6 @@ (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/")) (add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/1")) -(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e") -(autoload 'mu4e "mu4e" "Launch mu4e and show the main window" t) (add-to-list 'load-path "/home/jozan/.config/emacs/sunrise-commander/") (autoload 'sunrise "sunrise.el" "qweqwe" t) (add-to-list 'load-path "/home/jozan/.config/emacs/font-lock+") @@ -122,7 +120,6 @@ (setq evil-want-C-u-scroll t) (require 'evil) (require 'evil-magit) -(require 'evil-mu4e) ;; (require 'evil-collection) (evil-mode t) ;; (evil-collection-init) @@ -251,141 +248,6 @@ ;; golden-ratio-wide-adjust-factor .9) #+END_SRC -*** mu4e -#+BEGIN_SRC emacs-lisp -(require 'org-mime) -(require 'mu4e) - -(setq mu4e-maildir (expand-file-name "/home/jozan/Maildir")) - -(setq mu4e-get-mail-command "/usr/local/bin/mbsync -c /home/jozan/.config/emacs/mu4e/.mbsyncrc -a") -(setq mu4e-update-interval 300) -(setq mu4e-index-update-in-background t) -(setq mu4e-headers-auto-update t) -(setq mu4e-index-update-error-warning t) -(setq mu4e-compose-signature-auto-include nil) -(setq mu4e-compose-format-flowed t) -(setq mu4e-view-prefer-html t) -(add-to-list 'mu4e-view-actions - '("ViewInBrowser" . mu4e-action-view-in-browser) t) - -;; enable inline images -(setq mu4e-view-show-images t) - -;; use imagemagick, if available -(when (fboundp 'imagemagick-register-types) - (imagemagick-register-types)) - -;; every new email composition gets its own frame! -(setq mu4e-compose-in-new-frame t) - -;; don't save message to Sent Messages, IMAP takes care of this -(setq mu4e-sent-messages-behavior 'delete) - -(add-hook 'mu4e-view-mode-hook #'visual-line-mode) - -;; <tab> to navigate to links, <RET> to open them in browser -(add-hook 'mu4e-view-mode-hook - (lambda() - ;; try to emulate some of the eww key-bindings - (local-set-key (kbd "<RET>") 'mu4e~view-browse-url-from-binding) - (local-set-key (kbd "<tab>") 'shr-next-link) - (local-set-key (kbd "<backtab>") 'shr-previous-link))) - -;; from https://www.reddit.com/r/emacs/comments/bfsck6/mu4e_for_dummies/elgoumx -(add-hook 'mu4e-headers-mode-hook - (defun my/mu4e-change-headers () - (interactive) - (setq mu4e-headers-fields - `((:human-date . 25) ;; alternatively, use :date - (:flags . 6) - (:from . 22) - (:thread-subject . ,(- (window-body-width) 70)) ;; alternatively, use :subject - (:size . 7))))) - -;; spell check -(add-hook 'mu4e-compose-mode-hook - (defun my-do-compose-stuff () - "My settings for message composition." - (visual-line-mode) - (org-mu4e-compose-org-mode) - (use-hard-newlines -1) - (flyspell-mode))) - -(require 'smtpmail) - -;;rename files when moving -;;NEEDED FOR MBSYNC -(setq mu4e-change-filenames-when-moving t) - -;;set up queue for offline email -;;use mu mkdir ~/Maildir/acc/queue to set up first -(setq smtpmail-queue-mail nil) ;; start in normal mode - -;;from the info manual -(setq mu4e-attachment-dir "/home/jozan/Downloads") - -(setq message-kill-buffer-on-exit t) -(setq mu4e-compose-dont-reply-to-self t) -(setq mu4e-completing-read-function 'completing-read) - -;; (require 'org-mu4e) - -;; convert org mode to HTML automatically -;; (setq org-mu4e-convert-to-html t) - -;;from vxlabs config -;; show full addresses in view message (instead of just names) -;; toggle per name with M-RET -(setq mu4e-view-show-addresses 't) - -;; don't ask when quitting -(setq mu4e-confirm-quit nil) - -;; mu4e-context -(setq mu4e-context-policy 'pick-first) -(setq mu4e-compose-context-policy 'always-ask) -(setq mu4e-contexts - (list - (make-mu4e-context - :name "work" ;;for acc1-gmail - :enter-func (lambda () (mu4e-message "Entering context work")) - :leave-func (lambda () (mu4e-message "Leaving context work")) - :match-func (lambda (msg) - (when msg - (mu4e-message-contact-field-matches - msg '(:from :to :cc :bcc) "bousset.rudy@gmail.com"))) - :vars '((user-mail-address . "bousset.rudy@gmail.com") - (user-full-name . "Rudy Bousset") - (mu4e-sent-folder . "/acc1-gmail/[acc1].Sent Mail") - (mu4e-drafts-folder . "/acc1-gmail/[acc1].drafts") - (mu4e-trash-folder . "/acc1-gmail/[acc1].Trash") - (mu4e-compose-signature . (concat "Formal Signature\n" " ")) - (mu4e-compose-format-flowed . t) - (smtpmail-queue-dir . "~/Maildir/acc1-gmail/queue/cur") - ;; (message-send-mail-function . smtpmail-send-it) - (smtpmail-smtp-user . "bousset.rudy") - ;; (smtpmail-starttls-credentials . (("smtp.gmail.com" 587 nil nil))) - ;; (smtpmail-auth-credentials . (expand-file-name "~/.authinfo.gpg")) - (smtpmail-default-smtp-server . "smtp.gmail.com") - (smtpmail-smtp-server . "smtp.gmail.com") - (smtpmail-smtp-service . 587) - (smtpmail-debug-info . t) - (smtpmail-debug-verbose . t) - (mu4e-maildir-shortcuts . ( ("/acc1-gmail/INBOX" . ?i) - ("/acc1-gmail/[acc1].Sent Mail" . ?s) - ("/acc1-gmail/[acc1].Trash" . ?t) - ("/acc1-gmail/[acc1].All Mail" . ?a) - ("/acc1-gmail/[acc1].Starred" . ?r) - ("/acc1-gmail/[acc1].drafts" . ?d) - )))))) - -(require 'mu4e-alert) -(mu4e-alert-set-default-style 'libnotify) -(add-hook 'after-init-hook #'mu4e-alert-enable-notifications) -(add-hook 'after-init-hook #'mu4e-alert-enable-mode-line-display) -#+END_SRC - *** w3m #+BEGIN_SRC emacs-lisp (require 'w3m-load) diff --git a/.config/fish/alias.fish b/.config/fish/alias.fish index 9e09ee3..a262b50 100644 --- a/.config/fish/alias.fish +++ b/.config/fish/alias.fish @@ -1,3 +1,10 @@ +# alias.fish +# _ +# | | ___ ___ +# _ | |/ _ \ / _ \ +# | |_| | (_) | __/ +# \___/ \___/ \___| + alias ls='exa -l' alias c='clear' alias less='less --tabs 4' @@ -52,3 +59,4 @@ alias calcurse="calcurse -C $XDG_CONFIG_HOME/calcurse -D $XDG_DATA_HOME/calcurse alias abook="abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook" alias dosbox="dosbox -conf $XDG_CONFIG_HOME/dosbox/dosbox.conf" alias svn="svn --config-dir "$XDG_CONFIG_HOME"/subversion" +alias gpg2="gpg2 --homedir "$XDG_DATA_HOME"/gnupg" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index ef37ebf..f653708 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,3 +1,10 @@ +# config.fish +# _ +# | | ___ ___ +# _ | |/ _ \ / _ \ +# | |_| | (_) | __/ +# \___/ \___/ \___| + export LESS_TERMCAP_mb=(printf '\e[1;31m') export LESS_TERMCAP_md=(printf '\e[1;31m') export LESS_TERMCAP_me=(printf '\e[0m') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 00c792b..a9f2d7f 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,4 +1,4 @@ -" init.vim 4.0 by Joe +" init.vim " _ " | | ___ ___ " _ | |/ _ \ / _ \ diff --git a/.config/vim/vimrc b/.config/vim/vimrc new file mode 100644 index 0000000..445d015 --- /dev/null +++ b/.config/vim/vimrc @@ -0,0 +1,6 @@ +set undodir=$XDG_DATA_HOME/vim/undo +set directory=$XDG_DATA_HOME/vim/swap +set backupdir=$XDG_DATA_HOME/vim/backup +set viewdir=$XDG_DATA_HOME/vim/view +set viminfo+='1000,n$XDG_DATA_HOME/vim/viminfo +set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc new file mode 100644 index 0000000..f411a66 --- /dev/null +++ b/.config/x11/xinitrc @@ -0,0 +1,3 @@ +xrdb ~/.config/x11/xresources +source ~/.profile +dbus-launch bspwm diff --git a/.config/x11/xresources b/.config/x11/xresources new file mode 100644 index 0000000..3475eb8 --- /dev/null +++ b/.config/x11/xresources @@ -0,0 +1,3 @@ +Xcursor.theme: redglass +Xcursor.size: 18 +Sxiv.background: #1d2021 |