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

3
README.org
View file

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

42
pkgs/LightlyShaders.nix
View file

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

2
scripts/upgrade-nix
View file

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

3
system/kaladin/configuration.nix
View file

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

2
system/syl/configuration.nix
View file

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