diff --git a/modules/codedPC/audio.nix b/modules/codedPC/audio.nix
index 4046f2b..13d483f 100644
--- a/modules/codedPC/audio.nix
+++ b/modules/codedPC/audio.nix
@@ -27,9 +27,9 @@
   '';
 
   home-manager.users.coded.home.packages =
-    with pkgs; [
-      audacity
-      helvum
-      lmms
+    [
+      pkgs.audacity
+      pkgs.helvum
+      pkgs.lmms
     ];
 }
diff --git a/modules/codedPC/calibre.nix b/modules/codedPC/calibre.nix
index 1f44dc8..11b5019 100644
--- a/modules/codedPC/calibre.nix
+++ b/modules/codedPC/calibre.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    calibre
+  home-manager.users.coded.home.packages =[
+    pkgs.calibre
   ];
 }
diff --git a/modules/codedPC/games.nix b/modules/codedPC/games.nix
index 2560d61..93f3308 100644
--- a/modules/codedPC/games.nix
+++ b/modules/codedPC/games.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }: {
-  home-manager.users.coded.home.packages = with pkgs; [
-    minecraft
-    prismlauncher
-    BeatSaberModManager
-    gamemode
-    godot_4
+  home-manager.users.coded.home.packages = [
+    pkgs.minecraft
+    pkgs.prismlauncher
+    pkgs.BeatSaberModManager
+    pkgs.gamemode
+    pkgs.godot_4
   ];
   programs.steam = {
     enable = true;
diff --git a/modules/codedPC/kde_plasma.nix b/modules/codedPC/kde_plasma.nix
index 55b028f..39683b3 100644
--- a/modules/codedPC/kde_plasma.nix
+++ b/modules/codedPC/kde_plasma.nix
@@ -1,14 +1,14 @@
 { pkgs, ... }: {
-  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
-    okular
-    konsole
+  environment.plasma5.excludePackages = [
+    pkgs.libsForQt5.okular
+    pkgs.libsForQt5.konsole
   ];
 
-  environment.systemPackages = with pkgs; [
-    sweet-nova
-    pitch-black
-    adapta-kde-theme
-    ocs-url
+  environment.systemPackages = [
+    pkgs.sweet-nova
+    pkgs.pitch-black
+    pkgs.adapta-kde-theme
+    pkgs.ocs-url
   ];
 
 }
diff --git a/modules/codedPC/packages.nix b/modules/codedPC/packages.nix
index 90bad63..5fdd854 100644
--- a/modules/codedPC/packages.nix
+++ b/modules/codedPC/packages.nix
@@ -1,12 +1,11 @@
 { pkgs, ... }: {
   hardware.enableRedistributableFirmware = true;
-  home-manager.users.coded.home.packages = with pkgs; [
-    bitwarden
-    nixfmt
-    email
-    thunderbird
-    ollama
-    rpiplay
-    kdocker
+  home-manager.users.coded.home.packages = [
+    pkgs.bitwarden
+    pkgs.nixfmt
+    pkgs.email
+    pkgs.thunderbird
+    pkgs.ollama
+    pkgs.kdocker
   ];
 }
diff --git a/modules/codedPC/printing.nix b/modules/codedPC/printing.nix
index 68016f8..df90c53 100644
--- a/modules/codedPC/printing.nix
+++ b/modules/codedPC/printing.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
-    home-manager.users.coded.home.packages = with pkgs; [
-        cura
-        printrun
+    home-manager.users.coded.home.packages = [
+        pkgs.cura
+        pkgs.printrun
     ];
 }
diff --git a/modules/codedPC/social.nix b/modules/codedPC/social.nix
index bee39ce..bea1df6 100644
--- a/modules/codedPC/social.nix
+++ b/modules/codedPC/social.nix
@@ -1,3 +1,3 @@
 { pkgs, ... }: {
-  home-manager.users.coded.home.packages = with pkgs; [ discord ];
+  home-manager.users.coded.home.packages = [ pkgs.discord ];
 }
diff --git a/modules/codedPC/vscode.nix b/modules/codedPC/vscode.nix
index 89911d3..ecd4f35 100644
--- a/modules/codedPC/vscode.nix
+++ b/modules/codedPC/vscode.nix
@@ -16,13 +16,13 @@
         "terminal.integrated.enableMultiLinePasteWarning" = false;
         "liveshare.languages.allowGuestCommandControl" = true;
     };
-    extensions = with pkgs.vscode-extensions;
+    extensions =
       [
-        ms-vsliveshare.vsliveshare
-        codezombiech.gitignore
-        editorconfig.editorconfig
-        zhuangtongfa.material-theme
-        bbenoist.nix
+        pkgs.vscode-extensions.ms-vsliveshare.vsliveshare
+        pkgs.vscode-extensions.codezombiech.gitignore
+        pkgs.vscode-extensions.editorconfig.editorconfig
+        pkgs.vscode-extensions.zhuangtongfa.material-theme
+        pkgs.vscode-extensions.bbenoist.nix
       ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [{
         name = "helium-icon-theme";
         publisher = "helgardrichard";
diff --git a/modules/common/packages.nix b/modules/common/packages.nix
index 5b7de8a..4f3b9b0 100644
--- a/modules/common/packages.nix
+++ b/modules/common/packages.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }: {
   hardware.enableRedistributableFirmware = true;
   nixpkgs.config.allowUnfree = true;
-  home-manager.users.coded.home.packages = with pkgs; [
-    sops
-    nixfmt
-    nextcloud-client
+  home-manager.users.coded.home.packages = [
+    pkgs.sops
+    pkgs.nixfmt
+    pkgs.nextcloud-client
   ];
-  environment.systemPackages = with pkgs; [
-    tmux
+  environment.systemPackages = [
+    pkgs.tmux
   ];
 }
diff --git a/modules/common/shell.nix b/modules/common/shell.nix
index befb45e..77b2ce9 100644
--- a/modules/common/shell.nix
+++ b/modules/common/shell.nix
@@ -2,10 +2,10 @@
   programs.zsh.enable = true;
   users.users.coded.shell = pkgs.zsh;
 
-  home-manager.users.coded.home.packages = with pkgs; [
-    bmon
-    wget
-    guake
+  home-manager.users.coded.home.packages = [
+    pkgs.bmon
+    pkgs.wget
+    pkgs.guake
   ];
 
   home-manager.users.coded.programs = {