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

Miscelaneous touchups #23

Merged
merged 6 commits into from
Aug 4, 2023
Merged

Miscelaneous touchups #23

merged 6 commits into from
Aug 4, 2023

Conversation

e1mo
Copy link
Member

@e1mo e1mo commented Jul 28, 2023

Various smaller changes or cleanups that, to me, wouldn't warrant a PR on their own. Besides addressing some TODOs (namely the one in the flake.nix), goals included a reduction of redundant and ambiguous code / statements (e.g. the isDev detection) and a reduction of (visual) complexity making the code easier to follow, understand and review.

There are no changes in the resulting closures:

$ nix store diff-closures --derivation git+file:.\?ref=origin/main#nixosConfigurations.shirley.config.system.build.toplevel .#nixosConfigurations.shirley.config.system.build.toplevel -vv
evaluating derivation 'git+file:.?ref=origin/main#nixosConfigurations.shirley.config.system.build.toplevel'...
using revision 2f3a7072167fca820eec403c372def8eabcca5e5 of repo '.'
evaluating file '/nix/store/sh8dmfd0g213yxs2z68c96jsaw1qcx3l-source/flake.nix'
evaluating derivation 'git+file:///home/e1mo/Documents/chaos-jetzt/chaos-jetzt-nixfiles#nixosConfigurations.shirley.config.system.build.toplevel'...
using revision 6482c8092ab7f6ba8cc5f6c7edd8fb4837a0647e of repo '/home/e1mo/Documents/chaos-jetzt/chaos-jetzt-nixfiles'
evaluating file '/nix/store/7b4hs5s5vrxrh0p56h7b2xmwil8zpcsb-source/flake.nix'

$ nix store diff-closures --derivation git+file:.\?ref=origin/main#nixosConfigurations.goldberg.config.system.build.toplevel .#nixosConfigurations.goldberg.config.system.build.toplevel -vv
evaluating derivation 'git+file:.?ref=origin/main#nixosConfigurations.goldberg.config.system.build.toplevel'...
using revision 2f3a7072167fca820eec403c372def8eabcca5e5 of repo '.'
evaluating file '/nix/store/sh8dmfd0g213yxs2z68c96jsaw1qcx3l-source/flake.nix'
evaluating derivation 'git+file:///home/e1mo/Documents/chaos-jetzt/chaos-jetzt-nixfiles#nixosConfigurations.goldberg.config.system.build.toplevel'...
using revision 6482c8092ab7f6ba8cc5f6c7edd8fb4837a0647e of repo '/home/e1mo/Documents/chaos-jetzt/chaos-jetzt-nixfiles'
evaluating file '/nix/store/7b4hs5s5vrxrh0p56h7b2xmwil8zpcsb-source/flake.nix'

@e1mo e1mo marked this pull request as ready for review July 28, 2023 09:57
@e1mo e1mo requested a review from a team as a code owner July 28, 2023 09:57
Complete TODO we initially left there
That way we can configure the depployment tags and everything in a
single location.
Some variables that were intendet to be used were in fact not used (e.g.
allTargets) but that will be needed as soon as we have a second non-dev
host in our nixfiles.
Attempting to reduce the complexity of the service as a whole.
Also merged the various network configurations a bit for better clarity
@e1mo e1mo merged commit 1f9d8ba into main Aug 4, 2023
1 check passed
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.

2 participants