hyprland: prioritize variables and beziers #4263

fufexan · 2023-07-22T10:46:45Z

Description

The settings attribute now handles $variables and beziers differently,
putting them at the top of the file.
Also, proper indentation has been implemented.

EDIT(@ncfavier): fixes #4262

Checklist

Change is backwards compatible.
Code formatted with ./format.
Code tested through nix-shell --pure tests -A run.all or nix develop --ignore-environment .#all using Flakes.
Test cases updated/added. See example.
Commit messages are formatted like
```
{component}: {description}

{long description}
```
See CONTRIBUTING for more information and recent commit messages for examples.
If this PR adds a new module
- Added myself as module maintainer. See example.

Maintainer CC

The `settings` key now handles `$variables` and `bezier`s differently, putting them at the top of the file. Also, proper indentation has been implemented.

ncfavier · 2023-07-22T11:05:23Z

modules/services/window-managers/hyprland.nix

+          importantFields =
+            filterAttrs (n: _: (hasPrefix "$" n) || (hasPrefix "bezier" n))
+            allFields;


Could hyprland possibly be made order-agnostic in the future?

I will ask.

Yes, it could be made order-agnostic, but not with the current config parser, which processes the file line-by-line.

modules/services/window-managers/hyprland.nix

tests/modules/services/window-managers/hyprland/simple-config.conf

Co-authored-by: Naïm Favier <n@monade.li>

aouerf · 2023-07-24T01:37:58Z

modules/services/window-managers/hyprland.nix

+          mkFields = generators.toKeyValue { listsAsDuplicateKeys = true; };
+          allFields = filterAttrs (n: v: !(isAttrs v)) attrs;
+          importantFields =
+            filterAttrs (n: _: (hasPrefix "$" n) || (hasPrefix "bezier" n))


A bit late, but shouldn't source also be included here?

I think in some cases it might break users' configs.

* hyprland: prioritize variables and beziers The `settings` key now handles `$variables` and `bezier`s differently, putting them at the top of the file. Also, proper indentation has been implemented. * Update modules/services/window-managers/hyprland.nix Co-authored-by: Naïm Favier <n@monade.li> * hyprland: add animations & beziers test --------- Co-authored-by: Naïm Favier <n@monade.li>

