felixalb/nixos-config
felixalb
/
nixos-config
mirror of https://git.feal.no/felixalb/nixos-config.git
2
2
Fork 0
Code Issues Activity

all/voyager: update to nixos 24.05

This commit is contained in:
Felix Albrigtsen 2024-05-31 22:19:23 +02:00 committed by Felix Albrigtsen
parent f2dd1c21e6
commit 5876717df1
4 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock
View File

@ -41,16 +41,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706981411, "lastModified": 1716736833,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -163,16 +163,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1716991068, "lastModified": 1717144377,
"narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View File

@ -2,13 +2,13 @@
description = "Felixalb System flake"; description = "Felixalb System flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.url = "github:lnl7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
matrix-synapse-next.url = "github:dali99/nixos-matrix-modules"; matrix-synapse-next.url = "github:dali99/nixos-matrix-modules";

24
hosts/voyager/modules/snappymail.nix
View File

@ -7,14 +7,9 @@ let
maxUploadSize = "256M"; maxUploadSize = "256M";
in { in {
options.services.snappymail = { options.services.snappymail = {
enable = mkEnableOption (lib.mdDoc "Snappymail"); enable = mkEnableOption "Snappymail";
package = mkOption { package = mkPackageOption pkgs "snappymail" { };
type = types.package;
default = pkgs.snappymail;
defaultText = lib.mdDoc "pkgs.snappymail";
description = lib.mdDoc "Which snappymail package to use.";
};
dataDir = mkOption { dataDir = mkOption {
type = types.str; type = types.str;
@ -23,8 +18,8 @@ in {
}; };
hostname = mkOption { hostname = mkOption {
type = types.str; type = types.nullOr types.str;
/* default = null; */ default = null;
example = "mail.example.com"; example = "mail.example.com";
description = "Enable nginx with this hostname, null disables nginx"; description = "Enable nginx with this hostname, null disables nginx";
}; };
@ -32,13 +27,13 @@ in {
user = mkOption { user = mkOption {
type = types.str; type = types.str;
default = "snappymail"; default = "snappymail";
description = lib.mdDoc "System user under which snappymail runs"; description = "System user under which snappymail runs";
}; };
group = mkOption { group = mkOption {
type = types.str; type = types.str;
default = "snappymail"; default = "snappymail";
description = lib.mdDoc "System group under which snappymail runs"; description = "System group under which snappymail runs";
}; };
}; };
@ -48,8 +43,6 @@ in {
description = "Snappymail service"; description = "Snappymail service";
group = cfg.group; group = cfg.group;
home = cfg.dataDir; home = cfg.dataDir;
useDefaultShell = true;
createHome = true;
isSystemUser = true; isSystemUser = true;
}; };
}; };
@ -88,8 +81,9 @@ in {
locations."^~ /data".extraConfig = '' locations."^~ /data".extraConfig = ''
deny all; deny all;
''; '';
locations."~ \.php$".extraConfig = '' locations."~ \\.php$".extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_pass unix:${config.services.phpfpm.pools.snappymail.socket}; fastcgi_pass unix:${config.services.phpfpm.pools.snappymail.socket};
''; '';

7
hosts/voyager/services/nextcloud.nix
View File

@ -18,8 +18,11 @@ in {
dbname = "nextcloud"; dbname = "nextcloud";
adminuser = "ncadmin"; adminuser = "ncadmin";
adminpassFile = config.sops.secrets."nextcloud/adminpass".path; adminpassFile = config.sops.secrets."nextcloud/adminpass".path;
trustedProxies = [ "192.168.10.175" ]; # defiant };
defaultPhoneRegion = "NO";
settings = {
trusted_proxies = [ "192.168.10.175" ]; # defiant
default_phone_region = "NO";
}; };
phpOptions = { phpOptions = {