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.

Sign up for GitHub

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

Jump to bottom

feat: move to catppuccin namespace #371

Merged
merged 1 commit into from
Dec 19, 2024
Merged

feat: move to catppuccin namespace #371

merged 1 commit into from
Dec 19, 2024

Conversation

isabelroses
Copy link
Member

@isabelroses isabelroses commented Nov 10, 2024 •
edited
Loading

  • introduces a new lib function lib.ctp.mkCatppuccinRenamedOpt
  • moves all options to the catppuccin namespace
    • port names are preferred to nix names
    • examples:
      • programs.git.delta.catppuccin -> catpppuccin.delta
      • console.catppuccin -> catppuccin.tty
  • currently has a broken module in zsh-syntax-highlighting.nix

Incase anyone wants to run this in there own system heres the regex i used in nvim: /\(config\|options\)\.\(.*\.\)\?\(.*\)\.catppuccin/\1.catppuccin.\3/gc

@isabelroses isabelroses requested a review from getchoo November 10, 2024 14:00
getchoo
getchoo requested changes Nov 10, 2024
View reviewed changes
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of this looks good

Only other change I suggest are changing the commit prefix to feat to trigger a minor release. We also need to check how the docs handles this renaming (we may need to change how we handle that too :p)

modules/lib/default.nix Outdated Show resolved Hide resolved
modules/home-manager/zsh-syntax-highlighting.nix Outdated Show resolved Hide resolved
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch 2 times, most recently from 0689d37 to 701ed8a Compare November 10, 2024 22:20
@isabelroses isabelroses changed the title refactor: move to catppuccin namespace feat: move to catppuccin namespace Nov 10, 2024
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch from 701ed8a to 2882366 Compare November 12, 2024 16:20
@isabelroses isabelroses requested a review from getchoo November 12, 2024 16:21
@Weathercold
Copy link
Contributor

Closes #222

Weathercold
Weathercold suggested changes Nov 23, 2024
View reviewed changes
modules/home-manager/dunst.nix Outdated Show resolved Hide resolved
modules/home-manager/fcitx5.nix Outdated Show resolved Hide resolved
modules/home-manager/fcitx5.nix Outdated Show resolved Hide resolved
modules/home-manager/foot.nix Outdated Show resolved Hide resolved
modules/home-manager/obs-studio.nix Show resolved Hide resolved
modules/nixos/tty.nix Show resolved Hide resolved
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch from 2882366 to f9e2075 Compare November 23, 2024 09:56
getchoo
getchoo requested changes Nov 23, 2024
View reviewed changes
modules/lib/default.nix Outdated Show resolved Hide resolved
modules/home-manager/obs-studio.nix Show resolved Hide resolved
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch from f9e2075 to 47c5208 Compare November 23, 2024 15:20
Weathercold
Weathercold suggested changes Nov 23, 2024
View reviewed changes
modules/home-manager/cursor.nix Outdated Show resolved Hide resolved
modules/home-manager/obs-studio.nix Outdated Show resolved Hide resolved
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch 3 times, most recently from 0c1924e to 650479e Compare November 26, 2024 13:27
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch from 7bd5915 to de02515 Compare November 27, 2024 09:13
@getchoo getchoo added this to the 1.2.0 milestone Nov 27, 2024
getchoo
getchoo requested changes Nov 27, 2024
View reviewed changes
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be rebased to fix CI

tests/home.nix Outdated Show resolved Hide resolved
modules/home-manager/neovim.nix Outdated Show resolved Hide resolved
modules/home-manager/zsh-syntax-highlighting.nix Outdated Show resolved Hide resolved
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch 4 times, most recently from 982061b to bfd08e2 Compare November 27, 2024 12:01
Weathercold
Weathercold approved these changes Nov 29, 2024
View reviewed changes
Copy link
Contributor

@Weathercold Weathercold left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already started using in my config

getchoo
getchoo reviewed Nov 29, 2024
View reviewed changes
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs another rebase after #390 hopefully it doesn't blow up our new search

@isabelroses isabelroses force-pushed the refator/ctp-namespace branch from bfd08e2 to 6065437 Compare November 29, 2024 23:05
@isabelroses isabelroses mentioned this pull request Dec 9, 2024
Merged
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch from 6065437 to 0190fc9 Compare December 9, 2024 10:40
@isabelroses
Copy link
Member Author

