chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updating flake and todo

Browse source
This commit is contained in:
Chris Cochrun 2025-08-06 09:13:35 -05:00
parent e52cc3eb29
commit 8de473519b
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TODO.org
View file

@ -4,10 +4,13 @@
:CATEGORY: dev :CATEGORY: dev
:END: :END:
* Tasks [63%] [55/87] * Tasks [62%] [55/88]
** TODO [#A] REWRITE FOR ALL RUST AND BUILD WITH CARGO ** TODO [#A] REWRITE FOR ALL RUST AND BUILD WITH CARGO
** TODO [#A] Plugin architecture with steel or some scheme as an extension language Found that making sure qmake comes from qt6.full in the flake helps a lot!
** TODO [#A] Server client architecture ** TODO [#A] Move slides into service_items
I believe this will enable me to build things with much more simplicity. The service items contain slides anyway.
** TODO [#C] Plugin architecture with steel or some scheme as an extension language
** TODO [#C] Server client architecture
** TODO [#A] Organize and layout structure of rust code :maintenance: ** TODO [#A] Organize and layout structure of rust code :maintenance:
Since building a lot of the rust code felt more like an experiment, I've not kept it very well organized. I need to go through each model and rust module and organize them well and then decide what needs to be publicly available or not. Since building a lot of the rust code felt more like an experiment, I've not kept it very well organized. I need to go through each model and rust module and organize them well and then decide what needs to be publicly available or not.

2
flake.nix
View file

@ -33,6 +33,7 @@
]) ])
rust-analyzer rust-analyzer
qt6.wrapQtAppsHook qt6.wrapQtAppsHook
sccache
]; ];
bi = with pkgs; [ bi = with pkgs; [
@ -117,6 +118,7 @@
makeQtWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}" makeQtWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}"
sed "/^exec/d" -i "$setQtEnvironment" sed "/^exec/d" -i "$setQtEnvironment"
source "$setQtEnvironment" source "$setQtEnvironment"
export QMAKE=${pkgs.qt6.full}/bin/qmake
''; '';
# shellHook = '' # shellHook = ''
# export CMAKE_PREFIX_PATH="${pkgs.qt6.full}/lib/cmake/Qt6:$CMAKE_PREFIX_PATH" # export CMAKE_PREFIX_PATH="${pkgs.qt6.full}/lib/cmake/Qt6:$CMAKE_PREFIX_PATH"

2
smdview/blah/build.rs
View file

@ -5,7 +5,7 @@ fn main() {
.qt_module("Network") .qt_module("Network")
.qml_module(QmlModule { .qml_module(QmlModule {
uri: "org.kde.simplemdviewer", uri: "org.kde.simplemdviewer",
qml_files: &["src/qml/Main.qml"], qml_files: &["src/qml/main.qml"],
rust_files: &["src/main.rs"], rust_files: &["src/main.rs"],
..Default::default() ..Default::default()
}) })

5
smdview/blah/src/main.rs
View file

@ -1,7 +1,8 @@
#[cxx_qt::bridge] #[cxx_qt::bridge]
mod ffi { mod ffi {
extern "RustQt" { unsafe extern "RustQt" {
#[qobject] #[qobject]
#[qml_element]
type DummyQObject = super::DummyRustStruct; type DummyQObject = super::DummyRustStruct;
} }
} }
@ -32,7 +33,7 @@ fn main() {
let mut engine = QQmlApplicationEngine::new(); let mut engine = QQmlApplicationEngine::new();
if let Some(engine) = engine.as_mut() { if let Some(engine) = engine.as_mut() {
engine.load(&QUrl::from( engine.load(&QUrl::from(
"qrc:/qt/qml/org/kde/simplemdviewer/src/qml/Main.qml", "qrc:/qt/qml/org/kde/simplemdviewer/src/qml/main.qml",
)); ));
} }