diff --git a/home-modules/git.nix b/home-modules/git.nix
index 1e9d2d5..7cd99ae 100644
--- a/home-modules/git.nix
+++ b/home-modules/git.nix
@@ -21,10 +21,10 @@
     };
     extraConfig = {
       credential = {
-        "https://git.da.dicos.de".username = lib.mkIf (hyper.host =="NxDCS") "lkurzweg";
-        "https://git.da.dicos.de".password = lib.mkIf (hyper.host =="NxDCS") "Test";
+        "https://git.da.dicos.de".username = lib.mkIf (hyper.host == "NxDCS") "lkurzweg";
+        "https://git.da.dicos.de".password = lib.mkIf (hyper.host == "NxDCS") "Test";
       };
-      url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host =="NxDCS") "https://git.da.dicos.de/";
+      url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host == "NxDCS") "https://git.da.dicos.de/";
       url."ssh://git@github.com/".insteadOf = "https://github.com/";
       pull.rebase = false; # true
     };
diff --git a/shell-only.nix b/shell-only.nix
index 8341478..2d37815 100644
--- a/shell-only.nix
+++ b/shell-only.nix
@@ -30,7 +30,7 @@
   home = {
     username = hyper.user;    
     homeDirectory = hyper.home;
-    stateVersion = pkgs.version;
+    stateVersion = hyper.pkgs-version;
   };
   xdg = {
     enable = true;
diff --git a/wsl.nix b/wsl.nix
index c6a4ab6..5da4fe1 100644
--- a/wsl.nix
+++ b/wsl.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }@all: with all; {
   imports = [
     inputs.nixos-wsl.nixosModules.default
-    ./system-modules/base-packages.nix
     ./system-modules/docker.nix
     ./system-modules/gc.nix
     ./system-modules/gpg.nix
@@ -9,7 +8,8 @@
     ./system-modules/nixd.nix
     ./system-modules/users.nix
   ];
-  system.stateVersion = pkgs.version;
+  environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
+  system.stateVersion = hypr.pkgs-version;
   wsl = {
     defaultUser = hyper.user;
     enable = true;