Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/xdg #33

Merged
merged 50 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
260cc29
removes duplicate settings in vscode
edheltzel Feb 3, 2024
a49fac1
adds `.config/wallpapers`
edheltzel Feb 3, 2024
868cea1
includes abbrivation for `~/.local/`
edheltzel Feb 4, 2024
7ff61c3
tweaks iterm2 settings and profiles
edheltzel Feb 4, 2024
7e942b9
includes new git alias `git addi` that uses fzf
edheltzel Feb 4, 2024
6734dc1
add todo about plug.fish
edheltzel Feb 4, 2024
d2e62dd
removes tabtab completions from fish
edheltzel Feb 4, 2024
262d42b
removes titles from iterm2 split panes for more minimal look
edheltzel Feb 4, 2024
2c2ab87
update make help language
edheltzel Feb 4, 2024
77b511e
dropping support for Fisher - migration to Plug.fish
edheltzel Feb 4, 2024
66c8c8e
update readme and xdg support
edheltzel Feb 4, 2024
dfda09d
update readme and remove gitnow keybindings - rarely use them
edheltzel Feb 4, 2024
c232aba
fisher plugins file
edheltzel Feb 4, 2024
b60620c
adding only my completions
edheltzel Feb 4, 2024
c528f36
raycast backup
edheltzel Feb 4, 2024
cda5598
cleaning up only my custom fish files
edheltzel Feb 4, 2024
3bac99e
update iterm directory to iterm2
edheltzel Feb 4, 2024
deb7bb4
update todos
edheltzel Feb 4, 2024
b75164a
Update XDG Base Directory Specification paths
edheltzel Feb 5, 2024
f27ed1c
fix typo
edheltzel Feb 5, 2024
7891526
Add color codes and improve Makefile
edheltzel Feb 5, 2024
f2efc3c
Add makefile for managing dotfiles with Stow
edheltzel Feb 5, 2024
a6d044c
changed first task from `all` to `default`
edheltzel Feb 5, 2024
e506aa2
add some gh aliases for faster assignment of issues and workflow
edheltzel Feb 5, 2024
4beb1bc
update lazyvim
edheltzel Feb 5, 2024
a32f4b3
iterm2 window alignment update
edheltzel Feb 5, 2024
87c33af
match language from README
edheltzel Feb 5, 2024
4fe55ec
cspell dictionary update
edheltzel Feb 5, 2024
0bc8687
move images to misc/__images
edheltzel Feb 5, 2024
da1f6a7
update packages script
edheltzel Feb 5, 2024
39f991c
Updates Git Project Manager base folders to include ~/.dotfiles
edheltzel Feb 5, 2024
d9a2f44
private ;)
edheltzel Feb 5, 2024
2b79748
update to readme
edheltzel Feb 5, 2024
bbcc08b
Update Makefile and remove wallpapers
edheltzel Feb 6, 2024
d5bd7a6
updates stow packages to includes local
edheltzel Feb 6, 2024
a7dd5f3
move wallpaper to live in ~/.local/share/wallpapers
edheltzel Feb 6, 2024
1112aee
adding zed and updating comments
edheltzel Feb 6, 2024
3867ef4
update lazyvim
edheltzel Feb 6, 2024
8936e6d
Update Brewfile with new default description for Visual Studio Code I…
edheltzel Feb 6, 2024
5cdb8d1
trying to stay true to XDG standards
edheltzel Feb 6, 2024
d9aa72c
Update local directory description
edheltzel Feb 6, 2024
3ad096e
Update vscode sync settings feature
edheltzel Feb 6, 2024
0364afb
Add system provisioning and installation functions***
edheltzel Feb 6, 2024
1afcf61
iterm2 profile update
edheltzel Feb 6, 2024
0742d7e
bootstrap is now install for remote
edheltzel Feb 6, 2024
fb5a1da
Update Makefile and install.sh scripts
edheltzel Feb 6, 2024
126a6d5
update iterm window styling
edheltzel Feb 6, 2024
c9e0556
Update bootstrap script and installation instructions
edheltzel Feb 6, 2024
7ba0c90
Fix indentation in Makefile
edheltzel Feb 6, 2024
1f2b5c5
fix duplication with ghpr
edheltzel Feb 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update Makefile and install.sh scripts
  • Loading branch information
