nyanloutre
/
nixos-config
1
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nyanloutre:7ea868668549c89c659db7c7c09571281157851b
Branches Tags
nyanloutre:master
nyanloutre:transmission-patch
...
compare: nyanloutre:a315db49c6a600bc72795963011f26b1f81add64
Branches Tags
nyanloutre:master
nyanloutre:transmission-patch

4 Commits
7ea8686685 ... a315db49c6

Author SHA1 Message Date
nyanloutre a315db49c6 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/dac57a4eccf1442e8bf4030df6fcbb55883cb682' (2022-12-24)
  → 'github:NixOS/nixpkgs/913a47cd064cc06440ea84e5e0452039a85781f0' (2022-12-29)
 2022-12-30 15:09:18 +01:00
nyanloutre c4ff862ab4 install photoprism 2022-12-30 15:08:37 +01:00
nyanloutre 5ce6087b57 update LoutreOS to 22.11 2022-12-30 15:08:20 +01:00
nyanloutre 17d985a56c flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/fecf05d4861f3985e8dee73f08bc82668ef75125' (2022-11-27)
  → 'github:NixOS/nixpkgs/dac57a4eccf1442e8bf4030df6fcbb55883cb682' (2022-12-24)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/a115bb9bd56831941be3776c8a94005867f316a7' (2022-11-27)
  → 'github:NixOS/nixpkgs/e182da8622a354d44c39b3d7a542dc12cd7baa5f' (2022-12-28)
• Updated input 'simple-nixos-mailserver':
    'gitlab:simple-nixos-mailserver/nixos-mailserver/f535d8123c4761b2ed8138f3d202ea710a334a1d' (2022-06-22)
  → 'gitlab:simple-nixos-mailserver/nixos-mailserver/bc667fb6afc45f6cc2d118ab77658faf2227cffd' (2022-12-21)
• Removed input 'simple-nixos-mailserver/nixpkgs-22_05'
• Added input 'simple-nixos-mailserver/nixpkgs-22_11':
    'github:NixOS/nixpkgs/ce5fe99df1f15a09a91a86be9738d68fadfbad82' (2022-11-27)
 2022-12-29 15:37:00 +01:00
9 changed files with 82 additions and 37 deletions
Show Stats Expand all files Collapse all files

41
flake.lock
View File

