Merge branch 'master' of gitlab.com:mmk2410/dotfiles

emacs/emacs.el

@@ -1402,8 +1402,7 @@ signature-file is the path to the file which contains the signature."
 
 ;; spaceline
 ;; Powerline theme from Spacemacs
-(use-package spaceline
+(use-package spaceline)
-  :init (spaceline-emacs-theme))
 
 ;; fancy-battery
 ;; Fancy battery display
@@ -1411,6 +1410,14 @@ signature-file is the path to the file which contains the signature."
   :after spaceline
   :init (fancy-battery-mode))
 
+;; spaceline-all-the-icons
+;; A Spaceline Mode Line theme using All The Icons
+(use-package spaceline-all-the-icons
+  :after fancy-battery
+  :config
+  (spaceline-all-the-icons-theme)
+  (spaceline-toggle-all-the-icons-battery-status-on))
+
 ;; Doom theme
 ;; https://github.com/hlissner/emacs-doom-themes
 (use-package doom-themes

shells/bashrc

@@ -88,9 +88,11 @@ alias vim='nvim'
 alias mmk2410='cat /home/mmk/.mmk2410'
 
 # If SSH Client is active, show text "ssh-session"
-if [ -n "$SSH_CLIENT" ]; then text=" ssh-session"
+if [ -n "$SSH_CLIENT" ]; then text="(ssh-session) "
+elif [ -n "$SCHROOT_CHROOT_NAME" ]; then text="($SCHROOT_CHROOT_NAME) "
+else text=""
 fi
-export PS1='\[\e[1;32m\]\u@\h:\w${text}$\[\e[m\] '
+# export PS1='\[\e[1;32m\]\u@\h:\w${text}$\[\e[m\] '
 
 # Enable bash completion
 if [ -f /etc/bash_completion ]; then
@@ -98,7 +100,7 @@ if [ -f /etc/bash_completion ]; then
 fi
 
 # PS1='[\u@\h \W]\$ '
-PS1='\[\e[1;36m\]\h \[\e[1;31m\]\t \d \[\e[m\]\[\e[1;32m\]\w \[\e[m\]\n   \[\e[1;35m\]\u\[\e[1;33m\] >\[\e[m\] '
+PS1='${text}\[\e[1;36m\]\h \[\e[1;31m\]\t \d \[\e[m\]\[\e[1;32m\]\w \[\e[m\]\n   \[\e[1;35m\]\u\[\e[1;33m\] >\[\e[m\] '
 #powerline-daemon -q
 #POWERLINE_BASH_CONTINUATION=1
 #POWERLINE_BASH_SELECT=1

shells/fish/conf.d/.gitignore

@@ -0,0 +1,3 @@
+90-pure.fish
+_pure_init.fish
+pure.fish

shells/fish/conf.d/60-debian.fish

@@ -35,3 +35,13 @@ end
 if test -z $DEBEMAIL
     set -Ux DEBEMAIL "opensource@mmk2410.org"
 end
+
+# pbuilder customization
+
+set -x PDEBUILD_PBUILDER cowbuild
+set -x HOOKDIR /var/cache/pbuilder/hooks
+set -x MIRRORSITE http://httpredir.debian.org/debian/
+set -x APTCACHE /var/cache/apt/archives
+set -x BUILDRESULT ../
+set -x EXTRAPACKAGES lintian
+set -x DEBBUILDOPTS -j4

shells/fish/conf.d/pure.fish

@@ -1,70 +0,0 @@
-set --universal pure_version 2.1.1 # used for bug report
-
-# Base colors
-_pure_set_default pure_color_primary (set_color blue)
-_pure_set_default pure_color_info (set_color cyan)
-_pure_set_default pure_color_mute (set_color brblack)
-_pure_set_default pure_color_success (set_color magenta)
-_pure_set_default pure_color_normal (set_color normal)
-_pure_set_default pure_color_danger (set_color red)
-_pure_set_default pure_color_light (set_color white)
-_pure_set_default pure_color_warning (set_color yellow)
-_pure_set_default pure_color_dark (set_color black)
-
-# Prompt
-_pure_set_default pure_symbol_prompt "❯"
-_pure_set_default pure_symbol_reverse_prompt "❮"  # used for VI mode
-_pure_set_default pure_color_prompt_on_error $pure_color_danger
-_pure_set_default pure_color_prompt_on_success $pure_color_success
-
-# Current Working Directory
-_pure_set_default pure_color_current_directory $pure_color_primary
-
-# Git
-_pure_set_default pure_symbol_git_unpulled_commits "⇣"
-_pure_set_default pure_symbol_git_unpushed_commits "⇡"
-_pure_set_default pure_symbol_git_dirty "*"
-_pure_set_default pure_color_git_unpulled_commits $pure_color_info
-_pure_set_default pure_color_git_unpushed_commits $pure_color_info
-_pure_set_default pure_color_git_branch $pure_color_mute
-_pure_set_default pure_color_git_dirty $pure_color_mute
-
-# SSH info
-_pure_set_default pure_color_ssh_hostname $pure_color_mute
-_pure_set_default pure_color_ssh_separator $pure_color_mute
-_pure_set_default pure_color_ssh_user_normal $pure_color_mute
-_pure_set_default pure_color_ssh_user_root $pure_color_light
-
-# Virtualenv for Pyhon
-_pure_set_default pure_color_virtualenv $pure_color_mute
-# Deactivate the default virtualenv prompt so that we can add our own
-set --global --export VIRTUAL_ENV_DISABLE_PROMPT 1
-
-# Print current working directory at the beginning of prompt
-# true (default):   current directory, git, user@hostname (ssh-only), command duration
-# false:            user@hostname (ssh-only), current directory, git, command duration
-_pure_set_default pure_begin_prompt_with_current_directory true
-
-# Show exit code of last command as a separate prompt character (cf. https://github.com/sindresorhus/pure/wiki#show-exit-code-of-last-command-as-a-separate-prompt-character)
-# false - single prompt character, default
-# true - separate prompt character
-_pure_set_default pure_separate_prompt_on_error false
-
-# Max execution time of a process before its run time is shown when it exits
-_pure_set_default pure_threshold_command_duration 5
-_pure_set_default pure_color_command_duration $pure_color_warning
-
-# Right Prompt variables
-_pure_set_default pure_right_prompt ""
-_pure_set_default pure_color_right_prompt $pure_color_normal
-
-# VI mode indicator
-# true (default):  indicate a non-insert mode by reversing the prompt symbol (❮)
-# false:           indicate vi mode with [I], [N], [V]  
-_pure_set_default pure_reverse_prompt_symbol_in_vimode true
-
-# Title
-_pure_set_default pure_symbol_title_bar_separator "—"
-
-# Whether or not is a fresh session
-set --global _pure_fresh_session true

x/Xresources

@@ -37,8 +37,8 @@ xscreensaver.passwd.thermometer.width:       8
 
 ! urxvt -------------------------------------------
 
-URxvt*font: xft:Fira Mono:medium:size=8:antialiasing=true
+URxvt*font: xft:Hermit:medium:size=8:antialiasing=true
-URxvt*boldFont: xft:Fira Mono:bold:size=8:antialiasing=true:style=medium
+URxvt*boldFont: xft:Hermit:bold:size=8:antialiasing=true:style=medium
 URxvt.letterSpace: 0
 ! Add fallback fonts as laid out in `man 1 urxvt` under "font:" in the RESOURCES section