edheltzel committed Feb 6, 2024
commit fb5a1da6a7fdd9ced4215fa2caf3fcfb421a405a
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ help: ## Show this help message (default)
/^##/ { printf "$(YELLOW)%s$(CLR)\n", substr($$0, 4) }' $(MAKEFILE_LIST)

.PHONY: install
install: ## Provision a new system
install: ## Bootsraps a new machine
@echo "$(YELLOW)Running bootstrap to provision the system...$(CLR)"
@./bootstrap.sh
@./install.sh
@echo "$(GREEN)System provisioning complete!$(CLR)"


Expand Down
29 changes: 21 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
<img src="misc/__images/dotfiles-logo.png" alt="dotfiles logo" width="350">
<img src="local/.local/__images/dotfiles-logo.png" alt="dotfiles logo" width="350">

### My personal configuration (.dotfiles) for  macOS using 🐠 Fish shell.

This is my personal configuration (.dotfiles) for macOS that involves web development and devops which are deployed using [GNU Stow][STOW]. There are also files for provisioning a new machine and setting up my environment – they are highly personalized and built over time, so what works for me probably won't work for you. But take inspiration all you want and make it your own. _**So proceed with caution, and use at your own risk**_.
This is my personal configuration (.dotfiles) for macOS that involves web development and devops which are deployed using [GNU Stow][STOW]. There are also files for provisioning a new machine and setting up my environment. Zach Holman wrote a nice post about how [dotfiles](https://zachholman.com/2010/08/dotfiles-are-meant-to-be-forked/) should be forked, I agree with this to a point, but I'm more of a fan of take what you like and leave the rest. Because dotfiles are highly personalized and built over time, so what works for me probably won't work for you. But take inspiration all you want and make it your own. _**So proceed with caution, and use at your own risk**_.

## Get Started

<details>
<summary><strong>Single Line Install</strong></summary>
I have not tested this on a fresh install, so this could break your setup. I'd suggest you read through the `bootstrap.sh` and `install.sh` scripts and the `Makefile` before running this command.

In theory this will clone the repository and install everything outlined below. Again, In theory.
```shell
bash -c "`curl -fsSL https://raw.githubusercontent.com/edheltzel/dotfiles/master/remote-install.sh`"
```
</details>

<details>
<summary><strong>Caveats for non-Apple Silicon (Intel)</strong></summary>
If you are on any version of macOS that uses AFPS, you'll need to disable the SIP.
Expand Down Expand Up @@ -36,12 +46,15 @@ This is my personal configuration (.dotfiles) for macOS that involves web develo

Since we have a bad habit of forgetting things:

1. Install Xcode Command Line Tools `sudo softwardupdate -i -a && xcode-select --install`
1. Installing Xcode Command Line Tools `sudo softwardupdate -i -a && xcode-select --install`
- This will install `git` and `make` if not already installed.
2. Setup SSH keys for GitHub
2. Generate a new SSH key for GitHub
- [Generate a new ssh keys][GENSSHKEY] or restore existing key if needed.
2. Clone this repository to `~/.dotfiles`
3. Run the `bootstrap.sh` script or `make install` command
2. Clone this repository `git clone https://github.com/edheltzel/dotfiles.git ~/.dotfiles`
3. Use the [`Makefile`](makefile) to install the dotfiles and packages
- `cd ~/.dotfiles`
- `make install`
- Alternatively, you can run the `install.sh` script `cd ~/.dotfiles && ./install.sh`

## What's Inside

Expand Down Expand Up @@ -224,9 +237,9 @@ Gotta thanks to [kalis.me blog post](https://kalis.me/dotfiles-automating-macos-

## 📝 TODOs

- [ ] create a single line install script to execute bootstrap.sh
- [ ] use makefile to execute bootstrap.sh and install.sh
- [ ] Look into [Tuckr](https://github.com/RaphGL/Tuckr)
- [x] create a single line install script to execute bootstrap.sh
- [x] use makefile to execute bootstrap.sh and install.sh
- [x] update make unstow to include only the available stow package or all
- [x] add customizations to lazyvim
- [x] add vscode settings and symlink to dotfiles
Expand Down
11 changes: 11 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ check_required_commands() {
done
}

PROJECTS_DIR="$HOME/Developer"

# Start the bootstrap process referencing functions.sh
install_xcode
install_git

# Create the ~/Developer directory if it does not exist
if [ ! -d "$PROJECTS_DIR" ]; then
mkdir -p "$PROJECTS_DIR"
fi

# Main installation process
mainInstall() {
check_required_commands
Expand Down
File renamed without changes.