Merge branch 'master' into debian

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

@@ -5,12 +5,11 @@
    { "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": ["alt+="], "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" }
+   { "keys": ["ctrl+alt+f"], "command": "auto_indent" },
 ]

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

@@ -0,0 +1,15 @@
+[
+   { "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": ["alt+="], "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" },
+]

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

@@ -1,5 +1,3 @@
-// Settings in here override those in "Default/Preferences.sublime-settings",
-// and are overridden in turn by syntax-specific settings.
 {
    "always_show_minimap_viewport": true,
    "auto_complete_commit_on_tab": true,
@@ -8,11 +6,13 @@
    "bold_folder_labels": true,
    "color_scheme": "Mariana.sublime-color-scheme",
    "drag_text": false,
-   "draw_white_space": ["selection", "all_mixed"],
+   // "draw_white_space": ["selection", "all_mixed", "all_tabs", "trailing", "isolated"],
+   "draw_white_space": ["all"],
    "enable_tab_scrolling": false,
    "ensure_newline_at_eof_on_save": true,
    "fade_fold_buttons": false,
    "fallback_encoding": "UTF-8",
+   "find_in_files_side_by_side": false,
    "font_size": 11,
    "font_face": "JetBrains Mono Regular",
    "highlight_line": true,
@@ -45,4 +45,5 @@
    "word_wrap": true,
    "wrap_width": 120,
    "index_files": true,
+   "caret_style": "smooth",
 }

home_external/.config/wezterm/.wezterm.lua

@@ -0,0 +1,116 @@
+-- Pull in the wezterm API
+local wezterm = require 'wezterm'
+local act = wezterm.action
+local mux = wezterm.mux
+
+-- This will hold the configuration.
+local config = wezterm.config_builder()
+
+-- This is where you actually apply your config choices
+
+-- For example, changing the color scheme:
+config.color_scheme = 'AdventureTime'
+-- config.font = wezterm.font 'JetBrains Mono' -- also the default
+config.font = wezterm.font 'Fira Code'
+config.font_size = 12.0 -- also the default
+
+-- Spawn a git bash shell
+config.default_prog = { 'C:/Program Files/Git/bin/bash.exe' , '--cd-to-home' }
+
+-- cursor shape and behaviour
+config.default_cursor_style = 'BlinkingBar'
+config.animation_fps = 1
+config.cursor_blink_ease_in = 'Constant'
+config.cursor_blink_ease_out = 'Constant'
+
+config.enable_kitty_keyboard = true
+
+-- window appearance
+config.enable_scroll_bar = true
+config.window_padding = {
+  left = 0,
+  right = 0,
+  top = 0,
+  bottom = 0,
+}
+-- config.initial_rows = 50;
+
+--[[wezterm.on('gui-startup', function(cmd)
+  local tab, pane, window = mux.spawn_window(cmd or {})
+  -- Create a split occupying the right 1/3 of the screen
+  local loading_bar_pane = pane:split {
+     direction = 'Bottom',
+     size = 0.06,
+  }
+  -- go to JavaUtils-Directory and prepare command
+  loading_bar_pane:send_text 'cd JavaUtils/zeitlaeufer/target\njava de.szimnau.WorkLoadingBar'
+  -- optionally: clear before preparing command
+  -- loading_bar_pane:send_text 'cd JavaUtils/zeitlaeufer/target\nc\njava de.szimnau.WorkLoadingBar'
+end)]]
+
+config.keys = {
+  -- This will create a new horizontal split and run your default program inside it
+  {
+    key = 'E',
+    mods = 'CTRL|SHIFT',
+    action = act.SplitHorizontal { domain = 'CurrentPaneDomain' },
+  },
+  -- This will create a new vertical split and run your default program inside it
+  {
+    key = 'O',
+    mods = 'CTRL|SHIFT',
+    action = act.SplitVertical { domain = 'CurrentPaneDomain' },
+  },
+  -- resize the current split
+  {
+    key = 'UpArrow',
+    mods = 'CTRL|SHIFT',
+    action = act.AdjustPaneSize { 'Up', 1 },
+  },
+  {
+    key = 'DownArrow',
+    mods = 'CTRL|SHIFT',
+    action = act.AdjustPaneSize { 'Down', 1 },
+  },
+  { 
+    key = 'LeftArrow',
+    mods = 'CTRL|SHIFT',
+    action = act.AdjustPaneSize { 'Left', 1 } 
+  },
+  {
+    key = 'RightArrow',
+    mods = 'CTRL|SHIFT',
+    action = act.AdjustPaneSize { 'Right', 1 },
+  },
+  -- move around the splits
+  {
+    key = 'UpArrow',
+    mods = 'ALT',
+    action = act.ActivatePaneDirection 'Up',
+  },
+  {
+    key = 'DownArrow',
+    mods = 'ALT',
+    action = act.ActivatePaneDirection 'Down',
+  },
+  {
+    key = 'LeftArrow',
+    mods = 'ALT',
+    action = act.ActivatePaneDirection 'Left',
+  },
+  {
+    key = 'RightArrow',
+    mods = 'ALT',
+    action = act.ActivatePaneDirection 'Right',
+  },
+  -- makes pane take up all available space in the tab, hiding all other panes
+  {
+    key = 'X',
+    mods = 'CTRL|SHIFT',
+    action = wezterm.action.TogglePaneZoomState,
+  },
+}
+
+
+-- and finally, return the configuration to wezterm
+return config