Fix .gitconfig conflict

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "makefile.extensionOutputFolder": "./.vscode"
+}

Vagrantfile

@@ -0,0 +1,6 @@
+
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "generic/arch"
+end

configs/.gitconfig

@@ -268,9 +268,3 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Users/alicia/Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true

installs/arch.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# List of packages to be installed on Arch-based systems
+# Desktop apps installed via Flatpak, PKGBUILDs via Pacman
+# Apps are sorted by category, and arranged alphabetically
+# Be sure to delete / comment out anything you do not need
+
+set -e
+
+# Apps to be installed via Pacman
+pacman_apps=(
+  # Apps
+  
+  
+  # Development
+  
+
+  # Utils
+
+  # Security Utils
+
+
+  # Netowking
+
+
+)
+
+
+
+CYAN_B='\033[1;96m'
+YELLOW_B='\033[1;93m'
+RED_B='\033[1;31m'
+GREEN_B='\033[1;32m'
+RESET='\033[0m'
+
+echo "${CYAN_B}Installing Arch Packages...${RESET}"
+
+# Pacman
+if hash pacman 2> /dev/null; then
+  for app in ${pacman_apps[@]}; do
+    # If pacman -Qk ${app}
+    # And If: flatpak list --columns=ref | grep 'ch.protonmail.protonmail-bridge'
+    pacman -S ${app}
+  done
+else
+  echo "${YELLOW_B}Pacman not present, skipping${RESET}"
+fi
+

installs/flatpak.sh

@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+
+
+
+# Desktop apps to be installed via Flatpak
+flatpak_apps=(
+
+  # Communication
+  'com.discordapp.Discord'    # Team messaging and voice
+  'org.jitsi.jitsi-meet'      # Encrypted video calls
+  'org.signal.Signal'         # Private messenger, mobile
+  'info.mumble.Mumble'        # Low latency VoIP client
+  'im.riot.Riot'              # Decentralized Matrix chat
+  'org.mozilla.Thunderbird'   # Email + calendar client
+  'com.github.eneshecan.WhatsAppForLinux' # WhatApp client
+
+  # Media
+  'org.videolan.VLC'          # Media player
+  'com.obsproject.Studio'     # Video streaming
+  'com.valvesoftware.Steam'   # Gaming
+  'com.spotify.Client'        # Music streaming
+  'org.gnome.Cheese'          # Webcam client
+
+  # Creativity
+  'org.inkscape.Inkscape'     # Vector editor
+  'org.gimp.GIMP'             # Picture editor
+  'org.darktable.Darktable'   # Video editor
+  'org.audacityteam.Audacity' # Sound editor
+  'org.shotcut.Shotcut'       # Video editor
+  'org.blender.Blender'       # 3D modeling
+  'com.ultimaker.cura'        # 3D slicing
+  'fr.handbrake.ghb'          # Video transcoder
+  'org.synfig.SynfigStudio'   # 2D animation
+  'io.github.seadve.Kooha'    # Screen recorder
+
+  # Software development
+  'com.visualstudio.code'     # Extendable IDE
+  'com.getpostman.Postman'    # API development
+  'com.axosoft.GitKraken'     # GUI git client
+  'cc.arduino.IDE2'           # IOT development
+  'com.google.AndroidStudio'  # Android dev IDE
+
+  # Security testing
+  'org.wireshark.Wireshark'   # Packet capture and analyzer
+  'org.zaproxy.ZAP'           # Auto vulnerability scanning
+  'org.nmap.Zenmap'           # GUI for Nmap security scans
+
+  # Browsers
+  'org.mozilla.firefox'
+  'com.github.Eloston.UngoogledChromium'
+
+  # Personal
+  'ch.protonmail.protonmail-bridge' # ProtonMail bridge
+  'org.standardnotes.standardnotes' # Encrypted synced notes
+  'com.belmoussaoui.Authenticator'  # OTP authenticator
+  'org.cryptomator.Cryptomator'     # Encryption for cloud
+  # Missing: Trewsorit, 1Password, EteSync, Veracrypt
+)
+
+
+CYAN_B='\033[1;96m'
+YELLOW_B='\033[1;93m'
+RED_B='\033[1;31m'
+GREEN_B='\033[1;32m'
+RESET='\033[0m'
+
+echo -e "${CYAN_B}Installing Desktop Apps via Flatpak...${RESET}"
+
+# Flatpak
+
+# Pacman
+if hash flatpak 2> /dev/null; then
+  echo -e "${CYAN_B}Updating installed apps${RESET}"
+  flatpak update
+  for app in ${flatpak_apps[@]}; do
+    # If pacman -Qk ${app}
+    # And If: flatpak list --columns=ref | grep 'ch.protonmail.protonmail-bridge'
+    pacman -S ${app}
+  done
+else
+  echo "${YELLOW_B}Flatpak not present, skipping${RESET}"
+fi

symlinks.yaml

@@ -20,7 +20,8 @@
     ${XDG_DATA_HOME}/tmux/plugins/tpm: tpm
     ${XDG_CONFIG_HOME}/tmux/tmux.conf: tmux/tmux.conf
     ${XDG_CONFIG_HOME}/utils: utils
-    ~/.gitconfig: configs/.gitconfig
+    ${XDG_CONFIG_HOME}/git/.gitconfig: configs/.gitconfig
+    # ~/.gitconfig: configs/.gitconfig
     ${XDG_CONFIG_HOME}/.gitignore_global: configs/.gitignore_global
     # ${XDG_CONFIG_HOME}/curl/.curlrc: configs/.curlrc
     $XDG_CONFIG_HOME/yabai/yabairc:

utils/radio.sh

@@ -0,0 +1,2 @@
+alias kiss='mplayer http://oom-cmg.streamguys1.com/atl1041/atl1041.mp3'
+#Kiss 104.1-WALR-FM-FM 104.1-Atlanta,GA :SOURCE:view-source:http://streema.com/radios/play/3806