Skip to content

Commit 16295f5

Browse files
committed
feat(settings): enable experimental sharing and trim newlines in files
Add experimental sharing in VSCode editor settings and enable trimming final newlines in various file types.
1 parent 27742ce commit 16295f5

File tree

10 files changed

+11
-91
lines changed

10 files changed

+11
-91
lines changed

editors/vscode/settings.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"workbench.editor.labelFormat": "short",
66
"workbench.editor.languageDetection": true,
77
"workbench.editor.pinnedTabsOnSeparateRow": true,
8+
"workbench.experimental.share.enabled": true,
89
"workbench.iconTheme": "catppuccin-mocha",
910
"workbench.list.horizontalScrolling": true,
1011
"workbench.list.smoothScrolling": true,
@@ -181,6 +182,7 @@
181182
"files.autoSave": "onFocusChange",
182183
"files.eol": "\n",
183184
"files.insertFinalNewline": true,
185+
"files.trimFinalNewlines": true,
184186
"files.trimTrailingWhitespace": true,
185187

186188
/*** Formatting and linting settings ***/
@@ -300,12 +302,6 @@
300302
"[caddyfile]": {
301303
"editor.defaultFormatter": "matthewpi.caddyfile-support"
302304
},
303-
"[dockercompose]": {
304-
"editor.defaultFormatter": "ms-azuretools.vscode-docker"
305-
},
306-
"[dockerfile]": {
307-
"editor.defaultFormatter": "ms-azuretools.vscode-docker"
308-
},
309305
"[html]": {
310306
"editor.defaultFormatter": "esbenp.prettier-vscode"
311307
},
@@ -349,7 +345,5 @@
349345
"[x]"
350346
],
351347
"todo-tree.regex.regex": "(//|#|<!--|;|/\\*|^|^\\s*(-|\\d+.))\\s*($TAGS)",
352-
"rapidapi.terminalLink.enabled": false,
353-
"redhat.telemetry.enabled": false,
354-
"remoteHub.uncommittedChangesOnEntry": "none"
348+
"redhat.telemetry.enabled": false
355349
}

os/linux/brew/Brewfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ brew "thefuck"
3232
brew "step"
3333
brew "hadolint"
3434
brew "zimfw"
35+
brew "zoxide"

os/mac/brew/Brewfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ brew "thefuck"
7474
brew "step"
7575
brew "hadolint"
7676
brew "zimfw"
77+
brew "zoxide"
7778
cask "raycast"
7879
cask "notion"
7980
cask "dbeaver-community"

shell/aliases.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ alias c.='(code $PWD &>/dev/null &)'
3737
alias o.='open .'
3838

3939
# Utils
40-
alias clear="precmd() { precmd() { echo } } && clear && printf '\e[3J'"
4140
alias ping="prettyping --nolegend"
4241
alias htop="btm"
4342
alias k="kill -9"

shell/bash/.bash_profile

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,2 @@
1-
# Load Homebrew
2-
if [ -f "/home/linuxbrew/.linuxbrew/bin/brew" ]; then
3-
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
4-
elif [ -f "/opt/homebrew/bin/brew" ]; then
5-
eval "$(/opt/homebrew/bin/brew shellenv)"
6-
elif [ -f "/usr/local/bin/brew" ]; then
7-
eval "$(/usr/local/bin/brew shellenv)"
8-
fi
9-
10-
# if running bash
11-
if [ -n "$BASH_VERSION" ]; then
12-
# include .bashrc if it exists
13-
if [ -f "$HOME/.bashrc" ]; then
14-
. "$HOME/.bashrc"
15-
fi
16-
17-
# source .zshenv (for $ZSH) and .zprofile (for $PATH) if they exist
18-
if [ -f "$HOME/.zshenv" ] && [ -f "$HOME/.zprofile" ]; then
19-
. "$HOME/.zshenv"
20-
. "$HOME/.zprofile"
21-
fi
22-
fi
23-
24-
# set PATH so it includes user's private bin if it exists
25-
if [ -d "$HOME/bin" ]; then
26-
PATH="$HOME/bin:$PATH"
27-
fi
28-
29-
# set PATH so it includes user's private bin if it exists
30-
if [ -d "$HOME/.local/bin" ]; then
31-
PATH="$HOME/.local/bin:$PATH"
32-
fi
1+
# Load aliases, exports and functions
2+
source $DOTFILES_PATH/shell/init.sh

shell/bash/.bashrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,3 @@ if [ -n "$(/bin/ls -A "$DOTFILES_PATH/shell/bash/completions/")" ]; then
2121
source "$bash_file"
2222
done
2323
fi
24-
25-
# Load z
26-
source $(brew --prefix)/etc/profile.d/z.sh

shell/bash/.profile

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1 @@
1-
# Load Homebrew
2-
if [ -f "/home/linuxbrew/.linuxbrew/bin/brew" ]; then
3-
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
4-
elif [ -f "/opt/homebrew/bin/brew" ]; then
5-
eval "$(/opt/homebrew/bin/brew shellenv)"
6-
elif [ -f "/usr/local/bin/brew" ]; then
7-
eval "$(/usr/local/bin/brew shellenv)"
8-
fi
9-
10-
# if running bash
11-
if [ -n "$BASH_VERSION" ]; then
12-
# include .bashrc if it exists
13-
if [ -f "$HOME/.bashrc" ]; then
14-
. "$HOME/.bashrc"
15-
fi
16-
17-
# source .zshenv (for $ZSH) and .zprofile (for $PATH) if they exist
18-
if [ -f "$HOME/.zshenv" ] && [ -f "$HOME/.zprofile" ]; then
19-
. "$HOME/.zshenv"
20-
. "$HOME/.zprofile"
21-
fi
22-
fi
23-
24-
# set PATH so it includes user's private bin if it exists
25-
if [ -d "$HOME/bin" ]; then
26-
PATH="$HOME/bin:$PATH"
27-
fi
28-
29-
# set PATH so it includes user's private bin if it exists
30-
if [ -d "$HOME/.local/bin" ]; then
31-
PATH="$HOME/.local/bin:$PATH"
32-
fi
1+
ulimit -u 10000

shell/zsh/.zimrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ zmodule ohmyzsh/ohmyzsh --root plugins/cp
6565
zmodule zsh-users/zsh-syntax-highlighting
6666
zmodule zsh-users/zsh-history-substring-search
6767
zmodule zsh-users/zsh-autosuggestions
68+
zmodule kiesman99/zim-zoxide

shell/zsh/.zprofile

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,2 @@
1-
# Load Homebrew
2-
if [ -f "/home/linuxbrew/.linuxbrew/bin/brew" ]; then
3-
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
4-
elif [ -f "/opt/homebrew/bin/brew" ]; then
5-
eval "$(/opt/homebrew/bin/brew shellenv)"
6-
elif [ -f "/usr/local/bin/brew" ]; then
7-
eval "$(/usr/local/bin/brew shellenv)"
8-
fi
9-
10-
# OrbStack: command-line tools and integration
11-
source ~/.orbstack/shell/init.zsh 2>/dev/null || :
1+
# Load aliases, exports and functions
2+
source $DOTFILES_PATH/shell/init.sh

shell/zsh/.zshrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ fi
4848
## Initialize modules.
4949
source ${ZIM_HOME}/init.zsh
5050

51-
# Load z
52-
source $(brew --prefix)/etc/profile.d/z.sh
53-
5451
# Load aliases, exports and functions
5552
source $DOTFILES_PATH/shell/init.sh
5653
# Load key bindings

0 commit comments

Comments
 (0)