diff --git a/flake.lock b/flake.lock
index 4b07d5e..afc3293 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687134796,
-        "narHash": "sha256-gjBAkEtNPMQzqK4IHjTQBUv3VhggszOHLJbhXZy0OVQ=",
+        "lastModified": 1687747614,
+        "narHash": "sha256-KXspKgtdO2YRL12Jv0sUgkwOwHrAFwdIG/90pDx8Ydg=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "4823509bb3b014dc85abefc13efcfa076d36338a",
+        "rev": "fef67a1ddc293b595d62a660f57deabbcb70ff95",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1687388587,
-        "narHash": "sha256-TILQ4Ch+Y9Q6Hczm5vwgGWXD2ow29uxXPJuGzqS6jj0=",
+        "lastModified": 1687829807,
+        "narHash": "sha256-3frHlJgnHai4BCR67iAn8rpOpVMYGGsxXP/RD9CJeug=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "563afe26c68c2323e817345687c367ab5ca06dfa",
+        "rev": "71a84fc822c1d8f41d6b70ce31c600dd45dc7ac3",
         "type": "github"
       },
       "original": {
@@ -127,11 +127,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1687049841,
-        "narHash": "sha256-FBNZQfWtA7bb/rwk92mfiWc85x4hXta2OAouDqO5W8w=",
+        "lastModified": 1687654967,
+        "narHash": "sha256-ki8vItcjn8Z8n+QD9NEoCQbbbG7VzWy71hyOkFFwCkM=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "908af6d1fa3643c5818ea45aa92b21d6385fbbe5",
+        "rev": "b3ec8fb525fc0c8f08eff5ef93c684b4c6d0e777",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687183443,
-        "narHash": "sha256-foX4pkph2AwUdJL3JURa7IHog+YRIheZ54vwHwxqwhU=",
+        "lastModified": 1687743756,
+        "narHash": "sha256-WhDERdaMGX73CBxpDfoauKU2Z4NC10+/4khdBbpXjWs=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "09140f23f5ffce828db4ef040070bdd9595b1f3a",
+        "rev": "844ce2ab9a0ba819b30df1fff2c48c9b2b2344be",
         "type": "github"
       },
       "original": {
@@ -270,11 +270,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1687267549,
-        "narHash": "sha256-jpg5zwhEQlovGH/xrml9X5ciPKpIZr/3Z04+Fh3VtQY=",
+        "lastModified": 1687398569,
+        "narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
         "owner": "mic92",
         "repo": "sops-nix",
-        "rev": "d299d0538295e71e194aa0dfa896ad399f4508e3",
+        "rev": "2ff6973350682f8d16371f8c071a304b8067f192",
         "type": "github"
       },
       "original": {
@@ -290,8 +290,8 @@
         ]
       },
       "locked": {
-        "lastModified": 1687747647,
-        "narHash": "sha256-1gkAQLFAnlzp2P55Wql8fV0o8dJjsosRtyEFSdxGj8k=",
+        "lastModified": 1687749665,
+        "narHash": "sha256-wvpL4zqF5DoqkKuEkNVuvwXPBz7pnxc2c0z/a5FgndU=",
         "path": "/home/gerg/Projects/spicetify-nix",
         "type": "path"
       },
@@ -302,11 +302,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1687379288,
-        "narHash": "sha256-cSuwfiqYfeVyqzCRkU9AvLTysmEuSal8nh6CYr+xWog=",
+        "lastModified": 1687729501,
+        "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ef0bc3976340dab9a4e087a0bcff661a8b2e87f3",
+        "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0",
         "type": "github"
       },
       "original": {
@@ -338,11 +338,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1686960236,
-        "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
+        "lastModified": 1687681650,
+        "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
+        "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3",
         "type": "github"
       },
       "original": {
diff --git a/hosts/game-laptop/default.nix b/hosts/game-laptop/default.nix
index 99190d6..899a07d 100644
--- a/hosts/game-laptop/default.nix
+++ b/hosts/game-laptop/default.nix
@@ -38,8 +38,8 @@ _: {
         ;
     };
     etc = {
-      "jdks/17".source = pkgs.openjdk17 + /bin;
-      "jdks/8".source = pkgs.openjdk8 + /bin;
+      "jdks/17".source = "${pkgs.openjdk17}/bin";
+      "jdks/8".source = "${pkgs.openjdk8}/bin";
     };
   };
   networking = {
diff --git a/hosts/gerg-desktop/containers/minecraft.nix_ b/hosts/gerg-desktop/containers/minecraft.nix_
index f5b7274..3a24b23 100644
--- a/hosts/gerg-desktop/containers/minecraft.nix_
+++ b/hosts/gerg-desktop/containers/minecraft.nix_
@@ -1,4 +1,4 @@
-_:{
+_: {
   containers."minecraft" = {
     ephemeral = true;
     autoStart = true;
diff --git a/hosts/gerg-desktop/default.nix b/hosts/gerg-desktop/default.nix
index f9415c4..e7af949 100644
--- a/hosts/gerg-desktop/default.nix
+++ b/hosts/gerg-desktop/default.nix
@@ -57,8 +57,8 @@
       inherit (nvim-flake.packages.${pkgs.system}) neovim;
     };
     etc = {
-      "jdks/17".source = pkgs.openjdk17 + /bin;
-      "jdks/8".source = pkgs.openjdk8 + /bin;
+      "jdks/17".source = "${pkgs.openjdk17}/bin";
+      "jdks/8".source = "${pkgs.openjdk8}/bin";
     };
   };
 
diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix
index 258d441..3505293 100644
--- a/hosts/gerg-desktop/vfio.nix
+++ b/hosts/gerg-desktop/vfio.nix
@@ -46,8 +46,8 @@ let
       echo 'EndSection' >> $out
       echo >> $out
     '';
-  oneMonitor = pkgs.writeText "1-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/1-monitor.conf))]);
-  twoMonitor = pkgs.writeText "2-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/2-monitor.conf))]);
+  oneMonitor = pkgs.writeText "1-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile "${self}/misc/1-monitor.conf")]);
+  twoMonitor = pkgs.writeText "2-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile "${self}/misc/2-monitor.conf")]);
 in {
   ####VM SOUND BORKED
   services.pipewire.package = pipewire_fix.legacyPackages.${pkgs.system}.pipewire;
@@ -151,6 +151,6 @@ in {
   in [
     "L  /tmp/xorg.conf - - - - ${twoMonitor}"
     "L+ /var/lib/libvirt/hooks/qemu - - - - ${qemuHook}"
-    "L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${self + /misc/Windows.xml}"
+    "L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${self}/misc/Windows.xml"
   ];
 }
diff --git a/pkgs/parrot.nix b/pkgs/parrot.nix
index 1bc4d63..94e6fa0 100644
--- a/pkgs/parrot.nix
+++ b/pkgs/parrot.nix
@@ -43,7 +43,7 @@ in
         ffmpeg
       ]}'';
 
-    cargoLock.lockFile = src + /Cargo.lock;
+    cargoLock.lockFile = "${src}/Cargo.lock";
 
     RUSTC_BOOTSTRAP = 1;
   }