sadorowo/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix formatting errors

Browse Source
This commit is contained in:
Franek 2025-04-14 10:44:13 +02:00
parent 033aa0843c
commit 24bb4f8b89
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.md
View File

@ -2,4 +2,4 @@
* [x] Organize most common apps with modules * [x] Organize most common apps with modules
* [ ] Migrate from pywal + apple-fonts to Stylix (theme, cursor, fonts, ...) * [ ] Migrate from pywal + apple-fonts to Stylix (theme, cursor, fonts, ...)
* [x] Remove clutter * [x] Remove clutter
* [ ] Fix DDT4ALL derivation/shell * [x] Fix DDT4ALL derivation/shell

20
modules/derivations/nordvpn.nix
View File

@ -34,13 +34,13 @@ let
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out mkdir -p $out
mv usr/* $out/ mv usr/* $out/
mv var/ $out/ mv var/ $out/
mv etc/ $out/ mv etc/ $out/
runHook postInstall runHook postInstall
''; '';
}; };
nordVPNfhs = pkgs.buildFHSEnvChroot { nordVPNfhs = pkgs.buildFHSEnvChroot {
@ -65,9 +65,9 @@ let
preScript = pkgs.writeShellScript "nordvpn-start" '' preScript = pkgs.writeShellScript "nordvpn-start" ''
mkdir -m 700 -p /var/lib/nordvpn; mkdir -m 700 -p /var/lib/nordvpn;
if [ -z "$(ls -A /var/lib/nordvpn)" ]; then 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 fi
''; '';
in in
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
inherit pname version; inherit pname version;
@ -84,7 +84,7 @@ pkgs.stdenv.mkDerivation rec {
ln -s ${nordVPNBase}/share/* $out/share/ ln -s ${nordVPNBase}/share/* $out/share/
ln -s ${nordVPNBase}/var $out/ ln -s ${nordVPNBase}/var $out/
runHook postInstall runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
description = "CLI client for NordVPN"; description = "CLI client for NordVPN";

12
modules/home-manager/darkman.nix
View File

@ -26,9 +26,9 @@
enable = true; enable = true;
darkModeScripts = { darkModeScripts = {
theme = '' theme = ''
${pkgs.dconf}/bin/dconf write\ ${pkgs.dconf}/bin/dconf write\
/org/gnome/desktop/interface/color-scheme "'prefer-dark'" /org/gnome/desktop/interface/color-scheme "'prefer-dark'"
''; '';
custom = config.modules.darkman.customDarkModeScript; custom = config.modules.darkman.customDarkModeScript;
pywalfox = "command -v pywalfox &>/dev/null && pywalfox dark && pywalfox update"; pywalfox = "command -v pywalfox &>/dev/null && pywalfox dark && pywalfox update";
@ -36,9 +36,9 @@
lightModeScripts = { lightModeScripts = {
theme = '' theme = ''
${pkgs.dconf}/bin/dconf write\ ${pkgs.dconf}/bin/dconf write\
/org/gnome/desktop/interface/color-scheme "'prefer-light'" /org/gnome/desktop/interface/color-scheme "'prefer-light'"
''; '';
custom = config.modules.darkman.customLightModeScript; custom = config.modules.darkman.customLightModeScript;
pywalfox = "command -v pywalfox &>/dev/null && pywalfox light && pywalfox update"; pywalfox = "command -v pywalfox &>/dev/null && pywalfox light && pywalfox update";

10
modules/nixos/nordvpn.nix
View File

@ -12,11 +12,11 @@
let let
nordVPN = pkgs.callPackage ../derivations/nordvpn.nix { inherit pkgs lib; }; nordVPN = pkgs.callPackage ../derivations/nordvpn.nix { inherit pkgs lib; };
preScript = pkgs.writeShellScript "nordvpn-start" '' preScript = pkgs.writeShellScript "nordvpn-start" ''
mkdir -m 700 -p /var/lib/nordvpn; mkdir -m 700 -p /var/lib/nordvpn;
if [ -z "$(ls -A /var/lib/nordvpn)" ]; then if [ -z "$(ls -A /var/lib/nordvpn)" ]; then
cp -r ${nordVPN}/var/lib/nordvpn/* /var/lib/nordvpn; cp -r ${nordVPN}/var/lib/nordvpn/* /var/lib/nordvpn;
fi fi
''; '';
in in
{ {
networking.firewall.checkReversePath = false; networking.firewall.checkReversePath = false;

4
modules/nixos/nvidia-support.nix
View File

@ -11,7 +11,7 @@
"nvidia_drm" "nvidia_drm"
]; ];
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
options nvidia NVreg_OpenRmEnableUnsupportedGpus=1 options nvidia NVreg_OpenRmEnableUnsupportedGpus=1
''; '';
}; };
} }

14
shells/ddt4all.nix
View File

@ -45,13 +45,13 @@ pkgs.mkShell {
nativeBuildInputs = [ pkgs.libsForQt5.qt5.wrapQtAppsHook ]; nativeBuildInputs = [ pkgs.libsForQt5.qt5.wrapQtAppsHook ];
shellHook = '' shellHook = ''
mkdir -p $HOME/DDT4ALL mkdir -p $HOME/DDT4ALL
cp -r $src/bin/* $HOME/DDT4ALL cp -r $src/bin/* $HOME/DDT4ALL
cd $HOME/DDT4ALL cd $HOME/DDT4ALL
wrapQtAppsHook wrapQtAppsHook
python main.py python main.py
#exit exit
''; '';
} }