Laurent/infrastructure
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: Laurent:0f938f1ed388c309e34c131b6499d02f3d410702
Branches Tags
Laurent:master
..
compare: Laurent:5b23846110d02494c88a3592a132e79240ec2a61
Branches Tags
Laurent:master

No commits in common. "0f938f1ed388c309e34c131b6499d02f3d410702" and "5b23846110d02494c88a3592a132e79240ec2a61" have entirely different histories.
0f938f1ed3 ... 5b23846110

4 changed files with 79 additions and 148 deletions
Show stats Expand all files Collapse all files

211
flake.lock
View file

@ -149,11 +149,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1702562713,
"narHash": "sha256-CVMJAT+PdMir/0dV5nylkDxhqc1Lt4O1c3602InUxUA=",
"lastModified": 1701905325,
"narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=",
"owner": "nix-community",
"repo": "disko",
"rev": "bb75ad0b1d5a63884586517920b9a189721fc54d",
"rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe",
"type": "github"
},
"original": {
@ -280,42 +280,6 @@
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1701473968,
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1701473968,
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_4"
},
"locked": {
"lastModified": 1696343447,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
@ -383,6 +347,24 @@
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -412,11 +394,11 @@
]
},
"locked": {
"lastModified": 1702538064,
"narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=",
"lastModified": 1702423270,
"narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0e2e443ff24f9d75925e91b89d1da44b863734af",
"rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db",
"type": "github"
},
"original": {
@ -434,11 +416,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1702488319,
"narHash": "sha256-goxBCjjWitvx2Oq4AihpA2OhYEirolMLC48fdA7Iey8=",
"lastModified": 1702476903,
"narHash": "sha256-rzewhikIDI9WkkVQsxCDNVff6ZVdKb1IjkvKjErtYzU=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "01e5c59d752d3fe7fa484330fa48e010054b8fa1",
"rev": "b2e5a80e2ff1fcbf8164a45c5ef8ebffbb511fae",
"type": "github"
},
"original": {
@ -610,42 +592,6 @@
}
},
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1701253981,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib_3": {
"locked": {
"dir": "lib",
"lastModified": 1701253981,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib_4": {
"locked": {
"dir": "lib",
"lastModified": 1696019113,
@ -679,22 +625,6 @@
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1702312524,
@ -777,11 +707,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"lastModified": 1700794826,
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"type": "github"
},
"original": {
@ -793,11 +723,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"lastModified": 1700612854,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"type": "github"
},
"original": {
@ -809,15 +739,15 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1700612854,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"owner": "NixOS",
"lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@ -860,11 +790,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1702487657,
"narHash": "sha256-25MuTWHbihNpjpHA9bbOo4mt+GTHvOgH2kai6BcYklY=",
"ref": "refs/heads/main",
"rev": "c015950efac2ed8712fd4c905eb5f7f8f60978ef",
"revCount": 1,
"lastModified": 1702478973,
"narHash": "sha256-1HVWuzIsC9ycoC0Wy5iKk5dZ6c/pN2HuprCAhq6ijUU=",
"ref": "refs/heads/master",
"rev": "77706a8d0f1550d14db45ff03e8ea826e2b9a445",
"revCount": 5,
"type": "git",
"url": "https://git.fainsin.bzh/ENSEEIHT/projet-audionumerique"
},
@ -875,15 +805,15 @@
},
"projet-intelligence-artificielle-multimedia": {
"inputs": {
"flake-parts": "flake-parts_4",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1702562960,
"narHash": "sha256-xMUcPURcDdn8wQ7lxAN7hXvrL7jauLezurw4RpVtlGA=",
"lastModified": 1701038653,
"narHash": "sha256-mif1mtvfKUcLeLcHBjDeE8nDvSXqCgU2FlXwb123K7M=",
"ref": "refs/heads/master",
"rev": "88987bbb5b14e8cb6cfba13e955e45a4f4836426",
"revCount": 22,
"rev": "52c1f4c76d9da18c5d674b4db3b413af9193d285",
"revCount": 20,
"type": "git",
"url": "https://git.fainsin.bzh/ENSEEIHT/projet-intelligence-artificielle-multimedia"
},
@ -892,29 +822,10 @@
"url": "https://git.fainsin.bzh/ENSEEIHT/projet-intelligence-artificielle-multimedia"
}
},
"projet-oral-japonais": {
"inputs": {
"flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1702487764,
"narHash": "sha256-uz3lAmDbE/TrsLf+O4lbNqrL0TJITSSSxiYmKhR0hJY=",
"ref": "refs/heads/main",
"rev": "aa9e770ba38bdfad35009ea54105b65a3aa13ea2",
"revCount": 1,
"type": "git",
"url": "https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais"
},
"original": {
"type": "git",
"url": "https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais"
}
},
"resume": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_9",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_8",
"typst": "typst"
},
"locked": {
@ -944,7 +855,6 @@
"nixpkgs": "nixpkgs_5",
"projet-audionumerique": "projet-audionumerique",
"projet-intelligence-artificielle-multimedia": "projet-intelligence-artificielle-multimedia",
"projet-oral-japonais": "projet-oral-japonais",
"resume": "resume"
}
},
@ -1073,6 +983,21 @@
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -1097,9 +1022,9 @@
"typst": {
"inputs": {
"crane": "crane_3",
"flake-parts": "flake-parts_6",
"nixpkgs": "nixpkgs_10",
"systems": "systems_5"
"flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_9",
"systems": "systems_6"
},
"locked": {
"lastModified": 1700840283,

2
flake.nix
View file

@ -35,8 +35,6 @@
"git+https://git.fainsin.bzh/ENSEEIHT/projet-intelligence-artificielle-multimedia";
projet-audionumerique.url =
"git+https://git.fainsin.bzh/ENSEEIHT/projet-audionumerique";
projet-oral-japonais.url =
"git+https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais";
};
nixConfig = {

2
hosts/hydrogen/services/nginx/n7/default.nix
View file

@ -31,7 +31,7 @@
import ./projet-long.nix pkgs;
"/projet-oral-japonais/" = # #
import ./projet-oral-japonais.nix { inherit inputs system; };
import ./projet-oral-japonais.nix pkgs;
"/projet-oral-anglais/" = # #
import ./projet-oral-anglais.nix pkgs;

12
hosts/hydrogen/services/nginx/n7/projet-oral-japonais.nix
View file

@ -1,3 +1,11 @@
{ inputs, system, ... }: {
alias = inputs.projet-oral-japonais.packages.${system}.slides + "/";
{ pkgs, ... }:
let
pages = pkgs.fetchgit {
url = "https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais";
rev = "60fa70fb958c992282dbcff536ebc5d4d7e174a0"; # pages
sha256 = "1kc6jngpna41zf00i5i1d2wf8sp60w42jwa6xilzprawww0yr17i";
};
in {
alias = "${pages}/";
index = "slides.html";
}