diff options
| -rw-r--r-- | flake.lock | 66 | ||||
| -rwxr-xr-x | flake.nix | 2 | ||||
| -rwxr-xr-x | host/Rory-nginx/services/matrix/draupnir.nix | 17 |
3 files changed, 36 insertions, 49 deletions
diff --git a/flake.lock b/flake.lock index b4e7ea5..f9a04d4 100644 --- a/flake.lock +++ b/flake.lock @@ -5,7 +5,7 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -28,7 +28,7 @@ "crane": "crane_3", "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -48,7 +48,9 @@ }, "botcore-v4": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1683656302, @@ -73,7 +75,7 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1724842781, @@ -415,7 +417,7 @@ "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_5", "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-manifest": "rust-manifest" }, "locked": { @@ -436,7 +438,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1726036828, @@ -522,7 +524,7 @@ "inputs": { "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1725882169, @@ -540,27 +542,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", - "owner": "nixos", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-Draupnir": { "locked": { - "lastModified": 1723084195, - "narHash": "sha256-3K32bJQsGfTGQAAIxz3mb1w1+6I3JRpaot588lQhSSo=", + "lastModified": 1726450556, + "narHash": "sha256-QPTBj5+SmYNL/2E4Jlb5ptUpNYBcyO8EfANLXVw6KJA=", "owner": "TheArcaneBrony", "repo": "nixpkgs", - "rev": "dbf6ae4dd3d87392c4eb691e83962a6a24560e9d", + "rev": "bd7179de2c4192b0d054086e42f2b4c80a82d60b", "type": "github" }, "original": { @@ -652,22 +654,6 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "NixOS", @@ -682,7 +668,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1711401922, "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", @@ -698,7 +684,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1716330097, "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", @@ -714,7 +700,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1725634671, "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", @@ -730,7 +716,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1725693463, "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=", @@ -746,7 +732,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1725983898, "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", @@ -762,7 +748,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1725534445, "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", @@ -788,7 +774,7 @@ "mtxclientSrc": "mtxclientSrc", "nhekoSrc": "nhekoSrc", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-Draupnir": "nixpkgs-Draupnir", "nixpkgs-RoryNix": "nixpkgs-RoryNix", "nixpkgs-master": "nixpkgs-master", @@ -843,7 +829,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 31911be..7d6284c 100755 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ # Own projects botcore-v4 = { url = "gitlab:BotCore-Devs/BotCore-v4/staging"; - #inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; # We need this to avoid a LIBC error. }; # Packages built from git diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix index e9fba15..f20a7d0 100755 --- a/host/Rory-nginx/services/matrix/draupnir.nix +++ b/host/Rory-nginx/services/matrix/draupnir.nix @@ -4,16 +4,17 @@ services.draupnir = { enable = true; homeserverUrl = "https://matrix.rory.gay"; + accessTokenFile = "/etc/draupnir-access-token"; - pantalaimon = { - enable = true; - username = "draupnir"; - passwordFile = "/etc/draupnir-password"; - options = { + #pantalaimon = { + # enable = false; + # username = "draupnir"; + # passwordFile = "/etc/draupnir-password"; + # options = { #homeserver = "http://localhost:8008"; #ssl = false; - }; - }; + # }; + #}; settings = { managementRoom = "#draupnir-mgmt:rory.gay"; verboseLogging = false; @@ -21,7 +22,7 @@ autojoinOnlyIfManager = true; # Let's not open ourselves up to DoS attacks automaticallyRedactForReasons = [ "*" ]; # I always want autoredact fasterMembershipChecks = true; - # roomStateBackingStore.enabled = true; # broken under nix. + roomStateBackingStore.enabled = true; # broken under nix. backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit pollReports = false; # this is a single person homeserver... let's save ourself the work |