From 6f8394aabeca99d087ce36f9df8d1d7ba0632d0b Mon Sep 17 00:00:00 2001 From: TrudeEH Date: Tue, 30 Jan 2024 17:04:26 +0000 Subject: [PATCH] Beginning of macOS and Linux dotfiles separation and quality improvements --- .gitignore | 1 + {homeConfigs => Linux/homeConfigs}/.bashrc | 0 {homeConfigs => Linux/homeConfigs}/.zshrc | 0 linux.sh => Linux/linux.sh | 2 +- {scripts => Linux/scripts}/ai-ollama-code.sh | 0 .../scripts}/arch-maintenance.sh | 0 {scripts => Linux/scripts}/arch-wine-setup.sh | 0 {scripts => Linux/scripts}/color.sh | 0 .../scripts}/debian-maintenance.sh | 0 {scripts => Linux/scripts}/open-ports.sh | 0 {scripts => Linux/scripts}/p.sh | 0 MacOS/README.md | 61 +++++++++++++++++++ MacOS/macos.sh | 26 ++++++++ MacOS/scripts/color.sh | 18 ++++++ .../scripts}/macos-add-small-spacer.sh | 0 .../scripts}/macos-add-spacer.sh | 0 homeConfigs/.bash_profile | 1 - homeConfigs/.zprofile | 1 - macos.sh | 40 ------------ scripts/macos-maintenance.sh | 6 -- 20 files changed, 107 insertions(+), 49 deletions(-) rename {homeConfigs => Linux/homeConfigs}/.bashrc (100%) rename {homeConfigs => Linux/homeConfigs}/.zshrc (100%) rename linux.sh => Linux/linux.sh (99%) rename {scripts => Linux/scripts}/ai-ollama-code.sh (100%) rename {scripts => Linux/scripts}/arch-maintenance.sh (100%) rename {scripts => Linux/scripts}/arch-wine-setup.sh (100%) rename {scripts => Linux/scripts}/color.sh (100%) rename {scripts => Linux/scripts}/debian-maintenance.sh (100%) rename {scripts => Linux/scripts}/open-ports.sh (100%) rename {scripts => Linux/scripts}/p.sh (100%) create mode 100644 MacOS/README.md create mode 100755 MacOS/macos.sh create mode 100755 MacOS/scripts/color.sh rename {scripts => MacOS/scripts}/macos-add-small-spacer.sh (100%) mode change 100644 => 100755 rename {scripts => MacOS/scripts}/macos-add-spacer.sh (100%) mode change 100644 => 100755 delete mode 100644 homeConfigs/.bash_profile delete mode 100644 homeConfigs/.zprofile delete mode 100755 macos.sh delete mode 100755 scripts/macos-maintenance.sh diff --git a/.gitignore b/.gitignore index 0eaf5a9b..b873c181 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store +*/*.DS_Store .Trash diff --git a/homeConfigs/.bashrc b/Linux/homeConfigs/.bashrc similarity index 100% rename from homeConfigs/.bashrc rename to Linux/homeConfigs/.bashrc diff --git a/homeConfigs/.zshrc b/Linux/homeConfigs/.zshrc similarity index 100% rename from homeConfigs/.zshrc rename to Linux/homeConfigs/.zshrc diff --git a/linux.sh b/Linux/linux.sh similarity index 99% rename from linux.sh rename to Linux/linux.sh index f664cbf4..808d95bf 100755 --- a/linux.sh +++ b/Linux/linux.sh @@ -187,7 +187,7 @@ fi # Copy configs echo -e "${GREEN}[+] Configuring system...${ENDCOLOR}" -cp -rf homeConfigs/.* ~ +cp -rf ./homeConfigs/.* ~ # Enable bash case insensitive completion cat /etc/inputrc | grep completion-ignore-case diff --git a/scripts/ai-ollama-code.sh b/Linux/scripts/ai-ollama-code.sh similarity index 100% rename from scripts/ai-ollama-code.sh rename to Linux/scripts/ai-ollama-code.sh diff --git a/scripts/arch-maintenance.sh b/Linux/scripts/arch-maintenance.sh similarity index 100% rename from scripts/arch-maintenance.sh rename to Linux/scripts/arch-maintenance.sh diff --git a/scripts/arch-wine-setup.sh b/Linux/scripts/arch-wine-setup.sh similarity index 100% rename from scripts/arch-wine-setup.sh rename to Linux/scripts/arch-wine-setup.sh diff --git a/scripts/color.sh b/Linux/scripts/color.sh similarity index 100% rename from scripts/color.sh rename to Linux/scripts/color.sh diff --git a/scripts/debian-maintenance.sh b/Linux/scripts/debian-maintenance.sh similarity index 100% rename from scripts/debian-maintenance.sh rename to Linux/scripts/debian-maintenance.sh diff --git a/scripts/open-ports.sh b/Linux/scripts/open-ports.sh similarity index 100% rename from scripts/open-ports.sh rename to Linux/scripts/open-ports.sh diff --git a/scripts/p.sh b/Linux/scripts/p.sh similarity index 100% rename from scripts/p.sh rename to Linux/scripts/p.sh diff --git a/MacOS/README.md b/MacOS/README.md new file mode 100644 index 00000000..2e953bcf --- /dev/null +++ b/MacOS/README.md @@ -0,0 +1,61 @@ +## MacOS Commands (built-in) + +**Password-protected Zip:** +```sh +zip -e protected.zip /file/to/protect/ +``` + +**Remove dotfiles:** +```sh +dot_clean . +``` + +**Show all files in finder:** +```sh +defaults write com.apple.Finder AppleShowAllFiles 1 +``` + +**Search using Spotlight:** +```sh +mdfind "file name” +``` + +**Rebuild Spotlight index:** +```sh +mdutil -E +``` + +**Turn off Spotlight indexing:** +```sh +dutil -i off +``` + +**Repair Disk permissions:** +```sh +sudo /usr/libexec/repair_packages --repair --standard-pkgs --volume / +``` + +**Generate SHA-1 digest of a file:** +```sh +/usr/bin/openssl sha1 download.dmg +``` + +**Disable sleep temporarily:** +```sh +caffeinate +``` + +**Open multiple instances of a program:** +```sh +open multiple instances open -n /Applications/Safari.app/ +``` + +**Check network speed:** +```sh +networkQuality +``` + +**Convert files (txt, html, rtf, rtfd, doc, docx):** +```sh +textutil -convert html journal.doc +``` diff --git a/MacOS/macos.sh b/MacOS/macos.sh new file mode 100755 index 00000000..4b99c744 --- /dev/null +++ b/MacOS/macos.sh @@ -0,0 +1,26 @@ +#! /bin/zsh + +source ./scripts/color.sh + +# Copy configs +echo -e "${GREEN}[+] Configuring system...${ENDCOLOR}" +cp -rf ./homeConfigs/.* ~ + +# Disable dock delay +echo -e "${GREEN}[+] Disabling dock autohide delay...${ENDCOLOR}" +defaults write com.apple.dock autohide-delay -float 0 +defaults write com.apple.dock autohide -int 1 +#defaults write com.apple.dock autohide-time-modifier -int 0 #Disable animation +killall Dock + +# Hide dotfiles folder +echo -e "${GREEN}[+] Hiding dotfiles folder from finder...${ENDCOLOR}" +chflags hidden ~/dotfiles +# Unhide: chflags nohidden /path/to/unhide/ + +# Update MacOS +echo -e "${GREEN}[+] Updating MacOS...${ENDCOLOR}" +sudo softwareupdate -ia + +echo -e "${GREEN}${BOLD}[i] All done.${ENDCOLOR}" +say "All done." diff --git a/MacOS/scripts/color.sh b/MacOS/scripts/color.sh new file mode 100755 index 00000000..337d03ed --- /dev/null +++ b/MacOS/scripts/color.sh @@ -0,0 +1,18 @@ +#! /bin/bash + +RED="\e[31m" +GREEN="\e[32m" +YELLOW="\e[33m" +BLUE="\e[34m" +MAGENTA="\e[35m" +CYAN="\e[36m" +GRAY="\e[90m" +ENDCOLOR="\e[0m" + +ENDCOLOR="\e[0m" +BOLD="\e[1m" +FAINT="\e[2m" +ITALIC="\e[3m" +UNDERLINE="\e[4m" + +# Example usage: echo -e "${GRAY}Gray text${ENDCOLOR}" diff --git a/scripts/macos-add-small-spacer.sh b/MacOS/scripts/macos-add-small-spacer.sh old mode 100644 new mode 100755 similarity index 100% rename from scripts/macos-add-small-spacer.sh rename to MacOS/scripts/macos-add-small-spacer.sh diff --git a/scripts/macos-add-spacer.sh b/MacOS/scripts/macos-add-spacer.sh old mode 100644 new mode 100755 similarity index 100% rename from scripts/macos-add-spacer.sh rename to MacOS/scripts/macos-add-spacer.sh diff --git a/homeConfigs/.bash_profile b/homeConfigs/.bash_profile deleted file mode 100644 index ed57d785..00000000 --- a/homeConfigs/.bash_profile +++ /dev/null @@ -1 +0,0 @@ -PATH="/usr/local/bin:$PATH" diff --git a/homeConfigs/.zprofile b/homeConfigs/.zprofile deleted file mode 100644 index 6b27a6ce..00000000 --- a/homeConfigs/.zprofile +++ /dev/null @@ -1 +0,0 @@ -eval "$(/opt/homebrew/bin/brew shellenv)" diff --git a/macos.sh b/macos.sh deleted file mode 100755 index 6148ea24..00000000 --- a/macos.sh +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/zsh - -source ./scripts/p.sh -source ./scripts/color.sh - -dist=$(d) - -if [ $dist != 3 ]; then - echo -e "${RED}[E] Run linux.sh for Linux instead.${ENDCOLOR}" - return 1 -fi - -# Copy configs -echo -e "${GREEN}[+] Configuring system...${ENDCOLOR}" -cp -rf homeConfigs/.* ~ - -# Disable dock delay -echo -e "${GREEN}[+] Disabling dock autohide delay...${ENDCOLOR}" -defaults write com.apple.dock autohide-delay -float 0 -defaults write com.apple.dock autohide -int 1 -#defaults write com.apple.dock autohide-time-modifier -int 0 #Disable animation -killall Dock - -# Install brew -echo -e "${GREEN}[+] Installing homebrew...${ENDCOLOR}" -/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - -# Enable brew -eval "$(/opt/homebrew/bin/brew shellenv)" - -# Install Nerd Font -if p c font-jetbrains-mono-nerd-font &>/dev/null; then - echo -e "${GREEN}[i] JetBrains font is installed.${ENDCOLOR}" -else - echo -e "${GREEN}[+] Installing JetBrains font.${ENDCOLOR}" - p i font-jetbrains-mono-nerd-font - echo -e "${GREEN}[i] JetBrains font installed.${ENDCOLOR}" -fi - -echo -e "${GREEN}${BOLD}[i] All done.${ENDCOLOR}" diff --git a/scripts/macos-maintenance.sh b/scripts/macos-maintenance.sh deleted file mode 100755 index 5ade4d7b..00000000 --- a/scripts/macos-maintenance.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -brew doctor -brew update -brew upgrade -brew list