diff --git a/c/flake.lock b/c/flake.lock index d57185e..64b483e 100644 --- a/c/flake.lock +++ b/c/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755082269, - "narHash": "sha256-Ix7ALeaxv9tW4uBKWeJnaKpYZtZiX4H4Q/MhEmj4XYA=", + "lastModified": 1729818716, + "narHash": "sha256-XRfkUsxLzFkMn3Tpstio1gNOIQ+2PZPCKbifJ2IXxlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74de548348c46cf25cb1fcc4b74f38103a4590d", + "rev": "062c4f59744fcffa2e5aa3ef443dc8b4d1674ed6", "type": "github" }, "original": { diff --git a/c/flake.nix b/c/flake.nix index 1c7b728..7c10da2 100644 --- a/c/flake.nix +++ b/c/flake.nix @@ -16,52 +16,17 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ - #cmake + cmake gcc - #gccStdenv gnumake - # valgrind + valgrind - #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 + astyle # You might want to use your own IDE. - #(jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ]) - #vscodium + # (jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ]) ]; - - 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" - ''; }; }); } diff --git a/java/flake.lock b/java/flake.lock index d57185e..376f488 100644 --- a/java/flake.lock +++ b/java/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755082269, - "narHash": "sha256-Ix7ALeaxv9tW4uBKWeJnaKpYZtZiX4H4Q/MhEmj4XYA=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74de548348c46cf25cb1fcc4b74f38103a4590d", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { diff --git a/java/flake.nix b/java/flake.nix index ede6013..e1a7ff6 100644 --- a/java/flake.nix +++ b/java/flake.nix @@ -15,8 +15,8 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ - jdk - gradle + jdk8 + openjdk17 # You might want to use your own IDE. # (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ]) diff --git a/latex/flake.lock b/latex/flake.lock index 6c7036a..376f488 100644 --- a/latex/flake.lock +++ b/latex/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755268003, - "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { diff --git a/latex/flake.nix b/latex/flake.nix index 599e687..e2cb799 100644 --- a/latex/flake.nix +++ b/latex/flake.nix @@ -17,13 +17,6 @@ texlive.combined.scheme-full pgfplots biber - - gnumake - latexminted - - # Presentation tools - pdfpc - pympress ]; }; } diff --git a/minecraft/flake.lock b/minecraft/flake.lock index fff8092..3e9a197 100644 --- a/minecraft/flake.lock +++ b/minecraft/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1683777345, + "narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "635a306fc8ede2e34cb3dd0d6d0a5d49362150ed", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/minecraft/flake.nix b/minecraft/flake.nix index 43bd3c9..2d3df37 100644 --- a/minecraft/flake.nix +++ b/minecraft/flake.nix @@ -1,7 +1,7 @@ { description = "Minecraft flake"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils}: @@ -15,13 +15,16 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ - # minecraft - prismlauncher - ffmpeg - - jdk22_headless # Minecraft 1.21 + minecraft + prismlauncher-unwrapped + libredirect steam-run + rustc + flite + glibc + xorg.libX11 + xorg.libXext ]; }; } diff --git a/prolog/flake.lock b/prolog/flake.lock deleted file mode 100644 index d57185e..0000000 --- a/prolog/flake.lock +++ /dev/null @@ -1,61 +0,0 @@ -{ - "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 deleted file mode 100644 index 81379e1..0000000 --- a/prolog/flake.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - 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 - ]; - }; - }); -} diff --git a/scala/flake.lock b/scala/flake.lock deleted file mode 100644 index c3e7d56..0000000 --- a/scala/flake.lock +++ /dev/null @@ -1,64 +0,0 @@ -{ - "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 deleted file mode 100644 index 2ee14be..0000000 --- a/scala/flake.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - 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" ]) - ]; - }; - } - ); -}