From a779d6563ffb2f0093b4b74c8d5ff0982fa3e930 Mon Sep 17 00:00:00 2001 From: Alessandro Miliucci Date: Thu, 16 May 2024 22:13:36 +0200 Subject: chore(template): propose add `.local/bin` to PATH (#12417) --- templates/zshrc.zsh-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/zshrc.zsh-template') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 7e1c7997c..a73d60799 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -1,5 +1,5 @@ # If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH +# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh -- cgit v1.2.3-70-g09d2 From 6fe78e06291bdf6fc62b805b0171e16a6b71eee1 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Sat, 15 Jun 2024 17:39:32 +0200 Subject: chore: better document top-level custom files for aliases (#12504) See discussion in https://github.com/ohmyzsh/ohmyzsh/discussions/12504 --- templates/zshrc.zsh-template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'templates/zshrc.zsh-template') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index a73d60799..89fd0780e 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -1,11 +1,11 @@ # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH -# Path to your oh-my-zsh installation. +# Path to your Oh My Zsh installation. export ZSH=$HOME/.oh-my-zsh # Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, +# load a random theme each time Oh My Zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes ZSH_THEME="robbyrussell" @@ -91,9 +91,12 @@ source $ZSH/oh-my-zsh.sh # Compilation flags # export ARCHFLAGS="-arch x86_64" -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# Set personal aliases, overriding those provided by Oh My Zsh libs, +# plugins, and themes. Aliases can be placed here, though Oh My Zsh +# users are encouraged to define aliases within a top-level file in +# the $ZSH_CUSTOM folder, with .zsh extension. Examples: +# - $ZSH_CUSTOM/aliases.zsh +# - $ZSH_CUSTOM/macos.zsh # For a full list of active aliases, run `alias`. # # Example aliases -- cgit v1.2.3-70-g09d2 From 01a955657408c8396fc947075a912ee868d5e2a7 Mon Sep 17 00:00:00 2001 From: 0x07CB <83157348+0x07CB@users.noreply.github.com> Date: Sun, 28 Jul 2024 11:06:44 +0200 Subject: chore: use `uname` in ARCHFLAGS in .zshrc template (#12563) --- templates/zshrc.zsh-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/zshrc.zsh-template') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 89fd0780e..930015798 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -89,7 +89,7 @@ source $ZSH/oh-my-zsh.sh # fi # Compilation flags -# export ARCHFLAGS="-arch x86_64" +# export ARCHFLAGS="-arch $(uname -m)" # Set personal aliases, overriding those provided by Oh My Zsh libs, # plugins, and themes. Aliases can be placed here, though Oh My Zsh -- cgit v1.2.3-70-g09d2 From c10a99406a779606fe32eb9b824c90a91f95c842 Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Tue, 20 Aug 2024 16:34:08 +0200 Subject: chore: typo --- templates/zshrc.zsh-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/zshrc.zsh-template') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 930015798..3546ed82b 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -85,7 +85,7 @@ source $ZSH/oh-my-zsh.sh # if [[ -n $SSH_CONNECTION ]]; then # export EDITOR='vim' # else -# export EDITOR='mvim' +# export EDITOR='nvim' # fi # Compilation flags -- cgit v1.2.3-70-g09d2 From c690f731618959cba3b85500acee20ebf43e51c1 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Sun, 27 Oct 2024 20:46:46 +0100 Subject: feat: add `devcontainers` configuration (#12783) Co-authored-by: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com> --- .devcontainer/devcontainer.json | 20 ++++++++++++++++++++ .editorconfig | 4 ++++ templates/minimal.zshrc | 5 +++++ templates/zshrc.zsh-template | 2 +- 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/devcontainer.json create mode 100644 templates/minimal.zshrc (limited to 'templates/zshrc.zsh-template') diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 000000000..d3ad1a3a7 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,20 @@ +{ + "image": "mcr.microsoft.com/devcontainers/base:noble", + "features": { + "ghcr.io/devcontainers/features/common-utils": { + "installZsh": true, + "configureZshAsDefaultShell": true, + "username": "vscode", + "userUid": 1000, + "userGid": 1000 + } + }, + "postCreateCommand": "dir=/workspaces/ohmyzsh; rm -rf $HOME/.oh-my-zsh && ln -s $dir $HOME/.oh-my-zsh && cp $dir/templates/minimal.zshrc $HOME/.zshrc && chgrp -R 1000 $dir && chmod g-w,o-w $dir", + "customizations": { + "codespaces": { + "openFiles": [ + "README.md" + ] + } + } +} diff --git a/.editorconfig b/.editorconfig index b349bcc42..797fb62d0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,3 +9,7 @@ indent_style = space [*.py] indent_size = 4 + +[devcontainer.json] +indent_size = 4 +indent_style = tab diff --git a/templates/minimal.zshrc b/templates/minimal.zshrc new file mode 100644 index 000000000..6d4cd9a71 --- /dev/null +++ b/templates/minimal.zshrc @@ -0,0 +1,5 @@ +export ZSH="$HOME/.oh-my-zsh" +ZSH_THEME="robbyrussell" +plugins=(git) + +source $ZSH/oh-my-zsh.sh diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 3546ed82b..fa83cc0c6 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -2,7 +2,7 @@ # export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH # Path to your Oh My Zsh installation. -export ZSH=$HOME/.oh-my-zsh +export ZSH="$HOME/.oh-my-zsh" # Set name of the theme to load --- if set to "random", it will # load a random theme each time Oh My Zsh is loaded, in which case, -- cgit v1.2.3-70-g09d2