diff --git a/.gitignore b/.gitignore index e570fbe..64d859d 100644 --- a/.gitignore +++ b/.gitignore @@ -318,9 +318,5 @@ TSWLatexianTemp* # End of https://www.toptal.com/developers/gitignore/api/direnv,latex -### lualatex ### +# LuaTex luatex.*/ - -### Nix ### -result -result/ \ No newline at end of file diff --git a/flake.lock b/flake.lock index 3bf0746..302ca36 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757020766, - "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", - "owner": "NixOS", + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.05", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 04de325..9379dbc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,60 +1,18 @@ { - 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/nixpkgs-unstable"; + flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { - self, - nixpkgs, - flake-utils, - }: - flake-utils.lib.eachDefaultSystem ( - system: let - pkgs = nixpkgs.legacyPackages.${system}; - tex = pkgs.texlive.combine { - inherit - (pkgs.texlive) - scheme-basic - latex-bin - latexmk - collection-langspanish - beamer - biblatex - biber - csquotes - emoji - fontspec - noto-emoji - ; - }; - # tex = pkgs.texliveFull; - 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"]; - buildPhase = '' - export PATH="${pkgs.lib.makeBinPath buildInputs}"; - env TEXMFVAR=$(mktemp -d) \ - SOURCE_DATE_EPOCH=${toString self.lastModified} \ - latexmk -interaction=nonstopmode -pdf -lualatex \ - -pretex="\pdfvariable suppressoptionalinfo 512\relax" \ - -usepretex main.tex - ''; - installPhase = '' - mkdir -p $out - cp main.pdf $out/ - ''; - }; - }; - defaultPackage = packages.document; - + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; in + { devShells.default = pkgs.mkShell { - buildInputs = packages.document.buildInputs; + buildInputs = with pkgs; [ + texstudio + texlive.combined.scheme-full + ]; }; } ); diff --git a/main.pdf b/main.pdf new file mode 100644 index 0000000..30d2e84 Binary files /dev/null and b/main.pdf differ diff --git a/main.tex b/main.tex index 1d2b1a3..703b1f3 100644 --- a/main.tex +++ b/main.tex @@ -2,7 +2,7 @@ \usepackage[spanish]{babel} \usetheme{Madrid} -\usepackage[backend=biber, language=auto]{biblatex} +\usepackage[backend=biber]{biblatex} \usepackage{csquotes} \addbibresource{references.bib} @@ -17,7 +17,7 @@ \institute[GPUL]{Grupo de Programadores e Usuarios de Linux} -\date{\today} +\date{GPUL Schools 25/26} \logo{\includegraphics[height=1cm]{logo-gpul.png}} @@ -117,10 +117,10 @@ \begin{frame} \frametitle{Que facer despois desta charla?} \begin{itemize} - \item<1-> A - \item<2-> B - \item<3-> C - \item<4-> D + \item<1-> Comprar manzanas + \item<2-> Ver Telecinco + \item<3-> Por el culo te la hinco + \item<4-> Jeje \end{itemize} \end{frame} diff --git a/references.bib b/references.bib index 6c9aee1..2d612a9 100644 --- a/references.bib +++ b/references.bib @@ -1,4 +1,4 @@ -@online{gnu_free_sw, +@@online{gnu_free_sw, author = {GNU \& FSF}, title = {The Free Software Definition}, url = {https://www.gnu.org/philosophy/free-sw.en.html},