Merge branch 'master' of ssh://github.com/varp/dotfiles

dotfiles/shell/aliases

@@ -20,14 +20,12 @@ alias lh='ls -lh'
 #   sleep 10; alert
 alias alert='notify-send --urgency=low -i "$([[ $? = 0 ]] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 
-
 # VirtualBox related stuff which is defined in ./functions
 alias mvbsf='mount_vbox_share'
 alias umvbsf='umount_vbox_share'
 
 alias gen_md5_password='python3 -c "import hashlib; plain_pass = \"`genpassword`\".replace(\"password: \", \"\"); print(\"Plain password \t=>\t\", plain_pass, \"\nPassword MD5 \t=>\t\", hashlib.md5(plain_pass.encode()).hexdigest());"'
 
-
 # Aliases for apt
 alias apt-upgrade='sudo apt-get update && sudo apt-get dist-upgrade -y'
 alias apt-update='sudo apt-get update'
@@ -50,13 +48,9 @@ fi
 alias grepi='grep -i'
 #alias vim='vim -p'
 
-
 ## systemd
 alias ssctl='sudo systemctl'
 
-
 ## Docker related aliases
 alias dk='docker'
-alias dkc='docker-compose'
-alias dm='docker-machine'
-
+alias dkc='docker compose'

dotfiles/zshrc

@@ -111,7 +111,7 @@ if type brew &>/dev/null; then
   FPATH="$(brew --prefix)/completions:${FPATH}"
 fi
 
-ZSH_COMPLETION_DIR=$HOME/.zsh_completion.d
+ZSH_COMPLETION_DIR="$HOME/.zsh_completion.d"
 [[ ! -d $ZSH_COMPLETION_DIR ]] && mkdir -p "$ZSH_COMPLETION_DIR"
 FPATH="$ZSH_COMPLETION_DIR:${FPATH}"
 export FPATH

iterm/com.googlecode.iterm2.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>AiMaxTokens</key>
+	<integer>128000</integer>
+	<key>AiModel</key>
+	<string>gpt-4o</string>
 	<key>AlternateMouseScroll</key>
 	<true/>
 	<key>BracketedPasteMode</key>
@@ -716,7 +720,7 @@
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>JetBrainsMonoNFM-Regular 15</string>
+			<string>JetBrainsMonoNLNFM-Regular 15</string>
 			<key>Open Password Manager Automatically</key>
 			<true/>
 			<key>Option Key Sends</key>
@@ -769,6 +773,10 @@
 			<real>0.0</real>
 			<key>Triggers</key>
 			<array/>
+			<key>Unicode Normalization</key>
+			<integer>0</integer>
+			<key>Unicode Version</key>
+			<integer>9</integer>
 			<key>Unlimited Scrollback</key>
 			<true/>
 			<key>Use Bold Font</key>
@@ -1478,7 +1486,7 @@
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>JetBrainsMonoNFM-Regular 15</string>
+			<string>JetBrainsMonoNLNF-Regular 15</string>
 			<key>Open Password Manager Automatically</key>
 			<true/>
 			<key>Option Key Sends</key>

vscode/settings.json

@@ -1,7 +1,6 @@
 // Place your settings in this file to overwrite the default settings
 {
     "cSpell.language": "en,ru",
-    "debug.inlineValues": "on",
     "debug.openExplorerOnEnd": true,
     "debug.showBreakpointsInOverviewRuler": true,
     "debug.showSubSessionsInToolBar": true,
@@ -11,7 +10,6 @@
         "Ports",
         "CreatedTime"
     ],
-    "editor.bracketPairColorization.enabled": true,
     "editor.codeActionsOnSave": {
         "source.organizeImports": "explicit"
     },
@@ -21,13 +19,11 @@
     "editor.fontWeight": "400",
     "editor.largeFileOptimizations": true,
     "editor.minimap.enabled": false,
-    "editor.parameterHints.enabled": true,
     "editor.rulers": [
         120
     ],
     "editor.smoothScrolling": true,
     "editor.suggest.localityBonus": true,
-    "editor.tabCompletion": "on",
     "editor.tabSize": 4,
     "editor.wordWrapColumn": 120,
     "explorer.openEditors.visible": 16,
