From ca231bc2c805cb9b927a620062ec943cfe5d558d Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <cullmann@kde.org>
Date: Sat, 29 Jul 2023 16:11:55 +0200
Subject: sync current state

---
 common.nix                      |  3 ++-
 neko/hardware-configuration.nix | 20 +++++++++++++++-----
 projects/kde/kdesrc-buildrc     |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/common.nix b/common.nix
index 6045ca8..b30d543 100644
--- a/common.nix
+++ b/common.nix
@@ -237,7 +237,7 @@ in
   # more fonts for all users
   fonts = {
     # more fonts
-    fonts = with pkgs; [
+    packages = with pkgs; [
       # needed for powerlevel10k zsh stuff
       meslo-lgs-nf
 
@@ -409,6 +409,7 @@ in
       kate
       kcalc
       keychain
+      kmail
       kompare
       konversation
       krita
diff --git a/neko/hardware-configuration.nix b/neko/hardware-configuration.nix
index f2d229c..898bf93 100644
--- a/neko/hardware-configuration.nix
+++ b/neko/hardware-configuration.nix
@@ -52,31 +52,41 @@
     };
 
   fileSystems."/home" =
-    { device = "/data/home";
+    {
+      depends = [ "/data" ];
+      device = "/data/home";
       fsType = "none";
       options = [ "bind" ];
     };
 
   fileSystems."/root" =
-    { device = "/data/root";
+    {
+      depends = [ "/data" ];
+      device = "/data/root";
       fsType = "none";
       options = [ "bind" ];
     };
 
   fileSystems."/etc/nixos" =
-    { device = "/data/nixos/neko";
+    {
+      depends = [ "/data" ];
+      device = "/data/nixos/neko";
       fsType = "none";
       options = [ "bind" ];
     };
 
   fileSystems."/home/cullmann/projects" =
-    { device = "/dev/mapper/crypt-projects";
+    {
+      depends = [ "/home" ];
+      device = "/dev/mapper/crypt-projects";
       fsType = "btrfs";
       options = [ "noatime" ];
     };
 
   fileSystems."/home/cullmann/vms" =
-    { device = "/dev/mapper/crypt-vms";
+    {
+      depends = [ "/home" ];
+      device = "/dev/mapper/crypt-vms";
       fsType = "btrfs";
       options = [ "noatime" ];
     };
diff --git a/projects/kde/kdesrc-buildrc b/projects/kde/kdesrc-buildrc
index 8caedf0..a6694ce 100644
--- a/projects/kde/kdesrc-buildrc
+++ b/projects/kde/kdesrc-buildrc
@@ -3,7 +3,7 @@ global
     branch-group kf5-qt5
 
     # we want .kateproject files with ninja
-    cmake-options -G "Kate - Ninja"
+    cmake-options -G "Kate - Ninja" -DPHONON_BUILD_QT6=OFF
 
     # Restrict make and ninja to using no more than 8 separate compile jobs even
     # when more CPU is available, to avoid running out of memory
-- 
cgit v1.2.3