Ranger works properly w/ +e now, i3 floating steam, rifle file types, M-/ is comment region, added my ledger-stuff and emacs is now the default editor overall

clean_emacs
Tuan-Dat Tran 2018-04-29 23:13:10 +02:00
parent c2b78bff38
commit 271a3121e3
No known key found for this signature in database
GPG Key ID: 0DA1B0B23302CA72
11 changed files with 313 additions and 32 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ emacs/.emacs.d/*
config/.scripts/playstate config/.scripts/playstate
!emacs/.emacs.d/snippets* !emacs/.emacs.d/snippets*
!emacs/.emacs.d/config.org !emacs/.emacs.d/config.org
!emacs/.emacs.d/ledger.org

View File

@ -25,16 +25,8 @@ new_window none
new_float normal new_float normal
hide_edge_borders none hide_edge_borders none
################################################################################################
## sound-section - DO NOT EDIT if you wish to automatically upgrade Alsa -> Pulseaudio later! ##
################################################################################################
exec --no-startup-id volumeicon exec --no-startup-id volumeicon
bindsym $mod+Ctrl+m exec termite -e 'alsamixer' bindsym $mod+Ctrl+m exec termite -e 'alsamixer'
#exec --no-startup-id pulseaudio
#exec --no-startup-id pa-applet
#bindsym $mod+Ctrl+m exec pavucontrol
################################################################################################ ################################################################################################
###################################### Workspace Settings ###################################### ###################################### Workspace Settings ######################################
@ -102,6 +94,23 @@ for_window [title="KeePassX$"] floating enable border normal
# switch to workspace with urgent window automatically # switch to workspace with urgent window automatically
for_window [urgent=latest] focus for_window [urgent=latest] focus
# https://github.com/z3ntu/dotfiles/blob/master/i3/.config/i3/config
# Steam
for_window [class="^Steam$" title="^Friends$"] floating enable
for_window [class="^Steam$" title="Steam - News"] floating enable
for_window [class="^Steam$" title=".* - Chat"] floating enable
for_window [class="^Steam$" title="^Settings$"] floating enable
for_window [class="^Steam$" title=".* - event started"] floating enable
for_window [class="^Steam$" title=".* CD key"] floating enable
for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable
for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable
for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable
for_window [title="^Steam Keyboard$"] floating enable
# Jetbrains
for_window [class="^com-intellij-updater-Runner$" title="^Update$"] floating enable
for_window [instance="^sun-awt-X11-XDialogPeer$" title="^Complete Installation$"] floating enable
############################################################################### ###############################################################################
############################ Startup Applications ############################# ############################ Startup Applications #############################
############################################################################### ###############################################################################
@ -143,7 +152,7 @@ bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle
# Application Shortcuts # Application Shortcuts
bindsym $mod+b exec env GTK_THEME=Materia:light waterfox bindsym $mod+b exec env GTK_THEME=Materia:light waterfox
bindsym $mod+e exec termite -e ranger bindsym $mod+e exec source ~/.zshrc && termite -e 'ranger'
bindsym $mod+m exec thunderbird bindsym $mod+m exec thunderbird
bindsym Print exec --no-startup-id scrot bindsym Print exec --no-startup-id scrot

View File

@ -1,5 +1,2 @@
set preview_images true set preview_images true
set vcs_aware true set vcs_aware true
EDITOR='emacsclient -nw'
DEFAULT_EDITOR='emacsclient -nw'

View File

@ -0,0 +1,227 @@
# vim: ft=cfg
#
# This is the configuration file of "rifle", ranger's file executor/opener.
# Each line consists of conditions and a command. For each line the conditions
# are checked and if they are met, the respective command is run.
#
# Syntax:
# <condition1> , <condition2> , ... = command
#
# The command can contain these environment variables:
# $1-$9 | The n-th selected file
# $@ | All selected files
#
# If you use the special command "ask", rifle will ask you what program to run.
#
# Prefixing a condition with "!" will negate its result.
# These conditions are currently supported:
# match <regexp> | The regexp matches $1
# ext <regexp> | The regexp matches the extension of $1
# mime <regexp> | The regexp matches the mime type of $1
# name <regexp> | The regexp matches the basename of $1
# path <regexp> | The regexp matches the absolute path of $1
# has <program> | The program is installed (i.e. located in $PATH)
# env <variable> | The environment variable "variable" is non-empty
# file | $1 is a file
# directory | $1 is a directory
# number <n> | change the number of this command to n
# terminal | stdin, stderr and stdout are connected to a terminal
# X | $DISPLAY is not empty (i.e. Xorg runs)
#
# There are also pseudo-conditions which have a "side effect":
# flag <flags> | Change how the program is run. See below.
# label <label> | Assign a label or name to the command so it can
# | be started with :open_with <label> in ranger
# | or `rifle -p <label>` in the standalone executable.
# else | Always true.
#
# Flags are single characters which slightly transform the command:
# f | Fork the program, make it run in the background.
# | New command = setsid $command >& /dev/null &
# r | Execute the command with root permissions
# | New command = sudo $command
# t | Run the program in a new terminal. If $TERMCMD is not defined,
# | rifle will attempt to extract it from $TERM.
# | New command = $TERMCMD -e $command
# Note: The "New command" serves only as an illustration, the exact
# implementation may differ.
# 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.
#-------------------------------------------
# Websites
#-------------------------------------------
# Rarely installed browsers get higher priority; It is assumed that if you
# install a rare browser, you probably use it. Firefox/konqueror/w3m on the
# other hand are often only installed as fallback browsers.
ext x?html?, has waterfox, X, flag f = waterfox -- "$@"
ext x?html?, has surf, X, flag f = surf -- file://"$1"
ext x?html?, has qutebrowser, X, flag f = qutebrowser -- "$@"
ext x?html?, has dwb, X, flag f = dwb -- "$@"
ext x?html?, has jumanji, X, flag f = jumanji -- "$@"
ext x?html?, has luakit, X, flag f = luakit -- "$@"
ext x?html?, has uzbl, X, flag f = uzbl -- "$@"
ext x?html?, has uzbl-tabbed, X, flag f = uzbl-tabbed -- "$@"
ext x?html?, has uzbl-browser, X, flag f = uzbl-browser -- "$@"
ext x?html?, has uzbl-core, X, flag f = uzbl-core -- "$@"
ext x?html?, has midori, X, flag f = midori -- "$@"
ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
ext x?html?, has chromium, X, flag f = chromium -- "$@"
ext x?html?, has google-chrome, X, flag f = google-chrome -- "$@"
ext x?html?, has opera, X, flag f = opera -- "$@"
ext x?html?, has firefox, X, flag f = firefox -- "$@"
ext x?html?, has seamonkey, X, flag f = seamonkey -- "$@"
ext x?html?, has iceweasel, X, flag f = iceweasel -- "$@"
ext x?html?, has epiphany, X, flag f = epiphany -- "$@"
ext x?html?, has konqueror, X, flag f = konqueror -- "$@"
ext x?html?, has elinks, terminal = elinks "$@"
ext x?html?, has links2, terminal = links2 "$@"
ext x?html?, has links, terminal = links "$@"
ext x?html?, has lynx, terminal = lynx -- "$@"
ext x?html?, has w3m, terminal = w3m "$@"
#-------------------------------------------
# Misc
#-------------------------------------------
# Define the "editor" for text files as first action
mime ^text, label editor = ${VISUAL:-$EDITOR} -- "$@"
mime ^text, label pager = "$PAGER" -- "$@"
!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php = ${VISUAL:-$EDITOR} -- "$@"
!mime ^text, label pager, ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
ext org = $EDITOR -- "$@"
ext 1 = man "$1"
ext s[wmf]c, has zsnes, X = zsnes "$1"
ext s[wmf]c, has snes9x-gtk,X = snes9x-gtk "$1"
ext nes, has fceux, X = fceux "$1"
ext exe = wine "$1"
name ^[mM]akefile$ = make
#--------------------------------------------
# Code
#-------------------------------------------
ext py = python -- "$1"
ext pl = perl -- "$1"
ext rb = ruby -- "$1"
ext js = node -- "$1"
ext sh = sh -- "$1"
ext php = php -- "$1"
#--------------------------------------------
# Audio without X
#-------------------------------------------
mime ^audio|ogg$, terminal, has mpv = mpv -- "$@"
mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@"
mime ^audio|ogg$, terminal, has mplayer = mplayer -- "$@"
ext midi?, terminal, has wildmidi = wildmidi -- "$@"
#--------------------------------------------
# Video/Audio with a GUI
#-------------------------------------------
mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@"
mime ^video|audio, has smplayer, X, flag f = smplayer "$@"
mime ^video, has mpv, X, flag f = mpv -- "$@"
mime ^video, has mpv, X, flag f = mpv --fs -- "$@"
mime ^video, has mplayer2, X, flag f = mplayer2 -- "$@"
mime ^video, has mplayer2, X, flag f = mplayer2 -fs -- "$@"
mime ^video, has mplayer, X, flag f = mplayer -- "$@"
mime ^video, has mplayer, X, flag f = mplayer -fs -- "$@"
mime ^video|audio, has vlc, X, flag f = vlc -- "$@"
mime ^video|audio, has totem, X, flag f = totem -- "$@"
mime ^video|audio, has totem, X, flag f = totem --fullscreen -- "$@"
#--------------------------------------------
# Video without X:
#-------------------------------------------
mime ^video, terminal, !X, has mpv = mpv -- "$@"
mime ^video, terminal, !X, has mplayer2 = mplayer2 -- "$@"
mime ^video, terminal, !X, has mplayer = mplayer -- "$@"
#-------------------------------------------
# Documents
#-------------------------------------------
ext pdf, has llpp, X, flag f = llpp "$@"
ext pdf, has zathura, X, flag f = zathura -- "$@"
ext pdf, has mupdf, X, flag f = mupdf "$@"
ext pdf, has mupdf-x11,X, flag f = mupdf-x11 "$@"
ext pdf, has apvlv, X, flag f = apvlv -- "$@"
ext pdf, has xpdf, X, flag f = xpdf -- "$@"
ext pdf, has evince, X, flag f = evince -- "$@"
ext pdf, has atril, X, flag f = atril -- "$@"
ext pdf, has okular, X, flag f = okular -- "$@"
ext pdf, has epdfview, X, flag f = epdfview -- "$@"
ext pdf, has qpdfview, X, flag f = qpdfview "$@"
ext pdf, has open, X, flat f = open "$@"
ext docx?, has catdoc, terminal = catdoc -- "$@" | "$PAGER"
ext sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric, X, flag f = gnumeric -- "$@"
ext sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread, X, flag f = kspread -- "$@"
ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has soffice, X, flag f = soffice "$@"
ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has ooffice, X, flag f = ooffice "$@"
ext djvu, has zathura,X, flag f = zathura -- "$@"
ext djvu, has evince, X, flag f = evince -- "$@"
ext djvu, has atril, X, flag f = atril -- "$@"
ext epub, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
ext mobi, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
#-------------------------------------------
# Image Viewing:
#-------------------------------------------
mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
mime ^image/svg, has display, X, flag f = display -- "$@"
mime ^image, has pqiv, X, flag f = pqiv -- "$@"
mime ^image, has sxiv, X, flag f = sxiv -- "$@"
mime ^image, has feh, X, flag f = feh -- "$@"
mime ^image, has mirage, X, flag f = mirage -- "$@"
mime ^image, has ristretto, X, flag f = ristretto "$@"
mime ^image, has eog, X, flag f = eog -- "$@"
mime ^image, has eom, X, flag f = eom -- "$@"
mime ^image, has nomacs, X, flag f = nomacs -- "$@"
mime ^image, has geeqie, X, flag f = geeqie -- "$@"
mime ^image, has gimp, X, flag f = gimp -- "$@"
ext xcf, X, flag f = gimp -- "$@"
#-------------------------------------------
# Archives
#-------------------------------------------
# avoid password prompt by providing empty password
ext 7z, has 7z = 7z -p l "$@" | "$PAGER"
# This requires atool
ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has atool = atool --list --each -- "$@" | "$PAGER"
ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each -- "$@" | "$PAGER"
ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has atool = atool --extract --each -- "$@"
ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each -- "$@"
# Listing and extracting archives without atool:
ext tar|gz|bz2|xz, has tar = tar vvtf "$1" | "$PAGER"
ext tar|gz|bz2|xz, has tar = for file in "$@"; do tar vvxf "$file"; done
ext bz2, has bzip2 = for file in "$@"; do bzip2 -dk "$file"; done
ext zip, has unzip = unzip -l "$1" | less
ext zip, has unzip = for file in "$@"; do unzip -d "${file%.*}" "$file"; done
ext ace, has unace = unace l "$1" | less
ext ace, has unace = for file in "$@"; do unace e "$file"; done
ext rar, has unrar = unrar l "$1" | less
ext rar, has unrar = for file in "$@"; do unrar x "$file"; done
#-------------------------------------------
# Misc
#-------------------------------------------
label wallpaper, number 11, mime ^image, has feh, X = feh --bg-scale "$1"
label wallpaper, number 12, mime ^image, has feh, X = feh --bg-tile "$1"
label wallpaper, number 13, mime ^image, has feh, X = feh --bg-center "$1"
label wallpaper, number 14, mime ^image, has feh, X = feh --bg-fill "$1"
# Define the editor for non-text files + pager as last action
!mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = ask
label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = ${VISUAL:-$EDITOR} -- "$@"
label pager, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
# The very last action, so that it's never triggered accidentally, is to execute a program:
mime application/x-executable = "$1"

View File

@ -0,0 +1 @@
0

View File

@ -1 +0,0 @@
0

View File

@ -55,6 +55,7 @@ A list of installed packages and details about them.
(use-package powerline) (use-package powerline)
(use-package php-mode) (use-package php-mode)
(use-package visual-regexp) (use-package visual-regexp)
(use-package nasm-mode)
#+END_SRC #+END_SRC
* Appearance * Appearance
Using the [[https://github.com/cpaulik/emacs-material-theme][Material]]-Theme. Using the [[https://github.com/cpaulik/emacs-material-theme][Material]]-Theme.
@ -83,8 +84,11 @@ Powerline for Emacs
Save auto-save files in ~/.emacs-save Save auto-save files in ~/.emacs-save
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(f-mkdir "~/.emacs-saves") (f-mkdir "~/.emacs-saves")
(setq backup-directory-alist
'((".*" . "~/.emacs-saves/")))
(setq auto-save-file-name-transforms (setq auto-save-file-name-transforms
'((".*" "~/.emacs-saves/" t))) '((".*" "~/.emacs-saves/" t)))
#+END_SRC #+END_SRC
* Functions * Functions
@ -190,6 +194,15 @@ Using Anaconda-mode as default python development mode
(add-hook 'python-mode-hook 'anaconda-mode) (add-hook 'python-mode-hook 'anaconda-mode)
(add-hook 'python-mode-hook 'anaconda-eldoc-mode) (add-hook 'python-mode-hook 'anaconda-eldoc-mode)
#+END_SRC #+END_SRC
** Java
#+BEGIN_SRC emacs-lisp
(add-hook
'java-mode-hook
(lambda()
(local-set-key (kbd "C-c C-c") #'smart-compile)
(local-set-key (kbd "C-c /") #'comment-region)))
#+END_SRC
** C++ ** C++
My exec doesnt quite work yet. My exec doesnt quite work yet.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -209,6 +222,11 @@ My exec doesnt quite work yet.
(local-set-key (kbd "C-c /") #'comment-region))) (local-set-key (kbd "C-c /") #'comment-region)))
#+END_SRC #+END_SRC
** NASM
#+BEGIN_SRC emacs-lisp
(add-to-list 'auto-mode-alist '("\\.\\(asm\\|s\\)$" . nasm-mode))
#+END_SRC
** LaTeX ** LaTeX
Some default settings for LaTeX-Mode. Some default settings for LaTeX-Mode.
AucTeX is needed. AucTeX is needed.
@ -269,6 +287,7 @@ Enabled languages:
(emacs-lisp . t) (emacs-lisp . t)
(C . t) (C . t)
(gnuplot . t) (gnuplot . t)
(latex . t)
)) ))
#+END_SRC #+END_SRC
@ -298,6 +317,10 @@ Globaly highlight the current line in a slightly darker shade of grey.
(yas-global-mode 1) (yas-global-mode 1)
#+END_SRC #+END_SRC
** Ledger
#+BEGIN_SRC emacs-lisp
(org-babel-load-file "~/.emacs.d/ledger.org")
#+END_SRC
** Personal Global ** Personal Global
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defvar my-keys-minor-mode-map (defvar my-keys-minor-mode-map
@ -308,6 +331,7 @@ Globaly highlight the current line in a slightly darker shade of grey.
(define-key map (kbd "C-c M-y") 'paste-from-xclipboard) (define-key map (kbd "C-c M-y") 'paste-from-xclipboard)
(define-key map (kbd "C-c w") 'copy-word) (define-key map (kbd "C-c w") 'copy-word)
(define-key map (kbd "C-c r") 'vr/query-replace) (define-key map (kbd "C-c r") 'vr/query-replace)
(define-key map (kbd "M-/") 'comment-region)
map) map)
"my-keys-minor-mode keymap.") "my-keys-minor-mode keymap.")
@ -323,4 +347,3 @@ Globaly highlight the current line in a slightly darker shade of grey.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(add-hook 'conf-mode 'rainbow-mode) (add-hook 'conf-mode 'rainbow-mode)
#+END_SRC #+END_SRC

13
emacs/.emacs.d/ledger.org Normal file
View File

@ -0,0 +1,13 @@
#+BEGIN_SRC emacs-lisp
(custom-set-variables
'(ledger-reports
(quote
(("schulden" "ledger -f /home/tuan/Nextcloud/orgs/Budget/MyBudget.ledger bal ^Schulden")
("acclist" "ledger -f /home/tuan/Nextcloud/orgs/Budget/MyBudget.ledger accounts")
("spendable" "%(binary) -f %(ledger-file) reg Girokonto$ Brieftasche$")
("monthly" "%(binary) -f %(ledger-file) -M --period-sort \"amount\" reg ^Ausgaben")
("bal" "%(binary) -f %(ledger-file) bal")
("reg" "%(binary) -f %(ledger-file) reg")
("payee" "%(binary) -f %(ledger-file) reg @%(payee)")
("account" "%(binary) -f %(ledger-file) reg %(account)")))))
#+END_SRC

View File

@ -0,0 +1,6 @@
# -*- mode: snippet -*-
# name: transitions
# key: tran
# --
S_{$1}\rightarrow{}S_{$2}
$0

View File

@ -1,6 +1,5 @@
snippets:~/.emacs.d/snippets snippets:~/.emacs.d/snippets
dotfiles:~/.dotfiles dotfiles:~/.dotfiles
PyrSniff:~/workspace/Python/PyrSniff
Uni:~/Nextcloud/Uni/Studium Uni:~/Nextcloud/Uni/Studium
Studium:~/Nextcloud/Uni/Studium Studium:~/Nextcloud/Uni/Studium

View File

@ -1,4 +1,4 @@
export ZSH=~/.oh-my-zsh export ZSH=$HOME/.oh-my-zsh
plugins=( plugins=(
git git
@ -30,21 +30,27 @@ POWERLEVEL9K_TIME_FORMAT="%D{%H:%M:%S}"
alias df="df -h" alias df="df -h"
alias mkvirtenv="python -m virtualenv --system-site-packages" alias mkvirtenv="python -m virtualenv --system-site-packages"
alias e="emacsclient -t" alias e="emacsclient -t"
alias ek="pkill emacs"
alias ed="emacs --daemon" alias ed="emacs --daemon"
alias nyan="nyancat" alias nyan="nyancat"
alias rm="rm -i" alias rm="rm -i"
alias -s tex=e alias -s tex=e
alias -s cpp=e alias -s cpp=e
alias org="e ~/Nextcloud/orgs/man.org" alias -s org=e
alias diff="diff -s" alias diff="diff -s"
alias budget="e ~/Nextcloud/orgs/Budget/MyBudget.ledger" alias budget="e $HOME/Nextcloud/orgs/Budget/MyBudget.ledger"
alias q="exit" alias q="exit"
alias ranger='ranger --choosedir=$HOME/.rangerdir; LASTDIR=`cat $HOME/.rangerdir`; cd "$LASTDIR"'
alias steam='steam -silent %U'
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
# Variables # Variables
export TERM="xterm-256color" # in case you are using urxvt, to bypass an error during sshing export TERM="xterm-256color" # in case you are using urxvt, to bypass an error during sshing
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
export LC_ALL=en_GB.UTF-8 export LC_ALL=en_GB.UTF-8
PATH=$PATH:~/.local/bin PATH=$PATH:$HOME/.local/bin:/usr/lib/jvm/java-10-openjdk/bin
export EDITOR='emacsclient -nw' export EDITOR='emacsclient -t'
export DEFAULT_EDITOR='emacsclient -nw' export DEFAULT_EDITOR='emacsclient -t'
export VISUAL='emacsclient -ct'
export VISUAL_EDITOR='emacsclient -ct'
export STEAM_FRAME_FORCE_CLOSE=1