diff --git a/archive.tar.gz b/archive.tar.gz
index 0c8849c..e8bb236 100644
Binary files a/archive.tar.gz and b/archive.tar.gz differ
diff --git a/dev-env.sh b/dev-env.sh
index bea6741..14b7888 100755
--- a/dev-env.sh
+++ b/dev-env.sh
@@ -41,6 +41,7 @@ _extract_notes()
cp ./tmp/vimrc $MYVIMRC
cp ./tmp/bashrc $HOME/.bashrc
cp ./tmp/rssfeeds $HOME/.config/newsraft/feeds
+ #cp -r ./tmp/calendar $HOME/.config/khal
rm -r ./tmp
echo "Notes successfully extracted from archive."
exit 0
@@ -54,6 +55,7 @@ _storage_notes()
cp $MYVIMRC ./tmp/vimrc
cp $HOME/.bashrc ./tmp/bashrc
cp $HOME/.config/newsraft/feeds ./tmp/rssfeeds
+ cp -r $HOME/.config/khal/calendar ./tmp/calendar
tar czf archive.tar.gz ./tmp/
rm -r tmp
#gpg -c archive.tar.gz
@@ -103,6 +105,7 @@ _launch_notes()
tmux new-window 'newsraft'
tmux new-window "khal interactive"
tmux new-window "vim -o $TODOTXTPATH $VIMWIKIPATH/index.md"
+ tmux new-window "cd ~/dev/dev-env/homepage"
tmux -2 attach-session -d
}
diff --git a/homepage.html b/homepage.html
deleted file mode 100644
index ebef1cc..0000000
--- a/homepage.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
- This is the new homepage
-
-
diff --git a/homepage/src/main.zig b/homepage/src/main.zig
index 77e83fc..7023f0f 100644
--- a/homepage/src/main.zig
+++ b/homepage/src/main.zig
@@ -1,68 +1,20 @@
-////! By convention, main.zig is where your main function lives in the case that
-////! you are building an executable. If you are making a library, the convention
-////! is to delete this file and start with root.zig instead.
-
-//pub fn main() !void {
-// // Prints to stderr (it's a shortcut based on `std.io.getStdErr()`)
-// std.debug.print("All your {s} are belong to us.\n", .{"codebase"});
-
-// // stdout is for the actual output of your application, for example if you
-// // are implementing gzip, then only the compressed bytes should be sent to
-// // stdout, not any debugging messages.
-// const stdout_file = std.io.getStdOut().writer();
-// var bw = std.io.bufferedWriter(stdout_file);
-// const stdout = bw.writer();
-
-// try stdout.print("Run `zig build test` to run the tests.\n", .{});
-
-// try bw.flush(); // Don't forget to flush!
-//}
-
-//test "simple test" {
-// var list = std.ArrayList(i32).init(std.testing.allocator);
-// defer list.deinit(); // Try commenting this out and see if zig detects the memory leak!
-// try list.append(42);
-// try std.testing.expectEqual(@as(i32, 42), list.pop());
-//}
-
-//test "use other module" {
-// try std.testing.expectEqual(@as(i32, 150), lib.add(100, 50));
-//}
-
-//test "fuzz example" {
-// const Context = struct {
-// fn testOne(context: @This(), input: []const u8) anyerror!void {
-// _ = context;
-// // Try passing `--fuzz` to `zig build test` and see if it manages to fail this test case!
-// try std.testing.expect(!std.mem.eql(u8, "canyoufindme", input));
-// }
-// };
-// try std.testing.fuzz(Context{}, Context.testOne, .{});
-//}
-
-//const std = @import("std");
-
-///// This imports the separate module containing `root.zig`. Take a look in `build.zig` for details.
-//const lib = @import("homepage_lib");
-
const std = @import("std");
const zap = @import("zap");
fn on_request(r: zap.Request) void {
- if (r.path) |the_path| {
- std.debug.print("PATH: {s}\n", .{the_path});
+ // r.setStatus(.not_found);
+ // r.sendBody("404 - File not found
") catch return;
+ r.setHeader("Cache-Control", "no-cache") catch unreachable;
+ if (r.sendFile("src/homepage.html")) {} else |err| {
+ std.log.err("Unable to send file: {any}", .{err});
}
-
- if (r.query) |the_query| {
- std.debug.print("QUERY: {s}\n", .{the_query});
- }
- r.sendBody("Hello from ZAP!!!
") catch return;
}
pub fn main() !void {
var listener = zap.HttpListener.init(.{
.port = 3000,
.on_request = on_request,
+ .public_folder = "src",
.log = true,
});
try listener.listen();
diff --git a/zig/setup_zig.sh b/zig/setup_zig.sh
index 60a0eac..0f8ee31 100755
--- a/zig/setup_zig.sh
+++ b/zig/setup_zig.sh
@@ -1,5 +1,6 @@
#!/bin/sh
-echo "Requires curl, jq, wget and tar."
+echo "Requires curl, jq, wget, git and tar."
+echo "Getting Zig Master"
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
if [ "$OS" = "linux" ]; then
@@ -11,3 +12,9 @@ elif [ "$OS" = "mingw64_nt" ] || [ "$OS" = "cygwin" ]; then
fi
curl https://ziglang.org/download/index.json | jq -r ".master.[\"$OS\"].tarball" | wget -O zig-master.tar.xz -i -
tar xvf ./zig-master.tar.xz
+source ~/.bashrc
+echo "Getting ZLS"
+
+git clone https://github.com/zigtools/zls
+cd zls
+zig build -Doptimize=ReleaseSafe