Update
This commit is contained in:
parent
12580cc9c6
commit
b15fc41005
11
flake.lock
11
flake.lock
@ -552,16 +552,15 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1680096111,
|
"lastModified": 1694432324,
|
||||||
"narHash": "sha256-iPnnmH/v5tCZhvoB8zLI3qzMZ5HVG81zuVQm1xADXro=",
|
"narHash": "sha256-bo3Gv6Cp40vAXDBPi2XiDejzp/kyz65wZg4AnEWxAcY=",
|
||||||
"owner": "balsoft",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "1b90b22936ca018a6683e4715e2b774efbbf1747",
|
"rev": "ca41b8a227dd235b1b308217f116c7e6e84ad779",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "balsoft",
|
"owner": "nixos",
|
||||||
"ref": "add-librem-5",
|
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@
|
|||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixos-hardware.url = "github:balsoft/nixos-hardware/add-librem-5";
|
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||||
|
|
||||||
yt-dlp.url = "github:yt-dlp/yt-dlp";
|
yt-dlp.url = "github:yt-dlp/yt-dlp";
|
||||||
yt-dlp.flake = false;
|
yt-dlp.flake = false;
|
||||||
@ -129,7 +129,8 @@
|
|||||||
localSystem = { inherit system; };
|
localSystem = { inherit system; };
|
||||||
config = {
|
config = {
|
||||||
android_sdk.accept_license = true;
|
android_sdk.accept_license = true;
|
||||||
permittedInsecurePackages = [ "openssl-1.1.1u" ];
|
permittedInsecurePackages = [ "openssl-1.1.1v" ];
|
||||||
|
allowUnfreePredicate = (pkg: pkg.pname == "firmware-imx");
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
@ -35,6 +35,8 @@
|
|||||||
pass-secret-service
|
pass-secret-service
|
||||||
];
|
];
|
||||||
|
|
||||||
|
hardware.librem5.audio = false;
|
||||||
|
|
||||||
programs.ssh.askPassword =
|
programs.ssh.askPassword =
|
||||||
"${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";
|
"${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";
|
||||||
|
|
||||||
@ -51,7 +53,7 @@
|
|||||||
mono.size = 11;
|
mono.size = 11;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.pure-maps pkgs.plasma5Packages.elisa ];
|
environment.systemPackages = [ pkgs.pure-maps (pkgs.organicmaps.overrideAttrs (_: {meta = {};})) pkgs.plasma5Packages.elisa ];
|
||||||
|
|
||||||
environment.etc."gnss-share.conf".text = ''
|
environment.etc."gnss-share.conf".text = ''
|
||||||
# Socket to sent NMEA location to
|
# Socket to sent NMEA location to
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# jitsi
|
# jitsi
|
||||||
mailserver
|
mailserver
|
||||||
matrix-synapse
|
matrix-synapse
|
||||||
minidlna
|
# minidlna
|
||||||
nextcloud
|
nextcloud
|
||||||
nginx
|
nginx
|
||||||
vsftpd
|
vsftpd
|
||||||
@ -24,7 +24,7 @@
|
|||||||
systemd-boot.enable = lib.mkForce false;
|
systemd-boot.enable = lib.mkForce false;
|
||||||
grub = {
|
grub = {
|
||||||
enable = lib.mkForce true;
|
enable = lib.mkForce true;
|
||||||
device = "/dev/sda";
|
device = "/dev/disk/by-path/pci-0000:06:00.0-scsi-0:0:0:0";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3,10 +3,12 @@
|
|||||||
services.gitea = {
|
services.gitea = {
|
||||||
enable = true;
|
enable = true;
|
||||||
appName = "code.balsoft.ru";
|
appName = "code.balsoft.ru";
|
||||||
cookieSecure = true;
|
settings.server = {
|
||||||
rootUrl = "https://code.balsoft.ru";
|
HTTP_PORT = 6000;
|
||||||
domain = "code.balsoft.ru";
|
ROOT_URL = "https://code.balsoft.ru";
|
||||||
httpPort = 6000;
|
DISABLE_REGISTRATION = true;
|
||||||
disableRegistration = true;
|
COOKIE_SECURE = true;
|
||||||
|
DOMAIN = "code.balsoft.ru";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -152,7 +152,7 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
localDnsResolver = false;
|
localDnsResolver = false;
|
||||||
certificateScheme = 1;
|
certificateScheme = "manual";
|
||||||
certificateFile = "/var/lib/acme/balsoft.ru/fullchain.pem";
|
certificateFile = "/var/lib/acme/balsoft.ru/fullchain.pem";
|
||||||
keyFile = "/var/lib/acme/balsoft.ru/key.pem";
|
keyFile = "/var/lib/acme/balsoft.ru/key.pem";
|
||||||
enableImap = true;
|
enableImap = true;
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
hostName = "nextcloud.balsoft.ru";
|
hostName = "nextcloud.balsoft.ru";
|
||||||
config.adminpassFile = config.secrets.nextcloud.decrypted;
|
config.adminpassFile = config.secrets.nextcloud.decrypted;
|
||||||
package = pkgs.nextcloud27;
|
package = pkgs.nextcloud27;
|
||||||
|
enableBrokenCiphersForSSE = false;
|
||||||
https = true;
|
https = true;
|
||||||
};
|
};
|
||||||
secrets.nextcloud = {
|
secrets.nextcloud = {
|
||||||
|
Loading…
Reference in New Issue
Block a user