fix collision

2 files changed, 9 insertions, 14 deletions

diff --git a/nixos/general.nix b/nixos/general.nix
index 84d8131..204d62c 100644
--- a/nixos/general.nix
+++ b/nixos/general.nix
@@ -44,7 +44,7 @@
   disks.enable = true;
   user.enable = true;
   greetd.enable = true;
-  stylix.enable = true;
+  stylixConfig.enable = true;
   
   networking.networkmanager = {
     enable = true;
@@ -78,13 +78,6 @@
   ];
 
   services.v2raya.enable = true;
-  services.openvpn = {
-    servers.prostovpn = {
-      autoStart = true;
-      config = "config /home/jerpo/.prostovpn.ovpn";
-      updateResolvConf = true;
-    };
-  };
 
   fonts = {
     packages = with pkgs; [
diff --git a/nixos/nixosModules/stylix.nix b/nixos/nixosModules/stylix.nix
index 7daab8e..1c69cb8 100644
--- a/nixos/nixosModules/stylix.nix
+++ b/nixos/nixosModules/stylix.nix
@@ -1,22 +1,24 @@
-{ pkgs, config, lib, outputs, ... }:
+{ pkgs, config, lib, inputs, outputs, ... }:
 
 {
+  imports = [
+    inputs.stylix.nixosModules.stylix
+  ];
+  
   options = {
-    stylix.enable = lib.mkEnableOption "enable stylix";
+    stylixConfig.enable = lib.mkEnableOption "enable stylix";
   };
-  config = lib.mkIf config.stylix.enable {
+  config = lib.mkIf config.stylixConfig.enable {
     stylix = with outputs.homeConfigurations."jerpo@ltrr-mini".config.stylix; {
+      enable = true;
       image = image;
       base16Scheme = base16Scheme;
       autoEnable = false;
       targets.console.enable = true;
       fonts = with fonts; {
         serif = serif;
-
         sansSerif = sansSerif;
-
         monospace = monospace;
-
         emoji = emoji;
       };
     };