commit 532bb665e6f08990b2c6b1884c5c4f9aff11170d
parent 6fec2a190a1bb36e9551e947b1aa5cee9c13d7f4
Author: oscarbenedito <oscar@obenedito.org>
Date: Fri, 22 Nov 2019 21:40:22 +0100
Fixed backup alias and added i3 configuration file
Diffstat:
4 files changed, 202 insertions(+), 14 deletions(-)
diff --git a/.chezmoiignore b/.chezmoiignore
@@ -4,6 +4,7 @@ markion.sh
markion.py
*.md
.scripts/*.md
+.*/*/*.md
{{ if not .website -}}
.scripts
{{- end }}
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ dot_bash_aliases.tmpl
dot_gitconfig.tmpl
dot_scripts/executable_tmux-website.sh
dot_scripts/executable_deploy-website.sh.tmpl
+dot_config/i3/config
diff --git a/dot_bash_aliases.tmpl.md b/dot_bash_aliases.tmpl.md
@@ -7,6 +7,11 @@ chezmoi() {
}
```
+Changing the `clear` command.
+``` file dot_bash_aliases.tmpl
+alias clear="printf '\033c'"
+```
+
Alias to update the system, diferent for Debian or Arch.
``` file dot_bash_aliases.tmpl
alias upgrade="
@@ -21,30 +26,57 @@ alias upgrade="
If backup is enabled in the `chezmoi` data, create backup alias, excluding the files specified in the `chezmoi` data. First is the complete backup alias:
``` file dot_bash_aliases.tmpl
{{- if .backup }}
-alias backup="rsync -gloptruzvP --delete --exclude={
+alias backup_all="rsync -gloptruzvP --delete --no-group --exclude={
{{- range $i, $dir := .backup.backup_exclude }}
{{- if $i -}}
,
{{- end -}}
"{{ $dir }}"
{{- end -}}
-} {{ .chezmoi.homedir }}/ /media/oscar/OSCAR/.{{ .backup.backup_dir }}/"
+} {{ .chezmoi.homedir }}/ /media/$USER/OSCAR/.{{ .backup.backup_dir }}/"
```
-And secondly the smaller backup, with extra excluded directories. I back it up on a USB drive so I encrypted with VeraCrypt (as I carry my USB around, I wouldn't want my personal data to be in plain text in case I lost it). This alias assumes that you have mounted the VeraCrypt device on the 10th slot.
-``` file dot_bash_aliases.tmpl
-alias backup_vc_10="rsync -gloptruzvP --delete --exclude={
- {{- range $i, $dir := .backup.backup_exclude }}
- {{- if $i -}}
- ,
- {{- end -}}
- "{{ $dir }}"
- {{- end -}}
- {{ range $dir := .backup.small_backup_exclude -}}
- ,"{{ $dir }}"
+And secondly the smaller backup, with extra excluded directories. I back it up on a USB drive so I encrypted with VeraCrypt (as I carry my USB around, I wouldn't want my personal data to be in plain text in case I lost it). It will back it up to two VeraCrypt volumes (as the backup takes up more than 4GiB and the USB where I do it is formated with a FAT filesystem). First of all, we mount the VeraCrypt volumes:
+``` block mount-backup-vc
+veracrypt --mount /media/$USER/Oscar/Varis/copia-gris.hc --slot="10"
+veracrypt --mount /media/$USER/Oscar/Varis/copia-gris-git.hc --slot="11"
+```
+Then we back up all the data:
+``` block rsync-small-backup
+rsync -gloptruzvP --delete --exclude={"/Git",
+{{- range $i, $dir := .backup.backup_exclude }}
+ {{- if $i -}}
+ ,
{{- end -}}
-} {{ .chezmoi.homedir }}/ /media/veracrypt10/{{ .backup.backup_dir }}/"
+ "{{ $dir }}"
+{{- end -}}
+{{ range $dir := .backup.small_backup_exclude -}}
+ ,"{{ $dir }}"
+{{- end -}}
+} {{ .chezmoi.homedir }}/ /media/veracrypt10/{{ .backup.backup_dir }}/
{{- end }}
+rsync -gloptruzvP --delete {{ .chezmoi.homedir }}/Git/ /media/veracrypt11/{{ .backup.backup_dir }}/
+```
+
+And finally we unmount the volumes.
+``` block unmount-backup-vc
+veracrypt --dismount /media/$USER/Oscar/Varis/copia-gris.hc
+veracrypt --dismount /media/$USER/Oscar/Varis/copia-gris-git.hc
+```
+
+So the alias will be:
+``` file dot_bash_aliases.tmpl
+backup_vc_10_11() {
+ [[ include mount-backup-vc ]]
+ [[ include rsync-small-backup ]]
+ [[ include unmount-backup-vc ]]
+}
+```
+
+### USB Backups
+The following alias is used when backing up my USB drive.
+``` file dot_bash_aliases.tmpl
+alias backup_usb="rsync -gloptruzvP --delete --exclude={"/Varis/copia-gris.hc","/Varis/copia-gris-git.hc"} /media/$USER/Oscar/ {{ .chezmoi.homedir }}/USB/"
```
## Website
diff --git a/dot_config/i3/config.md b/dot_config/i3/config.md
@@ -0,0 +1,154 @@
+# File `i3/config`
+
+See <https://i3wm.org/docs/userguide.html> for a complete reference.
+
+This file is under construction, for now the only changes to the default configuration are the "left", "down", "up", "right" letters are changed to the default vim ones (`h`, `j`, `k`, `l`).
+
+
+``` file config
+set $mod Mod4
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+font pango:monospace 8
+
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
+
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+bindsym $mod+Return exec i3-sensible-terminal
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec dmenu_run
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+b split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2
+bindsym $mod+Shift+3 move container to workspace 3
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+bindsym $mod+Shift+0 move container to workspace 10
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+ # These bindings trigger as soon as you enter the resize mode
+
+ # Pressing left will shrink the window’s width.
+ # Pressing right will grow the window’s width.
+ # Pressing up will shrink the window’s height.
+ # Pressing down will grow the window’s height.
+ bindsym h resize shrink width 10 px or 10 ppt
+ bindsym j resize grow height 10 px or 10 ppt
+ bindsym k resize shrink height 10 px or 10 ppt
+ bindsym l resize grow width 10 px or 10 ppt
+
+ # same bindings, but for the arrow keys
+ bindsym Left resize shrink width 10 px or 10 ppt
+ bindsym Down resize grow height 10 px or 10 ppt
+ bindsym Up resize shrink height 10 px or 10 ppt
+ bindsym Right resize grow width 10 px or 10 ppt
+
+ # back to normal: Enter or Escape
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+ status_command i3status
+}
+```