@@ -104,52 +100,38 @@
     "workbench.editor.revealIfOpen": true,
     "workbench.iconTheme": "material-icon-theme",
     "workbench.list.openMode": "singleClick",
-    "workbench.preferredDarkColorTheme": "One Dark Vivid",
-    "workbench.preferredLightColorTheme": "GitHub Light",
-    "workbench.sideBar.location": "left",
     "workbench.startupEditor": "newUntitledFile",
-    "workbench.colorTheme": "GitHub Light",
     "editor.formatOnPaste": true,
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
     "editor.formatOnSaveMode": "modificationsIfAvailable",
-    "editor.inlineSuggest.showToolbar": "always",
     "editor.suggest.insertMode": "replace",
     "editor.suggest.preview": true,
     "terminal.integrated.cursorStyle": "line",
     "terminal.integrated.cursorBlinking": true,
     "zenMode.silentNotifications": false,
     "explorer.fileNesting.enabled": true,
-    "search.actionsPosition": "auto",
-    "debug.console.acceptSuggestionOnEnter": "on",
     "scm.countBadge": "focused",
-    "scm.diffDecorations": "gutter",
     "terminal.integrated.shellIntegration.suggestEnabled": true,
     "terminal.integrated.tabStopWidth": 4,
     "terminal.integrated.fontSize": 14,
     "editor.stickyTabStops": true,
-    "editor.stickyScroll.maxLineCount": 3,
     "editor.guides.indentation": false,
-    "editor.guides.bracketPairsHorizontal": true,
     "editor.renderLineHighlightOnlyWhenFocus": true,
     "search.seedWithNearestWord": true,
-    "editor.hover.delay": 500,
-    "workbench.tree.renderIndentGuides": "none",
     "workbench.tree.indent": 10,
     "workbench.editor.mouseBackForwardToNavigate": false,
     "workbench.editor.limit.value": 16,
     "scm.defaultViewMode": "tree",
     "outline.collapseItems": "alwaysCollapse",
     "explorer.autoReveal": "focusNoScroll",
     "workbench.list.scrollByPage": true,
-    "workbench.hover.delay": 700,
     "workbench.commandPalette.preserveInput": true,
     "workbench.commandPalette.experimental.suggestCommands": true,
     "workbench.editorLargeFileConfirmation": 250,
     "files.insertFinalNewline": true,
     "editor.find.globalFindClipboard": true,
     "editor.scrollbar.horizontal": "visible",
-    "editor.parameterHints.cycle": false,
     "editor.tokenColorCustomizations": {
         "textMateRules": [
             {
@@ -192,17 +174,13 @@
     "editor.linkedEditing": true,
     "editor.cursorBlinking": "smooth",
     "editor.cursorSmoothCaretAnimation": "on",
-    "editor.find.seedSearchStringFromSelection": "selection",
     "diffEditor.codeLens": true,
-    "diffEditor.wordWrap": "on",
     "workbench.localHistory.maxFileSize": 1024,
     "workbench.editor.wrapTabs": true,
-    "debug.toolBarLocation": "docked",
     "gitlens.telemetry.enabled": false,
     "gitlens.plusFeatures.enabled": false,
     "gitHistory.showEditorTitleMenuBarIcons": true,
     "workbench.editor.titleScrollbarSizing": "large",
-    "search.decorations.badges": true,
     "git.mergeEditor": true,
     "workbench.editor.highlightModifiedTabs": true,
     "gitlens.menus": {
@@ -262,7 +240,6 @@
     },
     "material-icon-theme.activeIconPack": "react_redux",
     "oneDarkPro.vivid": true,
-    "workbench.editor.tabSizing": "shrink",
     "errorLens.messageBackgroundMode": "message",
     "problems.showCurrentInStatus": true,
     "git.enableSmartCommit": true,
@@ -292,5 +269,11 @@
     "taskExplorer.pathToPrograms": {
         "make": "make"
     },
+    "workbench.hover.delay": 1000,
     "diffEditor.hideUnchangedRegions.enabled": true,
+    "[shellscript]": {
+        "editor.defaultFormatter": "foxundermoon.shell-format"
+    },
+    "cmake.showOptionsMovedNotification": false,
+    "cmake.configureOnOpen": false,
 }