diff --git a/Makefile b/Makefile index 6e134dc..a867b15 100644 --- a/Makefile +++ b/Makefile @@ -78,9 +78,9 @@ bash: profile bashrc bash_aliases bash_logout @# Prevent running the pattern rule .PHONY: -zsh: profile zprofile zshrc oh-my-zsh/themes/lsambuc.zsh-theme +zsh: profile zprofile zshrc oh-my-zsh/themes/sambuc.zsh-theme @# Prevent running the pattern rule -oh-my-zsh/themes/lsambuc.zsh-theme: oh-my-zsh/themes/dir +oh-my-zsh/themes/sambuc.zsh-theme: oh-my-zsh/themes/dir .PHONY: omz: diff --git a/_Xdefaults b/_Xdefaults index f082efc..0a1eb33 100644 --- a/_Xdefaults +++ b/_Xdefaults @@ -1,11 +1,12 @@ !Clickable links: URxvt.perl-ext-common: default,matcher -URxvt.url-launcher: /usr/bin/epiphany +URxvt.url-launcher: /usr/bin/firefox URxvt.colorUL: #4682B4 URxvt.matcher.button: 1 -!For use in ssh connexion to minix hosts +!For use in ssh connexion to remote hosts URxvt*termName: rxvt-256color + !Urgent hint so that I get red borders in i3 XTerm*bellIsUrgent: true @@ -21,7 +22,7 @@ Rxvt*scrollBar: false XTerm*background: black XTerm*foreground: grey XTerm*renderFont: true -XTerm*faceName: xft:Droid Sans Mono for Powerline:12 +XTerm*faceName: xft:jetbrainsmono nerd font mono:size=14 XTerm*scrollBar: false !black diff --git a/_config/i3/config b/_config/i3/config index 71a6a68..5a07481 100644 --- a/_config/i3/config +++ b/_config/i3/config @@ -19,7 +19,7 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 floating_modifier $mod # start a terminal -bindsym $mod+Return exec terminal +bindsym $mod+Return exec urxvt # kill focused window bindsym $mod+Shift+Q kill @@ -27,8 +27,9 @@ bindsym $mod+Shift+Q kill # start dmenu (a program launcher) bindsym $mod+d exec dmenu_run -# Lock screen -bindsym $mod+Mod1+del exec xscreensaver-command -lock +# Lock screen +bindsym $mod+Mod1+l exec xscreensaver-command -lock +#bindsym $mod+Mod1+l exec i3lock -c cccccc -i ~/Pictures/bg.png # change focus bindsym $mod+j focus left @@ -93,16 +94,28 @@ bindsym $mod+9 workspace 9 bindsym $mod+0 workspace 10 # move focused container to workspace -bindsym $mod+Shift+plus move workspace 1 -bindsym $mod+Shift+quotedbl move workspace 2 -bindsym $mod+Shift+asterisk move workspace 3 -bindsym $mod+Shift+ccedilla move workspace 4 +# fr_CH layout +#bindsym $mod+Shift+plus move workspace 1 +#bindsym $mod+Shift+quotedbl move workspace 2 +#bindsym $mod+Shift+asterisk move workspace 3 +#bindsym $mod+Shift+ccedilla move workspace 4 +#bindsym $mod+Shift+percent move workspace 5 +#bindsym $mod+Shift+ampersand move workspace 6 +#bindsym $mod+Shift+slash move workspace 7 +#bindsym $mod+Shift+parenleft move workspace 8 +#bindsym $mod+Shift+parenright move workspace 9 +#bindsym $mod+Shift+equal move workspace 10 +# us_en Layout +bindsym $mod+Shift+exclam move workspace 1 +bindsym $mod+Shift+at move workspace 2 +bindsym $mod+Shift+numbersign move workspace 3 +bindsym $mod+Shift+dollar move workspace 4 bindsym $mod+Shift+percent move workspace 5 -bindsym $mod+Shift+ampersand move workspace 6 -bindsym $mod+Shift+slash move workspace 7 -bindsym $mod+Shift+parenleft move workspace 8 -bindsym $mod+Shift+parenright move workspace 9 -bindsym $mod+Shift+equal move workspace 10 +bindsym $mod+Shift+asciicircum move workspace 6 +bindsym $mod+Shift+ampersand move workspace 7 +bindsym $mod+Shift+asterisk move workspace 8 +bindsym $mod+Shift+parenleft move workspace 9 +bindsym $mod+Shift+parenright move workspace 10 # reload the configuration file bindsym $mod+Shift+C reload @@ -153,14 +166,19 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) -exec xscreensaver -exec eval $(cat ~/.fehbg) -#exec i3status | i3bar --dock=top --font '-misc-liberation mono-medium-r-*-*-*-*-*-*-*-*-iso8859-*' +exec xscreensaver -no-splash +exec alsactl restore +exec sh ~/.fehbg + +#If you have several keyboard layout, to enable switching between them +#exec setxkbmap -option 'grp:menu_toggle' 'us,ch(fr)' + bar { status_command i3status - position top + position top workspace_buttons yes - font -misc-liberation mono-medium-r-*-*-*-*-*-*-*-*-iso8859-* + #font -misc-liberation mono-medium-r-*-*-*-*-*-*-*-*-iso8859-* + font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 colors { background #333333 diff --git a/_config/tmux/tmux.conf b/_config/tmux/tmux.conf index 8b90f0d..872c43a 100644 --- a/_config/tmux/tmux.conf +++ b/_config/tmux/tmux.conf @@ -1,123 +1,17 @@ -set -g default-terminal "screen-256color" -set -g status-utf8 on +#set -g default-terminal "screen-255color" -bind M source-file ~/.tmux/mac.session -bind L source-file ~/.tmux/linux.session +set -g terminal-overrides 'xterm*:smcup@:rmcup@' -# set -g terminal-overrides 'xterm*:smcup@:rmcup@' +# Highlight pane with activity +setw -g monitor-activity on # THEME -set -g status-bg black -set -g status-fg white +set -g status-bg white +set -g status-fg black set -g status-left-length 30 set -g status-right-length 60 -set -g status-left ' #[default]' -set -g status-right '#[fg=colour235]Inbox: #[fg=yellow]#(ls ~/Mails/INBOX/new | wc -l | tr -d " ")#[fg=colour235]/#(ls ~/Mails/INBOX/cur ~/Mails/INBOX/new | wc -l | tr -d " ") | Bugzilla: #[fg=yellow]#(ls ~/Mails/bugzilla/new | wc -l | tr -d " ")#[fg=colour235]/#(ls ~/Mails/bugzilla/cur ~/Mails/bugzilla/new| wc -l | tr -d " ") | ml: #[fg=yellow]#(ls ~/Mails/lists/new | wc -l | tr -d " ")#[fg=colour235]/#(ls ~/Mails/lists/cur ~/Mails/lists/new | wc -l | tr -d " ")#[default] #[fg=colour198]%H:%M#[default]' +set -g status-left '#[fg=black] [#S] #[default]' +set -g status-right '#[fg=black]%H:%M#[default] ' -setw -g window-status-format '#[fg=colour235]#I #[fg=white]#W#[default] ' -#FIXME: I want to be able to use: ⮁ -setw -g window-status-current-format '#[bg=white,fg=black]⮀ #W #[bg=black,fg=white]⮀' - -######################### SCREEN BINDINGS ###################### - -# $Id: screen-keys.conf,v 1.7 2010/07/31 11:39:13 nicm Exp $ -# -# By Nicholas Marriott. Public domain. -# -# This configuration file binds many of the common GNU screen key bindings to -# appropriate tmux key bindings. Note that for some key bindings there is no -# tmux analogue and also that this set omits binding some commands available in -# tmux but not in screen. -# -# Note this is only a selection of key bindings and they are in addition to the -# normal tmux key bindings. This is intended as an example not as to be used -# as-is. - -# Set the prefix to ^A. -unbind C-b -set -g prefix ^A -bind a send-prefix - -# Bind appropriate commands similar to screen. -# lockscreen ^X x -unbind ^X -bind ^X lock-server -unbind x -bind x lock-server - -# screen ^C c -unbind ^C -bind ^C new-window -bind c new-window - -# detach ^D d -unbind ^D -bind ^D detach - -# displays * -unbind * -bind * list-clients - -# next ^@ ^N sp n -unbind ^@ -bind ^@ next-window -unbind ^N -bind ^N next-window -unbind " " -bind " " next-window -unbind n -bind n next-window - -# title A -unbind A -bind A command-prompt "rename-window %%" - -# other ^A -unbind ^A -bind ^A last-window - -# prev ^H ^P p ^? -unbind ^H -bind ^H previous-window -unbind ^P -bind ^P previous-window -unbind p -bind p previous-window -unbind BSpace -bind BSpace previous-window - -# windows ^W w -unbind ^W -bind ^W list-windows -unbind w -bind w list-windows - -# quit \ -unbind \ -bind \ confirm-before "kill-server" - -# kill K k -unbind K -bind K confirm-before "kill-window" -unbind k -bind k confirm-before "kill-window" - -# redisplay ^L l -unbind ^L -bind ^L refresh-client -unbind l -bind l refresh-client - -# split -v | -unbind | -bind | split-window - -# :kB: focus up -unbind Tab -bind Tab select-pane -t:.+ -unbind BTab -bind BTab select-pane -t:.- - -# " windowlist -b -unbind '"' -bind '"' choose-window +setw -g window-status-format '#[fg=blue]#I#[fg=black]:#W#[default]' +setw -g window-status-current-format '#[bg=black,fg=white]#I:#W#[default]' diff --git a/_oh-my-zsh/themes/lsambuc.zsh-theme b/_oh-my-zsh/themes/sambuc.zsh-theme similarity index 100% rename from _oh-my-zsh/themes/lsambuc.zsh-theme rename to _oh-my-zsh/themes/sambuc.zsh-theme diff --git a/_profile b/_profile index a0bbbc6..1d66906 100644 --- a/_profile +++ b/_profile @@ -36,3 +36,7 @@ if [ -f "${HOME}/.cargo/env" ]; then . "$HOME/.cargo/env" fi +# Set language to English, UTF-8 +export LC_ALL=en_US.UTF-8 +export LC_CTYPE=en_US.UTF-8 +export LANG=en_US.UTF-8 diff --git a/_vimrc b/_vimrc index 82145b8..f1d666a 100644 --- a/_vimrc +++ b/_vimrc @@ -1,6 +1,7 @@ " " PLUGINS IMPORT """""""""""""""""""""""""""""""""""""""""""""""""""""" +set nocompatible " be iMproved, required filetype off set rtp+=~/.vim/bundle/vundle/ call vundle#rc() @@ -21,13 +22,14 @@ filetype plugin indent on " " GLOBALS """""""""""""""""""""""""""""""""""""""""""""""""""""" +filetype plugin indent on +colorscheme elflord +syntax on + let mapleader="," set t_Co=256 -colorscheme elflord set gfn=terminus set go= - -syntax on set encoding=utf-8 set hidden set showcmd @@ -51,7 +53,6 @@ set list set listchars=tab:>.,trail:.,extends:#,nbsp:. set ttyfast set mouse= -set nocompatible "set backup "set backupdir=~/.vim_backup "set noswapfile @@ -60,7 +61,6 @@ set laststatus=2 "set expandtab set softtabstop=8 tabstop=8 shiftwidth=4 set ruler -set nocompatible " " KEYBINDINGS @@ -84,16 +84,10 @@ let g:CommandTMaxHeight = 12 " " SPECIFIC CONFIGURATION """""""""""""""""""""""""""""""""""""""""""""""""""""" -" Insert date. -iab xdate =strftime("%Y/%m/%d %H:%M:%S") -" What's my name? -iab xname Lionel Sambuc +autocmd BufNewFile,BufRead *.md set filetype=markdown -" Acronyme -iab xac (LSU) - -" Default printk -iab xpk printk("(LSU) %s:%i:%s ## %s\n", __FILE__, __LINE__, __func__, "msg"); +" Case sensitive search and replace by default +set noic " Enable folding by indentation " Use: zc, zo, zC, zO, zR, zM diff --git a/_xinitrc b/_xinitrc index 9227557..4efd955 100644 --- a/_xinitrc +++ b/_xinitrc @@ -4,7 +4,6 @@ # # Executed by startx (run your window manager from here) -# Qingy does not source profile... [ -f /etc/profile ] && . /etc/profile if [ -d /etc/X11/xinit/xinitrc.d ]; then @@ -14,10 +13,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then unset f fi -# exec gnome-session -# exec startkde -# exec startxfce4 - # ...or the Window Manager of your choice #exec ck-launch-session dbus-launch --exit-with-session startxfce4 -exec ck-launch-session ssh-agent dbus-launch --exit-with-session i3 --force-xinerama +exec ck-launch-session ssh-agent dbus-launch --exit-with-session i3 --force-xinerama diff --git a/_zshrc b/_zshrc index fc39a0d..3a99ddf 100644 --- a/_zshrc +++ b/_zshrc @@ -11,7 +11,7 @@ export ZSH="$HOME/.oh-my-zsh" ZSH_THEME="robbyrussell" ZSH_THEME="clean" #all info, nice color, time on the right ZSH_THEME="gnzh" # two liner, nice arrow -ZSH_THEME="lsambuc" # one liner, fixed path, time, hostname +ZSH_THEME="sambuc" # one liner, fixed path, time, hostname # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load