From f89b492dc9989d5a96832d0e549c7c91667a17be Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sat, 12 Jul 2025 15:36:55 +0800 Subject: [PATCH 1/4] Open ports for Netatalk & WebOne --- hosts/weebill.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hosts/weebill.nix b/hosts/weebill.nix index 6be91cd..363b7cc 100644 --- a/hosts/weebill.nix +++ b/hosts/weebill.nix @@ -20,12 +20,6 @@ }; }; - # Open ports for DHCP server. - networking.firewall.allowedUDPPorts = [ - 53 - 67 - ]; - # Enable WebOne HTTP proxy. services.webone.enable = true; @@ -40,4 +34,12 @@ }; }; }; + # Open ports for services. + networking.firewall = { + allowedUDPPorts = [ + 53 # DHCP server. + 67 # DHCP server. + ]; + allowedTCPPorts = [8080 548]; # WebOne & Netatalk. + }; } From 8907f2f16a4855cc7df8eb6d57e7a3abcba67542 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sat, 12 Jul 2025 15:37:22 +0800 Subject: [PATCH 2/4] Add gruvbox theme for yazi --- helpers.nix | 1 + packages/yazi-flavour-gruvbox/default.nix | 21 +++++++++++++++++++++ suites/common.nix | 12 ++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 packages/yazi-flavour-gruvbox/default.nix diff --git a/helpers.nix b/helpers.nix index 968e8d8..50a8fda 100644 --- a/helpers.nix +++ b/helpers.nix @@ -43,6 +43,7 @@ with inputs.nixpkgs.lib; { fluffychat = (import nixpkgs-pr-fluffychat {inherit system;}).fluffychat; feishin = (import nixpkgs-pr-feishin {inherit system;}).feishin; webone = pkgs.callPackage ./packages/webone {}; + yazi-flavour-gruvbox-dark = pkgs.callPackage ./packages/yazi-flavour-gruvbox {}; }; in { diff --git a/packages/yazi-flavour-gruvbox/default.nix b/packages/yazi-flavour-gruvbox/default.nix new file mode 100644 index 0000000..ba82d3c --- /dev/null +++ b/packages/yazi-flavour-gruvbox/default.nix @@ -0,0 +1,21 @@ +{ + pkgs, + fetchFromGitHub, +}: let + flavor = "gruvbox-dark"; +in + pkgs.stdenv.mkDerivation { + pname = "yazi-flavor-${flavor}"; + version = "2025.04.24"; + src = fetchFromGitHub { + owner = "bennyyip"; + repo = "${flavor}.yazi"; + rev = "91fdfa70f6d593934e62aba1e449f4ec3d3ccc90"; + hash = "sha256-RWqyAdETD/EkDVGcnBPiMcw1mSd78Aayky9yoxSsry4="; + }; + + installPhase = '' + mkdir -p $out + cp $src/* $out/ + ''; + } diff --git a/suites/common.nix b/suites/common.nix index 7d7b769..79585bd 100644 --- a/suites/common.nix +++ b/suites/common.nix @@ -1,5 +1,6 @@ { nixpkgs, + userPackages, pkgs, lib, hostname, @@ -70,7 +71,7 @@ with lib; { enable = true; interactiveShellInit = '' # set gruvbox theme - theme_gruvbox + theme_gruvbox dark hard # yazi cd on quit. function y @@ -217,6 +218,14 @@ with lib; { }; }; + programs.yazi = { + enable = true; + flavors."gruvbox-dark.yazi" = userPackages.yazi-flavour-gruvbox-dark; + settings.theme = { + flavor.dark = "gruvbox-dark"; + }; + }; + environment.systemPackages = with pkgs; [ aria2 btop @@ -226,7 +235,6 @@ with lib; { rsync tmux trash-cli - yazi ]; # Enable avahi hostname resolution. From dc17db04f54a5e6bbef437c3ae186bee0dddfd93 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sat, 12 Jul 2025 15:37:38 +0800 Subject: [PATCH 3/4] Fix duplicate user config entry --- suites/server.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/suites/server.nix b/suites/server.nix index d9cc3bc..e3adcde 100644 --- a/suites/server.nix +++ b/suites/server.nix @@ -20,14 +20,16 @@ with lib; { }; }; - users.users.${user}.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETPyuxUVEmYyEW6PVC6BXqkhULHd/RvMm8fMbYhjTMV fern@muskduck" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzW4epTmK01kGVXcuAXUNJQPltnogf4uab9FA5m8S3n fern@pardalote" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEJYq1fMxVOzCMfE/td6DtWS8nUk76U9seYD3Z9RYAz u0_a399@fairywren" - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMoJvPcUJDVVzO4dHROCFNlgJdDZSP5xyPx2s40zcx5QAAAABHNzaDo= YubiKey5NFC" - ]; + users.users.${user} = { + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETPyuxUVEmYyEW6PVC6BXqkhULHd/RvMm8fMbYhjTMV fern@muskduck" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzW4epTmK01kGVXcuAXUNJQPltnogf4uab9FA5m8S3n fern@pardalote" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEJYq1fMxVOzCMfE/td6DtWS8nUk76U9seYD3Z9RYAz u0_a399@fairywren" + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMoJvPcUJDVVzO4dHROCFNlgJdDZSP5xyPx2s40zcx5QAAAABHNzaDo= YubiKey5NFC" + ]; + extraGroups = mkIf (user == "docker") ["docker"]; # if docker is enabled. + }; # Enable docker. virtualisation.docker.enable = mkIf (user == "docker") true; - users.users.${user}.extraGroups = mkIf (user == "docker") ["docker"]; } From 3f95cc7bc2759530cf5168e4652b1db6643feb00 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sat, 12 Jul 2025 16:00:14 +0800 Subject: [PATCH 4/4] Fix netatalk. --- hosts/weebill.nix | 7 +++++-- suites/common.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hosts/weebill.nix b/hosts/weebill.nix index 363b7cc..fca26fb 100644 --- a/hosts/weebill.nix +++ b/hosts/weebill.nix @@ -27,10 +27,13 @@ services.netatalk = { enable = true; settings = { - Global."uam list" = "uams_guest.so"; + Global = { + "uam list" = "uams_guest.so"; + }; iMac = { path = "/srv/iMac"; - "read-only" = true; + browsable = "yes"; + "read-only" = "yes"; }; }; }; diff --git a/suites/common.nix b/suites/common.nix index 79585bd..3c6d5e1 100644 --- a/suites/common.nix +++ b/suites/common.nix @@ -245,6 +245,7 @@ with lib; { enable = true; addresses = true; domain = true; + userServices = true; }; }; }