Now the zsh-syntax-highlighting will not show up too. Which is great.

image

@isabelroses isabelroses requested a review from getchoo December 9, 2024 10:43
@isabelroses isabelroses force-pushed the refator/ctp-namespace branch 3 times, most recently from a4cde89 to ed37a3e Compare December 18, 2024 12:09
@isabelroses isabelroses requested a review from getchoo December 18, 2024 12:14
@getchoo getchoo force-pushed the refator/ctp-namespace branch 2 times, most recently from 70c9569 to fd90378 Compare December 19, 2024 09:24
@isabelroses @Weathercold @getchoo
feat: move to catppuccin namespace
3803d0a 
Co-authored-by: Weathercold <[email protected]>
Co-authored-by: seth <[email protected]>
@getchoo getchoo force-pushed the refator/ctp-namespace branch from fd90378 to 3803d0a Compare December 19, 2024 09:33
getchoo
getchoo approved these changes Dec 19, 2024
View reviewed changes
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for all of your work here :)

@getchoo getchoo merged commit 20c0cb2 into main Dec 19, 2024
6 checks passed
@getchoo getchoo deleted the refator/ctp-namespace branch December 19, 2024 09:39
@khaneliman
Copy link

khaneliman commented Dec 19, 2024 •
edited
Loading

Rename option doesn't appear to be set up properly for hyprland.

 error: The option `home-manager.users.khaneliman.wayland.windowManager.hyprland.catppuccin.accent' does not exist. Definition values:
       - In `/nix/store/18zdkdp786dwgl3ivji0a223n2gz13a0-iv22jisi34qdx0frafdgrlncz09nnr2r-source/modules/home/theme/catppuccin/default.nix':

After manually resolving that one the other's showed properly.

@isabelroses isabelroses mentioned this pull request Dec 19, 2024
Merged
@getchoo getchoo mentioned this pull request Dec 20, 2024
Closed
@AnthonyEnr1quez AnthonyEnr1quez mentioned this pull request Dec 23, 2024
Merged
1 task
42willow added a commit to 42willow/ctp-nix that referenced this pull request Dec 26, 2024
@42willow
docs(FAQ): move to catppuccin namespace
119dfbd 
* catppuccin#371
@42willow 42willow mentioned this pull request Dec 26, 2024
Merged
42willow added a commit to 42willow/flake that referenced this pull request Dec 26, 2024
@42willow
refactor: update flake
08a925e 
* move to catppuccin namespace (catppuccin/nix#371)
getchoo pushed a commit that referenced this pull request Dec 27, 2024
@42willow
docs(FAQ): move to catppuccin namespace (#423)
a2e641b 
* docs(FAQ): move to catppuccin namespace

* #371

* docs(FAQ): use absolute URLs for search

* docs(FAQ): clarify enabling catppuccin globally

* docs(FAQ): remove kitty

why was that there??
github-actions bot pushed a commit that referenced this pull request Dec 27, 2024
@42willow @github-actions
docs(FAQ): move to catppuccin namespace (#423)
98d4299 
* docs(FAQ): move to catppuccin namespace

* #371

* docs(FAQ): use absolute URLs for search

* docs(FAQ): clarify enabling catppuccin globally

* docs(FAQ): remove kitty

why was that there??

(cherry picked from commit a2e641b)
getchoo pushed a commit that referenced this pull request Dec 27, 2024
@github-actions @42willow
[Backport release-1.x] docs(FAQ): move to catppuccin namespace (#426)
d96ff91 
docs(FAQ): move to catppuccin namespace (#423)

* docs(FAQ): move to catppuccin namespace

* #371

* docs(FAQ): use absolute URLs for search

* docs(FAQ): clarify enabling catppuccin globally

* docs(FAQ): remove kitty

why was that there??

(cherry picked from commit a2e641b)

Co-authored-by: willow <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arminius-smh arminius-smh arminius-smh left review comments

@Weathercold Weathercold Weathercold approved these changes

@getchoo getchoo getchoo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.2.0
Development

Successfully merging this pull request may close these issues.
5 participants
@isabelroses @Weathercold @khaneliman @getchoo @arminius-smh