vskilet
/
nixos-config
forked from nyanloutre/nixos-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update LoutreOS to 22.11

This commit is contained in:
nyanloutre 2022-12-30 15:08:20 +01:00
parent 17d985a56c
commit 5ce6087b57
8 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flake.lock
View File

@ -88,19 +88,20 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-22_11": { "nixpkgs-photoprism": {
"locked": { "locked": {
"lastModified": 1669558522, "lastModified": 1671922246,
"narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", "narHash": "sha256-Xh/pWG2mdheCtJZFmuuZIsvR9PVgs15Rn6yt/G1lINc=",
"owner": "NixOS", "owner": "Stunkymonkey",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", "rev": "6805f176fcc4b3673f23df5ee67caccc24bfba8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "Stunkymonkey",
"ref": "nixos-22.11", "ref": "photoprism-module-init",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
@ -123,6 +124,7 @@
"dogetipbot-telegram": "dogetipbot-telegram", "dogetipbot-telegram": "dogetipbot-telegram",
"ipmihddtemp": "ipmihddtemp", "ipmihddtemp": "ipmihddtemp",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-photoprism": "nixpkgs-photoprism",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"utils": "utils_2" "utils": "utils_2"
@ -134,7 +136,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-22_11": [
"nixpkgs"
],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {

12
flake.nix
View File

@ -1,13 +1,14 @@
{ {
inputs = { inputs = {
nixpkgs.url = "flake:nixpkgs/nixos-22.05"; nixpkgs.url = "flake:nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
nixpkgs-photoprism.url = "github:Stunkymonkey/nixpkgs/photoprism-module-init";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
simple-nixos-mailserver = { simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs-unstable"; nixpkgs.follows = "nixpkgs-unstable";
nixpkgs-22_05.follows = "nixpkgs"; nixpkgs-22_11.follows = "nixpkgs";
}; };
}; };
dogetipbot-telegram = { dogetipbot-telegram = {
@ -20,7 +21,7 @@
}; };
}; };
outputs = inputs@{ self, utils, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: utils.lib.mkFlake { outputs = inputs@{ self, utils, nixpkgs, nixpkgs-unstable, nixpkgs-photoprism, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: utils.lib.mkFlake {
inherit self inputs; inherit self inputs;
@ -32,7 +33,7 @@
# (nixpkgs-unstable.legacyPackages."x86_64-linux".fetchpatch { # (nixpkgs-unstable.legacyPackages."x86_64-linux".fetchpatch {
# name = "electron-cash.patch"; # name = "electron-cash.patch";
# url = "https://github.com/NixOS/nixpkgs/pull/160607.patch"; # url = "https://github.com/NixOS/nixpkgs/pull/160607.patch";
# sha256 = "sha256-oQbiyhVWYIkEuZEKqaPuIL00PNPnuTAw64wuqZ8YeDs="; # sha256 = nixpkgs.lib.fakeHash;
# }) # })
# ]; # ];
@ -46,6 +47,7 @@
]; ];
hosts.loutreos.modules = [ hosts.loutreos.modules = [
"${nixpkgs-photoprism}/nixos/modules/services/web-apps/photoprism.nix"
simple-nixos-mailserver.nixosModule simple-nixos-mailserver.nixosModule
dogetipbot-telegram.nixosModule dogetipbot-telegram.nixosModule
ipmihddtemp.nixosModule ipmihddtemp.nixosModule

2
services/python-ci.nix
View File

@ -33,7 +33,7 @@ in
RuntimeDirectoryPreserve = "yes"; RuntimeDirectoryPreserve = "yes";
ExecStart = with pkgs; ExecStart = with pkgs;
let env = python3Packages.python.buildEnv.override { let env = python3Packages.python.buildEnv.override {
extraLibs = with python3Packages;[ pyramid python-gitlab ]; extraLibs = with python3Packages;[ pyramid python-gitlab setuptools ];
ignoreCollisions = true; ignoreCollisions = true;
}; };
in "${pkgs.writeShellScriptBin "run.sh" '' in "${pkgs.writeShellScriptBin "run.sh" ''

2
systems/LoutreOS/configuration.nix
View File

@ -12,7 +12,7 @@
./services.nix ./services.nix
]; ];
nix.trustedUsers = [ "root" "paul" ]; nix.settings.trusted-users = [ "root" "paul" ];
boot = { boot = {
loader = { loader = {

2
systems/LoutreOS/hardware-configuration.nix
View File

@ -176,6 +176,6 @@
} }
]; ];
nix.maxJobs = lib.mkDefault 4; nix.settings.max-jobs = lib.mkDefault 4;
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
} }

31
systems/LoutreOS/monitoring.nix
View File

@ -87,18 +87,27 @@ in
grafana = { grafana = {
enable = true; enable = true;
addr = "127.0.0.1";
dataDir = "/var/lib/grafana"; dataDir = "/var/lib/grafana";
extraOptions = { settings = {
SERVER_ROOT_URL = "https://grafana.${domaine}"; server = {
SMTP_ENABLED = "true"; http_addr = "127.0.0.1";
SMTP_FROM_ADDRESS = "grafana@${domaine}"; root_url = "https://grafana.${domaine}";
SMTP_SKIP_VERIFY = "true"; };
AUTH_DISABLE_LOGIN_FORM = "true"; smtp = {
AUTH_DISABLE_SIGNOUT_MENU = "true"; enabled = true;
AUTH_ANONYMOUS_ENABLED = "true"; from_address = "grafana@${domaine}";
AUTH_ANONYMOUS_ORG_ROLE = "Admin"; skip_verify = true;
AUTH_BASIC_ENABLED = "false"; };
auth = {
disable_signout_menu = true;
};
"auth.basic" = {
enabled = false;
};
"auth.proxy" = {
enabled = true;
header_name = "X-WEBAUTH-USER";
};
}; };
}; };

10
systems/LoutreOS/web.nix
View File

@ -197,6 +197,8 @@ in
proxyPass = "http://127.0.0.1:${toString(rport)}/"; proxyPass = "http://127.0.0.1:${toString(rport)}/";
extraConfig = '' extraConfig = ''
auth_request_set $cookie $upstream_http_set_cookie; auth_request_set $cookie $upstream_http_set_cookie;
auth_request_set $username $upstream_http_x_username;
proxy_set_header X-WEBAUTH-USER $username;
add_header Set-Cookie $cookie; add_header Set-Cookie $cookie;
''; '';
}; };
@ -243,7 +245,7 @@ in
}; };
}; };
"login.nyanlout.re" = simpleReverse config.services.nginx.sso.configuration.listen.port; "login.nyanlout.re" = simpleReverse config.services.nginx.sso.configuration.listen.port;
"grafana.nyanlout.re" = authReverse config.services.grafana.port; "grafana.nyanlout.re" = authReverse config.services.grafana.settings.server.http_port;
"transmission.nyanlout.re" = authReverse config.services.transmission.settings.rpc-port; "transmission.nyanlout.re" = authReverse config.services.transmission.settings.rpc-port;
"radarr.nyanlout.re" = authReverse 7878; "radarr.nyanlout.re" = authReverse 7878;
"sonarr.nyanlout.re" = authReverse 8989; "sonarr.nyanlout.re" = authReverse 8989;
@ -376,7 +378,6 @@ in
gitea = { gitea = {
enable = true; enable = true;
cookieSecure = true;
httpPort = 3001; httpPort = 3001;
rootUrl = "https://gitea.nyanlout.re/"; rootUrl = "https://gitea.nyanlout.re/";
database = { database = {
@ -384,10 +385,11 @@ in
port = 5432; port = 5432;
passwordFile = "/var/lib/gitea/custom/conf/database_password"; passwordFile = "/var/lib/gitea/custom/conf/database_password";
}; };
log.level = "Warn";
disableRegistration = true;
settings = { settings = {
ui.DEFAULT_THEME = "arc-green"; ui.DEFAULT_THEME = "arc-green";
log.LEVEL = "Warn";
service.DISABLE_REGISTRATION = true;
session.COOKIE_SECURE = true;
}; };
}; };

1
systems/common-cli.nix
View File

@ -17,6 +17,7 @@
set expandtab set expandtab
set smarttab set smarttab
set background=dark set background=dark
set mouse=
''; '';
packages.myVimPackage = with pkgs.vimPlugins; { packages.myVimPackage = with pkgs.vimPlugins; {
start = [ start = [