chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Working lightlyshaders except on laptop? 🤷

Browse source
This commit is contained in:
Chris Cochrun 2022-05-24 09:35:29 -05:00
parent c124529a32
commit cf69aee709
7 changed files with 82 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
LightlyShaders/default.nix
View file

@ -1,47 +1,50 @@
{ {
mkDerivation, stdenv,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
qtbase, qtbase,
qtx11extras, # qtx11extras,
qttools, # qttools,
kglobalaccel, # kglobalaccel,
kinit, # kinit,
kwin, kwin,
kio, # kio,
kguiaddons, # kguiaddons,
kcoreaddons, # kcoreaddons,
systemsettings, # systemsettings,
cmake, cmake,
extra-cmake-modules, extra-cmake-modules,
wrapQtAppsHook,
libepoxy, libepoxy,
kdelibs4support,
libXdmcp libXdmcp
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "LightlyShaders"; pname = "LightlyShaders";
version = "0.0.2"; version = "0.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "a-parhom"; owner = "a-parhom";
repo = "LightlyShaders"; repo = "LightlyShaders";
rev = "d2a643b0c56d50d2ac1822e04c7b83d72de4213e"; rev = "0294499afece1620f47fa38fa74fa8604077347f";
sha256 = "MJk2pXRmyZDZX7KeZBHNKi0WQcQwqTM1nZWTWSxnvfc="; sha256 = "MJk2pXRmyZDZX7KeZBHNKi0WQcQwqTM1nZWTWSxnvfc=";
}; };
dontWrapQtApps = true; # dontWrapQtApps = true;
buildInputs = [ buildInputs = [
qtbase qtbase
qtx11extras # qtx11extras
qttools # qttools
kglobalaccel # kglobalaccel
kinit kdelibs4support
# kinit
kwin kwin
kio # kio
kguiaddons # kguiaddons
kcoreaddons # kcoreaddons
systemsettings # systemsettings
libepoxy libepoxy
libXdmcp libXdmcp
]; ];
@ -49,16 +52,24 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
extra-cmake-modules extra-cmake-modules
wrapQtAppsHook
]; ];
preConfigure = '' postConfigure = ''
local modulepath=$(kf5-config --install module) # local modulepath=$(kf5-config --install module)
local datapath=$(kf5-config --install data) # local datapath=$(kf5-config --install data)
local servicespath=$(kf5-config --install services) # local servicespath=$(kf5-config --install services)
substituteInPlace CMakeLists.txt \ # substituteInPlace CMakeLists.txt \
--replace "\''${MODULEPATH}" "$out/''${KDE_INSTALL_QTPLUGINDIR}" \ # --replace "\''${MODULEPATH}" "$out/''${modulepath#/nix/store/*/}" \
--replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}" \ # --replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}"
--replace "\''${SERVICES_INSTALL_DIR}" "$out/''${servicespath#/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; { meta = with lib; {

2
LightlyShaders/result
View file

@ -1 +1 @@
/nix/store/9zw7rwdbj8kkvy3mm5y44frlm2mg0lil-LightlyShaders-0.0.2 /nix/store/8v4a6zsgpal8vs6xrsqkzknxpajkbwbl-LightlyShaders-0.0.3

13
README.org
View file

