we do a little refactoring
3 files changed, 8 insertions(+), 6 deletions(-)
hosts/desktop/configuration.nix-2
| ... | ... | @@ -7,8 +7,6 @@ |
| 7 | 7 | imports = [ |
| 8 | 8 | # Include the results of the hardware scan. |
| 9 | 9 | ./hardware-configuration.nix |
| 10 | | |
| 11 | | ../../modules/nixos |
| 12 | 10 | ]; |
| 13 | 11 | programs = { |
| 14 | 12 | gamemode.enable = true; |
hosts/laptop/configuration.nix-4
| ... | ... | @@ -3,10 +3,6 @@ |
| 3 | 3 | userSettings, |
| 4 | 4 | ... |
| 5 | 5 | }: { |
| 6 | | imports = [ |
| 7 | | ../../modules/macos |
| 8 | | ]; |
| 9 | | |
| 10 | 6 | environment.systemPackages = with pkgs; [ |
| 11 | 7 | neovim |
| 12 | 8 | pinentry_mac |
lib/mkSystem.nix+8
| ... | ... | @@ -20,6 +20,11 @@ |
| 20 | 20 | then inputs.stylix.darwinModules.stylix |
| 21 | 21 | else inputs.stylix.nixosModules.stylix; |
| 22 | 22 | |
| 23 | systemModuleDir = |
| 24 | if darwin |
| 25 | then "macos" |
| 26 | else "nixos"; |
| 27 | |
| 23 | 28 | systemSettings = rec { |
| 24 | 29 | inherit darwin; |
| 25 | 30 | host = |
| ... | ... | @@ -70,6 +75,9 @@ in |
| 70 | 75 | #shared modules |
| 71 | 76 | ../modules/shared |
| 72 | 77 | |
| 78 | #system specific modules |
| 79 | ../modules/${systemModuleDir} |
| 80 | |
| 73 | 81 | # Link to config.nix |
| 74 | 82 | hostConfig |
| 75 | 83 | |
Natalie Marks <nmarks413@gmail.com> 2025-05-02 16:13:17-07:00