* upstream/master: (352 commits) flake.lock: Update qcal: add module bat: generate cache file in XDG cache home nixos: only refer to `users.users` if needed home-cursor: remove IFD when linking icon directories flake.lock: Update home-cursor: improve icon compatibility fix(qt): allow theming for apps started by systemd (nix-community#4349) flake.lock: Update fcitx5: add `fcitx5-config-qt` to test stub pqiv: only run tests on Linux platforms pqiv: add module Translate using Weblate (German) xplr: add module browserpass: support librewolf Translate using Weblate (Romanian) Translate using Weblate (Portuguese (Brazil)) hyprland: remove xwayland.hidpi (nix-community#4302) home-manager: handle profile list in Nix >2.17 lf: simplify option validation (nix-community#4334) programs.khal: uncomment locale config (nix-community#4319) kanshi: support adaptive sync (nix-community#4328) mu: add package option (nix-community#4325) modules: types.string throws error now (nix-community#4324) taffybar: Avoid restarting too quickly (nix-community#4316) aerc: do not use smtp-starttls (nix-community#4272) zsh: Add `zsh.history.ignoreAllDups` config option (nix-community#4248) jujutsu: fix zsh completion (nix-community#4305) Translate using Weblate (Korean) Translate using Weblate (Romanian) Translate using Weblate (German) flake.lock: Update network-manager-applet: remove `--sm-disable` flag himalaya: update a link to ticket nushell: deprecation of let-env (nix-community#4292) man: fix caches generation in cross-compiled system (nix-community#4294) fish: fix session vars build in cross-compiled system (nix-community#4293) Update translation files Translate using Weblate (Chinese (Simplified)) gh: option to enable helper for additional hosts (nix-community#4288) home-manager: rework news command home-manager: skip manual in uninstall configuration gnome-terminal: add assertion on profile names hyprland: use `toKeyValue`'s `indent` argument (nix-community#4274) gpg: fix typo (nix-community#4277) firefox: make package nullable (nix-community#4113) git-sync: add news entry for darwin tmate: don't generate empty config file (nix-community#4271) gh-dash: add module git-sync: add darwin support flake.lock: Update hyprland: prioritize variables and beziers (nix-community#4263) hyprland: add module script-directory: fix documentation link (nix-community#4258) Translate using Weblate (Indonesian) Translate using Weblate (Ukrainian) Translate using Weblate (Spanish) Translate using Weblate (Swedish) docs: hide `_module.*` from NixOS/nix-darwin docs jujutsu: update for Jujutsu 0.8.0 (nix-community#4250) ripgrep: don't set env. variable if no config (nix-community#4254) docs: update for Markdown migration treewide: remove now-redundant `lib.mdDoc` calls docs: clean up after Markdown migration flake: remove temporary nixpkgs pin treewide: convert all option docs to Markdown treewide: adjust some DocBook for conversion treewide: `mkAliasOption` -> `mkAliasOptionMD` treewide: `mkPackageOption` -> `mkPackageOptionMD` treewide: convert options with tables to Markdown treewide: convert options with lists to Markdown treewide: convert custom `enable` docs to Markdown treewide: convert parameterized docs to Markdown treewide: manually convert some docs to Markdown treewide: fix `mkEnableOption` arguments treewide: add missing option descriptions docs: use `nixosOptionsDoc` flake: temporarily pin nixpkgs version version: add `isReleaseBranch` manual: add test Update translation files flake.lock: Update home-manager: remove Home Manager default paths imapnotify: Use JSON type for extraConfig (nix-community#4238) Translate using Weblate (French) zsh: fix custom syntax highlighting styles (nix-community#4236) i3-sway: allow arbitrary floating modifier (nix-community#4229) i3-sway: multiple outputs (nix-community#4223) home-cursor.nix: enable gtk module when enabling gtk config generation (nix-community#4144) aerc: add assertion to limit per-account extraConfig to UI config (nix-community#4196) flake.lock: Update ssh-agent: add assertion and fix news entry (nix-community#4210) imapnotify: move test imapnotify: use direct nix store path for config flake.lock: Update nushell: add login.nu configuration option himalaya: fix notmuch backend swayosd: add module pyenv: add module darcs: add module tests: some minor cleanups goimapnotify: remove test dependency on notmuch unison: Allow using same option multiple times (nix-community#4208) imapnotify: Add launchd agent (nix-community#3291) i3: remove deprecated example in i3.config.startup (nix-community#4201) antidote: static file move to /tmp Translate using Weblate (Indonesian) PULL_REQUEST_TEMPLATE.md: add maintainer cc section (nix-community#4193) programs.khal vdirsyncer: synchronize metadata as well (nix-community#4167) i18n: Use glibcLocales from NixOS if possible (nix-community#2333) (nix-community#4177) xfconf: remove properties with null values (nix-community#4192) home-manager: Use `path:` URI type for flake default (nix-community#3646) ci: autolabel calendars PRs (nix-community#4165) flake.lock: Update (nix-community#4161) news: fix typo in programs.zsh.antidote entry ssh-agent: init module (nix-community#4178) chromium: fix `commandLineArgs` to use the user specified package (nix-community#4175) sxhkd: allow usage of derivations as keybind commands (nix-community#4169) README: Remove the pills (nix-community#4181) lsd: use -A instead of -a in aliases (nix-community#4173) kakoune: add defaultEditor option docs: update link to allowed users setting (nix-community#4176) zsh: allow setting custom syntax highlighting styles (nix-community#4122) flake: add formatter (nix-community#3620) broot: fix test (nix-community#4170) antidote: fix .dot path ci: build manual and push to home-manager.dev ...

hyprland: prioritize variables and beziers

554ff61

The `settings` key now handles `$variables` and `bezier`s differently, putting them at the top of the file. Also, proper indentation has been implemented.

ncfavier reviewed Jul 22, 2023

View reviewed changes

fufexan and others added 2 commits July 22, 2023 14:13

Update modules/services/window-managers/hyprland.nix

93aec6b

Co-authored-by: Naïm Favier <n@monade.li>

hyprland: add animations & beziers test

22aeb78

fufexan force-pushed the hyprland branch from c703705 to 22aeb78 Compare July 22, 2023 11:42

ncfavier mentioned this pull request Jul 22, 2023

lib/generators/toKeyValue: add indent parameter NixOS/nixpkgs#244819

Merged

ncfavier approved these changes Jul 22, 2023

View reviewed changes

ncfavier merged commit 76dd6c6 into nix-community:master Jul 22, 2023
3 checks passed

aouerf reviewed Jul 24, 2023

View reviewed changes

spikespaz mentioned this pull request Jul 24, 2023

Nix/HM: add instructions for upstream module hyprwm/hyprland-wiki#273

Merged

spikespaz mentioned this pull request Aug 2, 2023

Adoption by the Hyprland + Nix community hyprland-community/hyprnix#1

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

hyprland: prioritize variables and beziers #4263

hyprland: prioritize variables and beziers #4263

fufexan commented Jul 22, 2023 •

edited by ncfavier

ncfavier Jul 22, 2023

fufexan Jul 22, 2023

fufexan Jul 22, 2023

aouerf Jul 24, 2023

fufexan Jul 24, 2023

hyprland: prioritize variables and beziers #4263

hyprland: prioritize variables and beziers #4263

Conversation

fufexan commented Jul 22, 2023 • edited by ncfavier

Description

Checklist

Maintainer CC

ncfavier Jul 22, 2023

Choose a reason for hiding this comment

fufexan Jul 22, 2023

Choose a reason for hiding this comment

fufexan Jul 22, 2023

Choose a reason for hiding this comment

aouerf Jul 24, 2023

Choose a reason for hiding this comment

fufexan Jul 24, 2023

Choose a reason for hiding this comment

fufexan commented Jul 22, 2023 •

edited by ncfavier