Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion flake.lock

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

42 changes: 38 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,56 @@
{
description = "Cross-platform Bun development environment";
description = "Cross-platform Bun and Tauri development environment";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
rust-overlay.url = "github:oxalica/rust-overlay";
};

outputs = { self, nixpkgs, flake-utils }:
outputs = { self, nixpkgs, flake-utils, rust-overlay }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs {
inherit system overlays;
};

# Use specific rust version required by Tauri
rustToolchain = pkgs.rust-bin.stable."1.78.0".default.override {
extensions = [ "rust-src" ];
};
Comment thread
AnthonyRonning marked this conversation as resolved.
in
{
devShells.default = pkgs.mkShell {
packages = [
pkgs.bun
pkgs.just
];
rustToolchain

# Basic build dependencies
pkgs.pkg-config
pkgs.openssl

# GTK dependencies for Tauri
pkgs.atk
pkgs.gtk3
pkgs.glib
pkgs.pango
pkgs.cairo
pkgs.gdk-pixbuf
pkgs.libsoup_3
pkgs.webkitgtk_4_1
] ++ (if pkgs.stdenv.isDarwin then [
# macOS-specific dependencies
pkgs.darwin.apple_sdk.frameworks.WebKit
pkgs.darwin.apple_sdk.frameworks.AppKit
] else []);

# Set environment variables
shellHook = ''
echo "Using Rust version: $(rustc --version)"
echo "Tauri development environment ready"
'';
};
}
);
Expand Down
4 changes: 2 additions & 2 deletions frontend/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import tseslint from 'typescript-eslint'

export default tseslint.config({
extends: [js.configs.recommended, ...tseslint.configs.recommended],
files: ['**/*.{ts,tsx}'],
ignores: ['dist'],
files: ['src/**/*.{ts,tsx}'],
ignores: ['dist', 'src-tauri', '**/target', '**/node_modules'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
Expand Down
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "maple",
"private": true,
"version": "0.1.0",
"version": "0.2.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc -b && vite build",
"lint": "eslint .",
"lint": "eslint './src/**/*.{ts,tsx}'",
"preview": "vite preview",
"add": "bunx shadcn-ui@latest add",
"format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css,md}\"",
Expand Down
Loading
Loading