From f542e2a922701ee4ba235873a9d9d905b6b8523a Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 25 Feb 2024 07:39:37 +0000 Subject: [PATCH] Revert "Move stylix module definition, not needed for server" This reverts commit c9ab74c825fb264abc5d439dfb3bff98cd6090a0. Add stylix to system/default.nix --- flake.nix | 5 +---- system/default.nix | 2 +- system/desktop.nix | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index c42329a1..1109de6d 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ modules = [ home-manager.nixosModules.home-manager + stylix.nixosModules.stylix ./hosts/${hostName}/configuration.nix ./hosts/${hostName}/hardware-configuration.nix ./system/default.nix @@ -159,7 +160,6 @@ systemConfig { inherit hostName user system; systemModules = [ - stylix.nixosModules.stylix ./system/laptop.nix ./system/hyprland.nix ./system/games.nix @@ -175,7 +175,6 @@ systemConfig { inherit hostName user system; systemModules = [ - stylix.nixosModules.stylix ./system/autoupgrade.nix ./system/hyprland.nix ./system/games.nix @@ -193,7 +192,6 @@ systemConfig { inherit hostName user system; systemModules = [ - stylix.nixosModules.stylix ./system/laptop.nix ./system/hyprland.nix ]; @@ -208,7 +206,6 @@ systemConfig { inherit hostName user system; systemModules = [ - stylix.nixosModules.stylix ./system/autoupgrade.nix ./system/hyprland.nix ]; diff --git a/system/default.nix b/system/default.nix index 00cab910..198d0a87 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - imports = [./registry.nix]; + imports = [./registry.nix ./stylix.nix]; boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; diff --git a/system/desktop.nix b/system/desktop.nix index 5b42554e..fb15d0ce 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -3,7 +3,7 @@ user, ... }: { - imports = [./default.nix ./stylix.nix]; + imports = [./default.nix]; environment.systemPackages = with pkgs; [ libnotify libcamera