we do a little refactoring
This commit is contained in:
parent
dc5e5831b5
commit
1a7858b68b
3 changed files with 8 additions and 6 deletions
|
@ -7,8 +7,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
../../modules/nixos
|
|
||||||
];
|
];
|
||||||
programs = {
|
programs = {
|
||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
|
|
|
@ -3,10 +3,6 @@
|
||||||
userSettings,
|
userSettings,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
|
||||||
../../modules/macos
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
neovim
|
neovim
|
||||||
pinentry_mac
|
pinentry_mac
|
||||||
|
|
|
@ -20,6 +20,11 @@
|
||||||
then inputs.stylix.darwinModules.stylix
|
then inputs.stylix.darwinModules.stylix
|
||||||
else inputs.stylix.nixosModules.stylix;
|
else inputs.stylix.nixosModules.stylix;
|
||||||
|
|
||||||
|
systemModuleDir =
|
||||||
|
if darwin
|
||||||
|
then "macos"
|
||||||
|
else "nixos";
|
||||||
|
|
||||||
systemSettings = rec {
|
systemSettings = rec {
|
||||||
inherit darwin;
|
inherit darwin;
|
||||||
host =
|
host =
|
||||||
|
@ -70,6 +75,9 @@ in
|
||||||
#shared modules
|
#shared modules
|
||||||
../modules/shared
|
../modules/shared
|
||||||
|
|
||||||
|
#system specific modules
|
||||||
|
../modules/${systemModuleDir}
|
||||||
|
|
||||||
# Link to config.nix
|
# Link to config.nix
|
||||||
hostConfig
|
hostConfig
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue