Merge remote-tracking branch 'origin/master' into debian

This reverts commit 937fe0142d.

.gitignore

@@ -1,3 +1,3 @@
 /backup
-/home_internal
-/root_internal
+output.txt
+/.sublime

home_external/.bash_aliases

@@ -1,23 +1,28 @@
+#!/usr/bin/env bash
+
 if [ "$TERM" == 'xterm-kitty' ]; then
    alias ssh='kitty +kitten ssh'
+   alias diff='kitty +kitten diff'
 fi
 
-DEFAULT_RSYNC='--verbose --recursive --progress --delay-updates --human-readable --links --hard-links --perms'
+DEFAULT_RSYNC='--info=ALL --recursive --delay-updates --human-readable --links --hard-links --perms'
 
 alias l='ls -l -v --all --human-readable --classify --group-directories-first' # -lvahF --group-directories-first
+alias lt=='l --time-style=long-iso'
 alias r='reset'
 alias ..='cd ..'
 alias refresh_bashrc='. ~/.bashrc' # alternatively: 'source ~/.bashrc'
 alias rsync_default="rsync $DEFAULT_RSYNC --checksum"
-source /usr/share/bash-completion/completions/rsync
-complete -F _rsync rsync_default
+# source /usr/share/bash-completion/completions/rsync
+# complete -F _rsync rsync_default
 alias rsync_backup="rsync $DEFAULT_RSYNC --checksum --times --group --owner --delete"
-alias rsync_move='rsync_default --remove-source-files'
+alias rsync_move="rsync $DEFAULT_RSYNC --checksum --remove-source-files"
 alias rsync_update="rsync $DEFAULT_RSYNC --update --times"
+alias rsync_copy="rsync $DEFAULT_RSYNC --ignore-times"
+alias copy_link='cp --no-dereference --recursive --preserve=all --link' # not --force to make it optional
 alias off='systemctl poweroff'
 alias nnn='nnn -dHrR'
 alias nn='n -dHrR'
-alias finds='find $* 2>/dev/null'
 alias c='clear'
 alias sort_dirs_by_size='du --block-size=1K --human-readable --max-depth=1 | sort --human-numeric-sort --reverse' # 'du -kh --max-depth=1 | sort -hr'
 alias sd='sudo ' # alias, so sudo can use aliases: "If the last character of the alias value is a blank, then the next command word following the alias is also checked for alias expansion."
@@ -25,16 +30,56 @@ alias mountdrive='udisksctl mount -b'
 alias unmountdrive='udisksctl unmount -b'
 alias fssizes='df -kh --output=size,used,avail,pcent,target | sort -hr'
 alias dirsizes='du -kh --apparent-size --max-depth=1 | sort -hr'
