From 1d851c93f1f7b8d6ca30ea2d650844df1ecff641 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 14 Apr 2025 10:50:18 -0400 Subject: [PATCH 1/4] install nil --- home/yt/ytnix.nix | 1 + overlay/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 686a8a3..3ed40e6 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -103,6 +103,7 @@ gopls rust-analyzer minio-client + nil ]; home.sessionVariables = { diff --git a/overlay/default.nix b/overlay/default.nix index 9e6336c..7df6432 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -15,6 +15,7 @@ meta.mainProgram = "garage"; } ); + nil = pkgFrom inputs.nil "default"; } ) ] From e452f2b7537c8baf55de0014ba78a2af5e8ec938 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 14 Apr 2025 10:54:24 -0400 Subject: [PATCH 2/4] just don't use matrix anymore --- hosts/chunk/conduwuit.nix | 33 --------------------------------- hosts/chunk/default.nix | 1 - 2 files changed, 34 deletions(-) delete mode 100644 hosts/chunk/conduwuit.nix diff --git a/hosts/chunk/conduwuit.nix b/hosts/chunk/conduwuit.nix deleted file mode 100644 index 3a6638f..0000000 --- a/hosts/chunk/conduwuit.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ ... }: -{ - services.conduwuit = { - enable = true; - settings.global = { - port = [ 8448 ]; - server_name = "cything.io"; - allow_check_for_updates = true; - }; - }; - - services.caddy.virtualHosts."chat.cything.io".extraConfig = '' - import common - reverse_proxy localhost:8448 - ''; - - services.caddy.virtualHosts."cything.io" = { - serverAliases = [ "www.cything.io" ]; - extraConfig = '' - import common - - header /.well-known/matrix/* Content-Type application/json - header /.well-known/matrix/* Access-Control-Allow-Origin * - header /.well-known/matrix/* Access-Control-Allow-Methods GET,POST,PUT,DELETE,OPTIONS,PATCH,HEAD - header /.well-known/matrix/* Access-Control-Allow-Headers X-Requested-With,Content-Type,Authorization,Origin,Accept - route { - respond /.well-known/matrix/server {"m.server":"chat.cything.io:443"} - respond /.well-known/matrix/client {"m.server":{"base_url":"https://chat.cything.io"},"m.homeserver":{"base_url":"https://chat.cything.io"},"org.matrix.msc3575.proxy":{"url":"https://chat.cything.io"}} - redir https://cy7.sh/posts{uri} permanent - } - ''; - }; -} diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 0509b8d..5dcbf56 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -16,7 +16,6 @@ ./redlib.nix ./vaultwarden.nix ./grafana.nix - ./conduwuit.nix ./immich.nix ./forgejo.nix ./garage.nix From 1573032ace14174730a66f6ddcf19f8986dace30 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 14 Apr 2025 13:29:41 -0400 Subject: [PATCH 3/4] try not using lix --- hosts/common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/common.nix b/hosts/common.nix index 6e70707..b5a71a0 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -33,7 +33,6 @@ options = "--delete-older-than 14d"; }; registry.nixpkgs.flake = inputs.nixpkgs; - package = pkgs.lix; }; i18n.defaultLocale = "en_US.UTF-8"; From 892f42ed2a51661e21ab31864195935981ec6933 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 14 Apr 2025 13:37:13 -0400 Subject: [PATCH 4/4] use nixpkgs unstable --- flake.lock | 25 ++++--------------------- flake.nix | 3 +-- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 1cd47e8..e9223ab 100644 --- a/flake.lock +++ b/flake.lock @@ -838,22 +838,6 @@ "type": "github" } }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1743813633, - "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1730531603, @@ -904,16 +888,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743862455, - "narHash": "sha256-I/QXtrqznq1321mYR9TyMPX/zCWb9iAH64hO+pEBY00=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06f3516b0397bd241bde2daefc8538fc886c5467", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -971,7 +955,6 @@ "nix-index-database": "nix-index-database", "nix-ld": "nix-ld", "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_3", "rust-overlay": "rust-overlay_4", "sops-nix": "sops-nix", "vscode-extensions": "vscode-extensions" diff --git a/flake.nix b/flake.nix index d567a55..a9c4700 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,7 @@ description = "cy's flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager";