nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: use lib.singleton

Browse source
This commit is contained in:
Guanran Wang 2024-08-30 02:17:30 +08:00
parent d0e82dc230
commit 08653a609a
Signed by: nyancat
GPG key ID: 91F97D9ED12639CF
6 changed files with 51 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
home/applications/sway/default.nix
View file

@ -36,15 +36,13 @@
config = {
### Visuals
output."*".bg = "${inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.background} fill";
bars = [
{
statusCommand = "${lib.getExe pkgs.i3status-rust} $HOME/.config/i3status-rust/config-default.toml";
position = "top";
extraConfig = ''
icon_theme ${config.gtk.iconTheme.name}
'';
}
];
bars = lib.singleton {
statusCommand = "${lib.getExe pkgs.i3status-rust} $HOME/.config/i3status-rust/config-default.toml";
position = "top";
extraConfig = ''
icon_theme ${config.gtk.iconTheme.name}
'';
};
### Inputs
input = {

5
hosts/blacksteel/hardware-configuration.nix
View file

@ -1,4 +1,5 @@
{
lib,
inputs,
config,
...
@ -43,7 +44,5 @@
fsType = "vfat";
};
};
swapDevices = [
{ device = "/dev/disk/by-uuid/8a2e90a9-5cc2-40fc-82fe-69ef3cd88e29"; }
];
swapDevices = lib.singleton { device = "/dev/disk/by-uuid/8a2e90a9-5cc2-40fc-82fe-69ef3cd88e29"; };
}

54
hosts/blacksteel/services/matrix.nix
View file

@ -1,4 +1,4 @@
{ config, ... }:
{ lib, config, ... }:
{
services.matrix-synapse = {
enable = true;
@ -13,15 +13,13 @@
{
path = "/run/matrix-synapse/synapse.sock";
type = "http";
resources = [
{
names = [
"client"
"federation"
];
compress = true;
}
];
resources = lib.singleton {
names = [
"client"
"federation"
];
compress = true;
};
}
];
@ -32,25 +30,23 @@
};
# https://element-hq.github.io/synapse/latest/openid.html#keycloak
oidc_providers = [
{
idp_id = "keycloak";
idp_name = "id.ny4.dev";
issuer = "https://id.ny4.dev/realms/ny4";
client_id = "synapse";
client_secret_path = config.sops.secrets."synapse/oidc".path;
scopes = [
"openid"
"profile"
];
user_mapping_provider.config = {
localpart_template = "{{ user.preferred_username }}";
display_name_template = "{{ user.name }}";
};
backchannel_logout_enabled = true;
allow_existing_users = true;
}
];
oidc_providers = lib.singleton {
idp_id = "keycloak";
idp_name = "id.ny4.dev";
issuer = "https://id.ny4.dev/realms/ny4";
client_id = "synapse";
client_secret_path = config.sops.secrets."synapse/oidc".path;
scopes = [
"openid"
"profile"
];
user_mapping_provider.config = {
localpart_template = "{{ user.preferred_username }}";
display_name_template = "{{ user.name }}";
};
backchannel_logout_enabled = true;
allow_existing_users = true;
};
};
};

10
hosts/tyo0/default.nix
View file

@ -25,12 +25,10 @@
boot.loader.grub.device = lib.mkForce "/dev/nvme0n1";
system.stateVersion = "24.05";
swapDevices = [
{
device = "/var/lib/swapfile";
size = 4 * 1024; # 4 GiB
}
];
swapDevices = lib.singleton {
device = "/var/lib/swapfile";
size = 4 * 1024; # 4 GiB
};
# WORKAROUND:
systemd.services."print-host-key".enable = false;

12
hosts/tyo0/services/sing-box.nix
View file

@ -1,4 +1,4 @@
{ config, ... }:
{ lib, config, ... }:
{
networking.firewall.allowedTCPPorts = [
27253
@ -30,12 +30,10 @@
}
];
outbounds = [
{
type = "direct";
tag = "direct";
}
];
outbounds = lib.singleton {
type = "direct";
tag = "direct";
};
route = {
final = "direct";

18
nixos/profiles/sing-box/default.nix
View file

@ -12,16 +12,14 @@
level = "info";
};
inbounds = [
{
type = "http";
tag = "inbound";
listen = "127.0.0.1";
listen_port = 1080;
sniff = true;
sniff_override_destination = true;
}
];
inbounds = lib.singleton {
type = "http";
tag = "inbound";
listen = "127.0.0.1";
listen_port = 1080;
sniff = true;
sniff_override_destination = true;
};
outbounds = [
{