diff options
| -rwxr-xr-x | install.sh | 4 | ||||
| -rwxr-xr-x | lock/lock | 2 | ||||
| -rw-r--r-- | shell/zsh/.zshrc | 13 | ||||
| -rw-r--r-- | sublime-text/Adaptive.sublime-theme (renamed from sublimetext/Adaptive.sublime-theme) | 0 | ||||
| -rw-r--r-- | sublime-text/LSP.sublime-settings | 10 | ||||
| -rw-r--r-- | sublime-text/Package Control.sublime-settings (renamed from sublimetext/Package Control.sublime-settings) | 0 | ||||
| -rw-r--r-- | sublime-text/Preferences.sublime-settings (renamed from sublimetext/Preferences.sublime-settings) | 3 | ||||
| -rw-r--r-- | sublime-text/Python.sublime-settings (renamed from sublimetext/Python.sublime-settings) | 0 | ||||
| -rw-r--r-- | sublime-text/PythonImproved.sublime-settings (renamed from sublimetext/PythonImproved.sublime-settings) | 0 | ||||
| -rw-r--r-- | sublime-text/SublimeLinter.sublime-settings (renamed from sublimetext/SublimeLinter.sublime-settings) | 0 | ||||
| -rw-r--r-- | sublimetext/LSP.sublime-settings | 9 | ||||
| -rwxr-xr-x | vm/vm-win10 | 5 |
12 files changed, 26 insertions, 20 deletions
@@ -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 @@ -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/sublimetext/Adaptive.sublime-theme b/sublime-text/Adaptive.sublime-theme index 4872ecf..4872ecf 100644 --- a/sublimetext/Adaptive.sublime-theme +++ b/sublime-text/Adaptive.sublime-theme 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/sublimetext/Package Control.sublime-settings b/sublime-text/Package Control.sublime-settings index 22f3ad0..22f3ad0 100644 --- a/sublimetext/Package Control.sublime-settings +++ b/sublime-text/Package Control.sublime-settings diff --git a/sublimetext/Preferences.sublime-settings b/sublime-text/Preferences.sublime-settings index 4a27c16..4a6d6d5 100644 --- a/sublimetext/Preferences.sublime-settings +++ b/sublime-text/Preferences.sublime-settings @@ -44,7 +44,7 @@ [ ], "font_face": "Roboto Mono", - "font_size": 13, + "font_size": 12, "highlight_line": true, "highlight_modified_tabs": true, "ignored_packages": @@ -70,4 +70,5 @@ "translate_tabs_to_spaces": true, "trim_trailing_white_space_on_save": true, "update_check": false, + "sublime_merge_path": null, } diff --git a/sublimetext/Python.sublime-settings b/sublime-text/Python.sublime-settings index c9fb4e6..c9fb4e6 100644 --- a/sublimetext/Python.sublime-settings +++ b/sublime-text/Python.sublime-settings diff --git a/sublimetext/PythonImproved.sublime-settings b/sublime-text/PythonImproved.sublime-settings index 345ec57..345ec57 100644 --- a/sublimetext/PythonImproved.sublime-settings +++ b/sublime-text/PythonImproved.sublime-settings diff --git a/sublimetext/SublimeLinter.sublime-settings b/sublime-text/SublimeLinter.sublime-settings index 4f10839..4f10839 100644 --- a/sublimetext/SublimeLinter.sublime-settings +++ b/sublime-text/SublimeLinter.sublime-settings 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/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 |