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

idk...getting close maybe. Things are installing in the wrong places

Browse source
This commit is contained in:
Chris Cochrun 2022-05-18 11:18:31 -05:00
parent 3b9a625896
commit df4093fc06
6 changed files with 28 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
LightlyShaders/default.nix
View file

@ -15,7 +15,6 @@
plasma-framework,
cmake,
extra-cmake-modules,
clang,
libepoxy,
libXdmcp
}:
@ -51,7 +50,6 @@ stdenv.mkDerivation rec {
stdenv
cmake
extra-cmake-modules
clang
libepoxy
libXdmcp
];
@ -63,7 +61,7 @@ stdenv.mkDerivation rec {
substituteInPlace CMakeLists.txt \
--replace "\''${MODULEPATH}" "$out/''${modulepath#/nix/store/*/}" \
--replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}" \
--replace "\''${SERVICEPATH}" "$out/''${servicepath#/nix/store/*/}"
--replace "\''${SERVICES_INSTALL_DIR}" "$out/''${servicepath#/nix/store/*/}"
'';
meta = with lib; {

3
README.org
View file

@ -272,7 +272,7 @@ nixpkgs.overlays = [
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix";
sha256 = "1rhmvww15mkix7fg8gd7r5hwlszi4zlwzxyr02yfwfsf5hh0n0d9";
}))
(self: super:
@ -616,6 +616,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
neofetch
# Dev tools
<<dev-tools>>
<<lightlyshaders>>
];
<<overlays>>

42
pkgs/LightlyShaders.nix
View file

@ -2,9 +2,9 @@
stdenv,
lib,
fetchFromGitHub,
qt5.qtbase,
qt5.qtx11extras,
qt5.qttools,
qtbase,
qtx11extras,
qttools,
kglobalaccel,
kinit,
kwin,
@ -15,9 +15,8 @@
plasma-framework,
cmake,
extra-cmake-modules,
clang,
libepoxy,
xorg.libXdmcp
libXdmcp
}:
stdenv.mkDerivation rec {
@ -27,33 +26,32 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "a-parhom";
repo = "LightlyShaders";
rev = "0da0587dc2cea4766290695d8f8e1a1d8835b1ba";
rev = "d2a643b0c56d50d2ac1822e04c7b83d72de4213e";
sha256 = "MJk2pXRmyZDZX7KeZBHNKi0WQcQwqTM1nZWTWSxnvfc=";
};
dontWrapQtApps = true;
buildInputs = with pkgs; [
qt5.qtbase
qt5.qtx11extras
qt5.qttools
libsForQt5.kglobalaccel
libsForQt5.kinit
libsForQt5.kwin
libsForQt5.kio
libsForQt5.kguiaddons
libsForQt5.kcoreaddons
libsForQt5.systemsettings
libsForQt5.plasma-framework
buildInputs = [
qtbase
qtx11extras
qttools
kglobalaccel
kinit
kwin
kio
kguiaddons
kcoreaddons
systemsettings
plasma-framework
];
nativeBuildInputs = with pkgs; [
nativeBuildInputs = [
stdenv
cmake
extra-cmake-modules
clang
libepoxy
xorg.libXdmcp
libXdmcp
];
preConfigure = ''
@ -63,7 +61,7 @@ stdenv.mkDerivation rec {
substituteInPlace CMakeLists.txt \
--replace "\''${MODULEPATH}" "$out/''${modulepath#/nix/store/*/}" \
--replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}" \
--replace "\''${SERVICEPATH}" "$out/''${servicepath#/nix/store/*/}"
--replace "\''${SERVICES_INSTALL_DIR}" "$out/''${servicepath#/nix/store/*/}"
'';
meta = with lib; {

4
scripts/upgrade-nix
View file

@ -1,5 +1,5 @@
#!/bin/sh
currentdir=$(pwd)
cd ~/.dotfiles
nixos-rebuild --use-remote-sudo switch --flake .#
cd $currentdir
nixos-rebuild --use-remote-sudo switch --verbose --flake .#
cd $currentdir

3
system/kaladin/configuration.nix
View file

@ -224,13 +224,14 @@
libsForQt5.ki18n
libsForQt5.kcoreaddons
fennel
(libsForQt5.callPackage ../../LightlyShaders {})
];
nixpkgs.overlays = [
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix";
sha256 = "1rhmvww15mkix7fg8gd7r5hwlszi4zlwzxyr02yfwfsf5hh0n0d9";
}))
(self: super:

2
system/syl/configuration.nix
View file

@ -260,7 +260,7 @@
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix";
sha256 = "1rhmvww15mkix7fg8gd7r5hwlszi4zlwzxyr02yfwfsf5hh0n0d9";
}))
(self: super: