Skip to content

Commit

Permalink
Reduce complexity for enduser (#3)
Browse files Browse the repository at this point in the history
Changes: 

* Build from root

* program -> major

* Add flake build

* Add glossary

* Use charter font
  • Loading branch information
mrtz-j authored Sep 8, 2024
1 parent adcd459 commit d65c412
Show file tree
Hide file tree
Showing 42 changed files with 633 additions and 491 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:
lfs: true

- uses: typst-community/setup-typst@v3
- run: typst compile thesis.typ thesis.pdf
- run: typst compile proposal.typ proposal.pdf
- run: typst compile ./template/thesis.typ thesis.pdf --root "./"
# NOTE: Update proposal.typ and comment out the following line if you want to build the proposal.
# - run: typst compile proposal.typ proposal.pdf

- name: Upload Release Asset - Assignment
id: upload
Expand All @@ -35,5 +36,6 @@ jobs:
uses: thollander/actions-comment-pull-request@v2
with:
reactions: eyes, rocket
comment_tag: file-upload
message: |
Thank you for your contribution. Review ready at: ${{ steps.upload.outputs.artifact-url }}
7 changes: 4 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ jobs:
DEFAULT_BUMP: 'patch'

- uses: typst-community/setup-typst@v3
- run: typst compile thesis.typ thesis.pdf
- run: typst compile proposal.typ proposal.pdf
- run: typst compile ./template/thesis.typ thesis.pdf
# NOTE: Add back proposal.typ when ready
# - run: typst compile proposal.typ proposal.pdf

- name: Create Release
id: create_release
Expand All @@ -44,6 +45,6 @@ jobs:
name: Version ${{ steps.bump.outputs.new_tag }}
draft: false
prerelease: false
# NOTE: Add back proposal.pdf when ready
files: |
thesis.pdf
proposal.pdf
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.direnv/*
.pre-commit-config.yaml
*.pdf
Binary file removed NotoSans-Italic-VariableFont_wdth,wght.ttf
Binary file not shown.
Binary file removed NotoSans-VariableFont_wdth,wght.ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- [x] Back page
- [x] Supervisors page
- [ ] List of Definitions
- [ ] List of Abbreviations
- [x] List of Abbreviations
- [ ] Styling
- [ ] Headings (chapter on odd, subsection on even)
- [ ] Font features
Expand All @@ -24,5 +24,5 @@
- [x] CI/CD
- [x] Formatting
- [x] Build and Release pdf
- [ ] Release as lib
- [/] Release as lib
- [ ] License
3 changes: 0 additions & 3 deletions chapters/introduction.typ

This file was deleted.

33 changes: 0 additions & 33 deletions figures/Logo_EPFL.svg

This file was deleted.

Binary file removed figures/backpage.pdf
Binary file not shown.
Binary file removed figures/frontpage_full.pdf
Binary file not shown.
Binary file removed figures/logo.pdf
Binary file not shown.
59 changes: 58 additions & 1 deletion flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 32 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable";
};
flake-utils = {
url = "github:numtide/flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
pre-commit-hooks = {
url = "github:cachix/git-hooks.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
typst-packages = {
url = "github:typst/packages";
flake = false;
};
typst-nix = {
url = "github:misterio77/typst-nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.typst-packages.follows = "typst-packages";
};
};
outputs =
{ self
, nixpkgs
, flake-utils
, pre-commit-hooks
, typst-nix
, typst-packages
, ...
}:
flake-utils.lib.eachDefaultSystem (
Expand All @@ -33,6 +45,23 @@
};
};

packages = {
default = typst-nix.lib.${system}.mkTypstDerivation {
name = "nixy-thesis-typst";
src = ./.;
extraFonts = with pkgs; [
noto-fonts
open-sans
iosevka
];
extraCompileFlags = [ "--root" "./" ];
mainFile = "template/thesis.typ";
typstPackages = {
preview = "${typst-packages}/packages/preview";
};
};
};

devShells.default = mkShell {
inherit (self.checks.${system}.pre-commit-check) shellHook;

Expand All @@ -48,6 +77,7 @@
paths = with pkgs; [
noto-fonts
open-sans
iosevka
];
};
};
Expand Down
Loading

0 comments on commit d65c412

Please sign in to comment.