-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
42 changed files
with
137 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
nvim/lua/machine_settings.lua | ||
common/.config/nvim/lua/machine_settings.lua |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../redundant/clangd |
Submodule dotfiles_private
updated
from 241c52 to 4286bb
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# roots define root directories for syncing between | ||
root = /Users/jedrzej/Library/Mobile Documents/iCloud~md~obsidian/Documents/ | ||
root = /Users/jedrzej/Dropbox/ObsidianVaults/ | ||
|
||
# dirs to sync | ||
path=Personal | ||
|
||
# don't ask for confirmation | ||
auto=true | ||
batch=true | ||
# sync ownership and group | ||
owner=true | ||
group=true | ||
# for safety | ||
confirmbigdel=true | ||
# prefer newer in case of conflicts | ||
prefer=newer |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../redundant/clangd |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -x | ||
set -e | ||
|
||
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) | ||
ROOT_DIR=$(dirname "$SCRIPT_DIR") | ||
|
||
copy=false | ||
if [[ $1 == "--copy" ]]; then | ||
copy=true | ||
fi | ||
|
||
function add() { | ||
rm -r "$2" || true | ||
if [[ $copy == true ]]; then | ||
cp -r "$1" "$2" | ||
else | ||
ln -s "$1" "$2" | ||
fi | ||
} | ||
|
||
# snippets | ||
if [[ "$OSTYPE" == "linux-gnu"* ]]; then | ||
vscode_snippets_path="$HOME/.config/Code/User/snippets" | ||
elif [[ "$OSTYPE" == "darwin"* ]]; then | ||
vscode_snippets_path="$HOME/Library/Application Support/Code/User/snippets" | ||
else | ||
echo "OS type unknown. Exiting." | ||
exit 1 | ||
fi | ||
mkdir -p "$(dirname "${vscode_snippets_path}")" | ||
add "$SCRIPT_DIR/nvim/snippets" "${vscode_snippets_path}" | ||
|
||
cd "$ROOT_DIR" | ||
|
||
if ! [ -x "$(command -v stow)" ]; then | ||
if [[ "$OSTYPE" == "linux-gnu"* ]]; then | ||
sudo apt install stow -y | ||
elif [[ "$OSTYPE" == "darwin"* ]]; then | ||
if ! [ -x "$(command -v brew)" ]; then | ||
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" | ||
fi | ||
brew install stow | ||
else | ||
echo "Unsupported OS" | ||
fi | ||
fi | ||
|
||
# Stow common config | ||
stow -t ~ common | ||
cd dotfiles_private | ||
stow -t ~ common_private | ||
cd .. | ||
|
||
# Stow platform-specific config | ||
if [[ "$OSTYPE" == "linux-gnu"* ]]; then | ||
stow -t ~ debian | ||
cd dotfiles_private | ||
stow -t ~ debian_private | ||
cd .. | ||
scripts/debian/install_min.sh | ||
scripts/debian/install.sh --optional | ||
elif [[ "$OSTYPE" == "darwin"* ]]; then | ||
stow -t ~ macos | ||
cd dotfiles_private | ||
stow -t ~ macos_private | ||
cd .. | ||
scripts/macos/install.sh | ||
else | ||
echo "Unsupported OS" | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#!/usr/bin/env bash | ||
set -e | ||
|
||
# Unstow platform-specific config | ||
if [[ "$OSTYPE" == "linux-gnu"* ]]; then | ||
cd dotfiles_private | ||
stow -D -t ~ debian_private | ||
cd .. | ||
stow -D -t ~ debian | ||
elif [[ "$OSTYPE" == "darwin"* ]]; then | ||
cd dotfiles_private | ||
stow -D -t ~ macos_private | ||
cd .. | ||
stow -D -t ~ macos | ||
else | ||
echo "Unsupported OS" | ||
fi | ||
|
||
# Unstow common | ||
cd dotfiles_private | ||
stow -D -t ~ common_private | ||
cd .. | ||
stow -D -t ~ common |
This file was deleted.
Oops, something went wrong.