diff --git a/default.nix b/default.nix
index b6dda79..1285ef9 100644
--- a/default.nix
+++ b/default.nix
@@ -1,32 +1,34 @@
-{
-  stdenv,
-  lib,
-  # kglobalaccel,
-  # kinit,
-  # kwin,
-  # kio,
-  # kguiaddons,
-  # kcoreaddons,
-  gcc,
-  gnumake,
-  clang,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qt5Full,
-  clang-tools,
-  qttools,
-  qtquickcontrols2,
-  qtx11extras,
-  qtmultimedia,
-  kirigami2,
-  ki18n,
-  kcoreaddons,
-  # lightly-qt,
-  mpv
-}:
+{ pkgs ? import <nixpkgs> { } }:
+with pkgs;
+# {
+#   stdenv,
+#   lib,
+#   # kglobalaccel,
+#   # kinit,
+#   # kwin,
+#   # kio,
+#   # kguiaddons,
+#   # kcoreaddons,
+#   gcc,
+#   gnumake,
+#   clang,
+#   cmake,
+#   extra-cmake-modules,
+#   pkg-config,
+#   wrapQtAppsHook,
+#   qtbase,
+#   qt5Full,
+#   clang-tools,
+#   qttools,
+#   qtquickcontrols2,
+#   qtx11extras,
+#   qtmultimedia,
+#   kirigami2,
+#   ki18n,
+#   kcoreaddons,
+#   # lightly-qt,
+#   mpv
+# }:
 
 stdenv.mkDerivation rec {
   name = "Libre Presenter";
@@ -39,28 +41,28 @@ stdenv.mkDerivation rec {
     gcc
     gnumake
     clang
+    clang-tools
     cmake
     extra-cmake-modules
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     # gccStdenv
     # stdenv
   ];
 
   buildInputs = [
-    clang-tools
-    qt5Full
-    qttools
-    qtquickcontrols2
-    qtx11extras
-    qtmultimedia
+    libsForQt5.qt5.full
+    libsForQt5.qttools
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtx11extras
+    libsForQt5.qtmultimedia
     # qtwayland
-    kirigami2
+    libsForQt5.kirigami2
     # breeze-icons
     # breeze-qt5
     # qqc2-desktop-style
-    ki18n
-    kcoreaddons
+    libsForQt5.ki18n
+    libsForQt5.kcoreaddons
     # lightly-qt
     mpv
     # libsForQt5.kconfig
@@ -96,10 +98,10 @@ stdenv.mkDerivation rec {
   rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/
   '';
 
-  # installPhase = ''
-  # mkdir -p $out/bin
-  # mv presenter $out/bin
-  # '';
+  installPhase = ''
+  mkdir -p $out/bin
+  mv build/bin/presenter $out/bin
+  '';
 
   meta = with lib; {
     name = "Libre Presenter";
diff --git a/flake.nix b/flake.nix
index f1aa101..8d27d44 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,10 @@
 {
   description = "A Church Presentation Application";
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
 
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem
@@ -10,10 +12,10 @@
         let
           pkgs = nixpkgs.legacyPackages.${system};
           src = ./.;
-        in rec
+        in 
         {
           devShell = import ./shell.nix { inherit pkgs; };
-          defaultPackage = import ./default.nix { inherit pkgs; };
+          defaultPackage = import ./default.nix {inherit pkgs;};
         }
       );
 }
diff --git a/shell.nix b/shell.nix
index ed9cd6b..55c5dd6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,8 +6,8 @@ mkShell rec {
   nativeBuildInputs = [
     gcc
     gnumake
-    clang_14
-    clang-tools_14
+    clang
+    clang-tools
     cmake
     extra-cmake-modules
     pkg-config