Merge branch 'master' of github.com:Lissy93/dotfiles

This commit is contained in:
Alicia Sykes 2023-03-20 16:34:07 +00:00
commit 5b38a5c21b
14 changed files with 37 additions and 39 deletions

View File

@ -92,7 +92,7 @@ brew 'task' # Todo + task management
# CLI Development Suits
brew 'httpie' # HTTP / API testing testing client
brew 'lazydocker' # Full Docker management app
brew 'lazygit' # Full Git managemtne app
brew 'lazygit' # Full Git management app
brew 'kdash' # Kubernetes management
# CLI External Sercvices
@ -104,7 +104,7 @@ brew 'navi' # Browse, search, read cheat sheets
# CLI Fun
brew 'cowsay' # Have an ASCII cow say your message
brew 'figlet' # Output text as big ASCII art text
brew 'lolcat' # Make console output raibow colored
brew 'lolcat' # Make console output rainbow colored
brew 'neofetch' # Show system data and ditstro info
brew 'pipes-sh' # Cool terminal pipe screen saver
brew 'pv' # Pipe viewer, with animation options
@ -130,7 +130,7 @@ brew 'luarocks' # Package manager for Lua
brew 'node' # Node.js
brew 'nvm' # Switching node versions
brew 'openjdk' # Java development kit
brew 'python' # Python interpriter
brew 'python' # Python interpreter
brew 'rust' # Rust language
cask 'android-sdk' # Android software dev kit
@ -141,14 +141,14 @@ brew 'docker' # Containers
# Development Utils
brew 'gh' # Interact with GitHub PRs, issues, repos
brew 'git-extras' # Extra git commands for common tasks
brew 'scrcpy' # Display and control Andrdroid devices
brew 'scrcpy' # Display and control Android devices
brew 'terminal-notifier' # Trigger Mac notifications from terminal
brew 'tig' # Text-mode interface for git
brew 'ttygif' # Generate GIF from terminal commands + output
brew 'watchman' # Watch for changes and reload dev server
# Network and Security Testing
brew 'bettercap' # Network, scanning and moniroting
brew 'bettercap' # Network, scanning and monitoring
brew 'nmap' # Port scanning
brew 'wrk' # HTTP benchmarking
cask 'burp-suite' # Web security testing
@ -226,7 +226,7 @@ cask 'webpquicklook', args: { require_sha: false } # QL for WebP image files
# Mac OS Mods and Imrovments
cask 'alt-tab' # Much better alt-tab window switcher
cask 'anybar' # Custom programatic menubar icons
cask 'anybar' # Custom programmatic menubar icons
cask 'copyq' # Clipboard manager (cross platform)
cask 'espanso' # Live text expander (cross-platform)
cask 'finicky' # Website-specific default browser

View File

@ -5,7 +5,7 @@
################################################################
# Installs listed packages on Arch-based systems via Pacman #
# Also updates the cache database and existing applications #
# Confirms apps arn't installed via different package manager #
# Confirms apps aren't installed via different package manager #
# Doesn't include desktop apps, that're managed via Flatpak #
# Apps are sorted by category, and arranged alphabetically #
# Be sure to delete / comment out anything you do not need #
@ -69,7 +69,7 @@ pacman_apps=(
# CLI Fun
'cowsay' # Outputs message with ASCII art cow
'figlet' # Outputs text as 3D ASCII word art
'lolcat' # Rainbow coloured terminal output
'lolcat' # Rainbow colored terminal output
'neofetch' # Show off distro and system info
)

View File

