From fe81f7cd15abffd81044420b2a7510bdace02966 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Mon, 22 Sep 2025 07:56:57 +0200 Subject: [PATCH 1/6] feat(prolog): Add flake --- prolog/flake.lock | 61 +++++++++++++++++++++++++++++++++++++++++++++++ prolog/flake.nix | 27 +++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 prolog/flake.lock create mode 100644 prolog/flake.nix diff --git a/prolog/flake.lock b/prolog/flake.lock new file mode 100644 index 0000000..d57185e --- /dev/null +++ b/prolog/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1755082269, + "narHash": "sha256-Ix7ALeaxv9tW4uBKWeJnaKpYZtZiX4H4Q/MhEmj4XYA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d74de548348c46cf25cb1fcc4b74f38103a4590d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/prolog/flake.nix b/prolog/flake.nix new file mode 100644 index 0000000..81379e1 --- /dev/null +++ b/prolog/flake.nix @@ -0,0 +1,27 @@ +{ + description = "SWI-Prolog"; + + inputs = { + 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 = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + in { + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + swi-prolog + + # Editor + #(jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ]) + vscodium + ]; + }; + }); +} From d0c6ffd1bef1660bb6f246d02bb7159f69b0863a Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Mon, 22 Sep 2025 07:57:16 +0200 Subject: [PATCH 2/6] feat(scala): Add flake --- scala/flake.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ scala/flake.nix | 33 +++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 scala/flake.lock create mode 100644 scala/flake.nix diff --git a/scala/flake.lock b/scala/flake.lock new file mode 100644 index 0000000..c3e7d56 --- /dev/null +++ b/scala/flake.lock @@ -0,0 +1,64 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1755082269, + "narHash": "sha256-Ix7ALeaxv9tW4uBKWeJnaKpYZtZiX4H4Q/MhEmj4XYA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d74de548348c46cf25cb1fcc4b74f38103a4590d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/scala/flake.nix b/scala/flake.nix new file mode 100644 index 0000000..2ee14be --- /dev/null +++ b/scala/flake.nix @@ -0,0 +1,33 @@ +{ + description = "Scala shell"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + systems.url = "github:nix-systems/default"; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "systems"; + }; + }; + + outputs = { nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + in { + devShells.default = pkgs.mkShell { + packages = with pkgs; [ + jdk + scala-next + scala-cli + + # You might want to use your own IDE. + (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ]) + ]; + }; + } + ); +} From 71f9a08d71fe9238b23585824394e929d6672c6b Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Mon, 22 Sep 2025 08:01:24 +0200 Subject: [PATCH 3/6] feat(latex): Add pkgs --- latex/flake.lock | 12 ++++++------ latex/flake.nix | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/latex/flake.lock b/latex/flake.lock index 376f488..6c7036a 100644 --- a/latex/flake.lock +++ b/latex/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1755268003, + "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388", "type": "github" }, "original": { diff --git a/latex/flake.nix b/latex/flake.nix index e2cb799..599e687 100644 --- a/latex/flake.nix +++ b/latex/flake.nix @@ -17,6 +17,13 @@ texlive.combined.scheme-full pgfplots biber + + gnumake + latexminted + + # Presentation tools + pdfpc + pympress ]; }; } From 2f7c928fe24bafe8b73b2b6539a647ec5f2d48a5 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Mon, 22 Sep 2025 08:15:09 +0200 Subject: [PATCH 4/6] fix(java): Correct pkgs --- java/flake.lock | 12 ++++++------ java/flake.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/flake.lock b/java/flake.lock index 376f488..d57185e 100644 --- a/java/flake.lock +++ b/java/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1755082269, + "narHash": "sha256-Ix7ALeaxv9tW4uBKWeJnaKpYZtZiX4H4Q/MhEmj4XYA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "d74de548348c46cf25cb1fcc4b74f38103a4590d", "type": "github" }, "original": { diff --git a/java/flake.nix b/java/flake.nix index e1a7ff6..ede6013 100644 --- a/java/flake.nix +++ b/java/flake.nix @@ -15,8 +15,8 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ - jdk8 - openjdk17 + jdk + gradle # You might want to use your own IDE. # (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ]) From 1dcb4f842dfd08d08913a633db83ff88d9757e23 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Mon, 22 Sep 2025 09:52:02 +0200 Subject: [PATCH 5/6] fix(minecraft): 1.21 --- minecraft/flake.lock | 14 +++++++------- minecraft/flake.nix | 15 ++++++--------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/minecraft/flake.lock b/minecraft/flake.lock index 3e9a197..fff8092 100644 --- a/minecraft/flake.lock +++ b/minecraft/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683777345, - "narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "635a306fc8ede2e34cb3dd0d6d0a5d49362150ed", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/minecraft/flake.nix b/minecraft/flake.nix index 2d3df37..43bd3c9 100644 --- a/minecraft/flake.nix +++ b/minecraft/flake.nix @@ -1,7 +1,7 @@ { description = "Minecraft flake"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils}: @@ -15,16 +15,13 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ - minecraft - prismlauncher-unwrapped + # minecraft + prismlauncher + ffmpeg + + jdk22_headless # Minecraft 1.21 - libredirect steam-run - rustc - flite - glibc - xorg.libX11 - xorg.libXext ]; }; } From c01f5d71f262497a5fa40dd526989cae1d2062bb Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Mon, 22 Sep 2025 09:54:38 +0200 Subject: [PATCH 6/6] chore(c): Update --- c/flake.lock | 12 ++++++------ c/flake.nix | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/c/flake.lock b/c/flake.lock index 64b483e..d57185e 100644 --- a/c/flake.lock +++ b/c/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729818716, - "narHash": "sha256-XRfkUsxLzFkMn3Tpstio1gNOIQ+2PZPCKbifJ2IXxlw=", + "lastModified": 1755082269, + "narHash": "sha256-Ix7ALeaxv9tW4uBKWeJnaKpYZtZiX4H4Q/MhEmj4XYA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "062c4f59744fcffa2e5aa3ef443dc8b4d1674ed6", + "rev": "d74de548348c46cf25cb1fcc4b74f38103a4590d", "type": "github" }, "original": { diff --git a/c/flake.nix b/c/flake.nix index 7c10da2..1c7b728 100644 --- a/c/flake.nix +++ b/c/flake.nix @@ -16,17 +16,52 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ - cmake + #cmake gcc + #gccStdenv gnumake - valgrind + # valgrind - astyle + #astyle + + # CUDA https://nixos.wiki/wiki/CUDA#cudatoolkit.2C_cudnn.2C_and_related_packages +# git gitRepo gnupg autoconf curl +# procps gnumake util-linux m4 gperf unzip +# cudatoolkit linuxPackages.nvidia_x11 +# libGLU libGL +# xorg.libXi xorg.libXmu freeglut +# xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib +# xorg.libXinerama +# ncurses5 stdenv.cc binutils +# +# glib +# glibc +# +# intel-ocl +# intel-compute-runtime +# opencl-clhpp +# opencl-clang +# opencl-headers +# ocl-icd +# +# pkgconf +# waylandpp +# xorg.libXcursor # You might want to use your own IDE. - # (jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ]) + #(jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ]) + #vscodium ]; + + shellHook = '' + export CUDA_PATH=${pkgs.cudatoolkit} + # export LD_LIBRARY_PATH=${pkgs.linuxPackages.nvidia_x11}/lib:${pkgs.ncurses5}/lib + # export LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib" + export LD_LIBRARY_PATH="${pkgs.libGL}/lib/:${pkgs.stdenv.cc.cc.lib}/lib/:${pkgs.glibc}/lib" + export EXTRA_LDFLAGS="-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib" + export EXTRA_CCFLAGS="-I/usr/include" + ''; }; }); }