From 008cdf0aa2de3070cf2f6e8e9a47cd16dc21d6f2 Mon Sep 17 00:00:00 2001
From: panotaka <panotaka@additionalpenguin.com>
Date: Thu, 7 Dec 2023 09:37:38 -0400
Subject: [PATCH] Update NixOS configuration and add new themes

---
 flake.nix                | 74 ++++++++++++++++++----------------------
 modules/kde.nix          | 12 +++----
 themes/targets/foot.nix  |  4 +++
 themes/targets/kde.nix   |  4 +++
 themes/targets/kitty.nix |  4 +++
 5 files changed, 52 insertions(+), 46 deletions(-)
 create mode 100644 themes/targets/foot.nix
 create mode 100644 themes/targets/kde.nix
 create mode 100644 themes/targets/kitty.nix

diff --git a/flake.nix b/flake.nix
index a2fb695..93b38a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,6 @@
 {
   description = "NixOS configuration of Thomas Syms";
-  nixConfig = {
-    experimental-features = [ "nix-command" "flakes" ];
-  };
+  nixConfig = { experimental-features = [ "nix-command" "flakes" ]; };
   inputs = {
     # System
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -17,51 +15,47 @@
     # Theming
     stylix.url = "github:danth/stylix";
   };
-  outputs =
-    inputs@{ self, nixpkgs, home-manager, ... }:
+  outputs = inputs@{ self, nixpkgs, home-manager, ... }:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
     in
     {
       nixosConfigurations = {
-        Equinox = nixpkgs.lib.nixosSystem
-          {
-            system = "x86_64-linux";
-            specialArgs = { inherit inputs; };
-            modules = [
-              ./hosts/Equinox
-              home-manager.nixosModules.home-manager
-              {
-                home-manager.useGlobalPkgs = true;
-                home-manager.useUserPackages = true;
-                home-manager.extraSpecialArgs = inputs;
-
-                home-manager.users.panotaka =
-                  {
-                    imports = [
-                      ./home
-                      ./home/shell
-                      ./home/desktop
-                    ];
-                  };
-              }
-              inputs.stylix.nixosModules.stylix
-              ./themes/targets/all.nix
-              ./themes/sandstone-forest
-            ];
-          };
-      };
-
-
-      homeConfigurations.panotaka = home-manager.lib.homeManagerConfiguration
-        {
-          inherit pkgs;
-
+        Equinox = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = { inherit inputs; };
           modules = [
-            ./home
-            ./home/shell
+            ./hosts/Equinox
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = inputs;
+
+              home-manager.users.panotaka = {
+                imports = [ ./home ./home/shell ./home/desktop ];
+              };
+            }
+            inputs.stylix.nixosModules.stylix
+            ./themes/targets/all.nix
+            ./themes/sandstone-forest
           ];
         };
+      };
+
+      homeConfigurations.panotaka = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+
+        modules = [
+          ./home
+          ./home/shell
+          inputs.stylix.homeManagerModules.stylix
+          ./themes/sandstone-forest
+          ./themes/targets/foot.nix
+          ./themes/targets/kitty.nix
+          ./themes/targets/kde.nix
+        ];
+      };
     };
 }
diff --git a/modules/kde.nix b/modules/kde.nix
index 62ef3e5..799f59a 100644
--- a/modules/kde.nix
+++ b/modules/kde.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
-    services.xserver.enable = true;
-    services.xserver.displayManager.sddm.enable = true;
-    services.xserver.displayManager.defaultSession = "plasmawayland";
-    services.xserver.desktopManager.plasma5.enable = true;
-    programs.dconf.enable = true;
-}
\ No newline at end of file
+  services.xserver.enable = true;
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.displayManager.defaultSession = "plasmawayland";
+  services.xserver.desktopManager.plasma5.enable = true;
+  programs.dconf.enable = true;
+}
diff --git a/themes/targets/foot.nix b/themes/targets/foot.nix
new file mode 100644
index 0000000..3951495
--- /dev/null
+++ b/themes/targets/foot.nix
@@ -0,0 +1,4 @@
+{
+  stylix.autoEnable = false;
+  stylix.targets.foot.enable = true;
+}
diff --git a/themes/targets/kde.nix b/themes/targets/kde.nix
new file mode 100644
index 0000000..a4a7914
--- /dev/null
+++ b/themes/targets/kde.nix
@@ -0,0 +1,4 @@
+{
+  stylix.autoEnable = false;
+  stylix.targets.kde.enable = true;
+}
diff --git a/themes/targets/kitty.nix b/themes/targets/kitty.nix
new file mode 100644
index 0000000..eb50ce3
--- /dev/null
+++ b/themes/targets/kitty.nix
@@ -0,0 +1,4 @@
+{
+  stylix.autoEnable = false;
+  stylix.targets.kitty.enable = true;
+}