Merge forge.o9.re:olivier/dotfiles

vif
Olivier DOSSMANN 2020-01-31 11:56:42 +01:00
commit 20b5fdb08a
13 changed files with 234 additions and 31 deletions

View File

@ -0,0 +1,7 @@
" Affiche une colonne au caractère 80 et 120
set cc=80,120
" Coupe les lignes automatiquement
func! maconfig#after() abort
set wrap
endf

View File

@ -0,0 +1,48 @@
#=============================================================================
# dark_powered.toml --- dark powered configuration example for SpaceVim
# Copyright (c) 2016-2017 Wang Shidong & Contributors
# Author: Wang Shidong < wsdjeg at 163.com >
# URL: https://spacevim.org
# License: GPLv3
#=============================================================================
# All SpaceVim option below [option] section
[options]
# set spacevim theme. by default colorscheme layer is not loaded,
# if you want to use more colorscheme, please load the colorscheme
# layer
colorscheme = "gruvbox"
colorscheme_bg = "dark"
# Disable guicolors in basic mode, many terminal do not support 24bit
# true colors
enable_guicolors = true
# Disable statusline separator, if you want to use other value, please
# install nerd fonts
statusline_separator = "arrow"
statusline_inactive_separator = "arrow"
buffer_index_type = 4
enable_tabline_filetype_icon = true
enable_statusline_mode = false
# La colonne verticale suit le curseur
enable_cursorcolumn = 1
# colonne maximum à 80
max_column = 80
# Configuration VIM personnelle
bootstrap_after = "maconfig#after"
# Enable autocomplete layer
[[layers]]
name = 'autocomplete'
auto-completion-return-key-behavior = "complete"
auto-completion-tab-key-behavior = "smart"
[[layers]]
name = 'shell'
default_position = 'top'
default_height = 30
[[layers]]
name = "lang#javascript"
[[layers]]
name = "fzf"

View File

@ -0,0 +1,25 @@
[rc]
use_copy=true
use_primary=true
synchronize=false
automatic_paste=false
show_indexes=false
save_uris=true
use_rmb_menu=false
save_history=true
history_limit=25
items_menu=20
statics_show=false
statics_items=10
hyperlinks_only=false
confirm_clear=false
single_line=true
reverse_history=false
item_length=50
ellipsize=2
history_key=<Ctrl><Alt>H
actions_key=<Ctrl><Alt>A
menu_key=<Ctrl><Alt>P
search_key=<Ctrl><Alt>F
offline_key=<Ctrl><Alt>O
offline_mode=false

View File

@ -190,8 +190,18 @@ bindsym XF86AudioMute exec pactl set-sink-mute $sink toggle # mute sound
bindsym XF86MonBrightnessUp exec xbacklight -inc 5 # increase screen brightness
bindsym XF86MonBrightnessDown exec xbacklight -dec 5 # decrease screen brightness
# Player controls (via MPRIS, in example mpv-mpris)
# play/pause
bindsym XF86AudioPlay exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause"
# next file/music/movie
bindsym XF86AudioNext exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next"
# previous file/music/movie
bindsym XF86AudioPrev exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous"
# stop file/music/movie
bindsym XF86AudioStop exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Stop"
# Lock screen
bindsym $mod+l exec xscreensaver-command --lock
bindsym $mod+l exec i3lock -bfte -i ~/.config/i3/matrix-elements-design.png
# Print screen
bindsym Print exec --no-startup-id scrot '%Y-%m-%d-%s_screenshot_$wx$h.jpg' -e 'mv $f ~/Images/'
@ -203,8 +213,8 @@ bindsym XF86Sleep exec systemctl suspend
## STARTUP PROGRAMS
###
# Transparency (need compton)
exec_always --no-startup-id "killall compton; compton"
# Transparency (need picom)
exec_always --no-startup-id "killall picom; picom -b"
# DBUS daemon (needed for keyboard applet and more I think)
#exec --no-startup-id /usr/lib/gnome-settings-daemon/gnome-settings-daemon
@ -213,13 +223,7 @@ exec_always --no-startup-id "killall compton; compton"
exec --no-startup-id redshift -l 48.666977:7.706748
# Lock screen
exec_always --no-startup-id xscreensaver # if not launched via systemd or xinitrc
# XFCE panel instead of i3status
#exec --no-startup-id xfce4-panel --disable-wm-check
# Time tracking
#exec --no-startup-id hamster-indicator
exec --no-startup-id xautolock -locker "i3lock -bfte -i ~/.config/i3/matrix-elements-design.png" -corners "--00" -cornersize 30
# Default terminal
exec --no-startup-id i3-sensible-terminal
@ -235,9 +239,6 @@ smart_gaps on
# https://github.com/blankoworld/dotfiles/blob/master/bin/random_wallpaper)
exec_always --no-startup-id "kill -9 `ps aux | grep random_wallpaper |grep -v 'grep'| awk '{print $2}'`; random_wallpaper &"
# Network management
# exec --no-startup-id nm-applet
# Hasmter indicator
exec --no-startup-id hamster

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 MiB

