From f4b1af3b990e9d724f49ecc4f735e48c6884b6e4 Mon Sep 17 00:00:00 2001 From: "bozo.kopic" Date: Sat, 23 Oct 2021 21:15:03 +0200 Subject: . --- install.sh | 4 +- lock/lock | 2 +- shell/zsh/.zshrc | 13 +++-- sublime-text/Adaptive.sublime-theme | 24 +++++++++ sublime-text/LSP.sublime-settings | 10 ++++ sublime-text/Package Control.sublime-settings | 26 ++++++++++ sublime-text/Preferences.sublime-settings | 74 +++++++++++++++++++++++++++ sublime-text/Python.sublime-settings | 5 ++ sublime-text/PythonImproved.sublime-settings | 6 +++ sublime-text/SublimeLinter.sublime-settings | 9 ++++ sublimetext/Adaptive.sublime-theme | 24 --------- sublimetext/LSP.sublime-settings | 9 ---- sublimetext/Package Control.sublime-settings | 26 ---------- sublimetext/Preferences.sublime-settings | 73 -------------------------- sublimetext/Python.sublime-settings | 5 -- sublimetext/PythonImproved.sublime-settings | 6 --- sublimetext/SublimeLinter.sublime-settings | 9 ---- vm/vm-win10 | 5 +- 18 files changed, 168 insertions(+), 162 deletions(-) create mode 100644 sublime-text/Adaptive.sublime-theme create mode 100644 sublime-text/LSP.sublime-settings create mode 100644 sublime-text/Package Control.sublime-settings create mode 100644 sublime-text/Preferences.sublime-settings create mode 100644 sublime-text/Python.sublime-settings create mode 100644 sublime-text/PythonImproved.sublime-settings create mode 100644 sublime-text/SublimeLinter.sublime-settings delete mode 100644 sublimetext/Adaptive.sublime-theme delete mode 100644 sublimetext/LSP.sublime-settings delete mode 100644 sublimetext/Package Control.sublime-settings delete mode 100644 sublimetext/Preferences.sublime-settings delete mode 100644 sublimetext/Python.sublime-settings delete mode 100644 sublimetext/PythonImproved.sublime-settings delete mode 100644 sublimetext/SublimeLinter.sublime-settings diff --git a/install.sh b/install.sh index c8a4c6b..92f3413 100755 --- a/install.sh +++ b/install.sh @@ -145,7 +145,7 @@ symlink ~/.dotfiles/sublime-music/sublime-music.desktop \ symlink ~/.dotfiles/pictures/icons/sublime-music.png \ ~/.local/share/icons/hicolor/128x128/apps/sublime-music.png -# sublimetext +# sublime-text mkdir -p ~/.config/sublime-text/Packages/User for i in Adaptive.sublime-theme \ LSP.sublime-settings \ @@ -155,7 +155,7 @@ for i in Adaptive.sublime-theme \ PythonImproved.sublime-settings \ SublimeLinter.sublime-settings do - symlink ~/.dotfiles/sublimetext/"$i" ~/.config/sublime-text/Packages/User/"$i" + symlink ~/.dotfiles/sublime-text/"$i" ~/.config/sublime-text/Packages/User/"$i" done # sway diff --git a/lock/lock b/lock/lock index a5a1287..f7b20cb 100755 --- a/lock/lock +++ b/lock/lock @@ -3,5 +3,5 @@ if [ -n "$WAYLAND_DISPLAY" ]; then swaylock -i ~/.pictures/lock.png else - i3lock -i ~/.pictures/lock.png + i3lock -t -i ~/.pictures/lock.png fi diff --git a/shell/zsh/.zshrc b/shell/zsh/.zshrc index 1d7d2b4..0b133b8 100644 --- a/shell/zsh/.zshrc +++ b/shell/zsh/.zshrc @@ -16,8 +16,11 @@ PROMPT='[%F{green}%n%f@%m %F{green}%~%f $(git_super_status)]$ ' . /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh . /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh -bindkey '\e[1~' beginning-of-line # Home -bindkey '\e[4~' end-of-line # End -bindkey '\e[3~' delete-char # Delete -bindkey '^[[A' history-substring-search-up # Up -bindkey '^[[B' history-substring-search-down # Down +bindkey '\e[1~' beginning-of-line # Home +bindkey '\e[4~' end-of-line # End +bindkey '\e[3~' delete-char # Delete +bindkey '^[[A' history-substring-search-up # Up +bindkey '^[[B' history-substring-search-down # Down + +bindkey '^[[1;5D' backward-word # Ctrl+Left +bindkey '^[[1;5C' forward-word # Ctrl+Right diff --git a/sublime-text/Adaptive.sublime-theme b/sublime-text/Adaptive.sublime-theme new file mode 100644 index 0000000..4872ecf --- /dev/null +++ b/sublime-text/Adaptive.sublime-theme @@ -0,0 +1,24 @@ +[ + { + "class": "sidebar_label", + "font.bold": false, + "font.size": 16, + "font.face": "Inter", + "offset": [20, 0] + }, + { + "class": "sidebar_tree", + "row_padding": [10, 5], + "indent": 20 + }, + { + "class": "tab_label", + "font.size": 14 + }, + { + "class": "label_control", + "font.size": 14, + "font.face": "Inter", + "content_margin": 5 + } +] diff --git a/sublime-text/LSP.sublime-settings b/sublime-text/LSP.sublime-settings new file mode 100644 index 0000000..2795f48 --- /dev/null +++ b/sublime-text/LSP.sublime-settings @@ -0,0 +1,10 @@ +{ + "show_diagnostics_panel_on_save": 0, + "clients": { + "pylsp": { + "command": ["pylsp"], + "selector": "source.python", + "enabled": false, + }, + }, +} diff --git a/sublime-text/Package Control.sublime-settings b/sublime-text/Package Control.sublime-settings new file mode 100644 index 0000000..22f3ad0 --- /dev/null +++ b/sublime-text/Package Control.sublime-settings @@ -0,0 +1,26 @@ +{ + "bootstrapped": true, + "in_process_packages": + [ + ], + "installed_packages": + [ + "A File Icon", + "AutoWrap", + "Compare Side-By-Side", + "LSP", + "MagicPython", + "Material Theme", + "Origami", + "Package Control", + "PackageResourceViewer", + "Sass", + "SideBarEnhancements", + "SublimeLinter", + "SublimeLinter-contrib-sass-lint", + "SublimeLinter-eslint", + "SublimeLinter-flake8", + "Zeal", + "Zig Language", + ], +} diff --git a/sublime-text/Preferences.sublime-settings b/sublime-text/Preferences.sublime-settings new file mode 100644 index 0000000..4a6d6d5 --- /dev/null +++ b/sublime-text/Preferences.sublime-settings @@ -0,0 +1,74 @@ +{ + "always_show_minimap_viewport": true, + "binary_file_patterns": + [ + "*.pyc", + "*.pyo", + "*.exe", + "*.dll", + "*.obj", + "*.o", + "*.a", + "*.lib", + "*.so", + "*.dylib", + "*.ncb", + "*.sdf", + "*.suo", + "*.pdb", + "*.idb", + ".DS_Store", + "*.class", + "*.psd", + "*.db", + "*.sublime-workspace", + "*.jpg", + "*.jpeg", + "*.png", + "*.gif", + "*.ttf", + "*.tga", + "*.dds", + "*.ico", + "*.eot", + "*.pdf", + "*.swf", + "*.jar", + "*.zip" + ], + "color_scheme": "Packages/Color Scheme - Default/Monokai.sublime-color-scheme", + "default_line_ending": "unix", + "detect_indentation": false, + "ensure_newline_at_eof_on_save": true, + "file_exclude_patterns": + [ + ], + "font_face": "Roboto Mono", + "font_size": 12, + "highlight_line": true, + "highlight_modified_tabs": true, + "ignored_packages": + [ + "AutoWrap", + "Compare Side-By-Side", + "PackageResourceViewer", + "Python", + "SublimeLinter-eslint", + "Vintage", + ], + "line_padding_bottom": 1, + "line_padding_top": 1, + "material_theme_compact_sidebar": true, + "material_theme_small_tab": true, + "rulers": + [ + 80 + ], + "shift_tab_unindent": true, + "show_line_endings": true, + "theme": "Adaptive.sublime-theme", + "translate_tabs_to_spaces": true, + "trim_trailing_white_space_on_save": true, + "update_check": false, + "sublime_merge_path": null, +} diff --git a/sublime-text/Python.sublime-settings b/sublime-text/Python.sublime-settings new file mode 100644 index 0000000..c9fb4e6 --- /dev/null +++ b/sublime-text/Python.sublime-settings @@ -0,0 +1,5 @@ +{ + "extensions": + [ + ] +} diff --git a/sublime-text/PythonImproved.sublime-settings b/sublime-text/PythonImproved.sublime-settings new file mode 100644 index 0000000..345ec57 --- /dev/null +++ b/sublime-text/PythonImproved.sublime-settings @@ -0,0 +1,6 @@ +{ + "extensions": + [ + "py" + ] +} diff --git a/sublime-text/SublimeLinter.sublime-settings b/sublime-text/SublimeLinter.sublime-settings new file mode 100644 index 0000000..4f10839 --- /dev/null +++ b/sublime-text/SublimeLinter.sublime-settings @@ -0,0 +1,9 @@ +// SublimeLinter Settings - User +{ + "styles": [ + { + "mark_style": "squiggly_underline" + } + ], + "statusbar.counters_template": " ({} warn; {} err)", +} diff --git a/sublimetext/Adaptive.sublime-theme b/sublimetext/Adaptive.sublime-theme deleted file mode 100644 index 4872ecf..0000000 --- a/sublimetext/Adaptive.sublime-theme +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "class": "sidebar_label", - "font.bold": false, - "font.size": 16, - "font.face": "Inter", - "offset": [20, 0] - }, - { - "class": "sidebar_tree", - "row_padding": [10, 5], - "indent": 20 - }, - { - "class": "tab_label", - "font.size": 14 - }, - { - "class": "label_control", - "font.size": 14, - "font.face": "Inter", - "content_margin": 5 - } -] diff --git a/sublimetext/LSP.sublime-settings b/sublimetext/LSP.sublime-settings deleted file mode 100644 index 8b942b5..0000000 --- a/sublimetext/LSP.sublime-settings +++ /dev/null @@ -1,9 +0,0 @@ -{ - "clients": { - "pyls": { - "command": ["pyls"], - "selector": "source.python", - "enabled": false, - }, - }, -} diff --git a/sublimetext/Package Control.sublime-settings b/sublimetext/Package Control.sublime-settings deleted file mode 100644 index 22f3ad0..0000000 --- a/sublimetext/Package Control.sublime-settings +++ /dev/null @@ -1,26 +0,0 @@ -{ - "bootstrapped": true, - "in_process_packages": - [ - ], - "installed_packages": - [ - "A File Icon", - "AutoWrap", - "Compare Side-By-Side", - "LSP", - "MagicPython", - "Material Theme", - "Origami", - "Package Control", - "PackageResourceViewer", - "Sass", - "SideBarEnhancements", - "SublimeLinter", - "SublimeLinter-contrib-sass-lint", - "SublimeLinter-eslint", - "SublimeLinter-flake8", - "Zeal", - "Zig Language", - ], -} diff --git a/sublimetext/Preferences.sublime-settings b/sublimetext/Preferences.sublime-settings deleted file mode 100644 index 4a27c16..0000000 --- a/sublimetext/Preferences.sublime-settings +++ /dev/null @@ -1,73 +0,0 @@ -{ - "always_show_minimap_viewport": true, - "binary_file_patterns": - [ - "*.pyc", - "*.pyo", - "*.exe", - "*.dll", - "*.obj", - "*.o", - "*.a", - "*.lib", - "*.so", - "*.dylib", - "*.ncb", - "*.sdf", - "*.suo", - "*.pdb", - "*.idb", - ".DS_Store", - "*.class", - "*.psd", - "*.db", - "*.sublime-workspace", - "*.jpg", - "*.jpeg", - "*.png", - "*.gif", - "*.ttf", - "*.tga", - "*.dds", - "*.ico", - "*.eot", - "*.pdf", - "*.swf", - "*.jar", - "*.zip" - ], - "color_scheme": "Packages/Color Scheme - Default/Monokai.sublime-color-scheme", - "default_line_ending": "unix", - "detect_indentation": false, - "ensure_newline_at_eof_on_save": true, - "file_exclude_patterns": - [ - ], - "font_face": "Roboto Mono", - "font_size": 13, - "highlight_line": true, - "highlight_modified_tabs": true, - "ignored_packages": - [ - "AutoWrap", - "Compare Side-By-Side", - "PackageResourceViewer", - "Python", - "SublimeLinter-eslint", - "Vintage", - ], - "line_padding_bottom": 1, - "line_padding_top": 1, - "material_theme_compact_sidebar": true, - "material_theme_small_tab": true, - "rulers": - [ - 80 - ], - "shift_tab_unindent": true, - "show_line_endings": true, - "theme": "Adaptive.sublime-theme", - "translate_tabs_to_spaces": true, - "trim_trailing_white_space_on_save": true, - "update_check": false, -} diff --git a/sublimetext/Python.sublime-settings b/sublimetext/Python.sublime-settings deleted file mode 100644 index c9fb4e6..0000000 --- a/sublimetext/Python.sublime-settings +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extensions": - [ - ] -} diff --git a/sublimetext/PythonImproved.sublime-settings b/sublimetext/PythonImproved.sublime-settings deleted file mode 100644 index 345ec57..0000000 --- a/sublimetext/PythonImproved.sublime-settings +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extensions": - [ - "py" - ] -} diff --git a/sublimetext/SublimeLinter.sublime-settings b/sublimetext/SublimeLinter.sublime-settings deleted file mode 100644 index 4f10839..0000000 --- a/sublimetext/SublimeLinter.sublime-settings +++ /dev/null @@ -1,9 +0,0 @@ -// SublimeLinter Settings - User -{ - "styles": [ - { - "mark_style": "squiggly_underline" - } - ], - "statusbar.counters_template": " ({} warn; {} err)", -} diff --git a/vm/vm-win10 b/vm/vm-win10 index 09351d2..420c0cb 100755 --- a/vm/vm-win10 +++ b/vm/vm-win10 @@ -10,6 +10,7 @@ WIN10_ZIP_PATH=$ROOT_PATH/win10.zip WIN10_IMG_PATH=$ROOT_PATH/win10.qcow2 TMP_PATH=$ROOT_PATH/tmp INIT_ISO_PATH=$ROOT_PATH/init.iso +SHARE_PATH=$ROOT_PATH/share # \\10.0.2.4\qemu SAVE= @@ -21,7 +22,7 @@ while getopts s flag; do done -mkdir -p $ROOT_PATH +mkdir -p $ROOT_PATH $SHARE_PATH if [ ! -f $WIN10_ZIP_PATH ]; then wget --show-progress -q -c -O $WIN10_ZIP_PATH $WIN10_ZIP_URL @@ -88,7 +89,7 @@ exec qemu-system-x86_64 \ -cdrom $INIT_ISO_PATH \ -m 4G \ -device e1000,netdev=net0 \ - -netdev user,id=net0 \ + -netdev user,id=net0,smb=$SHARE_PATH \ -usb \ -device usb-tablet \ -rtc base=localtime -- cgit v1.2.3-70-g09d2