From 521c99c0c9c90a75c715d16886a71c6fe03f66cd Mon Sep 17 00:00:00 2001 From: TuDatTr Date: Sat, 29 May 2021 21:46:59 +0200 Subject: [PATCH] Fixed i3lock, from after update --- config/.config/i3/config | 9 +++-- config/.local/share/ranger/bookmarks | 4 +- config/.scripts/i3lock.py | 36 ++++++++--------- config/.scripts/screenshot.sh | 32 ++++++++++----- config/.scripts/startup.sh | 4 +- config/.ssh/config | 28 ++++++++++++- config/.ssh/known_hosts.old | 45 +++++++++++++++++++++ emacs/.emacs.d/config.org | 5 ++- emacs/.emacs.d/snippets/org-mode/leftarrow | 2 +- emacs/.emacs.d/snippets/org-mode/rightarrow | 2 +- emacs/.emacs.d/snippets/org-mode/righttack | 2 +- zsh/.zshrc | 19 ++++++--- 12 files changed, 140 insertions(+), 48 deletions(-) create mode 100644 config/.ssh/known_hosts.old diff --git a/config/.config/i3/config b/config/.config/i3/config index 573343f..c7a07e0 100644 --- a/config/.config/i3/config +++ b/config/.config/i3/config @@ -21,7 +21,7 @@ focus_follows_mouse no # Configure # border style -new_window none +new_window pixel 1 new_float normal hide_edge_borders none @@ -97,7 +97,7 @@ for_window [title="^Steam Keyboard$"] floating enable # exec --no-startup-id setxkbmap us,de; setxkbmap -option ctrl:nocaps; setxkbmap -option grp:lalt_lshift_toggle exec --no-startup-id feh --randomize --bg-fill $HOME/Pictures/Wallpaper/* -exec --no-startup-id compton +exec --no-startup-id picom exec --no-startup-id nextcloud --background exec --no-startup-id udiskie exec --no-startup-id conky -c ~/.conky/syclo-crimson-bottomleft.conkyrc @@ -117,7 +117,8 @@ bindsym $mod+Shift+0 exec python ~/.scripts/i3lock.py bindsym $mod+Shift+s exec poweroff # start a terminal -bindsym $mod+Return exec termite +bindsym $mod+space exec termite +bindsym $mod+Return exec termite -e byobu # kill focused window bindsym $mod+Shift+q kill @@ -180,7 +181,7 @@ bindsym $mod+f fullscreen toggle bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle +# bindsym $mod+space focus mode_toggle # focus the parent container bindsym $mod+a focus parent diff --git a/config/.local/share/ranger/bookmarks b/config/.local/share/ranger/bookmarks index 9e6a36d..02ca8a9 100644 --- a/config/.local/share/ranger/bookmarks +++ b/config/.local/share/ranger/bookmarks @@ -1,4 +1,4 @@ -u:/home/tuan/Documents/Uni/Studium/2020&2021 Wintersemseter +u:/home/tuan/Documents/Uni/Studium/2021 Sommersemester p:/home/tuan/Documents/Protokolle/FSE o:/home/tuan/.dotfiles/config m:/run/media @@ -9,5 +9,5 @@ t:/home/tuan/Templates w:/home/tuan/workspace_l/Projects k:/home/tuan/Documents/Uni/Studium/2017&2018 Wintersemester/Rechnerstrukturen und Betriebssysteme [4,0]/Rechnerstrukturen q:/home/tuan/.nextcloud/Quick Drop -':/home/tuan/Pictures/Screenshots/2021-03 +':/home/tuan/.nextcloud/Documents/Uni/Studium/2021 Sommersemester/Embedded Security/Papers/Fuzzing e:/home/tuan/Documents/CTF/TryHackMe/Ice/2_Recon diff --git a/config/.scripts/i3lock.py b/config/.scripts/i3lock.py index 3c41ea6..3d07976 100755 --- a/config/.scripts/i3lock.py +++ b/config/.scripts/i3lock.py @@ -63,16 +63,16 @@ def lock_config(): lock_clock_align = '--time-align 1 --date-align 1 --layout-align 1' clock = "{} {}".format(lock_clock_args, lock_clock_align) # time - lock_time_pos = '--timepos="{}:{}"'.format(clock_x, clock_y) - lock_time_size = '--timesize={}'.format(default_fontsize * 2) + lock_time_pos = '--time-pos="{}:{}"'.format(clock_x, clock_y) + lock_time_size = '--time-size={}'.format(default_fontsize * 2) l_time = "{} {}".format(lock_time_pos, lock_time_size) # date - lock_date_pos = '--datepos="{}:{}"'.format(date_x, date_y) - lock_date_size = '--datesize={}'.format(default_fontsize) + lock_date_pos = '--date-pos="{}:{}"'.format(date_x, date_y) + lock_date_size = '--date-size={}'.format(default_fontsize) date = "{} {}".format(lock_date_pos, lock_date_size) # date color - datecolor = '--datecolor=777777ff' - timecolor = '--timecolor=777777ff' + datecolor = '--date-color=777777ff' + timecolor = '--time-color=777777ff' color = '{} {}'.format(datecolor, timecolor) # done datetime = "{} {} {}".format(l_time, date, color) @@ -80,36 +80,36 @@ def lock_config(): # Indicator config # Indicator inner # Color of the circle while resting/typing | Color: transparenet - lock_rest_color = '--insidecolor 00000000 ' + lock_rest_color = '--inside-color 00000000 ' # Color of the circle while "VERIFYING..." | Color: transparent - lock_ver_color = '--insidevercolor 00000000 ' + lock_ver_color = '--insidever-color 00000000 ' # Color of the circle if wrong | Color: transparent - lock_wrong_color = '--insidewrongcolor 00000000 ' + lock_wrong_color = '--insidewrong-color 00000000 ' indicator_inner = "{} {} {}".format(lock_rest_color, lock_wrong_color, lock_ver_color) # indicator_outer_ring # Default Color of the ring | Color: torquoise - lock_ring = '--ringcolor 00CED1FF' + lock_ring = '--ring-color 00CED1FF' # Color of ring when wrong pw | Color: red - lock_ring_w = '--ringwrongcolor D10000FF' + lock_ring_w = '--ringwrong-color D10000FF' # Color of ring when verifying | color dark-torquoise - lock_ring_v = '--ringvercolor 25B6B8FF' + lock_ring_v = '--ringver-color 25B6B8FF' # Color on Keypresses | Color: green - lock_press = '--keyhlcolor 00D103FF' + lock_press = '--keyhl-color 00D103FF' # Color on Deletion | Color: orange - lock_del = '--bshlcolor D13400FF' + lock_del = '--bshl-color D13400FF' # Color of seperator | Color: dark-blue - lock_sep_color = '--separatorcolor 0000D1FF' + lock_sep_color = '--separator-color 0000D1FF' # Right Text - lock_right_text = '--veriftext="..."' + lock_right_text = '--verif-text="..."' # Wrong Text - lock_wrong_text = '--wrongtext="Noope"' + lock_wrong_text = '--wrong-text="Noope"' # Text Size # lock_text_size = '--textsize=20' # Ring Position lock_texts = '{} {}'.format(lock_right_text, lock_wrong_text) - lock_pos = '--indpos={}:{}'.format(int(clock_x)+370, int(clock_y)) + lock_pos = '--ind-pos={}:{}'.format(int(clock_x)+370, int(clock_y)) # Ring size ring_size = 40 lock_radius = '--radius {}'.format(ring_size) diff --git a/config/.scripts/screenshot.sh b/config/.scripts/screenshot.sh index 0fdb4ce..896c638 100755 --- a/config/.scripts/screenshot.sh +++ b/config/.scripts/screenshot.sh @@ -5,29 +5,41 @@ type dunstify >/dev/null 2>&1 || { echo >&2 "I require dunstify but it's not ins type xclip >/dev/null 2>&1 || { echo >&2 "I require xclip but it's not installed. Aborting."; exit 1; } type xdotool >/dev/null 2>&1 || { echo >&2 "I require xdotool but it's not installed. Aborting."; exit 1; } -d=$HOME/Pictures/Screenshots/$(date +%Y-%m); -fd=$(date +%G-%m-%d_%H-%M-%S) +clip_screenshot () { + if test -f "$1" + then + dunstify -r 2 "Saved in $1"; + xclip -selection clipboard -t image/png -i $1 + else + : + fi +} -mkdir $d; +d=$HOME/Pictures/Screenshots/$(date +%Y-%m); +fd=$(date +%y-%m-%d_%H-%M-%S) + +if [ -d "$d" ] +then + : +else + mkdir $d +fi case $1 in "screen"*) filename=$fd-$(cat /proc/$(xdotool getwindowfocus getwindowpid)/comm).png; maim -f png $d/$filename; - dunstify -r 2 "Saved screenshot of screen in $d/$filename"; - xclip -selection clipboard -t image/png -i $d/$filename + clip_screenshot $d/$filename; ;; "window"*) - filename=$fd-$(cat /proc/$(xdotool getwindowfocus getwindowpid)/comm).png + filename=$fd-$(cat /proc/$(xdotool getwindowfocus getwindowpid)/comm).png; maim -u -i $(xdotool getactivewindow) -f png $d/$filename; - dunstify -r 2 "Saved screenshot of window in $d/$filename"; - xclip -selection clipboard -t image/png -i $d/$filename + clip_screenshot $d/$filename; ;; "area"*) # dunstify -r 2 'Taking screenshot from area.'; filename=$fd-$(cat /proc/$(xdotool getwindowfocus getwindowpid)/comm).png; maim -u -s -f png $d/$filename; - dunstify -r 2 "Saved in $d/$filename."; - xclip -selection clipboard -t image/png -i $d/$filename + clip_screenshot $d/$filename; ;; esac diff --git a/config/.scripts/startup.sh b/config/.scripts/startup.sh index 502777f..c2f8e80 100755 --- a/config/.scripts/startup.sh +++ b/config/.scripts/startup.sh @@ -10,7 +10,7 @@ function kb_routine { oldKBD="$KBD"; case "$(xset -q | grep -A 0 'LED' | cut -c59-67)" in "00000000") - KBD="English (US)" ;; + KBD="Europe" ;; "00001000") KBD="Deutsch" ;; *) KBD="unknown" ;; @@ -31,7 +31,7 @@ function battery_routine { while : do - # kb_routine + kb_routine battery_routine sleep 1; done diff --git a/config/.ssh/config b/config/.ssh/config index e7cdfe5..adac692 100644 --- a/config/.ssh/config +++ b/config/.ssh/config @@ -61,6 +61,18 @@ Host picoCTF User mos4 IdentityFile "/home/tuan/Documents/CTF/picoCTF/2018/30 - ssh-keyz/picoCTF" +Host iui-jupyter + HostName 132.252.238.159 + Port 22 + User so21-tuan-dat.tran + IdentityFile /mnt/veracrypt1/jupyter + +Host git.uni-due.de + HostName git.uni-due.de + Port 22 + User git + IdentityFile /mnt/veracrypt1/git + # Homeserver Host proxmox HostName 10.1.10.2 @@ -87,6 +99,12 @@ Host fireflyiii User root IdentityFile /mnt/veracrypt1/proxmox +Host sonarr + HostName 10.1.11.106 + Port 22 + User root + IdentityFile /mnt/veracrypt1/proxmox + Host pihole HostName 10.1.11.108 Port 22 @@ -99,11 +117,17 @@ Host plex User root IdentityFile /mnt/veracrypt1/proxmox -Host sshfs +Host codimd HostName 10.1.11.107 Port 22 User root - IdentityFile /mnt/veracrypt1/tudattr + IdentityFile /mnt/veracrypt1/proxmox + +Host portainer + HostName 10.1.11.103 + Port 22 + User root + IdentityFile /mnt/veracrypt1/proxmox Host ansible HostName 10.1.11.104 diff --git a/config/.ssh/known_hosts.old b/config/.ssh/known_hosts.old new file mode 100644 index 0000000..f352851 --- /dev/null +++ b/config/.ssh/known_hosts.old @@ -0,0 +1,45 @@ +192.168.178.37 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA6tMNDBFzlBhwnb7Y8Cze/ZdcaNSeRJCInxkVmcDSNwqGSAPX7GMy9VxBNbcAwArI/NGxHWFDJ0vRV8mfQF/IQ= +192.168.178.38 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNyjs7y8q2lqpfaiaiWZnSZSG68bV4NFSoQzN2DYviHIg6EVNry2DbLy6JvEG3Rua+Mvhg3PHMoz0SjKPI3xp5Q= +192.168.178.43 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD8Wj85edbYXEG/Us9GRgu/cw2BycX6EIS79QdyjektR4kWoTGJBZ0VDwfqtzcqsB1/DCIDls7K+LeA1+2Zx+XM= +192.168.178.48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7hZjpvBGioU25He08Qnk2RCdwYGtLQmigJ/gaFXpNFnxmgWj5ByypoZ8leAff6jQ3yHrXOSA8PDkUQDJJ077E= +192.168.178.24 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDmNWFGigpzeAspBQOhBiGesU1p+KHVPcYKdqXohDi9E4NgtyBL2vsoFSgrQbFQORU8bZ+hnT/vbXpL9K2Bvx/A= +192.168.178.51 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLpjsSDDG3e0EzbiVWSWvsbh77bMA89eD+Lb5jOATVQLwQ95GNp2rUcAHqrjOr9yZqtTcE4iJ5QexlCEaWLRYRU= +mos4.de,5.45.99.65 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKEn9UgYP+e6T6t8ZVxBdcNL/aLJ36GBs/XaRmSS18I4Q3dgp9Z1kBW2kk70DmjdtEKHkZ0TBLITpAyg5z2gUuc= +[192.168.178.55]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAExK6XURwsSBbVYWBsJ66Utk6qNCuCP5tWxYGZcniPl +192.168.178.40 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7hZjpvBGioU25He08Qnk2RCdwYGtLQmigJ/gaFXpNFnxmgWj5ByypoZ8leAff6jQ3yHrXOSA8PDkUQDJJ077E= +192.168.178.25 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFhaJQt11br0LBX3dXb5nr777VdB2MTU7nePdbLy4+GpK+r8P8CBTQOjoqSCUpa9DOVkFztGqb9utdIHnzB9HZs= +192.168.178.59 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7hZjpvBGioU25He08Qnk2RCdwYGtLQmigJ/gaFXpNFnxmgWj5ByypoZ8leAff6jQ3yHrXOSA8PDkUQDJJ077E= +192.168.178.61 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBV1+w3EVS5YmsQFkg3SadCL/HDdFtnegcvmCDQZEf9LVf4c/fOjPwSI60YwD7igKccODNRys+KoLqYExSgkWgA= +gitlab.com,2606:4700:90:0:f22e:fbec:5bed:a9b9 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY= +192.168.178.64 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJY66ZlyMdoF4YNNbV6nCwrUMtyip5JQLaGrsw9bXoy5nJ18sRd/SrHDjmOAGFIYqn/SNjjFE4rTDYqWn0HYlrE= +132.252.238.17 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOiYGPBPSYMmZ4zBaFuoW5Wfz8nhKOWj3NTdEAy7KlpvJF+AzbfcPZCUjCGfPn6fwzWPs275ctC3wHFcMrXK9EM= +192.168.178.47 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPTEkLqtUQVYK/wkdRV5jiJAxSqY+E/L7g1lHzInLUrW/qF8ZUtojW3lUrT926C35Y+q9mYMXJncor/XTPmJsuc= +192.168.178.41 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJjcCrCcSnvUyqFy5WB/r470ig77W0g1VJQ1HzN/RW834limOa+ZrmplTjpLX54kKEQwGNb6aUw2TgTkX32zIHU= +192.168.178.67 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKgZ5x9iEnmVb3eXzO3rgJ16whznK6kJ8QU5tHw/lgaiRrPyGmozS2GSjelR4jfJjfmIZVrE+PvYFNEw7CAnEjg= +10.1.10.2 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNyjs7y8q2lqpfaiaiWZnSZSG68bV4NFSoQzN2DYviHIg6EVNry2DbLy6JvEG3Rua+Mvhg3PHMoz0SjKPI3xp5Q= +10.1.11.2 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDmNWFGigpzeAspBQOhBiGesU1p+KHVPcYKdqXohDi9E4NgtyBL2vsoFSgrQbFQORU8bZ+hnT/vbXpL9K2Bvx/A= +10.1.10.114 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJY66ZlyMdoF4YNNbV6nCwrUMtyip5JQLaGrsw9bXoy5nJ18sRd/SrHDjmOAGFIYqn/SNjjFE4rTDYqWn0HYlrE= +10.1.11.102 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFhaJQt11br0LBX3dXb5nr777VdB2MTU7nePdbLy4+GpK+r8P8CBTQOjoqSCUpa9DOVkFztGqb9utdIHnzB9HZs= +10.1.10.116 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA6tMNDBFzlBhwnb7Y8Cze/ZdcaNSeRJCInxkVmcDSNwqGSAPX7GMy9VxBNbcAwArI/NGxHWFDJ0vRV8mfQF/IQ= +10.1.11.100 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDmNWFGigpzeAspBQOhBiGesU1p+KHVPcYKdqXohDi9E4NgtyBL2vsoFSgrQbFQORU8bZ+hnT/vbXpL9K2Bvx/A= +10.1.11.104 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL93r4HbwmtI9C5rl63MPqYfcL9Ij9yOQv/+GAeGuJzyvianiqtoHt4OE/sTGlSfdGrSnARbRIIyQ/rN3tCubfo= +10.1.11.109 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA6tMNDBFzlBhwnb7Y8Cze/ZdcaNSeRJCInxkVmcDSNwqGSAPX7GMy9VxBNbcAwArI/NGxHWFDJ0vRV8mfQF/IQ= +10.1.11.111 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJY66ZlyMdoF4YNNbV6nCwrUMtyip5JQLaGrsw9bXoy5nJ18sRd/SrHDjmOAGFIYqn/SNjjFE4rTDYqWn0HYlrE= +10.1.11.105 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7hZjpvBGioU25He08Qnk2RCdwYGtLQmigJ/gaFXpNFnxmgWj5ByypoZ8leAff6jQ3yHrXOSA8PDkUQDJJ077E= +10.1.11.108 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPTEkLqtUQVYK/wkdRV5jiJAxSqY+E/L7g1lHzInLUrW/qF8ZUtojW3lUrT926C35Y+q9mYMXJncor/XTPmJsuc= +10.1.11.110 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7hZjpvBGioU25He08Qnk2RCdwYGtLQmigJ/gaFXpNFnxmgWj5ByypoZ8leAff6jQ3yHrXOSA8PDkUQDJJ077E= +sonarr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIyG9zxFEARPTtU7yBUOTM/4/vUAm9w08jNt93AEMAqz +10.1.11.106 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIyG9zxFEARPTtU7yBUOTM/4/vUAm9w08jNt93AEMAqz +github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +10.1.11.104 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQChwvESCsNtzjitFY96ObnSI9UIR+sGbi4JaKUnnw5LVaaVBFMj9fFjdgp0GqVdflKrYEJru2sHungIDsQEooWWaJYdIXVgy0dWG5YWEO8zf62Tq5uu+A0y1Umjs1Ez0FSFlQWyF0dF1yV9gFiESOAZmFCN2uBalm+4w0OlvuV7eap7GwjgKgXHUmhDN8XhUey3HKR1p1ek9kv5yZ77+vjiaEDU1I0OrHKIfnRX4K3F3ez9brcb/MYXEVXXjbNdxXetGFxD1aqkYGA+A3zIqRbS4D9byRHiQbBa3mh6KXnWl3vg0TsQMMsy2IqBh1ImQro/R5on1Tw4ZXr2GXD4F+5L +10.1.11.104 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnqBoWnukWEtKyDnIA+5y7sCb4ejYaDtsrXsQaxY0Pm +132.252.238.159 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH0G0HaE3uYGC7jq9nTpC7ihYqdk6bLKPmPOQevLXRyL +132.252.238.159 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQChSu3L7e6SlC7NLlMfzi8GkZPnDw2ckV8EQ7VuMiDPnLloHqgC+DSCWEUwxAZ/EcmXtpvb/Gdr/Wl57CAU/brrrf8OFqFz/ABC6sLehm/ajMZPZRpNLdk1ib+frnit2AqM/uOwwE1ltSOULip4XkJlbzkylYdFrps//IezS4cktfl0U5ZcPZfZFvk9+hifpSPoFU803HcHdhNxr1hBvXyj0UtQEYhy/ojcKJZshA+y7iIEQsMqSrp6EQD/83yOiFHl+lNe9a3KW63F03dJQLcd0wt/FbZBpa1gzruhMXvMZxqAScCI+Wo676qPpsUPDnCx5vAuwBkx78MJ50OB3+lLOy055kRjxJkdNDXOnQN3bQ073NVgKYJ2Kwc/0fsb6JHD2DGHiLx9yk60tcEETZYWH0ndrAzgFB266ZjJKKNbUI8aOWIWNu+Frz6uV4KUA4YQTXGrpdOwkU/B8kzJPIcQzieI0J+6RWcuDM+Qc77nAXayerWw3OJprAqUD0QTyPk= +132.252.238.159 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFoPGR+NTFgAXkmymwCVYIW8zize10AUiVCiJZi41Oaqg0esUiMtcb+EeT1qpNmnkC5M9Cjcg/l5BM6aQwl4NLQ= +10.1.11.107 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMTAeBT0/OJCwTXIaxu8Ua1ZCXAwLWtqX9Vtwg+IUjXW +10.1.11.107 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKAPOsK/oxJBFaHSeHXxitk2PWfyjQeU4I5hqXG5sDRfjlZcC5QDkV+OxnL7EHgx0NxR34BH55wnQYGdbYe7yCT2Kk05Y634+OC/XUrOnVd+p6X2/7IzR1pnjkwblq3oZR3/hZJd13ZSxY/GIZYKrDhRlIWQXc/8e+Cz3XBc3dtq19D3W2Ici0rv+74gPfksHk70R7Z7uIoYmYv2LysWiC0E8VFHSdflKatD0MNCpQTGJAaSlxknu4STjfX0m+Sq8u7NpK/xThkfMBKR5ag+lg8Yl79fNoi24LMYpnKff1YSH9ehPrk9CyFOmPxkFWY9tmuXP5qxkoT5HQH26JkmJd +10.1.11.107 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBABnjQ92lYuAqJaV7Uu7OFOyUZdDeRVlLwbNMxqRAP9Prh44TanrpmDYSvAcjZPKTY95KOBiudqbGQ8JcH3ZK2c= +10.1.11.103 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFnh0lu2k9BV0vHNEc3UswMDI7ZgHpx36vetMZ4XlQiq +10.1.11.103 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD9Rs2JqhOCaBpFPPM9RwxxV4s+ADqFIwl4sVKX+nFdKwD7Kh+WqWwic3L2uI0wosWzbWTPp/+XKTT1PCYymbUZ6wCmb1tbgNxijJThAMEKc1r3LclwHaCN2npstBvKIIx72QclTJIadY8MyNT0JEIvHHx0Z8n7YXoGFYiCcpuI1kqWcBKHGT7ovXdrO8No5KNP8dWbbmx9R8viejseHW9W0tCUbNa0X3GZZNJIExQiN9Xkr1PvU3lZ5M5/UP1cyFb0cztiRNVvYOO3Z5XKDNb5DTW46/vXNbl1b5sXrB6t0LdVU4abuKZIFzL8qWqEwC+5tUN9U9fIyG/9QRpvKEe1 +10.1.11.103 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDw3aVpAEee8v27xOzozu5NzlIaTHBuY6DriRG5lRs9DM47FEzT5s17meHQzIJ/r05HJFWdBHJ/hWaMBGBsME/s= +git.uni-due.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB/f8VVsjeXT82vK2GX1iU61w5JNLoQUQhOwCocA7Ox5 diff --git a/emacs/.emacs.d/config.org b/emacs/.emacs.d/config.org index 332a0b8..3215cea 100644 --- a/emacs/.emacs.d/config.org +++ b/emacs/.emacs.d/config.org @@ -199,6 +199,10 @@ (use-package cargo) #+END_SRC +*** [[https://github.com/millejoh/emacs-ipython-notebook][ein]] + #+begin_src emacs-lisp + (use-package ein) + #+end_src * Appearance This section is for appearance customization. Either via packages or manually. @@ -297,7 +301,6 @@ (display-line-numbers-mode 1))) #+end_src - ** rust-mode cargo.el #+begin_src emacs-lisp diff --git a/emacs/.emacs.d/snippets/org-mode/leftarrow b/emacs/.emacs.d/snippets/org-mode/leftarrow index 0765bc9..8044d6d 100644 --- a/emacs/.emacs.d/snippets/org-mode/leftarrow +++ b/emacs/.emacs.d/snippets/org-mode/leftarrow @@ -2,4 +2,4 @@ # name: leftarrow # key: <- # -- -\leftarrow{}$0 \ No newline at end of file +\leftarrow{} $0 \ No newline at end of file diff --git a/emacs/.emacs.d/snippets/org-mode/rightarrow b/emacs/.emacs.d/snippets/org-mode/rightarrow index 9465ca5..ef58f9d 100644 --- a/emacs/.emacs.d/snippets/org-mode/rightarrow +++ b/emacs/.emacs.d/snippets/org-mode/rightarrow @@ -2,4 +2,4 @@ # name: rightarrow # key: -> # -- -\rightarrow{}$0 \ No newline at end of file +\rightarrow{} $0 \ No newline at end of file diff --git a/emacs/.emacs.d/snippets/org-mode/righttack b/emacs/.emacs.d/snippets/org-mode/righttack index 9c448d1..3e31f08 100644 --- a/emacs/.emacs.d/snippets/org-mode/righttack +++ b/emacs/.emacs.d/snippets/org-mode/righttack @@ -2,4 +2,4 @@ # name: righttack # key: |- # -- -⊢$0 \ No newline at end of file +⊢ $0 \ No newline at end of file diff --git a/zsh/.zshrc b/zsh/.zshrc index fb5d3eb..d9ed223 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,6 +1,6 @@ # Paths export ZSH="$HOME/.oh-my-zsh" -export PATH="$PATH:$HOME/.go/bin:$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.dotnet/tools:$HOME:.scripts/" +export PATH="$PATH:$HOME/.go/bin:$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.dotnet/tools" export DOTNET_CLI_TELEMETRY_OPTOUT=1 export PenTestTools=$HOME/Local/PenTesting/ export CTF=$HOME/Documents/CTF/ @@ -8,6 +8,15 @@ export WORKSPACE=$HOME/workspace_l export ZSHRC="$HOME/.zshrc" export VISUAL="emacsclient -t" +# History +export HISTSIZE=10000000 +export SAVEHIST=10000000 +export HISTTIMEFORMAT="[%F %T] " +setopt EXTENDED_HISTORY +setopt HIST_FIND_NO_DUPS + + + # Alias alias q="exit" alias b="byobu" @@ -17,6 +26,8 @@ alias msfconsole="msfconsole -x \"db_connect metasploit@msf\"" alias nmap="nmap -T5 --min-parallelism 100 -Pn" alias ed="\emacs --daemon" alias e="emacsclient -t" +alias con="source /opt/anaconda/bin/activate root" +alias coff="source /opt/anaconda/bin/deactivate root" # Theme ZSH_THEME="agnoster" @@ -25,14 +36,10 @@ ZSH_THEME="agnoster" plugins=( git history + z ) randpw() { < /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-$1};echo;}; -# History -HISTORY_IGNORE='sudo veracrypt *|veracrypt *' -HISTSIZE=10000000 -SAVEHIST=10000000 - # Source source $ZSH/oh-my-zsh.sh