fix formatting errors
This commit is contained in:
parent
033aa0843c
commit
24bb4f8b89
2
TODO.md
2
TODO.md
@ -2,4 +2,4 @@
|
||||
* [x] Organize most common apps with modules
|
||||
* [ ] Migrate from pywal + apple-fonts to Stylix (theme, cursor, fonts, ...)
|
||||
* [x] Remove clutter
|
||||
* [ ] Fix DDT4ALL derivation/shell
|
||||
* [x] Fix DDT4ALL derivation/shell
|
||||
|
@ -34,13 +34,13 @@ let
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
mv usr/* $out/
|
||||
mv var/ $out/
|
||||
mv etc/ $out/
|
||||
runHook postInstall
|
||||
'';
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
mv usr/* $out/
|
||||
mv var/ $out/
|
||||
mv etc/ $out/
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
nordVPNfhs = pkgs.buildFHSEnvChroot {
|
||||
@ -65,9 +65,9 @@ let
|
||||
preScript = pkgs.writeShellScript "nordvpn-start" ''
|
||||
mkdir -m 700 -p /var/lib/nordvpn;
|
||||
if [ -z "$(ls -A /var/lib/nordvpn)" ]; then
|
||||
cp -r ${nordVPNBase}/var/lib/nordvpn/* /var/lib/nordvpn;
|
||||
cp -r ${nordVPNBase}/var/lib/nordvpn/* /var/lib/nordvpn;
|
||||
fi
|
||||
'';
|
||||
'';
|
||||
in
|
||||
pkgs.stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
@ -84,7 +84,7 @@ pkgs.stdenv.mkDerivation rec {
|
||||
ln -s ${nordVPNBase}/share/* $out/share/
|
||||
ln -s ${nordVPNBase}/var $out/
|
||||
runHook postInstall
|
||||
'';
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI client for NordVPN";
|
||||
|
@ -26,9 +26,9 @@
|
||||
enable = true;
|
||||
darkModeScripts = {
|
||||
theme = ''
|
||||
${pkgs.dconf}/bin/dconf write\
|
||||
/org/gnome/desktop/interface/color-scheme "'prefer-dark'"
|
||||
'';
|
||||
${pkgs.dconf}/bin/dconf write\
|
||||
/org/gnome/desktop/interface/color-scheme "'prefer-dark'"
|
||||
'';
|
||||
|
||||
custom = config.modules.darkman.customDarkModeScript;
|
||||
pywalfox = "command -v pywalfox &>/dev/null && pywalfox dark && pywalfox update";
|
||||
@ -36,9 +36,9 @@
|
||||
|
||||
lightModeScripts = {
|
||||
theme = ''
|
||||
${pkgs.dconf}/bin/dconf write\
|
||||
/org/gnome/desktop/interface/color-scheme "'prefer-light'"
|
||||
'';
|
||||
${pkgs.dconf}/bin/dconf write\
|
||||
/org/gnome/desktop/interface/color-scheme "'prefer-light'"
|
||||
'';
|
||||
|
||||
custom = config.modules.darkman.customLightModeScript;
|
||||
pywalfox = "command -v pywalfox &>/dev/null && pywalfox light && pywalfox update";
|
||||
|
@ -12,11 +12,11 @@
|
||||
let
|
||||
nordVPN = pkgs.callPackage ../derivations/nordvpn.nix { inherit pkgs lib; };
|
||||
preScript = pkgs.writeShellScript "nordvpn-start" ''
|
||||
mkdir -m 700 -p /var/lib/nordvpn;
|
||||
if [ -z "$(ls -A /var/lib/nordvpn)" ]; then
|
||||
cp -r ${nordVPN}/var/lib/nordvpn/* /var/lib/nordvpn;
|
||||
fi
|
||||
'';
|
||||
mkdir -m 700 -p /var/lib/nordvpn;
|
||||
if [ -z "$(ls -A /var/lib/nordvpn)" ]; then
|
||||
cp -r ${nordVPN}/var/lib/nordvpn/* /var/lib/nordvpn;
|
||||
fi
|
||||
'';
|
||||
in
|
||||
{
|
||||
networking.firewall.checkReversePath = false;
|
||||
|
@ -11,7 +11,7 @@
|
||||
"nvidia_drm"
|
||||
];
|
||||
boot.extraModprobeConfig = ''
|
||||
options nvidia NVreg_OpenRmEnableUnsupportedGpus=1
|
||||
'';
|
||||
options nvidia NVreg_OpenRmEnableUnsupportedGpus=1
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
@ -45,13 +45,13 @@ pkgs.mkShell {
|
||||
nativeBuildInputs = [ pkgs.libsForQt5.qt5.wrapQtAppsHook ];
|
||||
|
||||
shellHook = ''
|
||||
mkdir -p $HOME/DDT4ALL
|
||||
cp -r $src/bin/* $HOME/DDT4ALL
|
||||
mkdir -p $HOME/DDT4ALL
|
||||
cp -r $src/bin/* $HOME/DDT4ALL
|
||||
|
||||
cd $HOME/DDT4ALL
|
||||
wrapQtAppsHook
|
||||
cd $HOME/DDT4ALL
|
||||
wrapQtAppsHook
|
||||
|
||||
python main.py
|
||||
#exit
|
||||
'';
|
||||
python main.py
|
||||
exit
|
||||
'';
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user