@ -75,26 +75,42 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1669546925,
"narHash": "sha256-Gvtk9agz88tBgqmCdHl5U7gYttTkiuEd8/Rq1Im0pTg=",
"lastModified": 1672353432,
"narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fecf05d4861f3985e8dee73f08bc82668ef75125",
"rev": "913a47cd064cc06440ea84e5e0452039a85781f0",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.05",
"ref": "nixos-22.11",
"type": "indirect"
}
},
"nixpkgs-photoprism": {
"locked": {
"lastModified": 1671922246,
"narHash": "sha256-Xh/pWG2mdheCtJZFmuuZIsvR9PVgs15Rn6yt/G1lINc=",
"owner": "Stunkymonkey",
"repo": "nixpkgs",
"rev": "6805f176fcc4b3673f23df5ee67caccc24bfba8c",
"type": "github"
},
"original": {
"owner": "Stunkymonkey",
"ref": "photoprism-module-init",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1669542132,
"narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
"lastModified": 1672262501,
"narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a115bb9bd56831941be3776c8a94005867f316a7",
"rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f",
"type": "github"
},
"original": {
@ -108,6 +124,7 @@
"dogetipbot-telegram": "dogetipbot-telegram",
"ipmihddtemp": "ipmihddtemp",
"nixpkgs": "nixpkgs",
"nixpkgs-photoprism": "nixpkgs-photoprism",
"nixpkgs-unstable": "nixpkgs-unstable",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"utils": "utils_2"
@ -119,22 +136,22 @@
"nixpkgs": [
"nixpkgs-unstable"
],
"nixpkgs-22_05": [
"nixpkgs-22_11": [
"nixpkgs"
],
"utils": "utils"
},
"locked": {
"lastModified": 1655930346,
"narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
"lastModified": 1671659164,
"narHash": "sha256-DbpT+v1POwFOInbrDL+vMbYV3mVbTkMxmJ5j50QnOcA=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
"rev": "bc667fb6afc45f6cc2d118ab77658faf2227cffd",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
"ref": "nixos-22.05",
"ref": "nixos-22.11",
"repo": "nixos-mailserver",
"type": "gitlab"
}

12
flake.nix
View File

@ -1,13 +1,14 @@
{
inputs = {
nixpkgs.url = "flake:nixpkgs/nixos-22.05";
nixpkgs.url = "flake:nixpkgs/nixos-22.11";
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";
simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05";
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11";
inputs = {
nixpkgs.follows = "nixpkgs-unstable";
nixpkgs-22_05.follows = "nixpkgs";
nixpkgs-22_11.follows = "nixpkgs";
};
};
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;
@ -32,7 +33,7 @@
# (nixpkgs-unstable.legacyPackages."x86_64-linux".fetchpatch {
# name = "electron-cash.patch";
# url = "https://github.com/NixOS/nixpkgs/pull/160607.patch";
# sha256 = "sha256-oQbiyhVWYIkEuZEKqaPuIL00PNPnuTAw64wuqZ8YeDs=";
# sha256 = nixpkgs.lib.fakeHash;
# })
# ];
@ -46,6 +47,7 @@
];
hosts.loutreos.modules = [
"${nixpkgs-photoprism}/nixos/modules/services/web-apps/photoprism.nix"
simple-nixos-mailserver.nixosModule
dogetipbot-telegram.nixosModule
ipmihddtemp.nixosModule

2
services/python-ci.nix
View File

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

2
systems/LoutreOS/configuration.nix
View File

@ -12,7 +12,7 @@
./services.nix
];
nix.trustedUsers = [ "root" "paul" ];
nix.settings.trusted-users = [ "root" "paul" ];
boot = {
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";
}

31
systems/LoutreOS/monitoring.nix
View File

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

9
systems/LoutreOS/services.nix
View File

@ -545,6 +545,15 @@ in
#];
};
};
photoprism = {
enable = true;
originalsPath = "/mnt/backup_loutre/amandoleen/d/Users/Amand/Pictures";
extraConfig = {
PHOTOPRISM_AUTH_MODE = "public";
PHOTOPRISM_READONLY = true;
};
};
};
systemd.services."borgbackup-job-loutre".serviceConfig.TemporaryFileSystem = ["/mnt/borgsnap"];

15
systems/LoutreOS/web.nix
View File

@ -197,6 +197,8 @@ in
proxyPass = "http://127.0.0.1:${toString(rport)}/";
extraConfig = ''
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;
'';
};
@ -243,7 +245,7 @@ in
};
};
"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;
"radarr.nyanlout.re" = authReverse 7878;
"sonarr.nyanlout.re" = authReverse 8989;
@ -258,6 +260,11 @@ in
"ci.nyanlout.re" = simpleReverse 52350;
"gitea.nyanlout.re" = simpleReverse config.services.gitea.httpPort;
"musique.nyanlout.re" = simpleReverse config.services.navidrome.settings.Port;
"photo.nyanlout.re" = recursiveUpdate (authReverse config.services.photoprism.port) {
locations."/" = {
proxyWebsockets = true;
};
};
"apart.nyanlout.re" = recursiveUpdate (simpleReverse config.services.home-assistant.config.http.server_port) {
locations."/" = {
proxyWebsockets = true;
@ -376,7 +383,6 @@ in
gitea = {
enable = true;
cookieSecure = true;
httpPort = 3001;
rootUrl = "https://gitea.nyanlout.re/";
database = {
@ -384,10 +390,11 @@ in
port = 5432;
passwordFile = "/var/lib/gitea/custom/conf/database_password";
};
log.level = "Warn";
disableRegistration = true;
settings = {
ui.DEFAULT_THEME = "arc-green";
log.LEVEL = "Warn";
service.DISABLE_REGISTRATION = true;
session.COOKIE_SECURE = true;
};
};

5
systems/common-cli.nix
View File

@ -11,12 +11,13 @@
vimAlias = true;
configure = {
customRC = ''
set tabstop=8
set tabstop=8
set shiftwidth=4
set softtabstop=0
set expandtab
set smarttab
set smarttab
set background=dark
set mouse=
'';
packages.myVimPackage = with pkgs.vimPlugins; {
start = [