chore: revive project and update to latest

Author: orzklv

.github/workflows/deploy.yml

@@ -18,7 +18,6 @@ concurrency:
   group: "pages"
   cancel-in-progress: false
 
-
 jobs:
   build:
     environment:

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main

.gitignore

@@ -13,3 +13,6 @@ pnpm-lock.yaml
 
 # Nix
 /result
+
+# Direnv
+.direnv

default.nix

@@ -1,106 +1,71 @@
 {
-  pkgs ? import <nixpkgs> {},
+  pkgs ? import <nixpkgs> { },
   fenix,
-}: let
+}:
+let
   lib = pkgs.lib;
   getLibFolder = pkg: "${pkg}/lib";
 
   toolchain = fenix.packages.${pkgs.system}.fromToolchainFile {
     file = ./rust-toolchain.toml;
-    sha256 = "sha256-s1RPtyvDGJaX/BisLT+ifVfuhDT1nZkZ1NcK8sbwELM=";
+    sha256 = "sha256-zC8E38iDVJ1oPIzCqTk/Ujo9+9kx9dXq7wAwPMpkpg0=";
   };
 
   manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
 in
-  pkgs.rustPlatform.buildRustPackage {
-    pname = "rust-website";
-    version = manifest.version;
-    cargoLock.lockFile = ./Cargo.lock;
-    src = pkgs.lib.cleanSource ./.;
-
-    nativeBuildInputs = with pkgs; [
-      # LLVM & GCC
-      gcc
-      cmake
-      gnumake
-      pkg-config
-      llvmPackages.llvm
-      llvmPackages.clang
-      llvmPackages.bintools
-
-      # Tailwindcss
-      tailwindcss
-
-      # Rust
-      rustc
-      cargo
-      trunk
-      clippy
-      libiconv
-      toolchain
-      wasm-pack
-      pkg-config
-      rust-analyzer
-      wasm-bindgen-cli
-    ];
-
-    buildInputs = with pkgs; [
-      openssl
-    ];
-
-    buildPhase = ''
-      # Build the css
-      tailwindcss -i ./style/input.css -o ./style/output.css
-
-      # Wasm-bindgen nigga can't build without storing cache at HOME
-      export HOME="$(pwd)/home"
-      mkdir -p $HOME
-
-      # Test wasm
-      wasm-bindgen -V
-
-      # Build wasm webiste
-      trunk build --release --public-url=/
-    '';
-
-    installPhase = ''
-      # Create out directory
-      mkdir -p $out/www
-
-      # Move all finished content
-      mv ./dist/* $out/www
-    '';
-
-    # If you wanna get thorny
-    # RUST_BACKTRACE = 1;
-    NIX_LDFLAGS = "-L${(getLibFolder pkgs.libiconv)}";
-    LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [
-      pkgs.gcc
-      pkgs.libiconv
-      pkgs.llvmPackages.llvm
-    ];
-    CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
-
-    meta = with lib; {
-      homepage = manifest.package.homepage;
-      description = "Website of Rust Uzbekistan community";
-      license = with lib.licenses; [gpl3Only];
-
-      platforms = with platforms; linux ++ darwin;
-
-      maintainers = [
-        {
-          name = "Sokhibjon Orzikulov";
-          email = "sakhib@orzklv.uz";
-          handle = "orzklv";
-          github = "orzklv";
-          githubId = 54666588;
-          keys = [
-            {
-              fingerprint = "00D2 7BC6 8707 0683 FBB9  137C 3C35 D3AF 0DA1 D6A8";
-            }
-          ];
-        }
-      ];
-    };
-  }
+pkgs.rustPlatform.buildRustPackage {
+  pname = "rust-website";
+  version = manifest.version;
+  cargoLock.lockFile = ./Cargo.lock;
+  src = pkgs.lib.cleanSource ./.;
+
+  nativeBuildInputs = with pkgs; [
+    # WASM Target specifics
+    pkg-config
+    llvmPackages.bintools
+    wasm-pack
+    wasm-bindgen-cli
+    trunk
+
+    # Rest
+    tailwindcss
+    toolchain
+  ];
+
+  buildInputs = with pkgs; [
+    openssl
+  ];
+
+  buildPhase = ''
+    # Build the css
+    tailwindcss -i ./style/input.css -o ./style/output.css
+
+    # Wasm-bindgen nigga can't build without storing cache at HOME
+    export HOME="$(pwd)/home"
+    mkdir -p $HOME
+
+    # Test wasm
+    wasm-bindgen -V
+
+    # Build wasm webiste
+    trunk build --release --public-url=/
+  '';
+
+  installPhase = ''
+    # Create out directory
+    mkdir -p $out/www
+
+    # Move all finished content
+    mv ./dist/* $out/www
+  '';
+
+  CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
+
+  meta = with lib; {
+    homepage = manifest.package.homepage;
+    description = "Website of Rust Uzbekistan community";
+    license = with lib.licenses; [ gpl3Only ];
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [orzklv];
+  };
+}

flake.lock

@@ -2,14 +2,11 @@
   description = "Website for Rust Uzbekistan community";
 
   inputs = {
-    # Too old to work with most libraries
-    # nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-
     # Perfect!
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
 
-    # The flake-utils library
-    flake-utils.url = "github:numtide/flake-utils";
+    # The flake-parts library
+    flake-parts.url = "github:hercules-ci/flake-parts";
 
     # Additional helper Rust toolchain management
     fenix = {
@@ -18,25 +15,33 @@
     };
   };
 
-  outputs = {
-    nixpkgs,
-    fenix,
-    flake-utils,
-    ...
-  }:
-    flake-utils.lib.eachDefaultSystem
-    (
-      system: let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in {
-        # Nix script formatter
-        formatter = pkgs.alejandra;
+  outputs =
+    {
+      self,
+      flake-parts,
+      fenix,
+      ...
+    }@inputs:
+    flake-parts.lib.mkFlake { inherit inputs; } (
+      { ... }:
+      {
+        systems = [
+          "x86_64-linux"
+          "aarch64-linux"
+          "aarch64-darwin"
+        ];
+        perSystem =
+          { pkgs, ... }:
+          {
+            # Nix script formatter
+            formatter = pkgs.nixfmt-tree;
 
-        # Development environment
-        devShells.default = import ./shell.nix {inherit pkgs fenix;};
+            # Development environment
+            devShells.default = import ./shell.nix self { inherit pkgs; };
 
-        # Output package
-        packages.default = pkgs.callPackage ./. {inherit pkgs fenix;};
+            # Output package
+            packages.default = pkgs.callPackage ./. { inherit pkgs fenix; };
+          };
       }
     );
 }

flake.nix

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "stable"
+channel = "stable-2026-03-26"
 components = ["rust-src", "rustfmt", "rust-analyzer", "rust-std", "clippy"]
 targets = ["wasm32-unknown-unknown"]
 profile = "complete"