Skip to content

Commit

Permalink
Update nix/module.nix
Browse files Browse the repository at this point in the history 
Co-authored-by: orangc <orangc@proton.me>
  • Loading branch information
@noahfraiture @orangci
noahfraiture and orangci authored Dec 24, 2024
1 parent 3907dc3 commit c92c6b2
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions nix/module.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,7 @@ in

config = mkIf cfg.enable {
# TODO:(benvonh) Nerd font packaging changes in NixOS 25.05
home.packages = [
package
(pkgs.nerd-fonts.jetbrains-mono.override { fonts = [ "JetBrainsMono" ]; })
];
home.packages = [pkgs.nerd-fonts.jetbrains-mono];

# NOTE:(benvonh)
# When changing the configuration through the GUI, HyprPanel will delete the `config.json` file and create a new
Expand Down

6 comments on commit c92c6b2

@benvonh
Copy link
Contributor

@benvonh benvonh commented on c92c6b2 Dec 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

uhh this breaks for people not using unstable (I use 24.11)

Is that what we want or should we add a condition to check system version until the next release in May.

idm either way but might be annoying for others who prefer stable and then have to pach it themselves.

can fix if you want @orangci

@orangci
Copy link
Collaborator

Choose a reason for hiding this comment

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

uhh this breaks for people not using unstable (I use 24.11)

@benvonh this should only be an issue if people use nixpkgs.follows, which they shouldn't, kek

even if people use stable as long as they dont force hyprpanel to follow their nixpkgs input it shouldnt be an issue

@benvonh
Copy link
Contributor

Choose a reason for hiding this comment

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

but wouldn't that be weird when you use the same packages as hyprpanel?

e.g., swww. I use it from other stuff, too, so I would probably want hyprpanel to use the same version as my scripts, right?

@orangci
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hmm... I see what you're saying, however hyprpanel is geared towards nix unstable, not stable.

@benvonh
Copy link
Contributor

Choose a reason for hiding this comment

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

it is working with stable so it seems fine for now.

worst case, don't make hyprpanel follow your nixpkgs and just deal with whatever conflicts you might have with e.g. swww (which seems rare anyway lol)

I added logic anyway where it'll prefer unstable, if not, do stable (for nerd font). I also added every possible hyprpanel option. Should I make a PR with both changes?

@orangci
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should I make a PR with both changes?

Sure!

Please sign in to comment.