This commit is contained in:
Chris Cochrun 2025-07-11 17:07:09 -05:00
parent 4695b1f7ea
commit 35bbc655f5
11 changed files with 7 additions and 457 deletions

View file

@ -162,10 +162,9 @@ in {
qt = {
enable = true;
style.package = [
inputs.darkly.packages.${pkgs.system}.darkly-qt5
inputs.darkly.packages.${pkgs.system}.darkly-qt6
# pkgs.kdePackages.callPackage ../pkgs/darkly-pkg.nix { }
style.package = with pkgs; [
darkly-qt5
darkly
];
platformTheme.name = "qtct";
};

View file

@ -110,10 +110,10 @@ in
bash
'';
qt = {
platformTheme = "qt5ct";
enable = true;
};
# qt = {
# platformTheme = "qt5ct";
# enable = true;
# };
xdg.portal = {
enable = true;

View file

@ -1,75 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
qtbase,
qtx11extras,
qttools,
kglobalaccel,
kinit,
kwin,
kio,
kguiaddons,
kcoreaddons,
systemsettings,
plasma-framework,
cmake,
extra-cmake-modules,
libepoxy,
libXdmcp
}:
stdenv.mkDerivation rec {
pname = "LightlyShaders";
version = "0.0.2";
src = fetchFromGitHub {
owner = "a-parhom";
repo = "LightlyShaders";
rev = "d2a643b0c56d50d2ac1822e04c7b83d72de4213e";
sha256 = "MJk2pXRmyZDZX7KeZBHNKi0WQcQwqTM1nZWTWSxnvfc=";
};
dontWrapQtApps = true;
buildInputs = [
qtbase
qtx11extras
qttools
kglobalaccel
kinit
kwin
kio
kguiaddons
kcoreaddons
systemsettings
plasma-framework
];
nativeBuildInputs = [
stdenv
cmake
extra-cmake-modules
libepoxy
libXdmcp
];
preConfigure = ''
local modulepath=$(kf5-config --install module)
local datapath=$(kf5-config --install data)
local servicepath=$(kf5-config --install services)
substituteInPlace CMakeLists.txt \
--replace "\''${MODULEPATH}" "$out/''${modulepath#/nix/store/*/}" \
--replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}" \
--replace "\''${SERVICES_INSTALL_DIR}" "$out/''${servicepath#/nix/store/*/}"
'';
meta = with lib; {
name = "LightlyShaders";
description = "Round corners and outline effect for KWin.";
homepage = "https://github.com/a-parhom/LightlyShaders";
license = licenses.gpl3;
maintainers = [ "chriscochrun" ];
platforms = platforms.all;
};
}

View file

@ -1,79 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
qtbase,
qtx11extras,
qttools,
kglobalaccel,
kinit,
kwin,
kdecoration,
kcrash,
kio,
knotifications,
kguiaddons,
kcoreaddons,
# systemsettings,
cmake,
qt5base,
extra-cmake-modules,
wrapQtAppsHook,
libepoxy,
kdelibs4support,
libXdmcp
}:
stdenv.mkDerivation rec {
pname = "LightlyShaders";
version = "2.0.0";
src = fetchFromGitHub {
owner = "a-parhom";
repo = "LightlyShaders";
rev = "v2.0";
sha256 = "sha256-p94VwzGHB/4qxthvG507JEXx9j2MZDo6yyElq3XQxYc=";
};
# dontWrapQtApps = true;
buildInputs = [
qtbase
qtx11extras
qttools
kglobalaccel
kdelibs4support
kcrash
kinit
kwin
kdecoration
kio
knotifications
kguiaddons
kcoreaddons
# systemsettings
libepoxy
libXdmcp
];
nativeBuildInputs = [
cmake
extra-cmake-modules
wrapQtAppsHook
];
postConfigure = ''
substituteInPlace cmake_install.cmake \
--replace "${kdelibs4support}" "$out"
'';
meta = with lib; {
name = "LightlyShaders";
description = "Round corners and outline effect for KWin.";
homepage = "https://github.com/a-parhom/LightlyShaders";
license = licenses.gpl3;
maintainers = [ "chriscochrun" ];
platforms = platforms.all;
};
}

View file

@ -1,43 +0,0 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1671359686,
"narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

View file

@ -1,21 +0,0 @@
{
description = "A Church Presentation Application";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
src = ./.;
in
{
devShell = import ./shell.nix { inherit pkgs; };
defaultPackage = pkgs.libsForQt5.callPackage ./default.nix {};
}
);
}