@ -88,7 +88,7 @@ flatpak_apps=(
# Browsers and internet
'org.mozilla.firefox' # Firefox web browser (primary)
'com.github.Eloston.UngoogledChromium' # Chomium-based borwser (secondary)
'com.github.Eloston.UngoogledChromium' # Chromium-based borwser (secondary)
'com.github.micahflee.torbrowser-launcher' # Tor browser
'org.filezillaproject.Filezilla' # FTP client

View File

@ -5,7 +5,7 @@
######################################################################
# Installs essential pre-requsite packages, when using new systems #
# Intended to be run before install.sh, if packages not yet present. #
# All other package inatslls are managed in system-specific scripts #
# All other package installs are managed in system-specific scripts #
# For docs and more info, see: https://github.com/lissy93/dotfiles #
# IMPORTANT: Before running, read through everything very carefully! #
######################################################################
@ -29,7 +29,7 @@ RESET='\033[0m'
function print_usage () {
echo -e "${PURPLE}Prerequisite Dependency Installation Script${LIGHT}\n"\
"There's a few packages that are needed in order to continue with setting up dotfiles.\n"\
"This script will detect distro, and use appropriate package manager to install apps.\n"\
"This script will detect distro and use appropriate package manager to install apps.\n"\
"Elavated permissions may be required. Ensure you've read the script before proceeding."\
"\n${RESET}"
}

View File

@ -6,7 +6,7 @@
# Uses dconf to apply application preferences on Linux GNOME desktops #
# Reads source files from ./config/gnome/*.dconf ($DCONF_SOURCE_DIR) #
# Creates a backup of current settings, then loads + saves new config #
# IMPORTANT: Be sure to read files through thoughouly before executing #
# IMPORTANT: Be sure to read files thoroughly before executing! #
########################################################################
# Licensed under MIT (C) Alicia Sykes 2022 <https://aliciasykes.com> #
########################################################################

View File

@ -1,7 +1,7 @@
#!/bin/bash
##############################################################################
# Security improvments for Mac OS systems #
# Security improvements for Mac OS systems #
# Covers Siri, firewall, account security, connections and network protocols #
# #
# CAUTION: This script will apply changes to your OS X system configuration #
@ -10,7 +10,7 @@
# Options: #
# --silent - Don't log any status outputs #
# --skip-intro - Skip the warning and intro section #
# --yes-to-all - Don't ptompt user to agree to changes #
# --yes-to-all - Don't prompt user to agree to changes #
# #
# Licensed under MIT - (C) Alicia Sykes 2022 <https://aliciasykes.com> #
##############################################################################
@ -80,7 +80,6 @@ if [[ ! $params == *"--skip-intro"* ]]; then
exit 0
fi
fi
fi
# Check have got admin privilages
@ -158,13 +157,12 @@ defaults write com.apple.finder ShowPathbar -bool true
log_msg "Display full POSIX path as Finder window title"
defaults write com.apple.finder _FXShowPosixPathInTitle -bool true
log_msg "Expand the General, Open and Privlages file info panes"
log_msg "Expand the General, Open and Privileges file info panes"
defaults write com.apple.finder FXInfoPanesExpanded -dict \
General -bool true \
OpenWith -bool true \
Privileges -bool true
log_msg "Keep directories at top of search results"
defaults write com.apple.finder _FXSortFoldersFirst -bool true
@ -327,7 +325,7 @@ defaults write com.apple.mail DraftsViewerAttributes -dict-add "SortOrder" -stri
log_msg "Sort by newest to oldest"
defaults write com.apple.mail DraftsViewerAttributes -dict-add "SortedDescending" -string "yes"
log_msg "Disable inline attatchment viewing"
log_msg "Disable inline attachment viewing"
defaults write com.apple.mail DisableInlineAttachmentViewing -bool true
################
@ -493,7 +491,7 @@ defaults write org.m0k.transmission RandomPort -bool true
# Restart affected applications #
#################################
log_section "Finishing Up"
log_msg "Restarting afffecting apps"
log_msg "Restarting affecting apps"
for app in "Activity Monitor" \
"Address Book" \
"Calendar" \

View File

@ -10,7 +10,7 @@
# Options: #
# --silent - Don't log any status outputs #
# --skip-intro - Skip the warning and intro section #
# --yes-to-all - Don't ptompt user to agree to changes #
# --yes-to-all - Don't prompt user to agree to changes #
# #
# Licensed under MIT - (C) Alicia Sykes 2022 <https://aliciasykes.com> #
##############################################################################
@ -241,7 +241,7 @@ sudo pmset -b sleep 30
log_msg "Set system to not sleep automatically when on mains power"
sudo pmset -c sleep 0
log_msg "Require password immediatley after sleep or screensaver"
log_msg "Require password immediately after sleep or screensaver"
defaults write com.apple.screensaver askForPassword -int 1
defaults write com.apple.screensaver askForPasswordDelay -int 0
@ -262,7 +262,7 @@ sudo defaults write /Library/Preferences/com.apple.loginwindow AdminHostInfo Hos
##############################
log_section "Sound and Display"
log_msg "Increase sound quality for Bluetooth devivces"
log_msg "Increase sound quality for Bluetooth devices"
defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int 40
log_msg "Enable subpixel font rendering on non-Apple LCDs"
@ -406,7 +406,7 @@ defaults write com.apple.dock launchanim -bool true
log_msg "Set opening animation speed"
defaults write com.apple.dock expose-animation-duration -float 1
log_msg "Disable auntomatic rearanging of spaces"
log_msg "Disable auntomatic rearranging of spaces"
defaults write com.apple.dock mru-spaces -bool false
log_msg "Set dock to auto-hide by default"

View File

@ -1,7 +1,7 @@
#!/bin/bash
##############################################################################
# Security improvments for Mac OS systems #
# Security improvements for Mac OS systems #
# Covers Siri, firewall, account security, connections and network protocols #
# #
# CAUTION: This script will apply changes to your OS X system configuration #
@ -10,7 +10,7 @@
# Options: #
# --silent - Don't log any status outputs #
# --skip-intro - Skip the warning and intro section #
# --yes-to-all - Don't ptompt user to agree to changes #
# --yes-to-all - Don't prompt user to agree to changes #
# #
# Licensed under MIT - (C) Alicia Sykes 2022 <https://aliciasykes.com> #
##############################################################################

View File

@ -1,6 +1,6 @@
#!/bin/bash
# Utilities for checking terminal color support, and printing color pallete
# Utilities for checking terminal color support, and printing color palette
TEXT_COL="\033[1;30m"
RESET='\033[0m'
@ -37,7 +37,7 @@ function color_chooser () {
printf '%s' "${PWD%/}/")$(basename -- "$0") != "${.sh.file}" ]] ||
[[ -n $BASH_VERSION ]] && (return 0 2>/dev/null)) && sourced=1 || sourced=0
# If script being called directly run immediatley, otherwise register aliases
# If script being called directly run immediately, otherwise register aliases
if [ $sourced -eq 0 ]; then
check_color_support
color_map_16_bit