+# sed -ie 's/Beispiel/Ersetzung/' *.xml
+# sed -Eie 's/(Beispiel)/\1Anhang/' *.xml
+alias start_x11_vnc="x11vnc -many -display :0 -no6 -rfbport 5900 -auth /var/run/lightdm/root/:0 -rfbauth $HOME/.vnc/passwd"
+
+
+rsyncLink() {
+   source=$1;
+   linkSource="$(realpath $source)";
+   linkSource=${linkSource%/}; # cut off trailing "/"
+   shift;
+   dest=$1;
+   shift;
+   rsync $DEFAULT_RSYNC --one-file-system --link-dest=$linkSource $source $dest $*;
+}
+
+
+updateSystem() {
+  executeAndNotify "doUpdateSystem $1" "system updated" "system update failed"
+}
+
+
+doUpdateSystem() {
+   updatePackages $1;
+   updateFlatpak $1;
+}
+
+
+updateFlatpak() {
+   noconfirm=
+   if [[ $1 == "-y" ]]; then
+      noconfirm="--assumeyes";
+   fi
+   executeAndNotify "doUpdateFlatpak $noconfirm" "flatpaks updated" "flatpak update failed";
+}
+
+
+doUpdateFlatpak() {
+   flatpak update $1;
+   flatpak remove --unused $1;
+}
 
 
 # executes command and notifies upon failure
 execute() {
    dir="$(pwd)";
    dir=${dir##*/};
-   if [ -n "$2" ]; then
-      errLog=$2
+   if [[ -n "$2" ]]; then
+      errLog=$2;
    else
-      errLog="execution of \"$1\" failed"
+      errLog="execution of \"$1\" failed";
    fi
 
    if ! $1; then
@@ -47,34 +92,33 @@ execute() {
 # executes command and notifies upon success or failure
 executeAndNotify () {
    dir="$(pwd)";
-   dir=${dir##*/};
-   if [ -n "$2" ]; then
-      winLog=$2
+   dir=${dir##*/}; # cut off previous path (/path/to/foo.txt -> foo.txt)
+   if [[ -n "$2" ]]; then
+      winLog=$2;
    else
-      winLog="execution of \"$1\" succeeded"
+      winLog="execution of \"$1\" succeeded";
    fi
 
    if ! execute "$1" "$3"; then # arguments in quotes so they are interpreted as ONE argument each by execute()
       return 1;
    fi
-   notifyInfo "$dir: $winLog"
+   notifyInfo "$dir: $winLog";
 }
 
 
 # find file but don't print errors (e.g. can't access directory etc.)
-: 'seems to be working as alias as well:
 finds () {
-   find $* 2>/dev/null
-}'
+   find $* 2>/dev/null;
+}
 
 
 # sends a desktop-notification with an icon signalling an error
 notifyError () {
-   notify-send "$1" --icon=data-warning
+   notify-send "$1" --icon=data-warning;
 }
 
 
 # sends a desktop-notification with an icon signalling a simple information
 notifyInfo () {
-   notify-send "$1" --icon=preferences-desktop-notification
+   notify-send "$1" --icon=preferences-desktop-notification;
 }

home_external/.bash_aliases_branched

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+
+updatePackages() {
+   noconfirm=
+   if [[ $1 == "-y" ]]; then
+      noconfirm="--assume-yes"
+   fi
+   full=
+   if [[ $2 == "--full" ]]; then
+      full="full-"
+   fi
+   executeAndNotify "doUpdatePackages $noconfirm $full" "system updated" "system update failed";
+}
+
+
+doUpdatePackages() {
+   sudo apt update;
+   sudo apt ${2}upgrade $1;
+   sudo apt autoremove $1;
+}

home_external/.bash_aliases_extra

@@ -1,10 +0,0 @@
-alias mount_garrus='sshMount fabian FabisDokumente && sshMount media Filme'
-alias unmount_garrus='sshUnmount FabisDokumente && sshUnmount Filme'
-
-sshMount() {
-   sshfs fabian@garrus:/citadel/$1/ /home/fabian/$2/ -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=8
-}
-
-sshUnmount() {
-   fusermount -u /home/fabian/$1
-}

home_external/.bashrc

@@ -2,6 +2,9 @@
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
 # for examples
 
+set -o pipefail
+# set -u
+
 # If not running interactively, don't do anything
 if [[ $- != *i* ]]; then
    return
@@ -43,6 +46,8 @@ shopt -s checkwinsize
 # match all files and zero or more directories and subdirectories.
 shopt -s globstar
 
+shopt -s dotglob
+
 # make less more friendly for non-text input files, see lesspipe(1)
 if [ -x /usr/bin/lesspipe ]; then
    eval "$(SHELL=/bin/sh lesspipe)"
@@ -134,16 +139,12 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo
 # See /usr/share/doc/bash-doc/examples in the bash-doc package.
 
 if [ -f ~/.bash_aliases ]; then
-   . ~/.bash_aliases
+   source ~/.bash_aliases
 fi
 
-if [ -f ~/.bash_aliases_extra ]; then
-   . ~/.bash_aliases_extra
-fi
-
-if [ -f ~/.bash_aliases_local ]; then
-   . ~/.bash_aliases_local
-fi
+for file in ~/.bash_aliases_*; do
+   source $file
+done
 
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
@@ -185,34 +186,41 @@ colours() {
 
 # ex - archive extractor
 # usage: ex <file>
-ex ()
-{
-  if [ -f $1 ] ; then
-    case $1 in
-      *.tar.bz2)   tar xjf $1   ;;
-      *.tar.gz)    tar xzf $1   ;;
-      *.bz2)       bunzip2 $1   ;;
-      *.rar)       unrar x $1     ;;
-      *.gz)        gunzip $1    ;;
-      *.tar)       tar xf $1    ;;
-      *.tbz2)      tar xjf $1   ;;
-      *.tgz)       tar xzf $1   ;;
-      *.zip)       unzip $1     ;;
-      *.Z)         uncompress $1;;
-      *.7z)        7z x $1      ;;
-      *)           echo "'$1' cannot be extracted via ex()" ;;
-    esac
-  else
+ex() {
+   if [[ ! -f "$1" ]]; then
       echo "'$1' is not a valid file"
+      return 1;
    fi
+   # FIXME 7z kann (theoretisch) tar
+   outdir=${1%.*}
+   case "$1" in
+      *.tar.bz2 | *.tbz | *.tbz2)
+         tar xjf $1 -C $outdir;;
+      *.tar.gz  | *.tgz)
+         tar xzf $1 -C $outdir;;
+      *.tar)
+         tar xf $1 -C $outdir;;
+      *.7z | *.zip | *.gz | *.bz | *.bz2)
+         7z x -o$outdir $1;;
+      *.rar)
+         unrar x $1;;
+      *.Z)
+         uncompress $1;;
+      *)
+         echo "'$1' cannot be extracted via ex()";;
+   esac
 }
 
 # BEGIN_KITTY_SHELL_INTEGRATION
