felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(matrix): switch to matrix-conduit from nixos-unstable

Browse source
This commit is contained in:
Felix Schröter 2023-09-13 14:04:04 +02:00
parent 302151a92b
commit e8e8ffe166
Signed by: felschr
GPG key ID: 671E39E6744C807D
3 changed files with 11 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

153
flake.lock
View file

@ -48,31 +48,6 @@
"type": "github"
}
},
"conduit": {
"inputs": {
"crane": "crane_2",
"fenix": "fenix",
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1694457246,
"narHash": "sha256-PkdsgIbzxW4YwfrHlX2nPup3pbyyzrVOkvh6PW+BxNk=",
"owner": "famedly",
"repo": "conduit",
"rev": "fa725a14e2309ed416ef53ef8282303300190c61",
"type": "gitlab"
},
"original": {
"owner": "famedly",
"repo": "conduit",
"type": "gitlab"
}
},
"crane": {
"inputs": {
"flake-compat": "flake-compat",
@ -103,33 +78,6 @@
"type": "github"
}
},
"crane_2": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": [
"conduit",
"flake-utils"
],
"nixpkgs": [
"conduit",
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1688772518,
"narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
"owner": "ipetkov",
"repo": "crane",
"rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
@ -155,7 +103,7 @@
},
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat_2",
"nixpkgs": [
"nixpkgs"
],
@ -193,34 +141,12 @@
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"conduit",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1689488573,
"narHash": "sha256-diVASflKCCryTYv0djvMnP2444mFsIG0ge5pa7ahauQ=",
"owner": "nix-community",
"repo": "fenix",
"rev": "39096fe3f379036ff4a5fa198950b8e79defe939",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"fenix_2": {
"inputs": {
"nixpkgs": [
"fh",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src_2"
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"narHash": "sha256-BMN2Sf1yuv5pw2koZZdMCCaghUYyo0hOtxY/v2zmiL8=",
@ -236,8 +162,8 @@
},
"fh": {
"inputs": {
"fenix": "fenix_2",
"flake-compat": "flake-compat_4",
"fenix": "fenix",
"flake-compat": "flake-compat_3",
"naersk": "naersk",
"nixpkgs": [
"nixpkgs"
@ -272,22 +198,6 @@
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1668681692,
@ -303,7 +213,7 @@
"type": "github"
}
},
"flake-compat_4": {
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -319,7 +229,7 @@
"type": "github"
}
},
"flake-compat_5": {
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1641205782,
@ -335,7 +245,7 @@
"type": "github"
}
},
"flake-compat_6": {
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -432,7 +342,7 @@
"matrix-appservices": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_4",
"nixlib": "nixlib",
"nixpkgs": [
"nixpkgs"
@ -561,7 +471,7 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-compat": "flake-compat_5",
"flake-utils": [
"flake-utils"
],
@ -590,7 +500,6 @@
"root": {
"inputs": {
"agenix": "agenix",
"conduit": "conduit",
"deploy-rs": "deploy-rs",
"fh": "fh",
"flake-parts": "flake-parts",
@ -606,23 +515,6 @@
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1689441253,
"narHash": "sha256-4MSDZaFI4DOfsLIZYPMBl0snzWhX1/OqR/QHir382CY=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-analyzer-src_2": {
"flake": false,
"locked": {
"lastModified": 1693248848,
@ -664,33 +556,6 @@
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"conduit",
"crane",
"flake-utils"
],
"nixpkgs": [
"conduit",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1688351637,
"narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "f9b92316727af9e6c7fee4a761242f7f46880329",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,

6
flake.nix
View file

@ -45,12 +45,6 @@
inputs.flake-utils.follows = "flake-utils";
};
conduit = {
url = "gitlab:famedly/conduit";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.flake-utils.follows = "flake-utils";
};
matrix-appservices = {
url = "gitlab:coffeetables/nix-matrix-appservices";
inputs.nixpkgs.follows = "nixpkgs";

4
services/matrix/conduit.nix
View file

@ -1,4 +1,4 @@
{ inputs, config, pkgs, ... }:
{ config, pkgs, ... }:
let
server_name = "felschr.com";
@ -6,7 +6,7 @@ let
in {
services.matrix-conduit = {
enable = true;
package = inputs.conduit.packages.${pkgs.system}.default;
package = pkgs.unstable.matrix-conduit;
settings.global = {
inherit server_name;
database_backend = "rocksdb";