Skip to content

Commit

Permalink
Merge pull request #49 from Avivbens/support-subler
Browse files Browse the repository at this point in the history
  • Loading branch information
Avivbens authored Jan 26, 2024
2 parents 9c5da63 + 8025cd5 commit 938203c
Show file tree
Hide file tree
Showing 12 changed files with 99 additions and 65 deletions.
Empty file modified .eslintignore
100644 → 100755
Empty file.
Empty file modified .github/workflows/health-check/action.yaml
100644 → 100755
Empty file.
Empty file modified .github/workflows/pr-checks.yaml
100644 → 100755
Empty file.
16 changes: 12 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

# Shell-Config CLI - Your MacOS Setup Tool

**🚀 Simplify your MacOS setup** with `shell-config` - a CLI tool that tailors configurations, installs apps, and enables seamless team collaboration.
**🚀 Simplify your MacOS setup** with `shell-config` - a CLI tool that does it all for you:
installs apps, configures your dev system, and personalizes your working station.

**Turn your new Mac into a useful working station in minutes**

<br>

Expand Down Expand Up @@ -32,12 +35,16 @@ get_remote_execute_file "src/scripts/init.sh" | sh

## The Reason

`shell-config` is your go-to CLI tool for seamless MacOS configuration, app installation, and team collaboration.
`shell-config` is your go-to CLI tool for seamless MacOS configuration, app installation and zsh aliases commands.

Set up the very same environment, with a personalization touch just for your needs, on all your Macs in minutes, and enjoy a consistent experience across all your devices.

## CLI Features

📦 **Effortless App Installation:**

- Install apps with default selections or customized user profiles.
- Choose what suits your needs, whether you're a developer, designer, or data scientist. 💻
- Choose what suits **your needs**, whether you're a developer, designer, or data scientist. 💻

🐚 **Plug & Play Shell Settings:**

Expand Down Expand Up @@ -82,7 +89,7 @@ Select apps to install.
<br>
We're now support [preferences based on your selection!](#Screenshots)
<br>
Pay attention to passwords inputs if needed!
**Pay attention to passwords inputs if needed!**

```bash
shell-config install
Expand Down Expand Up @@ -144,6 +151,7 @@ shell-config update --target {version}
### Modules

- [Git](zsh/extends/.zshrc.extends.git.sh)
- [VSCode](zsh/extends/.zshrc.extends.vscode.sh)
- [Npm](zsh/extends/.zshrc.extends.npm.sh)
- [Angular](zsh/extends/.zshrc.extends.angular.sh)
- [MongoDB](zsh/extends/.zshrc.extends.mongo.sh)
Expand Down
1 change: 1 addition & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ This table shows the current support over the CLI versions:

| Version | Supported |
| -------- | ------------------ |
| >= 2.9.x | :white_check_mark: |
| >= 2.8.x | :white_check_mark: |
| >= 2.7.x | :white_check_mark: |
| <= 2.6.x | :x: |
Expand Down
106 changes: 53 additions & 53 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/commands/install/config/apps-groups/apps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ export const APPS: Readonly<IAppSetup[]> = [
group: 'apps',
commands: () => [BREW_CASK('vlc')],
},
{
name: 'Subler',
description: 'MP4 metadata editor, video converter, and muxer',
group: 'apps',
commands: () => [BREW_CASK('subler')],
},
{
name: 'Notion',
group: 'apps',
Expand Down
2 changes: 1 addition & 1 deletion src/commands/install/config/multi-select-apps.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const MULTI_SELECT_APPS_PROMPT = async (tags: ITag[]): Promise<IAppSetup[
message: 'Select your MacOS setup',
loop: false,
choices,
pageSize: 40,
pageSize: 30,
},
])

Expand Down
5 changes: 5 additions & 0 deletions src/commands/shell/config/shell-modules.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ export const SHELL_MODULES_OPTIONS: IShellModule[] = [
path: `${EXTENDS_MODULES_DIR_PATH}/.zshrc.extends.git.sh`,
description: 'Git aliases and functions',
},
{
name: 'VSCode',
path: `${EXTENDS_MODULES_DIR_PATH}/.zshrc.extends.vscode.sh`,
description: 'VSCode aliases and functions',
},
{
name: 'NPM',
path: `${EXTENDS_MODULES_DIR_PATH}/.zshrc.extends.npm.sh`,
Expand Down
7 changes: 0 additions & 7 deletions zsh/.entry-point.sh
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,6 @@ add-zsh-hook -Uz chpwd (){ ls; }
PROMPT='%F{yellow}%(4~|.../%3~|%~) %F{red}: ${vcs_info_msg_0_} %F{reset_color}$ '


# vscode
VSCODE="/Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin/code"
alias code="$VSCODE"
alias v="code ."
alias vall="ls -d */ | xargs -I {} sh -c '$VSCODE ./{}'"


# github-copilot-cli alias setup
if command -v github-copilot-cli &> /dev/null
then
Expand Down
7 changes: 7 additions & 0 deletions zsh/extends/.zshrc.extends.git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

echo "extends.git.sh loaded"

# depends on zsh/extends/.zshrc.extends.vscode.sh
source "$HOME/shell-config/zsh/extends/.zshrc.extends.vscode.sh"

alias gl="git log"
alias gd="git diff"
alias gs="git status"
Expand All @@ -20,6 +23,10 @@ alias gr="git rebase"
alias gunlast="git reset --soft HEAD~1"
alias pq="pretty-quick --staged"

# setup less to fit with git log, in order to search and see the hash of the commit
# set the number of padding lines to 15
export LESS="-FXRSj15"

function gmd(){
git pull
git merge origin/dev
Expand Down
14 changes: 14 additions & 0 deletions zsh/extends/.zshrc.extends.vscode.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#! /usr/bin/env zsh

echo "extends.vscode.sh loaded"

export VSCODE="/Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin/code"

# open vscode
alias code="$VSCODE"

# open vscode in current directory
alias v="code ."

# open vscode for all directories in current directory
alias vall="ls -d */ | xargs -I {} sh -c '$VSCODE ./{}'"

0 comments on commit 938203c

Please sign in to comment.