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

feat(window_tabs_enabled): Adding support for window tabs rather than directory tabs #22

Merged
merged 11 commits into from
Dec 14, 2022

Conversation

rogeruiz
Copy link
Member

@rogeruiz rogeruiz commented Nov 23, 2022

This option, for now, defaults to false. This is just so it keeps the
initial design intention for the original design of the plugin. I may
flip it or change the name of the variable in future commits. This patch
is addressing #16.

Alright, this closes #16 when it's merged into the default branch. If anyone would like to test this out locally, you should be able to set a new remote to my GH fork and then change branches to add-option-to-display-folders.

The commands to do that in your local Git repository should be:

cd ~/.tmux/plugins/tmux
git remote add rogeruiz https://github.com/rogeruiz/tmux.git
git fetch --all
git checkout add-option-to-display-folders

Afterwards, you can follow the documentation in the README.md to turn on the feature. Remember to source your Tmux configuration file when you update it if you're in a session.

When you're done, you can remove the remote and go back to the default branch with the following:

cd ~/.tmux/plugins/tmux
git remote rm rogeruiz
git checkout main

This option, for now, defaults to false. This is just so it keeps the
initial design intention for the original design of the plugin. I may
flip it or change the name of the variable in future commits. This patch
is addressing catppuccin#16.

Co-Authored-By: Robert Menke <robert.b.menke@gmail.com>
@rogeruiz
Copy link
Member Author

rogeruiz commented Nov 23, 2022

I don't see a dev branch here. so I'm merging this into main for now. But feel free to swap it out eventually.

=> Referencing this document for what branch to merge into

This is the start of plumbing things through into the theme files, but I
do think that there is a better way here. I'm open to suggestions and
will probably ask for some help in the Discord for Catppuccin.
I'm aiming for having the Style Guide more exposed in the documentation.
I'm expecting to be able to reference it if people start asking for
things that would go against the guide. Also if anything I write that
follows the guide but isn't accessible then maybe I can contribute back
to the guide.
This file should be ignored as it's getting modified by the main script
to pull in the themes for each flavor of Catppuccin in a safe way for
users running this script.
So the idea here is that the themes are only different based on the
variables for the theme files. So this will change the theme variables
to have `local` prefixes to keep the namespace regular. I decided to
keep this like this until I get more feedback, because I think I could
also just manually add the local to everything in the old `tmuxtheme`
files. I chose this though because I really like how the
`catppuccin-selected-theme` can be used for local debugging or testing
out new colors if things were ever to need to be changed. If what that
`sed` and `source` command is doing is unclear, I can do better about
commenting around it.
This architecture is now more extensible since all the display variables
are decoupled from where the options get set. This will make customizing
the theme with custom scripts more practical.
This patch adds the functionality necessary to setup
@catppuccin_window_tabs_enabled for folks who expect something
differently than the initial design.
@rogeruiz rogeruiz marked this pull request as ready for review November 24, 2022 01:42
This decoupling was done in a previous patch
0d82738 and I missed this. So I went
back to fix it.
rogeruiz added a commit to rogeruiz/tmux that referenced this pull request Nov 25, 2022
I hadn't realized this earlier but we need to include the executable
here with the theme files since those alone wouldn't be enough after
catppuccin#22 is merged in. Figured it out with @DakshG07's help.


Co-authored-by: Dukk <48651837+DakshG07@users.noreply.github.com>
rogeruiz added a commit to rogeruiz/tmux that referenced this pull request Nov 30, 2022
I'm doing this since I don't want to have to rebase things. But I wanted
to make sure that I make this branch easy to merge into the default
branch whenever catppuccin#22 is approved and merged in.

Merge branch 'add-option-to-display-folders' into add-zoom-indicator
@rogeruiz
Copy link
Member Author

discussed with @pocco81 in Discord about this being reviewed and good. 👍🏽

@rogeruiz rogeruiz merged commit e2561de into catppuccin:main Dec 14, 2022
@rogeruiz rogeruiz deleted the add-option-to-display-folders branch December 14, 2022 16:42
rogeruiz added a commit to rogeruiz/tmux that referenced this pull request Dec 14, 2022
I hadn't realized this earlier but we need to include the executable
here with the theme files since those alone wouldn't be enough after
catppuccin#22 is merged in. Figured it out with @DakshG07's help.


Co-authored-by: Dukk <48651837+DakshG07@users.noreply.github.com>
@rogeruiz rogeruiz mentioned this pull request Dec 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use window titles for tabs instead of directory names
1 participant