grimoire

commit 9496b84e5510f1cbcc417302f4c972c0cd9549a9
parent 99542bb2879de19f1ca000f8de884ed3477cfbaf
Author: pyratebeard <root@pyratebeard.net>
Date:   Wed, 20 Feb 2019 23:42:07 +0000

Merge remote-tracking branch 'refs/remotes/origin/master'

Diffstat:
M
Home.md
 | 
3
++-
A
misc/comic_wishlist.md
 | 
3
+++
D
misc/naming_schemes.md
 | 
29
-----------------------------
A
misc/pyratenet.md
 | 
37
+++++++++++++++++++++++++++++++++++++
A
technology/linux/general/ffmpeg.md
 | 
6
++++++
M
technology/linux/general/index.md
 | 
3
+++
A
technology/linux/general/keymaps.md
 | 
12
++++++++++++
A
technology/linux/general/rsync.md
 | 
6
++++++

8 files changed, 69 insertions(+), 30 deletions(-)
diff --git a/Home.md b/Home.md
@@ -32,8 +32,9 @@
 - [dragon_heist](d_and_d/dragon_heist)
 
 ## misc
+- [comic_wishlist](misc/comic_wishlist)
 - [music](misc/music)
-- [naming_schemes](misc/naming_schemes)
+- [pyratenet](misc/pyratenet)
 - [unicode_characters](misc/unicode_characters)
  
 ## projects
diff --git a/misc/comic_wishlist.md b/misc/comic_wishlist.md
@@ -0,0 +1,3 @@
+# comic wishlist
+
+- suicide squard #23 - first appearance of oracle
diff --git a/misc/naming_schemes.md b/misc/naming_schemes.md
@@ -1,29 +0,0 @@
-# pyratenet
-
-## servers
-| name       | device    |
-| ---        | ---       |
-| woodlawm   | media     |
-| warehouse  | ftp       |
-| severnaya  | web       |
-| metacortex | git       |
-| mordhaus   | powerzone |
-
-## devices
-| name     | device        |
-| ---      | ---           |
-| gilfoyle | pc            |
-| grady    | mobile        |
-| hardison | laptop        |
-| kaludis  | pi            |
-| nedry    | laptop (work) |
-
-/etc/issue-pyratenet
-```
- 
- \\ WARNING!
- \\ You are entering a restricted area.
- \\ UNAUTHORISED ENTRY IS PROHIBITED!
- 
-```
-
diff --git a/misc/pyratenet.md b/misc/pyratenet.md
@@ -0,0 +1,37 @@
+# pyratenet
+
+## server
+| name      | device    | os     |
+| ---       | ---       | ---    |
+| mainframe | media     | fedora |
+| warehouse | ftp       | centos |
+| blacksun  | web/irc   | centos |
+| grimoire  | code/wiki | debian |
+| mordhaus  | powerzone | debian |
+
+## devices
+| name       | device | os       |
+| ---        | ---    | ---      |
+| kraken     | pc     | fedora   |
+| artoo      | mobile | android  |
+| swordphish | laptop | arch     |
+| laundry    | pi     | raspbian |
+
+`/etc/issue-pyratenet`
+```
+ // WARNING!
+ // You are entering a restricted area.
+ // UNAUTHORISED ENTRY IS PROHIBITED!
+ 
+```
+
+`/etc/profile`
+```
+if [ -t 1 ] && [ ! -f ~/.hushlogin ] ; then
+    echo
+    cat /home/pyratebeard/pyratenet
+    echo -e "\n// LOGGED IN AS $(whoami | tr 'a-z' 'A-Z')\n"
+    uptime --pretty
+    echo
+fi
+```
diff --git a/technology/linux/general/ffmpeg.md b/technology/linux/general/ffmpeg.md
@@ -0,0 +1,6 @@
+# ffmpeg
+
+### extract audio from video
+```
+ffmpeg -i input-video.mkv -q:a 0 -map a output-audio.mp3
+```
diff --git a/technology/linux/general/index.md b/technology/linux/general/index.md
@@ -4,14 +4,17 @@
 - [bash](bash)
 - [bin](bin)
 - [dmidecode](dmidecode)
+- [ffmpeg](ffmpeg)
 - [i3lock](i3lock)
 - [journalctl](journalctl)
+- [keymaps](keymaps)
 - [logrotate](logrotate)
 - [man_pages](man_pages)
 - [mpd](mpd)
 - [mpv](mpv)
 - [processes](processes)
 - [python](python)
+- [rsync](rsync)
 - [rtv](rtv)
 - [sed](sed)
 - [ssh](ssh)
diff --git a/technology/linux/general/keymaps.md b/technology/linux/general/keymaps.md
@@ -0,0 +1,12 @@
+# keymaps
+
+check keymaps
+```
+localectl status
+```
+
+changes required to load keys
+```
+vconsole.conf
+/etc/X11/xorg.conf.d/00-keyboard.conf
+```
diff --git a/technology/linux/general/rsync.md b/technology/linux/general/rsync.md
@@ -0,0 +1,6 @@
+# rsync
+
+### copy files over ssh using compression
+```
+rsync -avz -e ssh --progress pyratebeard@remote_server:/path/to/file ./local/path
+```