diff --git a/flake.nix b/flake.nix index 4881026..04de325 100644 --- a/flake.nix +++ b/flake.nix @@ -1,22 +1,21 @@ { description = "LaTeX Beamer Presentation for GPUL Schools: Software Libre"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = github:NixOS/nixpkgs/nixos-25.05; + flake-utils.url = github:numtide/flake-utils; }; - outputs = - { - self, - nixpkgs, - flake-utils, - }: + outputs = { + self, + nixpkgs, + flake-utils, + }: flake-utils.lib.eachDefaultSystem ( - system: - let + system: let pkgs = nixpkgs.legacyPackages.${system}; tex = pkgs.texlive.combine { - inherit (pkgs.texlive) + inherit + (pkgs.texlive) scheme-basic latex-bin latexmk @@ -31,21 +30,13 @@ ; }; # tex = pkgs.texliveFull; - in - rec { + in rec { packages = { document = pkgs.stdenvNoCC.mkDerivation rec { name = "latex-beamer-gpul-schools-software-libre"; src = self; - buildInputs = [ - pkgs.coreutils - tex - ]; - phases = [ - "unpackPhase" - "buildPhase" - "installPhase" - ]; + buildInputs = [pkgs.coreutils tex]; + phases = ["unpackPhase" "buildPhase" "installPhase"]; buildPhase = '' export PATH="${pkgs.lib.makeBinPath buildInputs}"; env TEXMFVAR=$(mktemp -d) \ @@ -63,7 +54,7 @@ defaultPackage = packages.document; devShells.default = pkgs.mkShell { - buildInputs = packages.document.buildInputs ++ (with pkgs; [ texlab ]); + buildInputs = packages.document.buildInputs; }; } ); diff --git a/img/logo-fsf.org.png b/logo-fsf.org.png similarity index 100% rename from img/logo-fsf.org.png rename to logo-fsf.org.png diff --git a/img/logo-gnu.png b/logo-gnu.png similarity index 100% rename from img/logo-gnu.png rename to logo-gnu.png diff --git a/img/logo-gpul.png b/logo-gpul.png similarity index 100% rename from img/logo-gpul.png rename to logo-gpul.png diff --git a/img/logo-osi.png b/logo-osi.png similarity index 100% rename from img/logo-osi.png rename to logo-osi.png diff --git a/main.tex b/main.tex index 6b92537..1d2b1a3 100644 --- a/main.tex +++ b/main.tex @@ -19,7 +19,7 @@ \date{\today} -\logo{\includegraphics[height=1cm]{img/logo-gpul.png}} +\logo{\includegraphics[height=1cm]{logo-gpul.png}} \begin{document} @@ -43,7 +43,7 @@ \vspace{0.5em} \begin{center} - \includegraphics[width=0.7\linewidth]{img/logo-fsf.org} + \includegraphics[width=0.7\linewidth]{logo-fsf.org} \end{center} \end{frame} @@ -61,7 +61,7 @@ \vspace{0.5em} \begin{center} - \includegraphics[width=0.6\linewidth]{img/logo-osi.png} + \includegraphics[width=0.6\linewidth]{logo-osi.png} \end{center} \cite{gnu_open_source} @@ -85,7 +85,7 @@ \vspace{0.5em} \begin{center} - \includegraphics[width=0.2\linewidth]{img/tux.png} + \includegraphics[width=0.2\linewidth]{tux.png} \end{center} \end{frame} @@ -107,7 +107,7 @@ \vspace{0.5em} \begin{center} - \includegraphics[width=0.2\linewidth]{img/logo-gnu.png} + \includegraphics[width=0.2\linewidth]{logo-gnu.png} \end{center} \vspace{-2em} @@ -130,4 +130,4 @@ \end{frame} -\end{document} +\end{document} \ No newline at end of file diff --git a/img/tux.png b/tux.png similarity index 100% rename from img/tux.png rename to tux.png