From cf69aee70962ca4a6ccf0958024eb26605a9710c Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 24 May 2022 09:35:29 -0500 Subject: [PATCH] Working lightlyshaders except on laptop? :shrug: --- LightlyShaders/default.nix | 69 ++++++++++++++++++-------------- LightlyShaders/result | 2 +- README.org | 13 +++++- flake.lock | 12 +++--- system/kaladin/configuration.nix | 12 +++++- system/syl/configuration.nix | 13 +++++- user/home.nix | 6 --- 7 files changed, 82 insertions(+), 45 deletions(-) diff --git a/LightlyShaders/default.nix b/LightlyShaders/default.nix index 7c2b5ed..9d68460 100644 --- a/LightlyShaders/default.nix +++ b/LightlyShaders/default.nix @@ -1,47 +1,50 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, qtbase, - qtx11extras, - qttools, - kglobalaccel, - kinit, + # qtx11extras, + # qttools, + # kglobalaccel, + # kinit, kwin, - kio, - kguiaddons, - kcoreaddons, - systemsettings, + # kio, + # kguiaddons, + # kcoreaddons, + # systemsettings, cmake, extra-cmake-modules, + wrapQtAppsHook, libepoxy, + kdelibs4support, libXdmcp }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "LightlyShaders"; - version = "0.0.2"; + version = "0.0.4"; src = fetchFromGitHub { owner = "a-parhom"; repo = "LightlyShaders"; - rev = "d2a643b0c56d50d2ac1822e04c7b83d72de4213e"; + rev = "0294499afece1620f47fa38fa74fa8604077347f"; sha256 = "MJk2pXRmyZDZX7KeZBHNKi0WQcQwqTM1nZWTWSxnvfc="; }; - dontWrapQtApps = true; + # dontWrapQtApps = true; buildInputs = [ qtbase - qtx11extras - qttools - kglobalaccel - kinit + # qtx11extras + # qttools + # kglobalaccel + kdelibs4support + # kinit kwin - kio - kguiaddons - kcoreaddons - systemsettings + # kio + # kguiaddons + # kcoreaddons + # systemsettings libepoxy libXdmcp ]; @@ -49,16 +52,24 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + wrapQtAppsHook ]; - preConfigure = '' - local modulepath=$(kf5-config --install module) - local datapath=$(kf5-config --install data) - local servicespath=$(kf5-config --install services) - substituteInPlace CMakeLists.txt \ - --replace "\''${MODULEPATH}" "$out/''${KDE_INSTALL_QTPLUGINDIR}" \ - --replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}" \ - --replace "\''${SERVICES_INSTALL_DIR}" "$out/''${servicespath#/nix/store/*/}" + postConfigure = '' + # local modulepath=$(kf5-config --install module) + # local datapath=$(kf5-config --install data) + # local servicespath=$(kf5-config --install services) + # substituteInPlace CMakeLists.txt \ + # --replace "\''${MODULEPATH}" "$out/''${modulepath#/nix/store/*/}" \ + # --replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}" + + # substituteInPlace CMakeLists.txt \ + # --replace "\''${MODULEPATH}" "$out/qt-5.15.3/plugins" \ + # --replace "\''${DATAPATH}" "$out/share" + + substituteInPlace cmake_install.cmake \ + --replace "${kdelibs4support}" "$out" + ''; meta = with lib; { diff --git a/LightlyShaders/result b/LightlyShaders/result index 16b1117..1b8c76b 120000 --- a/LightlyShaders/result +++ b/LightlyShaders/result @@ -1 +1 @@ -/nix/store/9zw7rwdbj8kkvy3mm5y44frlm2mg0lil-LightlyShaders-0.0.2 \ No newline at end of file +/nix/store/8v4a6zsgpal8vs6xrsqkzknxpajkbwbl-LightlyShaders-0.0.3 \ No newline at end of file diff --git a/README.org b/README.org index 6ecadc8..6fcd4af 100644 --- a/README.org +++ b/README.org @@ -110,6 +110,8 @@ services.xserver = { displayManager.sddm.enable = true; desktopManager.plasma5.enable = true; }; + +# programs.qt5ct.enable = true; #+end_src To use pipewire there are some specific setup pieces that I like to have. @@ -138,6 +140,10 @@ To make sure certain things are setup properly I'll modify the shells a bit. environment.variables = { EDITOR = "emacsclient -t -a"; VISUAL = "emacsclient -c -a"; + + # Fixing Qt apps in other environments + # QT_XCB_GL_INTEGRATION = "xcb_egl"; + QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; }; environment.homeBinInPath = true; programs.fish.enable = true; @@ -152,6 +158,7 @@ vim wget killall discover +kde-rounded-corners lightly-qt pinentry pinentry-qt @@ -165,10 +172,12 @@ binutils hunspell hunspellDicts.en_US git +transmission openssh samba ark dash +light kget krename kwallet-pam @@ -223,7 +232,7 @@ xcape unclutter-xfixes bluez-tools networkmanager_dmenu -qt5ct +plasma5Packages.qt5ct lxappearance spotdl kdenlive @@ -253,6 +262,7 @@ cmake extra-cmake-modules pkg-config # LIBRARIES FOR DEV +qt5.full qt5.qtbase qt5.qtquickcontrols2 qt5.qtx11extras @@ -368,6 +378,7 @@ Notice how I am including all of my software here. It may be a big file, but hav # Enable fingerprint services.fprintd.enable = true; + programs.qt5ct.enable = true; <> diff --git a/flake.lock b/flake.lock index 906ef5d..6f85733 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1652452043, - "narHash": "sha256-nh3mdVB/Kk5ag1uRMAlKo8r+ssN3HNxwbLsqRG4xZkw=", + "lastModified": 1653153149, + "narHash": "sha256-8B/tWWZziFq4DqnAm9uO7M4Z4PNfllYg5+teX1e5yDQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "273598f53e04f0111dca5724b37640e3907edaaf", + "rev": "94780dd888881bf35165dfdd334a57ef6b14ead8", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652467128, - "narHash": "sha256-1wuQ7QgPQ3tugYcoVMJ3pUzl4wVdBzKZr9qtJAgA4VI=", + "lastModified": 1653060744, + "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb222e008681fce4608e94f2d1dfdf3d03a364c4", + "rev": "dfd82985c273aac6eced03625f454b334daae2e8", "type": "github" }, "original": { diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index 6b817cd..a99ddf3 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -54,6 +54,8 @@ desktopManager.plasma5.enable = true; }; + # programs.qt5ct.enable = true; + # Configure keymap in X11 services.xserver.layout = "us"; # services.xserver.xkbOptions = "eurosign:e"; @@ -87,6 +89,10 @@ environment.variables = { EDITOR = "emacsclient -t -a"; VISUAL = "emacsclient -c -a"; + + # Fixing Qt apps in other environments + # QT_XCB_GL_INTEGRATION = "xcb_egl"; + QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; }; environment.homeBinInPath = true; programs.fish.enable = true; @@ -122,6 +128,7 @@ wget killall discover + kde-rounded-corners lightly-qt pinentry pinentry-qt @@ -135,10 +142,12 @@ hunspell hunspellDicts.en_US git + transmission openssh samba ark dash + light kget krename kwallet-pam @@ -193,7 +202,7 @@ unclutter-xfixes bluez-tools networkmanager_dmenu - qt5ct + plasma5Packages.qt5ct lxappearance spotdl kdenlive @@ -221,6 +230,7 @@ extra-cmake-modules pkg-config # LIBRARIES FOR DEV + qt5.full qt5.qtbase qt5.qtquickcontrols2 qt5.qtx11extras diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 729267f..dd4f7b0 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -60,6 +60,8 @@ displayManager.sddm.enable = true; desktopManager.plasma5.enable = true; }; + + # programs.qt5ct.enable = true; # Configure keymap in X11 services.xserver.layout = "us"; @@ -71,6 +73,7 @@ # Enable fingerprint services.fprintd.enable = true; + programs.qt5ct.enable = true; # Enable sound. security.rtkit.enable = true; @@ -119,6 +122,10 @@ environment.variables = { EDITOR = "emacsclient -t -a"; VISUAL = "emacsclient -c -a"; + + # Fixing Qt apps in other environments + # QT_XCB_GL_INTEGRATION = "xcb_egl"; + QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; }; environment.homeBinInPath = true; programs.fish.enable = true; @@ -150,6 +157,7 @@ wget killall discover + kde-rounded-corners lightly-qt pinentry pinentry-qt @@ -163,10 +171,12 @@ hunspell hunspellDicts.en_US git + transmission openssh samba ark dash + light kget krename kwallet-pam @@ -221,7 +231,7 @@ unclutter-xfixes bluez-tools networkmanager_dmenu - qt5ct + plasma5Packages.qt5ct lxappearance spotdl kdenlive @@ -255,6 +265,7 @@ extra-cmake-modules pkg-config # LIBRARIES FOR DEV + qt5.full qt5.qtbase qt5.qtquickcontrols2 qt5.qtx11extras diff --git a/user/home.nix b/user/home.nix index 2058c87..d314881 100644 --- a/user/home.nix +++ b/user/home.nix @@ -65,12 +65,6 @@ programs.mu.enable = true; - # services.emacs = { - # enable = true; - # package = pkgs.emacsPgtkGcc; - # defaultEditor = true; - # }; - programs.mbsync = { enable = true; extraConfig = ''