From 20efb82c8983d69a14b37cf1e723f80182902bfb Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Thu, 27 Apr 2023 18:14:58 +0100 Subject: [PATCH 1/7] -m --- scripts/installs/README.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/installs/README.txt b/scripts/installs/README.txt index 59f1fd2..0678d2a 100644 --- a/scripts/installs/README.txt +++ b/scripts/installs/README.txt @@ -1,6 +1,5 @@ Lissy93/Dotfiles - Scripts for Package Installs 📥 ------------------------------------------------- - Each of these scripts is used to automate the installation and updates of packages, across various OSs Specific usage instructions can be found in a comment, at the top of each file - read before running Files can either be run directly, or can be invoked (based on system type) when you run install.sh From 7c76ffc189c27879a5741bec9164d89d4c23bbb6 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 29 Apr 2023 23:56:43 +0100 Subject: [PATCH 2/7] Adds workflow to maintain CodeBerg mirror --- .github/workflows/mirror.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/mirror.yml diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml new file mode 100644 index 0000000..02c4d2d --- /dev/null +++ b/.github/workflows/mirror.yml @@ -0,0 +1,16 @@ +# Pushes the contents of the repo to the Codeberg mirror +name: 🪞 Mirror to Codeberg +on: + workflow_dispatch: + schedule: + - cron: '0 2 * * 0' # At 02:00 on Sunday +jobs: + codeberg: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: { fetch-depth: 0 } + - uses: pixta-dev/repository-mirroring-action@v1 + with: + target_repo_url: git@codeberg.org:alicia/dotfiles.git + ssh_private_key: ${{ secrets.CODEBERG_SSH }} From 40517a6b0c21e86e3d7b60a4bf50a774b3f583c8 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 29 Apr 2023 23:57:50 +0100 Subject: [PATCH 3/7] Removal of Thunderbird conf --- config/desktop-apps/ thunderbird.user.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 config/desktop-apps/ thunderbird.user.js diff --git a/config/desktop-apps/ thunderbird.user.js b/config/desktop-apps/ thunderbird.user.js deleted file mode 100644 index e69de29..0000000 From a945af0b2b80456872b033e6767d48b238eb7f2f Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 29 Apr 2023 23:58:15 +0100 Subject: [PATCH 4/7] Removal of skhrdrc config, not needed --- config/macos/skhdrc | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 config/macos/skhdrc diff --git a/config/macos/skhdrc b/config/macos/skhdrc deleted file mode 100644 index e69de29..0000000 From 618504b7221f0c62b162596f60e92e4ab55706c9 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sun, 11 Jun 2023 11:38:44 +0100 Subject: [PATCH 5/7] Sets LC_ALL --- config/zsh/.zshenv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv index c2c1ba2..4ee2c22 100644 --- a/config/zsh/.zshenv +++ b/config/zsh/.zshenv @@ -39,5 +39,6 @@ export ZLIB="${ZDOTDIR}/lib" # Encodings, languges and misc settings export LANG='en_GB.UTF-8'; -export LC_ALL='en_GB'; export PYTHONIOENCODING='UTF-8'; +export LC_ALL='C'; + From 07b4e7c1de211cb58c60f2e85cd0b52ca351d671 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sun, 11 Jun 2023 11:39:35 +0100 Subject: [PATCH 6/7] Adds development packages to pacman manifest --- scripts/installs/arch-pacman.sh | 7 +++++++ 1 file changed, 7 insertions(+) mode change 100644 => 100755 scripts/installs/arch-pacman.sh diff --git a/scripts/installs/arch-pacman.sh b/scripts/installs/arch-pacman.sh old mode 100644 new mode 100755 index 0b343ff..0f3ebb5 --- a/scripts/installs/arch-pacman.sh +++ b/scripts/installs/arch-pacman.sh @@ -48,6 +48,13 @@ pacman_apps=( 'xsel' # Copy paste access to the X clipboard 'zoxide' # Auto-learning navigation (better cd) + # Development, languages, interpriters, compilers, etc + 'go' # Go Lang + 'rustup' # Crab Language + 'python-pip' # Snake Language + 'nodejs' + 'npm' + # Security Utilities 'clamav' # Open source virus scanning suite 'cryptsetup' # Reading / writing encrypted volumes From 3d1a41f3dbf4d7dfb7a9712927a2c7ab5362634f Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sun, 11 Jun 2023 11:47:14 +0100 Subject: [PATCH 7/7] Import cargo if present, removed duplicate code --- config/zsh/.zshrc | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 7aba112..c6e93d1 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -17,28 +17,6 @@ utils_dir="${XDG_CONFIG_HOME}/utils" # If not running interactively, don't do anything [[ $- != *i* ]] && return -# MacOS-specific services -if [ "$(uname -s)" = "Darwin" ]; then - # Add Brew to path, if it's installed - if [[ -d /opt/homebrew/bin ]]; then - export PATH=/opt/homebrew/bin:$PATH - fi - - # If using iTerm, import the shell integration if availible - if [[ -f "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh" ]]; then - source "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh" - fi - - # Append the Android SDK locations to path - if [[ -d "${HOME}/Library/Android/" ]]; then - export PATH="${HOME}/Library/Android/sdk/emulator:${PATH}" - export ANDROID_HOME="${HOME}/Library/Android/sdk" - export ANDROID_SDK_ROOT="${HOME}/Library/Android/sdk" - export ANDROID_AVD_HOME="${ANDROID_SDK_ROOT}/tools/emulator" - export NODE_BINARY="/usr/local/bin/node" - fi -fi - # Source all ZSH config files (if present) if [[ -d $zsh_dir ]]; then # Import alias files @@ -101,6 +79,16 @@ if [ "$(uname -s)" = "Darwin" ]; then fi fi +# If using Tilix, import the shell integration if availible +if [ $TILIX_ID ] || [ $VTE_VERSION ] && [[ -f "/etc/profile.d/vte.sh" ]]; then + source /etc/profile.d/vte.sh +fi + +# Append Cargo to path, if it's installed +if [[ -d "$HOME/.cargo/bin" ]]; then + export PATH="$HOME/.cargo/bin:$PATH" +fi + # Add Zoxide (for cd, quick jump) to shell if hash zoxide 2> /dev/null; then eval "$(zoxide init zsh)"