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

Compare commits

base: erwin:aaa7456bfe1f9a2465e01bdf82ad821abc61f4b8
Branches Tags
erwin:main
...
compare: erwin:3638fc6f857c7c5fbd744ec8292724a2bb04a155
Branches Tags
erwin:main

5 commits
aaa7456bfe ... 3638fc6f85

Author SHA1 Message Date
Erwin Boskma
3638fc6f85
heimdall: Add m.identity_server to Matrix well-known config 2024-04-26 08:47:19 +02:00
Erwin Boskma
5d0f4f4e4b
dendrite: Enable MSCs for threads and peeking 2024-04-26 08:46:46 +02:00
Erwin Boskma
e261780bd4
flake: Giving deploy-rs another go 2024-04-25 20:45:29 +02:00
Erwin Boskma
67325f6bd3
neo: Configure sliding sync server to use external matrix server address 2024-04-25 20:44:58 +02:00
Erwin Boskma
8b01934c79
Simplified cursor config, set size to 48 for work profile 2024-04-25 20:44:40 +02:00
7 changed files with 80 additions and 12 deletions
Show stats Expand all files Collapse all files

53
flake.lock
View file

@ -160,7 +160,7 @@
},
"crane_3": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_6",
"flake-utils": [
"ha-now-playing",
"flake-utils"
@ -188,6 +188,30 @@
"type": "github"
}
},
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_4",
"nixpkgs": [
"nixpkgs"
],
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1711973905,
"narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"disko": {
"inputs": {
"nixpkgs": [
@ -234,7 +258,7 @@
},
"eww": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_5",
"nixpkgs": [
"nixpkgs"
],
@ -321,6 +345,22 @@
}
},
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1696267196,
@ -336,7 +376,7 @@
"type": "github"
}
},
"flake-compat_6": {
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -352,7 +392,7 @@
"type": "github"
}
},
"flake-compat_7": {
"flake-compat_8": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -648,7 +688,7 @@
},
"nix-ld-rs": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
@ -827,7 +867,7 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_7",
"flake-compat": "flake-compat_8",
"flake-utils": [
"flake-utils"
],
@ -858,6 +898,7 @@
"atuin": "atuin",
"caddy-with-plugins": "caddy-with-plugins",
"colmena": "colmena",
"deploy-rs": "deploy-rs",
"disko": "disko",
"emacs-overlay": "emacs-overlay",
"eww": "eww",

23
flake.nix
View file

@ -106,6 +106,12 @@
inputs.nixpkgs.follows = "nixpkgs";
};
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
};
atuin = {
url = "github:atuinsh/atuin";
inputs = {
@ -197,6 +203,22 @@
}) (builtins.attrNames machines)
);
deploy = {
nodes = {
neo = {
hostname = "10.0.0.213";
profiles = {
system = {
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.neo;
};
};
};
};
sshUser = "erwin";
user = "root";
sshOpts = [ "-t" ];
};
colmena =
{
meta = {
@ -293,6 +315,7 @@
packages = [
age
config.packages.git-repo-go
inputs'.deploy-rs.packages.deploy-rs
inputs'.colmena.packages.colmena
just
lswt

2
machines/heimdall/caddy/default.nix
View file

@ -24,7 +24,7 @@
header /.well-known/matrix/* Content-Type application/json
header /.well-known/matrix/* Access-Control-Allow-Origin *
respond /.well-known/matrix/server `{"m.server":"matrix.boskma.frl:443"}`
respond /.well-known/matrix/client `{"m.homeserver": {"base_url":"https://matrix.boskma.frl"},"org.matrix.msc3575.proxy":{"url":"https://syncv3.boskma.frl"}}`
respond /.well-known/matrix/client `{"m.homeserver": {"base_url":"https://matrix.boskma.frl"},"m.identity_server":{"base_url":"https://vector.im"},"org.matrix.msc3575.proxy":{"url":"https://syncv3.boskma.frl"}}`
'';
};

7
machines/neo/dendrite/default.nix
View file

@ -75,6 +75,13 @@ let
sync_api = {
real_ip_header = "X-Forwarded-For";
};
mscs = {
mscs = [
"msc2444"
"msc2753"
"msc2836"
];
};
media_api = {
base_path = "${workingDir}/media_store";

2
machines/neo/matrix-sliding-sync/default.nix
View file

@ -8,7 +8,7 @@
environmentFile = config.sops.secrets.matrix-sliding-sync-env.path;
settings = {
SYNCV3_SERVER = "http://127.0.0.1:8008";
SYNCV3_SERVER = "https://matrix.boskma.frl";
SYNCV3_BINDADDR = "0.0.0.0:8009";
};
};

2
users/erwin/home.nix
View file

@ -353,13 +353,11 @@ in
bookmarks = [ "file:///home/erwin/workspace" ];
extraConfig = {
gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
};
};
gtk4.extraConfig = {
gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
};
};

3
users/erwin/work.nix
View file

@ -302,6 +302,7 @@ in
package = pkgs.catppuccin-cursors.mochaDark;
gtk.enable = true;
x11.enable = true;
size = 48;
};
file.".wallpapers".source = ../../wallpapers;
@ -377,14 +378,12 @@ in
bookmarks = [ "file:///home/erwin/workspace" ];
extraConfig = {
gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
};
};
gtk4 = {
extraConfig = {
gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
};
};
};