summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--flake.lock48
-rwxr-xr-xflake.nix40
-rwxr-xr-xhost/Rory-ovh/services/matrix/draupnir.nix2
3 files changed, 28 insertions, 62 deletions
diff --git a/flake.lock b/flake.lock

index b15954a..f002bfa 100644 --- a/flake.lock +++ b/flake.lock
@@ -569,11 +569,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1749483884, - "narHash": "sha256-HdyfdVx0NbgrVtLY4lXdX9X/YE3PZjGZFnSyoAy1GJc=", + "lastModified": 1749657191, + "narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=", "owner": "nix-community", "repo": "home-manager", - "rev": "74d196c9943a67908d1883f61154e594d03863e5", + "rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce", "type": "github" }, "original": { @@ -904,11 +904,11 @@ "matrixSpecSrc": { "flake": false, "locked": { - "lastModified": 1749302816, - "narHash": "sha256-4m2esju+AqCaZlnUeFcwoBh+kqWayeMNOejESKKgE5s=", + "lastModified": 1749631217, + "narHash": "sha256-brTS3ep8hd2ENJc1Gvm3/nIpojumbrvdJeKps+map0o=", "owner": "matrix-org", "repo": "matrix-spec", - "rev": "32b1f0514d4be78b3020119b530d108b0010de3a", + "rev": "a2a9a02efa4cc841c2031c6ba789828619bbfae5", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs-DraupnirPkg": { "locked": { - "lastModified": 1749491078, - "narHash": "sha256-jur6Yg9WabXKVmPpBghkah+dNkRb6dZ7UWYLgMuJ2fA=", + "lastModified": 1749723933, + "narHash": "sha256-zZTbEEY4zGsdMsThFmD5m9n+ZEi6pcI+Fato2R2Fau8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b0ce5c691507c031ac84575f2368665ecef3c27", + "rev": "a05e20c8600ad83cb9caacd5822c4d2ad002dee4", "type": "github" }, "original": { @@ -1061,11 +1061,11 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1749491078, - "narHash": "sha256-jur6Yg9WabXKVmPpBghkah+dNkRb6dZ7UWYLgMuJ2fA=", + "lastModified": 1749723933, + "narHash": "sha256-zZTbEEY4zGsdMsThFmD5m9n+ZEi6pcI+Fato2R2Fau8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b0ce5c691507c031ac84575f2368665ecef3c27", + "rev": "a05e20c8600ad83cb9caacd5822c4d2ad002dee4", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1749491078, - "narHash": "sha256-jur6Yg9WabXKVmPpBghkah+dNkRb6dZ7UWYLgMuJ2fA=", + "lastModified": 1749723933, + "narHash": "sha256-zZTbEEY4zGsdMsThFmD5m9n+ZEi6pcI+Fato2R2Fau8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b0ce5c691507c031ac84575f2368665ecef3c27", + "rev": "a05e20c8600ad83cb9caacd5822c4d2ad002dee4", "type": "github" }, "original": { @@ -1125,11 +1125,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1749173751, - "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", + "lastModified": 1749488106, + "narHash": "sha256-b9GIWdF/8jKpCC5JIMgDLZgwe8cEbty2fyTyo1eDFfI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", + "rev": "8fe3e32e7f210522377c3bcff80931a3284ace6a", "type": "github" }, "original": { @@ -1221,11 +1221,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -1429,11 +1429,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix
index ebe3bb9..befed2e 100755 --- a/flake.nix +++ b/flake.nix
@@ -18,9 +18,9 @@ url = "github:NixOS/nixpkgs/nixos-unstable"; }; - nixpkgs-stable = { - url = "github:NixOS/nixpkgs/nixos-24.11"; - }; +# nixpkgs-stable = { +# url = "github:NixOS/nixpkgs/nixos-24.11"; +# }; nixpkgs-master = { url = "github:NixOS/nixpkgs/master"; @@ -115,14 +115,6 @@ outputs = inputs: with inputs; - let - pkgs-stable = - system: - import nixpkgs-stable { - inherit system; - config.allowUnfree = true; - }; - in { nixosConfigurations = { Module-dev = nixpkgs.lib.nixosSystem { @@ -249,24 +241,11 @@ }; } ) - - ( - { pkgs, ... }: - { - nixpkgs.overlays = [ - (final: prev: { - jetbrains = (pkgs-stable pkgs.stdenv.hostPlatform.system).jetbrains; - }) - ]; - } - ) ]; specialArgs = { inherit home-manager; inherit (inputs) mtxclientSrc; inherit (inputs) nhekoSrc; - inherit nixpkgs-stable; - inherit hyprland; inherit hy3; }; @@ -292,23 +271,12 @@ }; } ) - ( - { pkgs, ... }: - { - nixpkgs.overlays = [ - (final: prev: { - jetbrains = (pkgs-stable pkgs.stdenv.hostPlatform.system).jetbrains; - }) - ]; - } - ) ]; specialArgs = { inherit home-manager; inherit (inputs) matrixSpecSrc; inherit (inputs) mtxclientSrc; inherit (inputs) nhekoSrc; - inherit nixpkgs-stable; inherit hyprland; inherit hy3; }; @@ -333,8 +301,6 @@ ]; specialArgs = { inherit home-manager; - inherit nixpkgs-stable; - inherit hyprland; inherit hy3; }; diff --git a/host/Rory-ovh/services/matrix/draupnir.nix b/host/Rory-ovh/services/matrix/draupnir.nix
index ef7da15..3f6d89a 100755 --- a/host/Rory-ovh/services/matrix/draupnir.nix +++ b/host/Rory-ovh/services/matrix/draupnir.nix
@@ -9,11 +9,11 @@ settings = { homeserverUrl = "https://matrix.rory.gay"; managementRoom = "#draupnir-mgmt:rory.gay"; - verboseLogging = false; recordIgnoredInvites = true; # Let's log ignored invites, just incase autojoinOnlyIfManager = true; # Let's not open ourselves up to DoS attacks automaticallyRedactForReasons = [ "*" ]; # I always want autoredact fasterMembershipChecks = true; + logLevel = "DEBUG"; #roomStateBackingStore.enabled = true; # broken under nix. backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit