Skip to content

Commit

Permalink
Merge pull request #20 from trystan2k/release/1.9.0
Browse files Browse the repository at this point in the history
Release/1.9.0
  • Loading branch information
trystan2k authored Dec 8, 2019
2 parents a01678f + e02507c commit de9444d
Show file tree
Hide file tree
Showing 10 changed files with 241 additions and 100 deletions.
96 changes: 0 additions & 96 deletions .cells-completion.bash

This file was deleted.

8 changes: 8 additions & 0 deletions .exports
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export PATH_TO_PROJECTS="$HOME/Documents/Thiago"
export SCREENSHOT_FOLDER=$HOME/Downloads/Screenshots
export TEXT_EDITOR="Visual Studio Code"

# This should be the last line of the file
# For local changes
# Don't make edits below this
[ -f ".exports.local" ] && source ".exports.local"
2 changes: 2 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@
# Prevent showing files whose names contain non-ASCII symbols as unversioned.
# http://michael-kuehnel.de/git/2014/11/21/git-mac-osx-and-german-umlaute.html
precomposeunicode = false
# Change default editor to VS Code
editor = code --wait
[color]
Expand Down
8 changes: 5 additions & 3 deletions .hyper.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
updateChannel: 'stable',

// default font size in pixels for all tabs
fontSize: 12,
fontSize: 14,

// font family with optional fallbacks
fontFamily: 'Fira Code, "Hack Nerd Font", Menlo, "DejaVu Sans Mono", Consolas, "Lucida Console", monospace',
Expand Down Expand Up @@ -179,6 +179,7 @@ module.exports = {
// `@company/project`
// `project#1.0.1`
plugins: [
"hyperterm-cobalt2-theme",
"hyper-quit",
"hyperline",
"hypercwd",
Expand All @@ -187,14 +188,15 @@ module.exports = {
"hyper-search",
//"hyper-letters",
"hyper-fading-scrollbar",
"hyper-font-ligatures"
"hyper-font-ligatures",
"hyper-reorderable-tabs"
],

// in development, you can create a directory under
// `~/.hyper_plugins/local/` and include it here
// to load it and avoid it being `npm install`ed
localPlugins: [
"hyper-native",
//"hyper-native",
],

keymaps: {
Expand Down
6 changes: 6 additions & 0 deletions .macos
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Specific setups for MacOS sistem

mkdir -p $SCREENSHOT_FOLDER

# Set default screenshot location to a specific folder
defaults write com.apply.screencapture location $SCREENSHOT_FOLDER
5 changes: 5 additions & 0 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,8 @@ source $ZSH/oh-my-zsh.sh
if [ -f $HOME/.aliases ]; then
. $HOME/.aliases
fi

if [ -f $HOME/.exports ]; then
. $HOME/.exports
fi

12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.9.0] - 2019-12-08

### Added

- Add new Hyper theme `hyperterm-cobalt2-theme`
- Add new bootstrap and tools script to help to setup new machine

### Removed

- Remove cells-completation file, not in use

## [1.8.0] - 2019-10-29

### Added
Expand Down Expand Up @@ -98,6 +109,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).


[Unreleased]: https://github.com/trystan2k/dotfiles/compare/master...develop
[1.9.0]: https://github.com/trystan2k/dotfiles/compare/v1.8.0...v1.9.0
[1.8.0]: https://github.com/trystan2k/dotfiles/compare/v1.7.0...v1.8.0
[1.7.0]: https://github.com/trystan2k/dotfiles/compare/v1.6.0...v1.7.0
[1.6.0]: https://github.com/trystan2k/dotfiles/compare/v1.5.0...v1.6.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Thiago’s dotfiles

[![v1.8.0](https://img.shields.io/badge/version-1.8.0-brightgreen.svg)](https://github.com/trystan2k/dotfiles/tree/v1.8.0)
[![v1.9.0](https://img.shields.io/badge/version-1.9.0-brightgreen.svg)](https://github.com/trystan2k/dotfiles/tree/v1.9.0)

# General Information

Expand Down
51 changes: 51 additions & 0 deletions bootstrap.exclude.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/bin/sh

source .exports
source .aliases
source .macos

# Initialize a few things
init () {
echo "Making a Projects folder in $PATH_TO_PROJECTS if it doesn't already exist"
mkdir -p "$PATH_TO_PROJECTS"
}

# TODO : Delete symlinks to deleted files
# Is this where rsync shines?
# TODO - add support for -f and --force
link () {
echo "This utility will symlink the files in this repo to the home directory"
echo "Proceed? (y/n)"
read resp
# TODO - regex here?
if [ "$resp" = 'y' -o "$resp" = 'Y' ] ; then
for file in $( ls -A | grep -vE '\.exclude*|\.git$|\.gitignore|.*.md' ) ; do
ln -sv "$PWD/$file" "$HOME"
done
echo "Symlinking complete"
else
echo "Symlinking cancelled by user"
return 1
fi
}

install_tools () {
if [ $( echo "$OSTYPE" | grep 'darwin' ) ] ; then
echo "This utility will install useful utilities using Homebrew/Git/others"
echo "Proceed? (y/n)"
read resp
# TODO - regex here?
if [ "$resp" = 'y' -o "$resp" = 'Y' ] ; then
echo "Installing useful stuff using brew/git/others. This may take a while..."
sh tools.exclude.sh
else
echo "Brew installation cancelled by user"
fi
else
echo "Skipping installations using Homebrew/Git/Others because MacOS was not detected..."
fi
}

init
install_tools
link
Loading

0 comments on commit de9444d

Please sign in to comment.