summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Cullmann <cullmann@kde.org>2024-05-26 16:58:37 +0200
committerChristoph Cullmann <cullmann@kde.org>2024-05-26 16:58:37 +0200
commit2f4dad8cc0c63306273b65add2a8f8e22fba96fb (patch)
treebe6087ea4940651787abf8f6391c1636cd27b757
parentb8c63935e96f6187a02acb52e03866d9a969de73 (diff)
sync config state, use kvm virtualbox
-rw-r--r--common.nix3
-rw-r--r--mini/hardware-configuration.nix5
-rw-r--r--neko/hardware-configuration.nix5
-rwxr-xr-xprojects/kde/cleanup.sh2
-rw-r--r--projects/kde/kdesrc-buildrc2
-rw-r--r--projects/kde/shell.nix5
6 files changed, 18 insertions, 4 deletions
diff --git a/common.nix b/common.nix
index b0588b8..0cf8429 100644
--- a/common.nix
+++ b/common.nix
@@ -470,6 +470,9 @@ in
# enable VirtualBox
virtualisation.virtualbox.host.enable = true;
+ virtualisation.virtualbox.host.enableKvm = true;
+ virtualisation.virtualbox.host.enableHardening = false;
+ virtualisation.virtualbox.host.addNetworkInterface = false;
# configure sudo
security.sudo.execWheelOnly = true;
diff --git a/mini/hardware-configuration.nix b/mini/hardware-configuration.nix
index 76fd0c0..68bfb4b 100644
--- a/mini/hardware-configuration.nix
+++ b/mini/hardware-configuration.nix
@@ -10,7 +10,10 @@
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ];
- # system
+ # don't check for split locks, for KVM and Co.
+ boot.kernelParams = [ "split_lock_detect=off" ];
+
+ # system
boot.initrd.luks.devices."crypt-system".device = "/dev/disk/by-id/nvme-CT4000P3PSSD8_2325E6E63746-part2";
# efi partition
diff --git a/neko/hardware-configuration.nix b/neko/hardware-configuration.nix
index 2ab1bed..62c1669 100644
--- a/neko/hardware-configuration.nix
+++ b/neko/hardware-configuration.nix
@@ -15,7 +15,10 @@
options snd_hda_intel enable=0,1
'';
- # system
+ # don't check for split locks, for KVM and Co.
+ boot.kernelParams = [ "split_lock_detect=off" ];
+
+ # system
boot.initrd.luks.devices."crypt-system".device = "/dev/disk/by-id/nvme-Seagate_FireCuda_530_ZP4000GM30013_7VS01VBM-part2";
# efi partition
diff --git a/projects/kde/cleanup.sh b/projects/kde/cleanup.sh
index 2885bc0..b508418 100755
--- a/projects/kde/cleanup.sh
+++ b/projects/kde/cleanup.sh
@@ -11,4 +11,4 @@ mkdir -p ~/projects/kde/src || exit 1
git clone https://invent.kde.org/sdk/kde-builder.git ~/projects/kde/src/kde-builder || exit 1
# start from scratch
-exec ./src/kde-builder/kde-builder --rc-file=~/projects/kde/kdesrc-buildrc --include-dependencies breeze konsole kate
+exec ./src/kde-builder/kde-builder --rc-file=~/projects/kde/kdesrc-buildrc --include-dependencies breeze konsole kate dolphin
diff --git a/projects/kde/kdesrc-buildrc b/projects/kde/kdesrc-buildrc
index 78e653c..454b4a5 100644
--- a/projects/kde/kdesrc-buildrc
+++ b/projects/kde/kdesrc-buildrc
@@ -31,7 +31,7 @@ global
log-dir ~/projects/kde/log
# use distro stuff for that
- ignore-modules wayland wayland-protocols gpgme appstream
+ ignore-modules wayland wayland-protocols gpgme appstream packagekit-qt
end global
include ${module-definitions-dir}/kf6-qt6.ksb
diff --git a/projects/kde/shell.nix b/projects/kde/shell.nix
index 4994031..fb722a2 100644
--- a/projects/kde/shell.nix
+++ b/projects/kde/shell.nix
@@ -31,9 +31,12 @@ export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde/usr/lib/qml/QtQu
cmake
ctags
curl
+ discount
+ djvulibre
docbook_xml_dtd_45
docbook_xsl_ns
doxygen
+ ebook_tools
exiv2
flex
gdb
@@ -64,10 +67,12 @@ export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde/usr/lib/qml/QtQu
libraw
libselinux
libsndfile
+ libspectre
libva
libxkbcommon
libxml2
libxslt
+ libzip
linux-pam
lm_sensors
lmdb