cullmann/nixos
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix dev setup

Browse source
This commit is contained in:
Christoph Cullmann 2024-03-10 00:28:26 +01:00
parent 8e3da91aac
commit e1da4a78b3
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common.nix
View file

@ -2,7 +2,6 @@
let let
impermanence = builtins.fetchTarball "https://github.com/nix-community/impermanence/archive/master.tar.gz"; impermanence = builtins.fetchTarball "https://github.com/nix-community/impermanence/archive/master.tar.gz";
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
kde2nix = builtins.fetchTarball "https://github.com/nix-community/kde2nix/archive/main.tar.gz";
in in
{ {
# #
@ -16,9 +15,6 @@ in
# home manager for per user config # home manager for per user config
"${home-manager}/nixos" "${home-manager}/nixos"
# Provisional, experimental Plasma 6
"${kde2nix}/nixos.nix"
]; ];
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default

5
projects/kde/cleanup.sh
View file

@ -9,9 +9,6 @@ rm -rf ~/projects/kde/src ~/projects/kde/build ~/projects/kde/usr || exit 1
# get new kde-builder # get new kde-builder
mkdir -p ~/projects/kde/src || exit 1 mkdir -p ~/projects/kde/src || exit 1
git clone https://invent.kde.org/sdk/kde-builder.git ~/projects/kde/src/kde-builder || exit 1 git clone https://invent.kde.org/sdk/kde-builder.git ~/projects/kde/src/kde-builder || exit 1
git clone https://invent.kde.org/sdk/kdesrc-build.git ~/projects/kde/src/kdesrc-build || exit 1
# start from scratch # start from scratch
exec ./src/kde-builder/kde-builder --rc-file=~/projects/kde/kdesrc-buildrc kguiaddons exec ./src/kde-builder/kde-builder --rc-file=~/projects/kde/kdesrc-buildrc --include-dependencies breeze plasma-integration kwayland-integration konsole kate
# exec ./src/kdesrc-build/kdesrc-build --rc-file=~/projects/kde/kdesrc-buildrc kguiaddons
# exec ./src/kde-builder/kde-builder --rc-file=~/projects/kde/kdesrc-buildrc --include-dependencies breeze plasma-integration kwayland-integration konsole kate

4
projects/kde/kdesrc-buildrc
View file

@ -2,7 +2,7 @@ global
# use the latest KF6 and Qt6-based software. # use the latest KF6 and Qt6-based software.
branch-group kf6-qt6 branch-group kf6-qt6
# we want .kateproject files with ninja # we want .kateproject files with ninja, turn off some Qt 5 things to have less dependencies
cmake-options -G "Kate - Ninja" -DBUILD_WITH_QT6=ON -DQT_MAJOR_VERSION=6 -DPHONON_BUILD_QT5=OFF -DBUILD_QT5=OFF cmake-options -G "Kate - Ninja" -DBUILD_WITH_QT6=ON -DQT_MAJOR_VERSION=6 -DPHONON_BUILD_QT5=OFF -DBUILD_QT5=OFF
# Restrict make and ninja to using no more than 8 separate compile jobs even # Restrict make and ninja to using no more than 8 separate compile jobs even
@ -28,7 +28,7 @@ global
build-dir ~/projects/kde/build build-dir ~/projects/kde/build
# use distro stuff for that # use distro stuff for that
ignore-modules wayland ignore-modules wayland wayland-protocols gpgme appstream
end global end global
include ${module-definitions-dir}/kf6-qt6.ksb include ${module-definitions-dir}/kf6-qt6.ksb

1
projects/kde/shell.nix
View file

@ -27,6 +27,7 @@ export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde/usr/lib/qml/QtQu
bison bison
boost boost
bzip2 bzip2
clang-tools_16
cmake cmake
ctags ctags
curl curl