From cdda1bd20dc1dae98db5dd82d0f42bd9632337f5 Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Tue, 30 Jun 2020 22:47:29 +0300 Subject: [PATCH 1/2] git: --ff by default --- etc/soft/git/gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etc/soft/git/gitconfig b/etc/soft/git/gitconfig index 494f2d4..7195480 100644 --- a/etc/soft/git/gitconfig +++ b/etc/soft/git/gitconfig @@ -17,6 +17,9 @@ [color] ui = true +[pull] + ff = only + [merge] tool = vimdiff From 66723b4bb6e4ed9f0d573e1fb4bb0b4d40a06d21 Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Wed, 1 Jul 2020 23:07:49 +0300 Subject: [PATCH 2/2] vifm: view openssl certificates --- etc/soft/vifm/filetypes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/etc/soft/vifm/filetypes b/etc/soft/vifm/filetypes index 293b1e6..e5aafe6 100644 --- a/etc/soft/vifm/filetypes +++ b/etc/soft/vifm/filetypes @@ -85,6 +85,14 @@ fileviewer *.iso isoinfo -l -i %c " Табулатуры fileviewer *.gp,*.gp3,*.gp4,*.gp5 gptinfo %c +" Сертификаты +" crt +fileviewer *.crt openssl x509 -text -noout -in %c | bat --color=always --paging=never --theme=GitHub -n -l yaml +" csr +fileviewer *.csr openssl req -text -noout -verify -in %c | bat --color=always --paging=never --theme=GitHub -n -l yaml +" key +fileviewer *.key,*.pem openssl rsa -check -in %c | bat --color=always --paging=never --theme=GitHub -n -l yaml + " Монтирование ssh filetype *.ssh FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR