Compare commits

..

9 Commits

14 changed files with 182 additions and 43 deletions

4
distributeHome.sh Executable file
View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
shopt -s dotglob
cp -lrf ./home_external/* $HOME/

4
distributeRoot.sh Executable file
View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
shopt -s dotglob
sudo cp -lrf ./root_external/* /

View File

@@ -5,20 +5,25 @@ if [ "$TERM" == 'xterm-kitty' ]; then
alias diff='kitty +kitten diff' alias diff='kitty +kitten diff'
fi fi
DEFAULT_RSYNC='--info=ALL --recursive --delay-updates --human-readable --links --hard-links --perms' COMMON_RSYNC='--info=ALL --recursive --delay-updates --human-readable --links --hard-links --perms'
export RSDEF="$COMMON_RSYNC --checksum"
export RSBKP="$RSDEF --times --group --owner --delete"
export RSMOV="$RSDEF --remove-source-files"
export RSUPD="$COMMON_RSYNC --update --times"
export RSCPY="$COMMON_RSYNC --ignore-times"
alias l='ls -l -v --all --human-readable --classify --group-directories-first' # -lvahF --group-directories-first alias l='ls -l -v --all --human-readable --classify --group-directories-first' # -lvahF --group-directories-first
alias lt=='l --time-style=long-iso' alias lt=='l --time-style=long-iso'
alias r='reset' alias r='reset'
alias ..='cd ..' alias ..='cd ..'
alias refresh_bashrc='. ~/.bashrc' # alternatively: 'source ~/.bashrc' alias refresh_bashrc='. ~/.bashrc' # alternatively: 'source ~/.bashrc'
alias rsync_default="rsync $DEFAULT_RSYNC --checksum" alias rsync_default="rsync $RSDEF"
# source /usr/share/bash-completion/completions/rsync # source /usr/share/bash-completion/completions/rsync
# complete -F _rsync rsync_default # complete -F _rsync rsync_default
alias rsync_backup="rsync $DEFAULT_RSYNC --checksum --times --group --owner --delete" alias rsync_backup="rsync $RSBKP"
alias rsync_move="rsync $DEFAULT_RSYNC --checksum --remove-source-files" alias rsync_move="rsync $RSMOV"
alias rsync_update="rsync $DEFAULT_RSYNC --update --times" alias rsync_update="rsync $RSUPD"
alias rsync_copy="rsync $DEFAULT_RSYNC --ignore-times" alias rsync_copy="rsync $RSCPY"
alias copy_link='cp --no-dereference --recursive --preserve=all --link' # not --force to make it optional alias copy_link='cp --no-dereference --recursive --preserve=all --link' # not --force to make it optional
alias off='systemctl poweroff' alias off='systemctl poweroff'
alias nnn='nnn -dHrR' alias nnn='nnn -dHrR'

View File

@@ -4,18 +4,13 @@
updatePackages() { updatePackages() {
noconfirm= noconfirm=
if [[ $1 == "-y" ]]; then if [[ $1 == "-y" ]]; then
noconfirm="--assume-yes" noconfirm="--no-confirm";
fi fi
full= executeAndNotify "doUpdatePackages $noconfirm" "packages updated" "package update failed";
if [[ $2 == "--full" ]]; then
full="full-"
fi
executeAndNotify "doUpdatePackages $noconfirm $full" "system updated" "system update failed";
} }
doUpdatePackages() { doUpdatePackages() {
sudo apt update; pamac update $1;
sudo apt ${2}upgrade $1; pamac remove --orphans --cascade $1;
sudo apt autoremove $1;
} }

View File

@@ -89,7 +89,7 @@ set linenumbers
set matchbrackets "(<[{)>]}" set matchbrackets "(<[{)>]}"
## Suppress title bar and show file name and editor state at the bottom. ## Suppress title bar and show file name and editor state at the bottom.
# set minibar set minibar
## Enable mouse support, if available for your system. When enabled, ## Enable mouse support, if available for your system. When enabled,
## mouse clicks can be used to place the cursor, set the mark (with a ## mouse clicks can be used to place the cursor, set the mark (with a

View File

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

View File

@@ -5,12 +5,11 @@
{ "keys": ["ctrl+shift+tab"], "command": "prev_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": ["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+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": ["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": ["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": ["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+n"], "command": "new_snippet" },
{ "keys": ["ctrl+alt+f"], "command": "auto_indent" } { "keys": ["ctrl+alt+f"], "command": "auto_indent" },
// { "keys": [""], "command": "lower_case" }
// { "keys": [""], "command": "upper_case" }
] ]

View File

@@ -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" },
]

View File

@@ -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, "always_show_minimap_viewport": true,
"auto_complete_commit_on_tab": true, "auto_complete_commit_on_tab": true,
@@ -8,11 +6,13 @@
"bold_folder_labels": true, "bold_folder_labels": true,
"color_scheme": "Mariana.sublime-color-scheme", "color_scheme": "Mariana.sublime-color-scheme",
"drag_text": false, "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, "enable_tab_scrolling": false,
"ensure_newline_at_eof_on_save": true, "ensure_newline_at_eof_on_save": true,
"fade_fold_buttons": false, "fade_fold_buttons": false,
"fallback_encoding": "UTF-8", "fallback_encoding": "UTF-8",
"find_in_files_side_by_side": false,
"font_size": 11, "font_size": 11,
"font_face": "JetBrains Mono Regular", "font_face": "JetBrains Mono Regular",
"highlight_line": true, "highlight_line": true,
@@ -45,4 +45,5 @@
"word_wrap": true, "word_wrap": true,
"wrap_width": 120, "wrap_width": 120,
"index_files": true, "index_files": true,
"caret_style": "smooth",
} }

View File

@@ -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

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
source=$1 source=$1
destinationPart=${1%/}; # cut off trailing "/" destinationPart=${1%/}; # cut off trailing "/"
# tar cfv $destinationPart.tar $source && xz $destinationPart.tar; # tar cfv "$destinationPart.tar" "$source" && xz "$destinationPart.tar";
tar c -I"xz -v" -vf $destinationPart.tar.xz $source tar c -I"xz -v" -vf "$destinationPart.tar.xz" "$source"

View File

@@ -32,7 +32,7 @@ backupRootDirectory /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/
### upload backup ### ### upload backup ###
##################### #####################
if [[ $# > 0 && "$1" == "--noupload" ]]; then if [[ "$1" == "--noupload" ]]; then
exit 0; exit 0;
fi fi

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
source=$1; source=$1;
# archive=${source%.xz}; # cut off trailing ".xz" # archive=${source%.xz}; # cut off trailing ".xz"
# unxz $source && tar xfv $archive # unxz "$source" && tar xfv "$archive"
tar x -I"unxz -v" -vf $source tar x -I"unxz -v" -vf "$source"

View File

@@ -16,7 +16,7 @@ upDownContainers() {
continue; continue;
fi fi
cd $subdir; cd $subdir;
docker compose $@; docker-compose $@;
done done
} }