From 7dc03182a4035468b156a032ec85c70a0b6aaa4e Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 15 Apr 2025 15:35:30 +0200 Subject: [PATCH] gimme yarn --- flake.nix | 2 +- home/on-server.nix | 22 ++++++++++++++++++++++ home/slim-desktop.nix | 2 +- system/web-server/default.nix | 2 -- system/web-server/ksh-map.nix | 9 +++++++++ system/web-server/mail.nix | 20 ++++++++++---------- 6 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 home/on-server.nix create mode 100644 system/web-server/ksh-map.nix diff --git a/flake.nix b/flake.nix index 5f1b73b..3455dba 100644 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,7 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = { inherit inputs; }; modules = [ - ./home/minimal.nix + ./home/on-server.nix ]; }; alt = home-manager.lib.homeManagerConfiguration { diff --git a/home/on-server.nix b/home/on-server.nix new file mode 100644 index 0000000..0578b19 --- /dev/null +++ b/home/on-server.nix @@ -0,0 +1,22 @@ +{ config, pkgs, inputs, lib, ... }: + +{ + home.file.".npmrc".text = '' + prefix = ${config.xdg.dataHome}/npm/packages + ''; + + home.packages = with pkgs; [ + + # development + bundler + bundix + nodejs + appimage-run + yarn + + ]; + + imports = [ + ./minimal.nix + ]; +} diff --git a/home/slim-desktop.nix b/home/slim-desktop.nix index 4668a71..c249c08 100644 --- a/home/slim-desktop.nix +++ b/home/slim-desktop.nix @@ -51,11 +51,11 @@ vlc # development + appimage-run bundler bundix nodejs yarn - appimage-run # secrets libsecret diff --git a/system/web-server/default.nix b/system/web-server/default.nix index e33da09..3b4530d 100644 --- a/system/web-server/default.nix +++ b/system/web-server/default.nix @@ -5,7 +5,6 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; - services.nginx = { enable = true; recommendedProxySettings = true; @@ -16,5 +15,4 @@ acceptTerms = true; defaults.email = "till@ktiu.net"; }; - } diff --git a/system/web-server/ksh-map.nix b/system/web-server/ksh-map.nix new file mode 100644 index 0000000..834ef23 --- /dev/null +++ b/system/web-server/ksh-map.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + services.nginx.virtualHosts."karte.nichtzudritt.de" = { + addSSL = true; + enableACME = true; + root = "/var/www/ksh-map/dist"; + }; +} diff --git a/system/web-server/mail.nix b/system/web-server/mail.nix index a2bd09a..2225c3f 100644 --- a/system/web-server/mail.nix +++ b/system/web-server/mail.nix @@ -2,16 +2,16 @@ { - services.postfix = { - enable = true; - domain = "ktiu.net"; - virtual = [ - "@ktiu.net till" - "till till" - "uni@ktiu.net straube@geo.uni-frankfurt.de" - "meetup@ktiu.net straube@geo.uni-frankfurt.de" - ]; - }; + # services.postfix = { + # enable = true; + # domain = "ktiu.net"; + # virtual = [ + # "@ktiu.net till" + # "till till" + # "uni@ktiu.net straube@geo.uni-frankfurt.de" + # "meetup@ktiu.net straube@geo.uni-frankfurt.de" + # ]; + # }; services.opendkim = { enable = true;