From 8705ea8f528072d2546875cf27201f0dbbd18401 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Fri, 3 Jan 2025 23:57:05 -0600 Subject: [PATCH 1/3] oscar: Revert kicad to nixpkgs-unstable --- oscar/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index 0cb042e..ece2538 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -138,8 +138,7 @@ josm kate krita - # kicad # https://github.com/NixOS/nixpkgs/issues/335003 - (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/13456ccaf2874c921891b04fe0c39fc79aa7357f.tar.gz") {}).kicad + kicad libreoffice-qt mumble musescore From 9955a314ae8cafa02f2dfc96ac463ff49edb3b20 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Sat, 4 Jan 2025 00:02:54 -0600 Subject: [PATCH 2/3] oscar: Install unzip --- oscar/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index ece2538..faeae26 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -160,6 +160,7 @@ imagemagick killall pv + unzip wl-clipboard # compilers/language utils From 9b6c2fdc3e5493dfda4badebe6045a65dd40c782 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Tue, 14 Jan 2025 18:06:19 -0600 Subject: [PATCH 3/3] bert: Add bannergen --- .../http/bannergen.chandlerswift.com.nix | 28 +++++++++++++++++++ bert/services/http/index.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 bert/services/http/bannergen.chandlerswift.com.nix diff --git a/bert/services/http/bannergen.chandlerswift.com.nix b/bert/services/http/bannergen.chandlerswift.com.nix new file mode 100644 index 0000000..8863ae7 --- /dev/null +++ b/bert/services/http/bannergen.chandlerswift.com.nix @@ -0,0 +1,28 @@ +{ config, pkgs, lib, ... }: +let + bannergen = pkgs.buildGoModule { + pname = "bannergen"; + version = "0.1.0"; + src = pkgs.fetchgit { + url = "https://git.chandlerswift.com/chandlerswift/bannergen"; + rev = "4f277239206e3df49a22306ce4a9f3bc8d738905"; + sha256 = "sha256-4u8nUFUio4SlpdQB1oYg8Hbem0eBfKt5GSFOUmoVdz4="; + }; + vendorHash = "sha256-yKZdNhNyUOqywLy/RDjcziJ0FfrpuNcNMwyUAnRov60="; + }; +in +{ + systemd.services.bannergen = { + enable = true; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${bannergen}/bin/bannergen"; + Restart = "on-failure"; + }; + }; + + services.caddy.virtualHosts."bannergen.chandlerswift.com".extraConfig = '' + reverse_proxy localhost:8000 + ''; +} diff --git a/bert/services/http/index.nix b/bert/services/http/index.nix index fae2c7b..b6cb723 100644 --- a/bert/services/http/index.nix +++ b/bert/services/http/index.nix @@ -1,6 +1,7 @@ { imports = [ ./0hats.com.nix + ./bannergen.chandlerswift.com.nix ./files.chandlerswift.com.nix ./git.chandlerswift.com.nix ./harborpaperco.com.nix