-if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
+if [[ -n "$KITTY_INSTALLATION_DIR" && -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash" ]]; then
+   source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash";
+fi
 # END_KITTY_SHELL_INTEGRATION
 
 #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
 export SDKMAN_DIR="$HOME/.sdkman"
-[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
+if [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]]; then
+   source "$HOME/.sdkman/bin/sdkman-init.sh"
+fi
 
 export PATH=$PATH:/sync/scripts

home_external/.config/nano/nanorc

@@ -1,17 +1,307 @@
+## Sample initialization file for GNU nano.
+##
+## For the options that take parameters, the default value is shown.
+## Other options are unset by default.  To make sure that an option
+## is disabled, you can use "unset <option>".
+##
+## Characters that are special in a shell should not be escaped here.
+## Inside string parameters, quotes should not be escaped -- the last
+## double quote on the line will be seen as the closing quote.
+
+## Make 'nextword' (Ctrl+Right) and 'chopwordright' (Ctrl+Delete)
+## stop at word ends instead of at beginnings.
+# even more unintuitive than normal behaviour
 # set afterends
+
+## When soft line wrapping is enabled, make it wrap lines at blanks
+## (tabs and spaces) instead of always at the edge of the screen.
 set atblanks
+
+## Automatically indent a newly created line to the same number of
+## tabs and/or spaces as the preceding line -- or as the next line
+## if the preceding line is the beginning of a paragraph.
 set autoindent
+
+## Back up files to the current filename plus a tilde.
+# set backup
+
+## The directory to put unique backup files in.
+# set backupdir ""
+
+## Use bold text instead of reverse video text.
+# set boldtext
+
+## Treat any line with leading whitespace as the beginning of a paragraph.
+# set bookstyle
+
+## The characters treated as closing brackets when justifying paragraphs.
+## This may not include any blank characters.  Only closing punctuation,
+## optionally followed by these closing brackets, can end sentences.
 set brackets ""')>]}"
+
+## Automatically hard-wrap the current line when it becomes overlong.
+# set breaklonglines
+
+## Do case-sensitive searches by default.
+# set casesensitive
+
+## Constantly display the cursor position in the status bar or minibar.
 set constantshow
-# set fill 121 # only works with hard wrap which atblanks
+
+## Use cut-from-cursor-to-end-of-line by default.
+# set cutfromcursor
+
+## Do not use the line below the title bar, leaving it entirely blank.
+# set emptyline
+
+## Set the target width for automatic hard-wrapping and for justifying
+## paragraphs.  If the specified value is 0 or less, the wrapping point
+## will be the terminal's width minus this number.
+# only works with hard wrap which does not work with atblanks
+# set fill -8
+
+## mark soft wrap indicator ##
 set guidestripe 121
+
+## Remember the used search/replace strings for the next session.
+# set historylog
+
+## Display a "scrollbar" on the righthand side of the edit window.
 set indicator
+
+## Scroll the buffer contents per half-screen instead of per line.
+# set jumpyscrolling
+
+## Display line numbers to the left (and any anchors in the margin).
 set linenumbers
+
+## Enable vim-style lock-files.  This is just to let a vim user know you
+## are editing a file [s]he is trying to edit and vice versa.  There are
+## no plans to implement vim-style undo state in these files.
+# set locking
+
+## Fall back to slow libmagic to try and determine an applicable syntax.
+# set magic
+
+## The opening and closing brackets that can be found by bracket
+## searches.  They cannot contain blank characters.  The former set must
+## come before the latter set, and both must be in the same order.
 set matchbrackets "(<[{)>]}"
-set minibar
+
+## Suppress title bar and show file name and editor state at the bottom.
+# set minibar
+
+## Enable mouse support, if available for your system.  When enabled,
+## mouse clicks can be used to place the cursor, set the mark (with a
+## double click), and execute shortcuts.  The mouse will work in the X
+## Window System, and on the console when gpm is running.
+# unintuitive
 # set mouse
+
+## Switch on multiple file buffers (inserting a file will put it into
+## a separate buffer).
+# set multibuffer
+
+## Don't convert files from DOS/Mac format.
+# set noconvert
+
+## Don't display the helpful shortcut lists at the bottom of the screen.
+# set nohelp
+
+## Don't automatically add a newline when a file does not end with one.
+# set nonewlines
+
+## Set operating directory.  nano will not read or write files outside
+## this directory and its subdirectories.  Also, the current directory
+## is changed to here, so any files are inserted from this dir.  A blank
+## string means the operating-directory feature is turned off.
+# set operatingdir ""
+
+## Remember the cursor position in each file for the next editing session.
+# set positionlog
+
+## Preserve the XON and XOFF keys (^Q and ^S).
+# set preserve
+
+## The characters treated as closing punctuation when justifying
+## paragraphs.  They cannot contain blank characters.  Only closing
+## punctuation, optionally followed by closing brackets, can end
+## sentences.
+# set punct "!.?"
+
+## Make status-bar messages disappear after 1 keystroke instead of after 20.
+# set quickblank
+
+## The regular expression that matches quoting characters in email
+## or line-comment introducers in source code.  The default is:
+# set quotestr "^([ 	]*([!#%:;>|}]|//))+"
+
+## Try to work around a mismatching terminfo terminal description.
+# set rawsequences
+
+## Fix Backspace/Delete confusion problem.
+# set rebinddelete
+
+## Do regular-expression searches by default.
+## Regular expressions are of the extended type (ERE).
+# set regexp
+
+## Save a changed buffer automatically on exit; don't prompt.
+# set saveonexit
+## (The old form of this option, 'set tempfile', is deprecated.)
+
+## Put the cursor on the highlighted item in the file browser, and show
+## the cursor in the help viewer; useful for people who use a braille
+## display and people with poor vision.
+# set showcursor
+
+## Make the Home key smarter.  When Home is pressed anywhere but at the
+## very beginning of non-whitespace characters on a line, the cursor
+## will jump to that beginning (either forwards or backwards).  If the
+## cursor is already at that position, it will jump to the true
+## beginning of the line.
+set smarthome
+
+## Spread overlong lines over multiple screen lines.
 set softwrap
+
+## Use this spelling checker instead of the internal one.  This option
+## does not have a default value.
+# set speller "aspell -x -c"
+
+## Use the end of the title bar for some state flags: I = auto-indenting,
+## M = mark, L = hard-wrapping long lines, R = recording, S = soft-wrapping.
 set stateflags
+
+## Allow nano to be suspended (with ^Z by default).
+# set suspendable
+## (The old form of this option, 'set suspend', is deprecated.)
+
+## Use this tab size instead of the default; it must be greater than 0.
 set tabsize 3
+
+## Convert typed tabs to spaces.
 set tabstospaces
+
+## Snip whitespace at the end of lines when justifying or hard-wrapping.
 set trimblanks
+
+## The two single-column characters used to display the first characters
+## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
+## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
+## The default when in a UTF-8 locale:
+# set whitespace "»·"
+## The default otherwise:
+# set whitespace ">."
+
+## Detect word boundaries differently by treating punctuation
+## characters as parts of words.
+# set wordbounds
+
+## The characters (besides alphanumeric ones) that should be considered
+## as parts of words.  This option does not have a default value.  When
+## set, it overrides option 'set wordbounds'.
+# set wordchars "<_>."
+
+## Let an unmodified Backspace or Delete erase the marked region (instead
+## of a single character, and without affecting the cutbuffer).
+# set zap
+
+
+## Paint the interface elements of nano.  These are examples; there are
+## no colors by default, except for errorcolor and spotlightcolor.
+# set titlecolor bold,lightwhite,blue
+# set promptcolor lightwhite,lightblack
+# set statuscolor bold,lightwhite,green
+# set errorcolor bold,lightwhite,red
+# set spotlightcolor black,lime
+# set selectedcolor lightwhite,magenta
+# set stripecolor ,yellow
+# set scrollercolor cyan
+# set numbercolor cyan
+# set keycolor cyan
+# set functioncolor green
+
+## In root's .nanorc you might want to use:
+# set titlecolor bold,lightwhite,magenta
+# set promptcolor black,yellow
+# set statuscolor bold,lightwhite,magenta
+# set errorcolor bold,lightwhite,red
+# set spotlightcolor black,orange
+# set selectedcolor lightwhite,cyan
+# set stripecolor ,yellow
+# set scrollercolor magenta
+# set numbercolor magenta
+# set keycolor lightmagenta
+# set functioncolor magenta
+
+
+## === Syntax coloring ===
+## For all details, see 'man nanorc', section SYNTAX HIGHLIGHTING.
+
+## To include most of the existing syntax definitions, you can do:
+include "/usr/share/nano/*.nanorc"
+
+## Or you can select just the ones you need.  For example:
+# include "/usr/share/nano/html.nanorc"
+# include "/usr/share/nano/python.nanorc"
+# include "/usr/share/nano/sh.nanorc"
+
+## In /usr/share/nano/extra/ you can find some syntaxes that are
+## specific for certain distros or for some less common languages.
+
+
+## If <Tab> should always produce four spaces when editing a Python file,
+## independent of the settings of 'tabsize' and 'tabstospaces':
+# extendsyntax python tabgives "    "
+
+## If <Tab> should always produce an actual TAB when editing a Makefile:
+# extendsyntax makefile tabgives "	"
+
+
+## === Key bindings ===
+## For all details, see 'man nanorc', section REBINDING KEYS.
+
+## The <Ctrl+Delete> keystroke deletes the word to the right of the cursor.
+## On some terminals the <Ctrl+Backspace> keystroke produces ^H, which is
+## the ASCII character for backspace, so it is bound by default to the
+## backspace function.  The <Backspace> key itself produces a different
+## keycode, which is hard-bound to the backspace function.  So, if you
+## normally use <Backspace> for backspacing and not ^H, you can make
+## <Ctrl+Backspace> delete the word to the left of the cursor with:
+# bind ^H chopwordleft main
+
+## If you would like nano to have keybindings that are more "usual",
+## such as ^O for Open, ^F for Find, ^H for Help, and ^Q for Quit,
+## then uncomment these:
+#bind ^Q exit all
+#bind ^S savefile main
+#bind ^W writeout main
+#bind ^O insert main
+#bind ^H help all
+#bind ^H exit help
+#bind ^F whereis all
+#bind ^G findnext all
+#bind ^B wherewas all
+#bind ^D findprevious all
+#bind ^R replace main
+#bind M-X flipnewbuffer all
+#bind ^X cut all
+#bind ^C copy main
+#bind ^V paste all
+#bind ^P location main
+#bind ^A mark main
+#unbind ^K main
+#unbind ^U all
+#unbind ^N main
+#unbind ^Y all
+#unbind M-J main
+#unbind M-T main
+#bind ^T gotoline main
+#bind ^T gotodir browser
+#bind ^Y speller main
+#bind M-U undo main
+#bind M-R redo main
+#bind ^U undo main
+#bind ^E redo main
+#set multibuffer

home_external/.config/rofi/config.rasi

@@ -139,13 +139,13 @@ configuration {
 /*	me-select-entry: "MousePrimary";*/
 /*	me-accept-entry: "MouseDPrimary";*/
 /*	me-accept-custom: "Control+MouseDPrimary";*/
-  timeout {
+/*  timeout {
       action: "kb-cancel";
       delay:  0;
   }
   filebrowser {
       directories-first: true;
       sorting-method:    "name";
-  }
+  }*/
 }
 @theme "/usr/share/rofi/themes/Arc-Dark.rasi"

home_external/.config/sublime-text-3/Packages/User/Default (Linux).sublime-keymap

@@ -1,5 +1,16 @@
 [
-   { "keys": ["ctrl+shift+x"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Delete Line.sublime-macro"} },
    { "keys": ["ctrl+alt+up"], "command": "select_lines", "args": {"forward": false} },
    { "keys": ["ctrl+alt+down"], "command": "select_lines", "args": {"forward": true} },
+   { "keys": ["ctrl+tab"], "command": "next_view" },
+   { "keys": ["ctrl+shift+tab"], "command": "prev_view" },
+   { "keys": ["ctrl+shift+x"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Delete Line.sublime-macro"} },
+   { "keys": ["alt+keypad_plus"], "command": "jump_forward" },
+   { "keys": ["ctrl+b"], "command": "none" },
+   { "keys": ["ctrl+keypad_enter"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Add Line.sublime-macro"} },
+   // { "keys": ["shift+tab"], "command": "insert", "args": {"characters": "\t"} },
+   // { "keys": ["tab"], "command": "insert_best_completion", "args": {"default": "\t", "exact": true} } // can't unset this. fuck you.
+   { "keys": ["ctrl+alt+n"], "command": "new_snippet" },
+   { "keys": ["ctrl+alt+f"], "command": "auto_indent" }
+   // { "keys": [""], "command": "lower_case" }
+   // { "keys": [""], "command": "upper_case" }
 ]

home_external/.config/sublime-text-3/Packages/User/Package Control.sublime-settings

@@ -1,12 +0,0 @@
-{
-	"bootstrapped": true,
-	"in_process_packages":
-	[
-	],
-	"installed_packages":
-	[
-		"Compare Side-By-Side",
-		"nginx",
-		"Package Control",
-	],
-}

home_external/.config/sublime-text-3/Packages/User/Preferences.sublime-settings

@@ -1,25 +1,48 @@
 // Settings in here override those in "Default/Preferences.sublime-settings",
 // and are overridden in turn by syntax-specific settings.
 {
-   "tab_size": 3,
-   "translate_tabs_to_spaces": true,
-   "trim_automatic_white_space": false,
-   "wrap_width": 120,
    "always_show_minimap_viewport": true,
-   "highlight_line": true,
-   "scroll_past_end": false,
-   "draw_white_space": ["all_mixed"],
-   "trim_trailing_white_space_on_save": "all",
-   "ensure_newline_at_eof_on_save": true,
    "auto_complete_commit_on_tab": true,
-   "auto_complete_with_fields": true,
    "auto_complete_trailing_symbols": true,
+   "auto_complete_with_fields": true,
+   "bold_folder_labels": true,
+   "color_scheme": "Mariana.sublime-color-scheme",
    "drag_text": false,
+   "draw_white_space": ["selection", "all_mixed"],
+   "enable_tab_scrolling": false,
+   "ensure_newline_at_eof_on_save": true,
+   "fade_fold_buttons": false,
+   "fallback_encoding": "UTF-8",
+   "font_size": 11,
+   "font_face": "JetBrains Mono Regular",
+   "highlight_line": true,
    "highlight_modified_tabs": true,
-   "remember_full_screen": true,
    "ignored_packages":
    [
       "Vintage",
    ],
-   "font_size": 10,
+   "indent_to_bracket": false,
+   "margin": 0,
+   "rulers":
+   [
+      0,
+      3,
+      120
+   ],
+   "shift_tab_unindent": true,
+   "show_encoding": true,
+   "show_line_endings": true,
+   "tab_completion": false,
+   "remember_full_screen": true,
+   "scroll_past_end": false,
+   "tab_size": 3,
+   "theme": "Adaptive.sublime-theme",
+   "translate_tabs_to_spaces": true,
+   "trim_automatic_white_space": false,
+   "trim_trailing_white_space_on_save": "all",
+   "ui_scale": 1.1,
+   "use_tab_stops": false,
+   "word_wrap": true,
+   "wrap_width": 120,
+   "index_files": true,
 }