From a7c2c2487aab2d4714177dbfb9dcc3bf04d3e577 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 6 Jul 2022 15:12:53 -0500
Subject: [PATCH] adding nix-shell as a todo and tweaking the shell

---
 TODO.org   |  4 ++++
 flake.lock | 14 ++++++++------
 flake.nix  |  1 +
 shell.nix  | 15 ++++-----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/TODO.org b/TODO.org
index 3a80e3e..41eb97b 100644
--- a/TODO.org
+++ b/TODO.org
@@ -7,6 +7,10 @@
 ** 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]]
 
+** 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:
 [[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::Controls.ToolBar {]]
 
diff --git a/flake.lock b/flake.lock
index 76554ca..8d1066d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,16 +17,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1655451545,
-        "narHash": "sha256-uLHNGkZbINBZ8Yz9z+/6xF77EVLPTasDyfE/sQpzZ4A=",
-        "owner": "NixOS",
+        "lastModified": 1657020478,
+        "narHash": "sha256-sU5hXEGcOcvz2xoPAuNLBQJLXjwvPpTkoddyXE8gw20=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3802c98cffe636d54dc8f2812d143e50b4b07bb0",
+        "rev": "71a4f0dc3d80ba76f437c888c1c3d59f1df98163",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index d9f2d72..ac5fa8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,7 @@
 {
   description = "A Church Presentation Application";
 
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
   outputs = { self, nixpkgs, flake-utils }:
diff --git a/shell.nix b/shell.nix
index bafbefb..e50fb33 100644
--- a/shell.nix
+++ b/shell.nix
@@ -28,8 +28,7 @@ mkShell {
     libsForQt5.kcoreaddons
 
     # This is only here because apparently it doesn't pick up the icon theme from the base system
-    # papirus-icon-theme
-    lightly-qt
+    papirus-icon-theme
 
     mpv
     # libsForQt5.kconfig
@@ -38,13 +37,7 @@ mkShell {
   ];
   
   # This creates the proper qt env so that plugins are found right.
-  # shellHook = ''
-  #   # setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh)
-  #   # 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
-  # '';
+  shellHook = ''
+    fish
+  '';
 }