revert: remove optionals, they weren't working either way

This commit is contained in:
Ahwx 2026-06-12 01:48:44 +02:00
parent 1f061a508d
commit 36d0c7aabb

View file

@ -9,14 +9,10 @@
}: }:
{ {
imports = imports =
(lib.optionals (system == "x64_64-linux") [ inputs.home-manager.nixosModules.home-manager ]) [ inputs.home-manager.nixosModules.home-manager ]
++ (lib.optionals (system == "aarch64-darwin") [ inputs.home-manager.darwinModules.home-manager ]) ++ [ ./../../roles/default.nix ]
++ (lib.optionals (system == "x64_64-linux") [ ./../../roles/default.nix ]) ++ [ ./user-linux.nix ]
++ (lib.optionals (system == "aarch64-linux") [ ./../../roles/default.nix ]) ++ [ ./sops.nix ]
++ (lib.optionals (system == "x64_64-linux") [ ./user-linux.nix ])
++ (lib.optionals (system == "aarch64-linux") [ ./user-linux.nix ])
++ (lib.optionals (system == "x64_64-linux") [ ./sops.nix ])
++ (lib.optionals (system == "aarch64-linux") [ ./sops.nix ])
++ [ ./../../variables.nix ]; ++ [ ./../../variables.nix ];
home-manager = { home-manager = {
@ -38,12 +34,14 @@
[ ./../home/default.server.nix ] [ ./../home/default.server.nix ]
else if (host == "daisy") then else if (host == "daisy") then
[ ./../home/default.server.nix ] [ ./../home/default.server.nix ]
else if (host == "flora") then
[ ./../home/default.server.nix ]
else if (system == "aarch64-darwin") then else if (system == "aarch64-darwin") then
[ ./../home/default.azalea.nix ] [ ./../home/default.azalea.nix ]
else else
[ ./../home ]; [ ./../home ];
home = { home = {
username = "liv"; username = "${username}";
stateVersion = "22.11"; stateVersion = "22.11";
sessionVariables = { sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";