commit 7b327b22e3555f637729badce7f81f624fdd360f
parent c4a16cfbfcad70b60c3b03901a2ea60cf817cf87
Author: Ashymad <czilukim@o2.pl>
Date: Sat, 9 Dec 2017 22:59:54 +0100
some commit
Diffstat:
4 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/.extend.Xresources b/.Xresources
diff --git a/.bashrc b/.bashrc
@@ -0,0 +1,39 @@
+#
+# ~/.bashrc
+#
+
+[[ $- != *i* ]] && return
+
+[ -x /usr/bin/fish ] && [ -z "$FISH_RAMP_DISABLE" ] && exec fish
+
+colors() {
+ local fgc bgc vals seq0
+
+ printf "Color escapes are %s\n" '\e[${value};...;${value}m'
+ printf "Values 30..37 are \e[33mforeground colors\e[m\n"
+ printf "Values 40..47 are \e[43mbackground colors\e[m\n"
+ printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n"
+
+ # foreground colors
+ for fgc in {30..37}; do
+ # background colors
+ for bgc in {40..47}; do
+ fgc=${fgc#37} # white
+ bgc=${bgc#40} # black
+
+ vals="${fgc:+$fgc;}${bgc}"
+ vals=${vals%%;}
+
+ seq0="${vals:+\e[${vals}m}"
+ printf " %-9s" "${seq0:-(default)}"
+ printf " ${seq0}TEXT\e[m"
+ printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m"
+ done
+ echo; echo
+ done
+}
+
+[[ -f ~/.extend.bashrc ]] && . ~/.extend.bashrc
+
+[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
@@ -2,4 +2,6 @@
alias ec "emacsclient -a \"\""
alias fcd 'cd (fd -I -L -d 8 -t d . ~ | fzf)'
+alias bash 'env FISH_RAMP_DISABLE=1 bash'
+alias psgr 'ps aux | grep'
diff --git a/.emacs b/.emacs
@@ -8,11 +8,13 @@
(require 'package)
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
-(setq load-path (cons "/usr/share/emacs/site-lisp/ess" load-path))
-(require 'ess-site)
+(require 'paradox)
+(paradox-enable)
+
+(require 'poly-R)
+(add-to-list 'auto-mode-alist '("\\.Rnw" . poly-noweb+r-mode))
-(load "auctex.el" nil t t)
-(load "preview-latex.el" nil t t)
+(require 'ess-site)
(add-to-list 'load-path "~/.emacs.d/evil")
(require 'evil)
@@ -60,7 +62,9 @@
'(ansi-color-names-vector
["#242424" "#e5786d" "#95e454" "#cae682" "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"])
'(custom-enabled-themes (quote (tsdh-dark)))
- '(package-selected-packages (quote (evil ## polymode paradox)))
+ '(package-selected-packages
+ (quote
+ (async auctex ess evil-magit magit evil ## polymode paradox)))
'(tool-bar-mode nil))
(custom-set-faces
;; custom-set-faces was added by Custom.