AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update NixOS-VPS machine

Browse Source
This commit is contained in:
Dmitriy Kholkin 2024-06-30 13:47:03 +03:00
parent 38fec28a21
commit aa91244df7
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -116,17 +116,17 @@
customRoles = import ./roles; customRoles = import ./roles;
secretsDir = ./secrets; secretsDir = ./secrets;
sharedPatches = patchesPath [ sharedPatches = patchesPath [ ];
"onlyoffice.patch"
"vaultwarden.patch"
];
sharedOverlays = [ flake-utils-plus.overlay inputs.sops-nix.overlays.default ]; sharedOverlays = [ flake-utils-plus.overlay inputs.sops-nix.overlays.default ];
channelsConfig = { channelsConfig = {
allowUnfree = true; android_sdk.accept_license = true; allowUnfree = true; android_sdk.accept_license = true;
# permittedInsecurePackages = [ "electron-25.9.0" ]; # permittedInsecurePackages = [ "electron-25.9.0" ];
}; };
channels.unstable.input = nixpkgs; channels.unstable.input = nixpkgs;
channels.unstable.patches = patchesPath [ "jaxlib.patch" "zen-kernels.patch" ] ++ sharedPatches; channels.unstable.patches = sharedPatches ++ patchesPath [
"onlyoffice.patch" "vaultwarden.patch"
"jaxlib.patch" "zen-kernels.patch"
];
channels.stable.input = inputs.nixpkgs-stable; channels.stable.input = inputs.nixpkgs-stable;
channels.stable.patches = sharedPatches; channels.stable.patches = sharedPatches;

2
machines/NixOS-VPS/nix.nix
View File

@ -2,7 +2,7 @@
nix = { nix = {
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ]; nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ];
registry.self.flake = inputs.self; registry.self.flake = inputs.self;
registry.nixpkgs.flake = inputs.nixpkgs; # registry.nixpkgs.flake = inputs.nixpkgs;
optimise.automatic = lib.mkDefault true; optimise.automatic = lib.mkDefault true;
extraOptions = '' extraOptions = ''
builders-use-substitutes = true builders-use-substitutes = true

3
machines/NixOS-VPS/services/xtls.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: { config, pkgs, inputs, modulesPath, ... }:
let let
inherit (pkgs.hostPlatform) system; inherit (pkgs.hostPlatform) system;
cert-key = config.sops.secrets."cert.key".path; cert-key = config.sops.secrets."cert.key".path;
@ -6,6 +6,7 @@ let
nginx-conf = config.sops.secrets."nginx.conf".path; nginx-conf = config.sops.secrets."nginx.conf".path;
marzban-env = config.sops.secrets.marzban.path; marzban-env = config.sops.secrets.marzban.path;
in { in {
disabledModules = [ "${modulesPath}/services/web-apps/ocis.nix" ];
imports = [ inputs.ataraxiasjel-nur.nixosModules.ocis ]; imports = [ inputs.ataraxiasjel-nur.nixosModules.ocis ];
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];