View File

@ -0,0 +1 @@
/usr/lib/mpv/mpris.so

View File

@ -335,6 +335,11 @@ type = internal/temperature
thermal-zone = 0
warn-temperature = 60
; Full path of temperature sysfs path
; Use `sensors` to find preferred temperature source, then run
; $ for i in /sys/class/hwmon/hwmon*/temp*_input; do echo "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*})) $(readlink -f $i)"; done
; to find path to desired file
; Default reverts to thermal zone setting
hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input
;format = <ramp> <label>
@ -375,7 +380,7 @@ menu-0-1-exec = menu-open-2
menu-1-0 = annuler
menu-1-0-exec = menu-open-0
menu-1-1 = redémarrer
menu-1-1-exec = systemctl reboot
menu-1-1-exec = shutdown -r 0
menu-2-0 = arrêt
menu-2-0-exec = systemctl poweroff

81
.ssh/config 100644
View File

@ -0,0 +1,81 @@
# Baloo (accès externe)
Host maison
Hostname olivier.o9.re
User alarm
Port 4555
Host maison2
Hostname 192.168.1.220
User od
Port 22
ProxyJump maison
Host maison3
Hostname 192.168.1.68
User od
Port 22
ProxyJump maison
# Baloo (accès interne)
Host lime baloo
Hostname 192.168.1.210
User alarm
Port 22
# Production (accès externe)
Host ovh
Hostname 37.187.17.29
User od
Port 22
# ??
Host pi
Hostname 192.168.1.200
User pi
Port 22
# EOST (CNRS, Strasbourg)
Host eost
Hostname 130.79.9.144
User olivier
Port 22
# Test
Host sam
Hostname 192.168.1.220
User od
Port 22
# Liseuse remarKable
Host remarkable
Hostname 10.11.99.1
User root
Port 22
# WeirdOS (accès externe)
Host yuno
Hostname 89.234.141.125
User root
Port 22
# Perso
Host zou
Hostname 192.168.1.68
User root
Port 22
# Groupe Open (entreprise)
Host mercure
Hostname 94.23.38.188
User root
Port 22
Host isengard
Hostname 94.23.33.120
User root
Port 22
Host baccus
Hostname 10.10.4.20
User root
Port 22

View File

@ -40,12 +40,12 @@ setw -g mode-keys vi
# set some pretty colors
# ----------------------
# set pane colors - hilight the active pane
set-option -g pane-border-fg colour235 #base02
set-option -g pane-active-border-fg colour240 #base01
set-option -g pane-border-style fg=colour235 #base02
set-option -g pane-active-border-style fg=colour240 #base01
# colorize messages in the command line
set-option -g message-bg black #base02
set-option -g message-fg brightred #orange
set-option -g message-style bg=black #base02
set-option -g message-style fg=brightred #orange
# ----------------------
# Status Bar
@ -63,16 +63,16 @@ set -g visual-activity on
# set color for status bar
set-option -g status-bg colour235 #base02
set-option -g status-fg yellow #yellow
set-option -g status-attr dim
set-option -g status-style "dim"
# set window list colors - red for active and cyan for inactive
set-window-option -g window-status-fg default
set-window-option -g window-status-bg colour236
set-window-option -g window-status-attr dim
set-window-option -g window-status-style fg=default
set-window-option -g window-status-style bg=colour236
set-window-option -g window-status-style dim
set-window-option -g window-status-current-fg brightred #orange
set-window-option -g window-status-current-bg colour236
set-window-option -g window-status-current-attr bright
set-window-option -g window-status-current-style fg=brightred #orange
set-window-option -g window-status-current-style bg=colour236
set-window-option -g window-status-current-style bright
# status bar
#set -g status-right "#[fg=blue]#S #I:#P #[fg=yellow]:: %d %b %Y #[fg=green]:: %l:%M %p :: #(date -u | awk '{print $4}')::"

