From 16770c5d67f478d02405452748b1924a75b9339a Mon Sep 17 00:00:00 2001
From: "christoph.hollizeck" <christoph.hollizeck@web.de>
Date: Tue, 26 Mar 2024 19:23:10 +0100
Subject: [PATCH] bugs

---
 modules/nixos/submodules/basics/default.nix |  2 +-
 modules/nixos/submodules/games/default.nix  |  6 ++---
 modules/nixos/system/fonts/default.nix      |  8 +++----
 modules/nixos/system/locale/default.nix     | 26 +++++++++------------
 modules/nixos/system/xkb/default.nix        |  6 ++---
 systems/x86_64-linux/yggdrasil/default.nix  |  2 +-
 6 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/modules/nixos/submodules/basics/default.nix b/modules/nixos/submodules/basics/default.nix
index b5752d5..fb5a36e 100644
--- a/modules/nixos/submodules/basics/default.nix
+++ b/modules/nixos/submodules/basics/default.nix
@@ -10,7 +10,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [
+    environment.systemPackages = with pkgs; [
       neofetch
 
       fd
diff --git a/modules/nixos/submodules/games/default.nix b/modules/nixos/submodules/games/default.nix
index a827ae7..ffe1d03 100644
--- a/modules/nixos/submodules/games/default.nix
+++ b/modules/nixos/submodules/games/default.nix
@@ -11,9 +11,9 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-    			prismlauncher
-    		];
-    
+      prismlauncher
+    ];
+
     wyrdgard = {
       apps = {
         steam = enabled;
diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix
index 99f79f2..3bb6b17 100644
--- a/modules/nixos/system/fonts/default.nix
+++ b/modules/nixos/system/fonts/default.nix
@@ -26,10 +26,10 @@ in
 
     fonts.packages = with pkgs;
       [
-            (nerdfonts.override {fonts = ["Jetbrains Mono" "CodeNewRoman" "NerdFontsSymbolsOnly"];})
-      font-awesome
-      powerline-fonts
-      powerline-symbols
+        (nerdfonts.override { fonts = [ "Jetbrains Mono" "CodeNewRoman" "NerdFontsSymbolsOnly" ]; })
+        font-awesome
+        powerline-fonts
+        powerline-symbols
       ]
       ++ cfg.fonts;
   };
diff --git a/modules/nixos/system/locale/default.nix b/modules/nixos/system/locale/default.nix
index 5395ccf..def4ebc 100644
--- a/modules/nixos/system/locale/default.nix
+++ b/modules/nixos/system/locale/default.nix
@@ -1,11 +1,7 @@
-{ options
-, config
-, pkgs
-, lib
-, ...
-}:
+{ options, config, pkgs, lib, ... }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.locale;
 in
 {
@@ -17,14 +13,14 @@ in
     i18n.defaultLocale = "en_US.UTF-8";
 
     i18n.extraLocaleSettings = {
-        LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
+      LC_ADDRESS = "de_DE.UTF-8";
+      LC_IDENTIFICATION = "de_DE.UTF-8";
+      LC_MEASUREMENT = "de_DE.UTF-8";
+      LC_MONETARY = "de_DE.UTF-8";
+      LC_NAME = "de_DE.UTF-8";
+      LC_NUMERIC = "de_DE.UTF-8";
+      LC_PAPER = "de_DE.UTF-8";
+      LC_TELEPHONE = "de_DE.UTF-8";
       LC_TIME = "de_DE.UTF-8";
     };
 
diff --git a/modules/nixos/system/xkb/default.nix b/modules/nixos/system/xkb/default.nix
index afe8ea1..91efcc1 100644
--- a/modules/nixos/system/xkb/default.nix
+++ b/modules/nixos/system/xkb/default.nix
@@ -1,6 +1,6 @@
-{ options , config , lib , ... }:
+{ options, config, lib, ... }:
 with lib;
-with lib.wyrdgard; 
+with lib.wyrdgard;
 let
   cfg = config.wyrdgard.system.xkb;
 in
@@ -13,7 +13,7 @@ in
     console.useXkbConfig = true;
     services.xserver = {
       xkb.layout = "us";
-      variant = "";
+      xkb.variant = "";
       xkbOptions = "caps:escape";
     };
   };
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index 7a63cf9..8c848c7 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -26,7 +26,7 @@ with lib.wyrdgard;
     package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 
-  environment.pathsToLink = ["/libexec"];
+  environment.pathsToLink = [ "/libexec" ];
 
   services.xserver.videoDrivers = [ "nvidia" ];