@ -110,6 +110,8 @@ services.xserver = {
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
}; };
# programs.qt5ct.enable = true;
#+end_src #+end_src
To use pipewire there are some specific setup pieces that I like to have. 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 = { environment.variables = {
EDITOR = "emacsclient -t -a"; EDITOR = "emacsclient -t -a";
VISUAL = "emacsclient -c -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; environment.homeBinInPath = true;
programs.fish.enable = true; programs.fish.enable = true;
@ -152,6 +158,7 @@ vim
wget wget
killall killall
discover discover
kde-rounded-corners
lightly-qt lightly-qt
pinentry pinentry
pinentry-qt pinentry-qt
@ -165,10 +172,12 @@ binutils
hunspell hunspell
hunspellDicts.en_US hunspellDicts.en_US
git git
transmission
openssh openssh
samba samba
ark ark
dash dash
light
kget kget
krename krename
kwallet-pam kwallet-pam
@ -223,7 +232,7 @@ xcape
unclutter-xfixes unclutter-xfixes
bluez-tools bluez-tools
networkmanager_dmenu networkmanager_dmenu
qt5ct plasma5Packages.qt5ct
lxappearance lxappearance
spotdl spotdl
kdenlive kdenlive
@ -253,6 +262,7 @@ cmake
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
# LIBRARIES FOR DEV # LIBRARIES FOR DEV
qt5.full
qt5.qtbase qt5.qtbase
qt5.qtquickcontrols2 qt5.qtquickcontrols2
qt5.qtx11extras 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 # Enable fingerprint
services.fprintd.enable = true; services.fprintd.enable = true;
programs.qt5ct.enable = true;
<<pipewire>> <<pipewire>>

12
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1652452043, "lastModified": 1653153149,
"narHash": "sha256-nh3mdVB/Kk5ag1uRMAlKo8r+ssN3HNxwbLsqRG4xZkw=", "narHash": "sha256-8B/tWWZziFq4DqnAm9uO7M4Z4PNfllYg5+teX1e5yDQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "273598f53e04f0111dca5724b37640e3907edaaf", "rev": "94780dd888881bf35165dfdd334a57ef6b14ead8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1652467128, "lastModified": 1653060744,
"narHash": "sha256-1wuQ7QgPQ3tugYcoVMJ3pUzl4wVdBzKZr9qtJAgA4VI=", "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fb222e008681fce4608e94f2d1dfdf3d03a364c4", "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
system/kaladin/configuration.nix
View file

@ -54,6 +54,8 @@
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
}; };
# programs.qt5ct.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver.layout = "us"; services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e"; # services.xserver.xkbOptions = "eurosign:e";
@ -87,6 +89,10 @@
environment.variables = { environment.variables = {
EDITOR = "emacsclient -t -a"; EDITOR = "emacsclient -t -a";
VISUAL = "emacsclient -c -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; environment.homeBinInPath = true;
programs.fish.enable = true; programs.fish.enable = true;
@ -122,6 +128,7 @@
wget wget
killall killall
discover discover
kde-rounded-corners
lightly-qt lightly-qt
pinentry pinentry
pinentry-qt pinentry-qt
@ -135,10 +142,12 @@
hunspell hunspell
hunspellDicts.en_US hunspellDicts.en_US
git git
transmission
openssh openssh
samba samba
ark ark
dash dash
light
kget kget
krename krename
kwallet-pam kwallet-pam
@ -193,7 +202,7 @@
unclutter-xfixes unclutter-xfixes
bluez-tools bluez-tools
networkmanager_dmenu networkmanager_dmenu
qt5ct plasma5Packages.qt5ct
lxappearance lxappearance
spotdl spotdl
kdenlive kdenlive
@ -221,6 +230,7 @@
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
# LIBRARIES FOR DEV # LIBRARIES FOR DEV
qt5.full
qt5.qtbase qt5.qtbase
qt5.qtquickcontrols2 qt5.qtquickcontrols2
qt5.qtx11extras qt5.qtx11extras

13
system/syl/configuration.nix
View file

@ -61,6 +61,8 @@
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
}; };
# programs.qt5ct.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver.layout = "us"; services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e"; # services.xserver.xkbOptions = "eurosign:e";
@ -71,6 +73,7 @@
# Enable fingerprint # Enable fingerprint
services.fprintd.enable = true; services.fprintd.enable = true;
programs.qt5ct.enable = true;
# Enable sound. # Enable sound.
security.rtkit.enable = true; security.rtkit.enable = true;
@ -119,6 +122,10 @@
environment.variables = { environment.variables = {
EDITOR = "emacsclient -t -a"; EDITOR = "emacsclient -t -a";
VISUAL = "emacsclient -c -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; environment.homeBinInPath = true;
programs.fish.enable = true; programs.fish.enable = true;
@ -150,6 +157,7 @@
wget wget
killall killall
discover discover
kde-rounded-corners
lightly-qt lightly-qt
pinentry pinentry
pinentry-qt pinentry-qt
@ -163,10 +171,12 @@
hunspell hunspell
hunspellDicts.en_US hunspellDicts.en_US
git git
transmission
openssh openssh
samba samba
ark ark
dash dash
light
kget kget
krename krename
kwallet-pam kwallet-pam
@ -221,7 +231,7 @@
unclutter-xfixes unclutter-xfixes
bluez-tools bluez-tools
networkmanager_dmenu networkmanager_dmenu
qt5ct plasma5Packages.qt5ct
lxappearance lxappearance
spotdl spotdl
kdenlive kdenlive
@ -255,6 +265,7 @@
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
# LIBRARIES FOR DEV # LIBRARIES FOR DEV
qt5.full
qt5.qtbase qt5.qtbase
qt5.qtquickcontrols2 qt5.qtquickcontrols2
qt5.qtx11extras qt5.qtx11extras

6
user/home.nix
View file

@ -65,12 +65,6 @@
programs.mu.enable = true; programs.mu.enable = true;
# services.emacs = {
# enable = true;
# package = pkgs.emacsPgtkGcc;
# defaultEditor = true;
# };
programs.mbsync = { programs.mbsync = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''