View file

@ -1,85 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
qtbase,
qtx11extras,
qttools,
kglobalaccel,
kinit,
kwin,
kdecoration,
kcrash,
kio,
knotifications,
kguiaddons,
kcoreaddons,
# systemsettings,
cmake,
extra-cmake-modules,
wrapQtAppsHook,
libepoxy,
kdelibs4support,
libXdmcp
}:
stdenv.mkDerivation rec {
pname = "RoundedSBE";
version = "0.1.0";
src = fetchFromGitHub {
owner = "a-parhom";
repo = "RoundedSBE";
rev = "ba60e3c84ed0bab18d369435e7d8cdd1e33fd6b2";
sha256 = "sha256-soQdRykn0WucfQkiEdMZTVmvxNu1i0siS3f8LAUMKMQ=";
};
# dontWrapQtApps = true;
buildInputs = [
qtbase
qtx11extras
qttools
kglobalaccel
kdelibs4support
kcrash
kinit
kwin
kdecoration
kio
knotifications
kguiaddons
kcoreaddons
# systemsettings
libepoxy
libXdmcp
];
nativeBuildInputs = [
cmake
extra-cmake-modules
wrapQtAppsHook
];
# postConfigure = ''
# substituteInPlace cmake_install.cmake \
# --replace "${kdelibs4support}" "$out"
# '';
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=$out"
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_TESTING=OFF"
"-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
];
meta = with lib; {
name = "RoundedSBE";
description = "Round corners and outline effect for Sierra Breeze Enhanced.";
homepage = "https://github.com/a-parhom/RoundedSBE";
license = licenses.gpl3;
maintainers = [ "chriscochrun" ];
platforms = platforms.all;
};
}

View file

@ -1,43 +0,0 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1671359686,
"narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

View file

@ -1,21 +0,0 @@
{
description = "Rounded Sierra Breeze Enhanced";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
src = ./.;
in
{
devShell = import ./shell.nix { inherit pkgs; };
defaultPackage = pkgs.libsForQt5.callPackage ./default.nix {};
}
);
}

View file

@ -1,81 +0,0 @@
{
lib,
stdenv,
cmake,
qtbase,
wrapQtAppsHook,
kwindowsystem,
kiconthemes,
kdecoration,
kcoreaddons,
kcolorscheme ? null,
kcmutils,
frameworkintegration,
extra-cmake-modules,
darkly-qt6 ? null,
}:
let
inherit (builtins) baseNameOf;
inherit (lib.sources) cleanSourceWith cleanSource;
inherit (lib.strings) hasSuffix;
isQt5 = lib.versionOlder qtbase.version "6";
in
stdenv.mkDerivation (finalAttrs: {
pname = "darkly-qt${if isQt5 then "5" else "6"}";
version = lib.removeSuffix "\n" (builtins.readFile ../VERSION);
src = cleanSourceWith {
filter =
name: _type:
let
baseName = baseNameOf (toString name);
in
!(hasSuffix ".nix" baseName);
src = cleanSource ../.;
};
postInstall = lib.optionalString isQt5 ''
rm -r $out/share
ln -s "${darkly-qt6}/share" "$out/share"
ln -s "${darkly-qt6}/bin" "$out/bin"
'';
buildInputs = [ qtbase ];
propagatedBuildInputs =
[
frameworkintegration
kcmutils
kcoreaddons
kdecoration
kiconthemes
kwindowsystem
]
++ lib.optionals (!isQt5) [
kcolorscheme
];
nativeBuildInputs = [
cmake
extra-cmake-modules
wrapQtAppsHook
];
cmakeFlags = [
(lib.cmakeBool "BUILD_QT5" isQt5)
(lib.cmakeBool "BUILD_QT6" (!isQt5))
];
outputs = [
"out"
"dev"
];
meta = with lib; {
description = "Fork of the Darkly breeze theme style that aims to be visually modern and minimalistic";
mainProgram = "darkly-settings6";
homepage = "https://github.com/Bali10050/Darkly";
license = licenses.gpl2Plus;
platforms = platforms.all;
};
})

View file

@ -4,7 +4,6 @@
environment.systemPackages = with pkgs; [
pinentry
pinentry-qt
lightly-boehs
caffeine-ng
hunspell
hunspellDicts.en_US-large