comparing f27c093a6060607780d6dcba9e147fba2b643d1a and master on sapphic.moe/flake

+16

flake.lock

···

       82
       82
        
               "type": "github"

     

       83
       83
        
             }

     

       84
       84
        
           },

     

       85
       85
       +
           "darwin-login-items": {

     

       86
       86
       +
             "locked": {

     

       87
       87
       +
               "lastModified": 1763528199,

     

       88
       88
       +
               "narHash": "sha256-8LQ5Wp3AJUp71Elax1R9lNkuEbO2Mrnpq+o8qpbhQyc=",

     

       89
       89
       +
               "owner": "uncenter",

     

       90
       90
       +
               "repo": "nix-darwin-login-items",

     

       91
       91
       +
               "rev": "ab75c315893ca206ddf9529e6e3aac6cb01b2f1a",

     

       92
       92
       +
               "type": "github"

     

       93
       93
       +
             },

     

       94
       94
       +
             "original": {

     

       95
       95
       +
               "owner": "uncenter",

     

       96
       96
       +
               "repo": "nix-darwin-login-items",

     

       97
       97
       +
               "type": "github"

     

       98
       98
       +
             }

     

       99
       99
       +
           },

     

       85
       100
        
           "easy-hosts": {

     

       86
       101
        
             "locked": {

     

       87
       102
        
               "lastModified": 1755470564,

     
···

       512
       527
        
           "root": {

     

       513
       528
        
             "inputs": {

     

       514
       529
        
               "catppuccin": "catppuccin",

     

       530
       530
       +
               "darwin-login-items": "darwin-login-items",

     

       515
       531
        
               "easy-hosts": "easy-hosts",

     

       516
       532
        
               "flake-parts": "flake-parts",

     

       517
       533
        
               "home-manager": "home-manager",

+3 -5

flake.nix

···

       55
       55
        
             url = "git+https://tangled.org/@tangled.org/core";

     

       56
       56
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       57
       57
        
           };

     

       58
       58
       +
       

     

       59
       59
       +
           darwin-login-items.url = "github:uncenter/nix-darwin-login-items";

     

       58
       60
        
         };

     

       59
       61
        
       

     

       60
       62
        
         outputs =

     

       61
       61
       -
           inputs@{

     

       62
       62
       -
             flake-parts,

     

       63
       63
       -
             nixos-wsl,

     

       64
       64
       -
             ...

     

       65
       65
       -
           }:

     

       63
       63
       +
           inputs@{ flake-parts, ... }:

     

       66
       64
        
           flake-parts.lib.mkFlake { inherit inputs; } {

     

       67
       65
        
             imports = [

     

       68
       66
        
               inputs.easy-hosts.flakeModule

+20

home/chloe/activation.nix

···

       1
       1
       +
       # macOS Tahoe (26.x) no longer supports symlinks in the Launchpad.

     

       2
       2
       +
       # So, we're forced to copy applications instead of linking them.

     

       3
       3
       +
       # This is computationally slower, but we're left with no choice.

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
         pkgs,

     

       7
       7
       +
         lib,

     

       8
       8
       +
         ...

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       {

     

       12
       12
       +
         config = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {

     

       13
       13
       +
           targets.darwin.copyApps = {

     

       14
       14
       +
             enable = true;

     

       15
       15
       +
             enableChecks = true;

     

       16
       16
       +
           };

     

       17
       17
       +
       

     

       18
       18
       +
           targets.darwin.linkApps.enable = false;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+28

home/chloe/autostart.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         osConfig,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       {

     

       9
       9
       +
         config = lib.mkIf osConfig.settings.profiles.graphical.enable {

     

       10
       10
       +
           xdg.configFile = {

     

       11
       11
       +
             # .desktop files for autostart only work on Linux with XDG

     

       12
       12
       +
             "autostart/1password.desktop" = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {

     

       13
       13
       +
               text = ''

     

       14
       14
       +
                 [Desktop Entry]

     

       15
       15
       +
                 Name=1Password

     

       16
       16
       +
                 Exec=1password --silent %U

     

       17
       17
       +
                 Terminal=false

     

       18
       18
       +
                 Type=Application

     

       19
       19
       +
                 Icon=1password

     

       20
       20
       +
                 StartupWMClass=1Password

     

       21
       21
       +
                 Comment=Password manager and secure wallet

     

       22
       22
       +
                 MimeType=x-scheme-handler/onepassword;

     

       23
       23
       +
                 Categories=Office;

     

       24
       24
       +
               '';

     

       25
       25
       +
             };

     

       26
       26
       +
           };

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+3

home/chloe/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         imports = [

     

       3
       3
       +
           ./activation.nix

     

       4
       4
       +
           ./autostart.nix

     

       3
       5
        
           ./catppuccin.nix

     

       4
       6
        
           ./docs.nix

     

       5
       7
        
           ./files.nix

     

       6
       8
        
           ./packages

     

       7
       9
        
           ./programs

     

       10
       10
       +
           ./scripts.nix

     

       8
       11
        
         ];

     

       9
       12
        
       

     

       10
       13
        
         xdg.enable = true;

-23

home/chloe/packages/autostart.nix

···

       1
       1
       -
       { lib, osConfig, pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       {

     

       4
       4
       -
         config = lib.mkIf osConfig.settings.profiles.graphical.enable {

     

       5
       5
       -
           xdg.configFile = {

     

       6
       6
       -
             # .desktop files for autostart only work on Linux with XDG

     

       7
       7
       -
             "autostart/1password.desktop" = lib.mkIf pkgs.stdenv.isLinux {

     

       8
       8
       -
               text = ''

     

       9
       9
       -
                 [Desktop Entry]

     

       10
       10
       -
                 Name=1Password

     

       11
       11
       -
                 Exec=1password --silent %U

     

       12
       12
       -
                 Terminal=false

     

       13
       13
       -
                 Type=Application

     

       14
       14
       -
                 Icon=1password

     

       15
       15
       -
                 StartupWMClass=1Password

     

       16
       16
       -
                 Comment=Password manager and secure wallet

     

       17
       17
       -
                 MimeType=x-scheme-handler/onepassword;

     

       18
       18
       -
                 Categories=Office;

     

       19
       19
       -
               '';

     

       20
       20
       -
             };

     

       21
       21
       -
           };

     

       22
       22
       -
         };

     

       23
       23
       -
       }

+14

home/chloe/packages/base.nix

···

       1
       1
       +
       { pkgs }:

     

       2
       2
       +
       

     

       3
       3
       +
       with pkgs;

     

       4
       4
       +
       [

     

       5
       5
       +
         # dev tools

     

       6
       6
       +
         nodejs

     

       7
       7
       +
         deno

     

       8
       8
       +
         cloudflared

     

       9
       9
       +
         corepack_latest

     

       10
       10
       +
         bun

     

       11
       11
       +
       

     

       12
       12
       +
         # other

     

       13
       13
       +
         _1password-cli

     

       14
       14
       +
       ]

+15

home/chloe/packages/darwin.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         osConfig,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         packages = with pkgs; [

     

       9
       9
       +
           # tools

     

       10
       10
       +
           shottr

     

       11
       11
       +
         ];

     

       12
       12
       +
       in

     

       13
       13
       +
       lib.optionals (

     

       14
       14
       +
         osConfig.settings.profiles.graphical.enable && pkgs.stdenv.hostPlatform.isDarwin

     

       15
       15
       +
       ) packages

+7 -10

home/chloe/packages/default.nix

···

       1
       1
       -
       { 

     

       1
       1
       +
       {

     

       2
       2
        
         pkgs,

     

       3
       3
        
         lib,

     

       4
       4
       -
         osConfig, 

     

       4
       4
       +
         osConfig,

     

       5
       5
        
         ...

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         defaultPackages = import ./list/default.nix { inherit pkgs; };

     

       10
       10
       -
         guiPackages = import ./list/gui.nix { inherit pkgs lib osConfig; };

     

       9
       9
       +
         basePackages = import ./base.nix { inherit pkgs; };

     

       10
       10
       +
         darwinPackages = import ./darwin.nix { inherit pkgs lib osConfig; };

     

       11
       11
       +
         linuxPackages = import ./linux.nix { inherit pkgs lib osConfig; };

     

       12
       12
       +
         universalPackages = import ./universal.nix { inherit pkgs lib osConfig; };

     

       11
       13
        
       in

     

       12
       14
        
       {

     

       13
       13
       -
         imports = [

     

       14
       14
       -
           ./autostart.nix

     

       15
       15
       -
           ./scripts.nix

     

       16
       16
       -
         ];

     

       17
       17
       -
       

     

       18
       15
        
         config = {

     

       19
       19
       -
           home.packages = defaultPackages ++ guiPackages;

     

       16
       16
       +
           home.packages = basePackages ++ darwinPackages ++ linuxPackages ++ universalPackages;

     

       20
       17
        
         };

     

       21
       18
        
       }

+32

home/chloe/packages/linux.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         osConfig,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         packages = with pkgs; [

     

       9
       9
       +
           # messengers

     

       10
       10
       +
           telegram-desktop

     

       11
       11
       +
           vesktop

     

       12
       12
       +
       

     

       13
       13
       +
           # dev tools

     

       14
       14
       +
           httpie-desktop

     

       15
       15
       +
       

     

       16
       16
       +
           # mail

     

       17
       17
       +
           thunderbird

     

       18
       18
       +
       

     

       19
       19
       +
           # games

     

       20
       20
       +
           xivlauncher

     

       21
       21
       +
       

     

       22
       22
       +
           # messengers

     

       23
       23
       +
           discord

     

       24
       24
       +
       

     

       25
       25
       +
           # other GUI apps

     

       26
       26
       +
           obs-studio

     

       27
       27
       +
           _1password-gui

     

       28
       28
       +
         ];

     

       29
       29
       +
       in

     

       30
       30
       +
       lib.optionals (

     

       31
       31
       +
         osConfig.settings.profiles.graphical.enable && pkgs.stdenv.hostPlatform.isLinux

     

       32
       32
       +
       ) packages

-19

home/chloe/packages/list/default.nix

···

       1
       1
       -
       { pkgs }:

     

       2
       2
       -
       

     

       3
       3
       -
       with pkgs; [

     

       4
       4
       -
         # dev tools

     

       5
       5
       -
         nodejs

     

       6
       6
       -
         deno

     

       7
       7
       -
         cloudflared

     

       8
       8
       -
         corepack_latest

     

       9
       9
       -
         bun

     

       10
       10
       -
       

     

       11
       11
       -
         # fonts

     

       12
       12
       -
         iosevka

     

       13
       13
       -
         inter

     

       14
       14
       -
         atkinson-hyperlegible

     

       15
       15
       -
         nerd-fonts.jetbrains-mono

     

       16
       16
       -
       

     

       17
       17
       -
         # other

     

       18
       18
       -
         _1password-cli

     

       19
       19
       -
       ]

-31

home/chloe/packages/list/gui.nix

···

       1
       1
       -
       { pkgs, lib, osConfig }:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         # Common GUI packages available on all platforms

     

       5
       5
       -
         commonPackages = with pkgs; [

     

       6
       6
       -
           # cloud

     

       7
       7
       -
           owncloud-client

     

       8
       8
       -
       

     

       9
       9
       -
           # messengers

     

       10
       10
       -
           telegram-desktop

     

       11
       11
       -
           vesktop

     

       12
       12
       -
       

     

       13
       13
       -
           # notes

     

       14
       14
       -
           obsidian

     

       15
       15
       -
       

     

       16
       16
       -
           # dev tools

     

       17
       17
       -
           zed-editor

     

       18
       18
       -
           httpie-desktop

     

       19
       19
       -
       

     

       20
       20
       -
           # mail

     

       21
       21
       -
           thunderbird

     

       22
       22
       -
       

     

       23
       23
       -
           # games

     

       24
       24
       -
           prismlauncher

     

       25
       25
       -
           xivlauncher

     

       26
       26
       -
       

     

       27
       27
       -
           # other GUI apps

     

       28
       28
       -
           obs-studio

     

       29
       29
       -
           _1password-gui

     

       30
       30
       -
         ];

     

       31
       31
       -
       in lib.optionals osConfig.settings.profiles.graphical.enable commonPackages

-15

home/chloe/packages/scripts.nix

···

       1
       1
       -
       { pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       {  

     

       4
       4
       -
         home.packages = with pkgs; [

     

       5
       5
       -
           # Convert nix hash to SRI format and fetch from URL

     

       6
       6
       -
           (writeShellScriptBin "shash" ''

     

       7
       7
       -
             nix hash to-sri --type sha256 $(nix-prefetch-url ''$1)

     

       8
       8
       -
           '')

     

       9
       9
       -
       

     

       10
       10
       -
           # Create a Python virtual environment with --copies flag

     

       11
       11
       -
           (writeShellScriptBin "create-venv" ''

     

       12
       12
       -
             nix run nixpkgs#python3 -- -m venv .venv --copies

     

       13
       13
       -
           '')

     

       14
       14
       -
         ];

     

       15
       15
       -
       }

+25

home/chloe/packages/universal.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         osConfig,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         packages = with pkgs; [

     

       9
       9
       +
           # dev tools

     

       10
       10
       +
           zed-editor

     

       11
       11
       +
       

     

       12
       12
       +
           # fonts

     

       13
       13
       +
           iosevka

     

       14
       14
       +
           inter

     

       15
       15
       +
           atkinson-hyperlegible

     

       16
       16
       +
           nerd-fonts.jetbrains-mono

     

       17
       17
       +
       

     

       18
       18
       +
           # games

     

       19
       19
       +
           prismlauncher

     

       20
       20
       +
       

     

       21
       21
       +
           # notes

     

       22
       22
       +
           obsidian

     

       23
       23
       +
         ];

     

       24
       24
       +
       in

     

       25
       25
       +
       lib.optionals osConfig.settings.profiles.graphical.enable packages

+12 -8

home/chloe/programs/cli/zsh.nix

···

       1
       1
       -
       { lib, pkgs, osConfig, config, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         osConfig,

     

       5
       5
       +
         config,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       {

     

       4
       10
        
         programs.zsh = {

     
···

       18
       24
        
           '';

     

       19
       25
        
       

     

       20
       26
        
           envExtra = ''

     

       21
       21
       -
             ${lib.optionalString pkgs.stdenv.isLinux ''

     

       22
       22
       -
               export PRISMA_SCHEMA_ENGINE_BINARY="${pkgs.prisma-engines}/bin/schema-engine"

     

       23
       23
       -
               export PRISMA_QUERY_ENGINE_BINARY="${pkgs.prisma-engines}/bin/query-engine"

     

       24
       24
       -
               export PRISMA_QUERY_ENGINE_LIBRARY="${pkgs.prisma-engines}/lib/libquery_engine.node"

     

       25
       25
       -
               export PRISMA_INTROSPECTION_ENGINE_BINARY="${pkgs.prisma-engines}/bin/introspection-engine"

     

       26
       26
       -
               export PRISMA_FMT_BINARY="${pkgs.prisma-engines}/bin/prisma-fmt"

     

       27
       27
       -
             ''}

     

       27
       27
       +
             export PRISMA_SCHEMA_ENGINE_BINARY="${pkgs.prisma-engines}/bin/schema-engine"

     

       28
       28
       +
             export PRISMA_QUERY_ENGINE_BINARY="${pkgs.prisma-engines}/bin/query-engine"

     

       29
       29
       +
             export PRISMA_QUERY_ENGINE_LIBRARY="${pkgs.prisma-engines}/lib/libquery_engine.node"

     

       30
       30
       +
             export PRISMA_INTROSPECTION_ENGINE_BINARY="${pkgs.prisma-engines}/bin/introspection-engine"

     

       31
       31
       +
             export PRISMA_FMT_BINARY="${pkgs.prisma-engines}/bin/prisma-fmt"

     

       28
       32
        
           '';

     

       29
       33
        
       

     

       30
       34
        
           shellAliases = lib.mkMerge [

+15

home/chloe/scripts.nix

···

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {  

     

       4
       4
       +
         home.packages = with pkgs; [

     

       5
       5
       +
           # Convert nix hash to SRI format and fetch from URL

     

       6
       6
       +
           (writeShellScriptBin "shash" ''

     

       7
       7
       +
             nix hash to-sri --type sha256 $(nix-prefetch-url ''$1)

     

       8
       8
       +
           '')

     

       9
       9
       +
       

     

       10
       10
       +
           # Create a Python virtual environment with --copies flag

     

       11
       11
       +
           (writeShellScriptBin "create-venv" ''

     

       12
       12
       +
             nix run nixpkgs#python3 -- -m venv .venv --copies

     

       13
       13
       +
           '')

     

       14
       14
       +
         ];

     

       15
       15
       +
       }

+6

hosts/juniper/default.nix

···

       1
       1
        
       {

     

       2
       2
       +
         settings = {

     

       3
       3
       +
           profiles = {

     

       4
       4
       +
             graphical.enable = true;

     

       5
       5
       +
             laptop.enable = true;

     

       6
       6
       +
           };

     

       7
       7
       +
         };

     

       2
       8
        
         system.stateVersion = 6; # Initial nix-darwin version

     

       3
       9
        
       }

+1

modules/darwin/default.nix

···

       7
       7
        
           ./packages.nix

     

       8
       8
        
           ./preferences

     

       9
       9
        
           ./security

     

       10
       10
       +
           ./startup.nix

     

       10
       11
        
           ./users.nix

     

       11
       12
        
         ];

     

       12
       13
        
       }

+1

modules/darwin/extras.nix

···

       4
       4
        
         imports = [

     

       5
       5
        
           inputs.home-manager.darwinModules.home-manager

     

       6
       6
        
           inputs.ragenix.darwinModules.default

     

       7
       7
       +
           inputs.darwin-login-items.darwinModules.default

     

       7
       8
        
         ];

     

       8
       9
        
       }

+8 -1

modules/darwin/homebrew.nix

···

       22
       22
        
           # Casks (GUI applications)

     

       23
       23
        
           casks = [

     

       24
       24
        
             "1password"

     

       25
       25
       +
             "bruno"

     

       26
       26
       +
             "crossover"

     

       27
       27
       +
             "discord"

     

       25
       28
        
             "maccy"

     

       29
       29
       +
             "microsoft-edge"

     

       26
       30
        
             "microsoft-teams"

     

       31
       31
       +
             "mos"

     

       27
       32
        
             "music-presence"

     

       28
       28
       -
             "prismlauncher"

     

       33
       33
       +
             "osu"

     

       34
       34
       +
             "signal"

     

       35
       35
       +
             "steam"

     

       29
       36
        
           ];

     

       30
       37
        
       

     

       31
       38
        
           # Mac App Store apps (requires mas-cli)

+19

modules/darwin/startup.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       {

     

       9
       9
       +
         environment.loginItems = {

     

       10
       10
       +
           enable = true;

     

       11
       11
       +
           items = [

     

       12
       12
       +
             "/Applications/1Password.app"

     

       13
       13
       +
             "/Applications/Mos.app"

     

       14
       14
       +
             "/Applications/Maccy.app"

     

       15
       15
       +
             "/Users/chloe/Applications/Home Manager Apps/Shottr.app"

     

       16
       16
       +
             "/Applications/Tailscale.app"

     

       17
       17
       +
           ];

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+5 -2

services/caddy/default.nix

···

       9
       9
        
         services.caddy = {

     

       10
       10
        
           enable = true;

     

       11
       11
        
           package = pkgs.caddy.withPlugins {

     

       12
       12
       -
             plugins = [ "github.com/caddy-dns/bunny@v1.2.0" ];

     

       12
       12
       +
             plugins = [

     

       13
       13
       +
               "github.com/caddy-dns/bunny@v1.2.0"

     

       14
       14
       +
             ];

     

       13
       15
        
             hash = "sha256-bwffi5sWq07DVoPQGgEIN1jnvQKL6c4tFfR9AT9ThD4=";

     

       14
       16
        
           };

     

       15
       17
        
           environmentFile = config.age.secrets.caddy.path;

     

       16
       18
        
           globalConfig = ''

     

       19
       19
       +
             debug

     

       17
       20
        
             email chloe@sapphic.moe

     

       18
       21
        
           '';

     

       19
       22
        
           extraConfig = ''

     
···

       28
       31
        
             }

     

       29
       32
        
           '';

     

       30
       33
        
           logFormat = ''

     

       31
       31
       -
             level info

     

       34
       34
       +
             level debug

     

       32
       35
        
             format json

     

       33
       36
        
           '';

     

       34
       37
        
         };

+1 -1

services/glance/default.nix

···

       8
       8
        
       

     

       9
       9
        
         services.glance = {

     

       10
       10
        
           enable = true;

     

       11
       11
       -
           openFirewall = true;

     

       11
       11
       +
           openFirewall = false;

     

       12
       12
        
           environmentFile = config.age.secrets.glance.path;

     

       13
       13
        
           settings = import ./settings.nix;

     

       14
       14
        
         };

+28 -2

services/knot/default.nix

···

       2
       2
        
         services.tangled-knot = {

     

       3
       3
        
           enable = true;

     

       4
       4
        
           motd = ''

     

       5
       5
       -
             🌸 welcome to the tangled knot server 🌸

     

       5
       5
       +
                ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⡀⢀⠀⢀⠀⠀⠀⠀

     

       6
       6
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⢧⢳⣾⣂⣾⡁⣴⠀⠀

     

       7
       7
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⠓⣬⠾⠋⠉⢸⣷⣋⣤⡦

     

       8
       8
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢯⡞⠃⠀⠀⠀⡼⠊⣠⡏⠀

     

       9
       9
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡀⠀⠀⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣶⣄⣀⣀⡴⣡⡴⠃⠀⠀

     

       10
       10
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡀⠀⣽⠧⢴⡀⢸⡛⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡿⠻⠛⠋⠉⠁⠀⠀⠀⠀

     

       11
       11
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠾⡇⢸⠉⠀⠀⠹⣼⣽⡚⠉⠹⡄⠀⠀⠀⠀⠀⠀⠀⠀⡴⠛⠙⢳⡀⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       12
       12
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡘⢿⣆⠀⠀⠀⣿⠉⠀⠀⢀⣧⠀⢀⣤⠤⢤⣄⠀⢸⠉⠀⠀⠈⣧⢸⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       13
       13
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢰⠾⠉⠙⠻⢗⠀⣦⣏⣤⠀⣠⠞⠀⠀⣞⠋⠀⠀⠈⠻⡼⡀⣄⡀⢀⡯⠟⠧⢤⡀⠀⠀⠀⠀⠀⠀⠀⠀

     

       14
       14
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⢯⣀⠀⠀⠲⣷⡿⣿⠋⠉⠁⠀⠀⠀⠹⣄⠀⠀⣠⣤⠘⠧⣽⣨⣞⡁⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⠀⠀

     

       15
       15
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠉⠁⠀⢸⣷⠀⠀⠀⠀⠀⠀⠈⣓⣦⣜⠉⣿⣶⠧⣟⣙⣀⣀⣠⠞⠁⠀⠀⠀⠀⠀⠀⠀⠀

     

       16
       16
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⡞⠉⠀⠾⠞⡵⢜⣇⡀⠙⢦⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       17
       17
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡤⠤⠤⣄⠀⣼⣿⡠⠴⠶⠦⣄⠀⣷⣀⠀⢀⣠⡷⡀⠉⠁⠀⢸⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       18
       18
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⡋⠀⠀⠀⠈⢷⣿⠋⠀⠀⠀⠀⢸⡆⠀⠈⠉⣩⣿⠣⠙⠲⠤⠶⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       19
       19
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⢻⠀⠀⠀⠀⠀⠀⡇⣠⣴⣾⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       20
       20
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⣄⠀⠀⠀⢠⣦⣌⡄⢠⣦⠀⠀⣾⠹⠋⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       21
       21
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡠⠤⠙⠢⢄⡀⠀⢳⡄⢃⡼⠉⣀⠜⠋⠉⠒⢦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       22
       22
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⢠⡯⠀⠀⠀⠀⠀⣠⡉⠙⣹⣿⠶⣮⣁⡀⠀⠀⠀⠀⢻⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       23
       23
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠳⣄⠀⠀⠀⠘⠛⠓⣛⠇⢸⡷⡀⠻⠟⠀⠀⠀⠀⢸⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       24
       24
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣹⠒⠶⢶⠒⠉⠀⠀⠈⠉⢫⠳⢄⣀⣀⣀⡤⠟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       25
       25
       +
               ⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⡾⠋⠀⠀⢰⠀⠀⠀⠀⠀⠀⢸⣇⠀⠈⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       26
       26
       +
               ⠀⠀⠀⠀⣠⣴⣾⠿⠛⠁⠀⠀⠀⠀⠈⠳⣄⣀⣀⣀⡤⠞⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       27
       27
       +
               ⠀⠀⣴⣿⡿⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       28
       28
       +
               ⠀⣾⡟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       29
       29
       +
               ⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       30
       30
       +
               ⠈⢧⡃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       31
       31
       +
               ⠀⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       6
       32
        
       

     

       7
       7
       -
             hosted by sapphic angels

     

       33
       33
       +
             Welcome to Sapphic Angels' Knot server for tangled.org.

     

       8
       34
        
           '';

     

       9
       35
        
           server = {

     

       10
       36
        
             hostname = "knot.sappho.systems";

+2 -8

services/ntfy/default.nix

···

       33
       33
        
         services.caddy.virtualHosts."notify.sappho.systems" = {

     

       34
       34
        
           extraConfig = ''

     

       35
       35
        
             import common

     

       36
       36
       +
             import tls_bunny

     

       36
       37
        
       

     

       37
       37
       -
             reverse_proxy http://127.0.0.1:7070 {

     

       38
       38
       -
               header_up X-Forwarded-Proto https

     

       39
       39
       -
               header_up X-Forwarded-Host notify.sappho.systems

     

       40
       40
       -
               header_up X-Real-IP {remote_host}

     

       41
       41
       -
             }

     

       38
       38
       +
             reverse_proxy http://127.0.0.1:7070

     

       42
       39
        
           '';

     

       43
       40
        
         };

     

       44
       44
       -
       

     

       45
       45
       -
         # Firewall

     

       46
       46
       -
         settings.firewall.allowedTCPPorts = [ 7070 ];

     

       47
       41
        
       }

Compare changes