From 00d6e22bdb0d6f2a836bd20f2639acc1f3efcdea Mon Sep 17 00:00:00 2001
From: Florian RICHER <florian.richer@axyus.com>
Date: Tue, 17 Jun 2025 14:26:24 +0200
Subject: [PATCH] Update

---
 README.md                             |  7 ++++---
 flake.nix                             | 13 ++++++++++---
 src/contents/ui/AddEditSheet.qml      |  8 ++++----
 src/contents/ui/KountdownDelegate.qml |  8 ++++----
 src/contents/ui/main.qml              |  8 ++++----
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index eb75b03..98b57bd 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
 # How to run it
 
-1. `nix develop`
-2. `cmakeConfigurePhase`
-3. `buildPhase`
+1. `direnv allow`
+2. `cmake $cmakeFlags -B build -G Ninja .`
+3. `cd build`
+3. `ninja`
 4. `./src/tutorial_kirigami2`
 
 For use gammaray, you need to disable yama security.
diff --git a/flake.nix b/flake.nix
index d59e765..4cb5550 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,19 +6,26 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachSystem flake-utils.lib.allSystems (system:
       let
         pkgs = import nixpkgs { inherit system; };
       in
       {
-        devShells = rec {
+        devShells = {
           default = pkgs.mkShell {
             packages = with pkgs; [
-              kdePackages.qtbase
+              # For Qt
+              qt6.wrapQtAppsHook
+              qt6.qtbase
+              qt6.qtdeclarative
+
+              # For Kirigami
               kdePackages.kirigami
               kdePackages.ki18n
               kdePackages.kcoreaddons
+
+              # For building
               ninja
               cmake
               gcc
diff --git a/src/contents/ui/AddEditSheet.qml b/src/contents/ui/AddEditSheet.qml
index 49f6ec6..921d46c 100644
--- a/src/contents/ui/AddEditSheet.qml
+++ b/src/contents/ui/AddEditSheet.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.20 as Kirigami
+import QtQuick
+import QtQuick.Controls as Controls
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
 
 // Overlay sheets appear over a part of the window
 Kirigami.OverlaySheet {
diff --git a/src/contents/ui/KountdownDelegate.qml b/src/contents/ui/KountdownDelegate.qml
index 42548e4..7634c92 100644
--- a/src/contents/ui/KountdownDelegate.qml
+++ b/src/contents/ui/KountdownDelegate.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.20 as Kirigami
+import QtQuick
+import QtQuick.Controls as Controls
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
 
 Kirigami.AbstractCard {
     id: kountdownDelegate
diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml
index 5fa9d2d..7d686db 100644
--- a/src/contents/ui/main.qml
+++ b/src/contents/ui/main.qml
@@ -1,8 +1,8 @@
 // Includes relevant modules used by the QML
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.20 as Kirigami
+import QtQuick
+import QtQuick.Controls as Controls
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
 
 // Provides basic features needed for all kirigami applications
 Kirigami.ApplicationWindow {