View File

@ -1,5 +1,5 @@
typeset -U PATH path
path=("$HOME/.local/bin" "$HOME/bin" "$path[@]")
path=("$HOME/.local/bin" "$HOME/bin" "/opt/sublime_merge" "$path[@]")
export PATH
# Autocomplètement supplémentaire (Docker)

16
.zshrc
View File

@ -68,7 +68,11 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
<<<<<<< HEAD
plugins=(git httpie ng npm nvm pass pip pyenv sudo virtualenvwrapper wd)
=======
plugins=(git httpie ng npm nvm pass pip pyenv sudo wd)
>>>>>>> 3be7111b37ae91585798c3e046fc8cf9f9cceb0e
source $ZSH/oh-my-zsh.sh
@ -83,8 +87,8 @@ export BROWSER=elinks
export SSH_ASKPASS=qt4-ssh-askpass
export AUTEUR="Olivier DOSSMANN"
export DEFAULT_USER="od"
export WORKON_HOME=~/.virtualenvs
source /usr/bin/virtualenvwrapper.sh
export PYTHONWARNINGS="ignore::DeprecationWarning"
export FLASK_SKIP_DOTENV=1
# You may need to manually set your language environment
export LANG=fr_FR.UTF-8
@ -111,6 +115,8 @@ setopt transient_rprompt
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
alias e="${EDITOR}"
alias r="${EDITOR} -R"
alias sm="sublime_merge"
alias vi="${EDITOR}"
alias mem='free -mt'
alias df='df -hT'
@ -159,12 +165,16 @@ if [ ! $SSH_AGENT_PID ]; then
fi;
fi;
# Launch nvm possibilities (for javascript environment)
# Desktop specificities for development
case $HOST in
lueur | baloo | sam)
:
;;
*)
# nvm (for JS environment)
source /usr/share/nvm/init-nvm.sh
# Virtualenv (for Python development)
export WORKON_HOME=~/.virtualenvs
source /usr/bin/virtualenvwrapper.sh
;;
esac

View File

@ -24,12 +24,37 @@ Les autres fois :
```bash
git clone --bare gitea@forge.o9.re:olivier/dotfiles.git $HOME/.dotfiles
alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
dotfiles config --local status.showUntrackedFiles no
dotfiles checkout
source ~/.zshrc
```
Ce qui relance zsh pour rendre la commande `dotfiles` active !
## Après un script Ansible
Cf. https://www.atlassian.com/git/tutorials/dotfiles
Puis ssh@maMachine et :
```
function config {
/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME $@
}
mkdir -p .config-backup
config checkout
if [ $? = 0 ]; then
echo "Checked out config.";
else
echo "Backing up pre-existing dot files.";
config checkout 2>&1 | egrep "\s+\." | awk {'print $1'} | xargs -I{} mv {} .config-backup/{}
fi;
config checkout
config config status.showUntrackedFiles no
```
Ensuite on supprime les fichiers/dossiers listés puis on fait : `config checkout`.
## Description
Quelques fichiers de configuration possibles pour des outils quotidiens tels que :
@ -57,6 +82,7 @@ Sont nécessaires :
* kitty + ttf-fira-code (AUR) pour les fontes avec ligatures
* mlocate
* most
* i3lock pour le verrouillage de l'écran
* i3wm-gaps
* redshift
* ripgrep
@ -65,7 +91,6 @@ Sont nécessaires :
* ttf-dejavu
* vim + neovim
* vim-airline + powerline-fonts (pour VIM)
* xscreensaver
* zsh + oh-my-zsh (Cf. https://github.com/robbyrussell/oh-my-zsh) + powerlevel10k (Cf. https://github.com/romkatv/powerlevel10k#oh-my-zsh)
## Cas de ZSH
@ -91,7 +116,7 @@ Dépendances :
* feh
* i3-gaps (à la place d'i3)
* rofi (pour le menu de lancement)
* compton (pour la transparence et les ombres des fenêtres)
* picom (pour la transparence et les ombres des fenêtres)
* polybar (à la place de la barre d'état)
* ttf-font-awesome-4 (pour afficher des icônes dans la barre d'état)
* (optionnel) network-manager-applet (pour la configuration wifi)