View File

@ -1,7 +1,7 @@
#!/bin/sh -
# Quick utility to aid in keeping clutter down in the $HOME directory
# Lists statistics about number of files, auto-cleans certain files,
# and prompts user wheather they'd like to each remaining dotfile in turn
# and prompts user whether they'd like to each remaining dotfile in turn
set -u

View File

@ -5,7 +5,7 @@
######################################################################
# Series of commands for freeing up disk space on *nix based systems #
# Will ask for user permission before executing or deleting anything #
# Info about current disk usage, and recomendations is printed prior #
# Info about current disk usage and recommendations is printed prior #
# Tasks are split into 3 categories: recommended, optional, hardcore #
# #
# Includes the following tasks: #
@ -13,7 +13,7 @@
# - Removing orphaned and unused packages and binaries #
# - Setting logging preferences and removing old logs #
# - Removing local cache files for the current user #
# - Deleting broken symlinks and empty files + folers #
# - Deleting broken symlinks and empty files + folders #
# - Finding and deleting duplicated large files #
# #
# IMPORTANT: Before running, read through everything very carefully! #
@ -271,7 +271,7 @@ function fuds_start () {
printf '%s' "${PWD%/}/")$(basename -- "$0") != "${.sh.file}" ]] ||
[[ -n $BASH_VERSION ]] && (return 0 2>/dev/null)) && sourced=1 || sourced=0
# Either start now (if exectuted directly) or export the function (if sourced)
# Either start now (if executed directly) or export the function (if sourced)
if [ $sourced -eq 0 ]; then
fuds_start $@
else

View File

@ -38,7 +38,7 @@ hr() {
printf '%s' "${PWD%/}/")$(basename -- "$0") != "${.sh.file}" ]] ||
[[ -n $BASH_VERSION ]] && (return 0 2>/dev/null)) && sourced=1 || sourced=0
# Either instantiate immediatley, or set alias for later
# Either instantiate immediately, or set alias for later
if [ $sourced -eq 0 ]; then
[ "$0" == "$BASH_SOURCE" ] && hr "$@"
else

View File

@ -5,7 +5,7 @@
# Bash functions for launching a web search #
# #
# Usage: #
# -Either source this file, or run directley #
# -Either source this file, or run directly #
# -Run with --help for full list of options #
# #
# Licensed under MIT, (C) Alicia Sykes 2022 #
@ -95,7 +95,7 @@ ws_grepapp() {
ws_make_search 'https://grep.app/search?q=' $@
}
# Lists availible search options
# Lists available search options
web_search() {
# If help flag specified, show help
[[ $@ == *"--help"* || $@ == "help" ]] && show_ws_help && return

View File

@ -41,7 +41,7 @@ function welcome_greeting () {
function welcome_sysinfo () {
if hash neofetch 2>/dev/null; then
neofetch --shell_version off \
--disable shell resolution de wm wm_theme theme icons terminal \
--disable kernel distro shell resolution de wm wm_theme theme icons terminal \
--backend off \
--colors 4 8 4 4 8 6 \
--color_blocks off \
@ -51,14 +51,14 @@ function welcome_sysinfo () {
# Print todays info: Date, IP, weather, etc
function welcome_today () {
timeout=0.5
timeout=1
echo -e "\033[1;34mToday\n------"
# Print date time
echo -e "$COLOR_S$(date '+🗓️ Date: %A, %B %d, %Y at %H:%M')"
# Print local weather
curl -s -m $timeout "wttr.in?format=%cWeather:+%C+%t,+%p+%w"
curl -s -m $timeout "https://wttr.in?format=%cWeather:+%C+%t,+%p+%w"
echo -e "${RESET}"
# Print IP address
@ -83,7 +83,7 @@ function welcome() {
printf '%s' "${PWD%/}/")$(basename -- "$0") != "${.sh.file}" ]] ||
[[ -n $BASH_VERSION ]] && (return 0 2>/dev/null)) && sourced=1 || sourced=0
# If script being called directly run immediatley
# If script being called directly run immediately
if [ $sourced -eq 0 ]; then
welcome $@
fi