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

adding nix-shell as a todo and tweaking the shell

Browse source
This commit is contained in:
Chris Cochrun 2022-07-06 15:12:53 -05:00
parent 2f51355f49
commit a7c2c2487a
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TODO.org
View file

@ -7,6 +7,10 @@
** TODO Need to make =getLyricList= give back the verses with empty lines as separate slides :core: ** TODO Need to make =getLyricList= give back the verses with empty lines as separate slides :core:
[[file:~/dev/church-presenter/src/songsqlmodel.cpp:://TODO make sure to split empty line in verse into two slides]] [[file:~/dev/church-presenter/src/songsqlmodel.cpp:://TODO make sure to split empty line in verse into two slides]]
** TODO nix-shell needs a little bit of work perhaps yet. But may be working under plasma just not minimal window managers using qt5ct.
https://discourse.nixos.org/t/developing-kirigami-applications/19947/17
This thread helped a lot
** TODO Make toolbar functional for =songeditor= [3/4] [75%] :core: ** TODO Make toolbar functional for =songeditor= [3/4] [75%] :core:
[[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::Controls.ToolBar {]] [[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::Controls.ToolBar {]]

14
flake.lock generated
View file

@ -17,16 +17,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1655451545, "lastModified": 1657020478,
"narHash": "sha256-uLHNGkZbINBZ8Yz9z+/6xF77EVLPTasDyfE/sQpzZ4A=", "narHash": "sha256-sU5hXEGcOcvz2xoPAuNLBQJLXjwvPpTkoddyXE8gw20=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3802c98cffe636d54dc8f2812d143e50b4b07bb0", "rev": "71a4f0dc3d80ba76f437c888c1c3d59f1df98163",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"type": "indirect" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {

1
flake.nix
View file

@ -1,6 +1,7 @@
{ {
description = "A Church Presentation Application"; description = "A Church Presentation Application";
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils }: outputs = { self, nixpkgs, flake-utils }:

15
shell.nix
View file

@ -28,8 +28,7 @@ mkShell {
libsForQt5.kcoreaddons libsForQt5.kcoreaddons
# This is only here because apparently it doesn't pick up the icon theme from the base system # This is only here because apparently it doesn't pick up the icon theme from the base system
# papirus-icon-theme papirus-icon-theme
lightly-qt
mpv mpv
# libsForQt5.kconfig # libsForQt5.kconfig
@ -38,13 +37,7 @@ mkShell {
]; ];
# This creates the proper qt env so that plugins are found right. # This creates the proper qt env so that plugins are found right.
# shellHook = '' shellHook = ''
# # setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh) fish
# # echo "shellHook: setQtEnvironment = $setQtEnvironment" '';
# # makeWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}"
# # sed "/^exec/d" -i "$setQtEnvironment"
# # source "$setQtEnvironment"
# # export QT_QPA_PLATFORM_PLUGIN_PATH=${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins/platformthemes
# # export QML2_IMPORT_PATH=${libsForQt5.kirigami2}/lib/${builtins.replaceStrings ["full-"] [""] qt5.full.name}/qml
# '';
} }