17 Commits

Author SHA1 Message Date
6e2eba211f fix oh my bash path 2026-03-16 20:57:29 +05:30
993e375a76 Move shell config 2026-03-15 14:55:55 +05:30
d68beb82d9 Geany config changes 2026-03-15 14:32:21 +05:30
58080d0aa2 Change wezterm config file path 2026-03-15 14:28:04 +05:30
471d2e2b71 remove copilot from master 2026-03-15 14:20:33 +05:30
48d7990c10 ignore lazy lock 2026-03-15 14:19:37 +05:30
32fa1a369b Fix stow 2026-03-15 14:10:52 +05:30
d002786ad4 docs: restore README.md 2026-03-15 14:02:22 +05:30
bcd24b7c15 chore: ignore README.md and .git recursively in stow 2026-03-15 13:58:52 +05:30
839b7e0b5f Change directory structure 2026-03-15 13:56:32 +05:30
1f9cee1ad9 Zshrc changes 2026-03-15 13:09:31 +05:30
81540facfe Add ohmybash changes in bashrc 2026-03-15 13:08:25 +05:30
7a121e3814 fix stow 2026-03-15 12:59:33 +05:30
d7f76aa1a9 Merge pull request 'mac_personal' (#1) from mac_personal into master
Reviewed-on: #1
2026-03-15 12:54:07 +05:30
3a82b9b170 Remove work config file 2026-03-15 12:50:16 +05:30
3000fe9834 Ignore fonts in mac stow 2026-03-15 12:50:16 +05:30
de06d3ecb9 Remove copilot chat 2026-03-15 12:44:26 +05:30
2576 changed files with 1002 additions and 92 deletions

View File

@@ -1,3 +0,0 @@
return {
require("kickstart.plugins.copilot_chat"),
}

2
.gitignore vendored
View File

@@ -1,2 +1,2 @@
*nvim/lazy-lock.json*
*nvim/.config/nvim/lazy-lock.json*
.DS_Store

View File

@@ -28,3 +28,5 @@ _darcs
scripts # scripts directory to be ignored
shell # various shell configurations need not be stowed.
.DS_store
README.md
.*/\.git

View File

@@ -39,44 +39,56 @@ sudo pacman -S stow
To install all configurations at once, navigate to the root of this repository and run:
```bash
stow .
stow */
```
*(Note: Using `stow */` prevents the shell from passing pure files like `README.md` to Stow, ensuring only directory packages are stowed).*
This will automatically create the necessary symlinks in your `$HOME` directory pointing to the files in this repository.
This will automatically create the necessary symlinks in your `$HOME` directory.
### Removing Configurations
If you want to remove the symlinks created by Stow, use the `-D` flag:
```bash
stow -D .
stow -D */
```
## Directory Structure
## Directory Structure & Branching Strategy
The folder structure directly mirrors its target destination relative to the home (`~/`) directory.
This repository uses a **Folder-Per-App** structure combined with a **Git Branching Strategy** to flawlessly handle different machines (Mac, Work, Linux) without any `if/else` logic.
### 1. Folder Structure
The root directories represent individual applications:
```text
.
├── .bashrc # Symlinked to ~/.bashrc
├── .config/ # Symlinked to ~/.config/
│ ├── alacritty/
│ ├── kitty/
│ ├── nvim/
│ ├── starship.toml
│ └── ...
├── .fonts/ # Symlinked to ~/.fonts/
├── .tmux.conf # Symlinked to ~/.tmux.conf
├── .tmux.conf.local # Symlinked to ~/.tmux.conf.local
├── .vimrc # Symlinked to ~/.vimrc
├── .zshrc # Symlinked to ~/.zshrc
├── scripts/ # Symlinked to ~/scripts/
├── shell/ # Symlinked to ~/shell/
└── wezterm.lua # Symlinked to ~/wezterm.lua
├── bash/ # Stowed to ~ (contains .bashrc)
├── nvim/ # Stowed to ~/.config/nvim/
├── tmux/ # Stowed to ~ (contains .tmux.conf)
├── zsh/ # Stowed to ~ (contains .zshrc)
└── ...
```
### 2. The Git Branch Workflow
This repository has zero conditional logic. Configurations are managed purely via branches.
- **`master` branch**: Contains the 95% common base configurations shared across all machines.
- **`mac`, `work`, `linux` branches**: Machine-specific branches derived from `master`.
**How to manage machine-specific settings:**
1. Check out your machine's branch (e.g., `git checkout work`).
2. Statically write your overrides (e.g., adding a Work-only plugin to `nvim/`).
3. Commit and push: `git push origin work`.
**How to update shared settings:**
1. Switch to the base branch: `git checkout master`.
2. Update the shared configuration and commit.
3. Switch back to your local branch: `git checkout work`.
4. Pull the updates in by rebasing: `git rebase master` (then `git push origin work -f`).
### Adding New Configurations
When you want to add a new tool:
1. Replicate the target directory structure inside this repository (e.g., `.config/new_tool/config.toml`).
2. Run `stow .` from the root of this repository to link the new files.
1. Create a new folder matching the application's name (e.g., `mkdir alacritty`).
2. Replicate the target directory structure inside it (e.g., `alacritty/.config/alacritty/alacritty.toml`).
3. Run `stow */` from the root of this repository to link the new package.

View File

Before

Width:  |  Height:  |  Size: 694 KiB

After

Width:  |  Height:  |  Size: 694 KiB

Some files were not shown because too many files have changed in this diff Show More