Compare commits
4 commits
73239b2f5c
...
3e34fbebe1
| Author | SHA1 | Date | |
|---|---|---|---|
|
3e34fbebe1 | ||
|
|
f1eafd33b2 | ||
|
|
0dc3dfd82d | ||
|
|
18b6b0f605 |
17 changed files with 107 additions and 122 deletions
|
|
@ -28,6 +28,8 @@ lib.extra.mkConfig {
|
|||
"sshd-bruteforce"
|
||||
"sshd-timeout"
|
||||
];
|
||||
|
||||
dgn-hardware.useZfs = true;
|
||||
};
|
||||
|
||||
root = ./.;
|
||||
|
|
|
|||
|
|
@ -1,42 +1,21 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{ modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "ehci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.zfs.forceImportRoot = false;
|
||||
boot.zfs.extraPools = [ "fast01" "work01" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c83f6978-fd26-44a8-a86a-b0e971bb0c8c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/55DB-056F";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[{ device = "/dev/disk/by-uuid/30547280-00e9-4ee1-8a07-d116590d9fbf"; }];
|
||||
|
||||
# networking.interfaces.eno2.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno3.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno4.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.idrac.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -364,7 +364,7 @@ in {
|
|||
|
||||
ensureUsers = optional (cfg.user == "ds-fr") {
|
||||
name = "ds-fr";
|
||||
ensurePermissions = { "DATABASE \"ds-fr\"" = "ALL PRIVILEGES"; };
|
||||
ensureDBOwnership = true;
|
||||
};
|
||||
|
||||
extraPlugins = with config.services.postgresql.package.pkgs;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ in {
|
|||
|
||||
ensureUsers = [{
|
||||
name = "hedgedoc";
|
||||
ensurePermissions = { "DATABASE hedgedoc" = "ALL PRIVILEGES"; };
|
||||
ensureDBOwnership = true;
|
||||
}];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ in {
|
|||
|
||||
};
|
||||
|
||||
streamingProcesses = 4;
|
||||
|
||||
configureNginx = true;
|
||||
|
||||
extraConfig = {
|
||||
|
|
|
|||
|
|
@ -68,8 +68,6 @@ in {
|
|||
|
||||
autoUpdateApps.enable = true;
|
||||
|
||||
enableBrokenCiphersForSSE = false;
|
||||
|
||||
extraOptions = {
|
||||
overwritehost = host;
|
||||
"overwrite.cli.url" = "https://${host}";
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ in {
|
|||
|
||||
ensureUsers = [{
|
||||
name = "vaultwarden";
|
||||
ensurePermissions = { "DATABASE vaultwarden" = "ALL PRIVILEGES"; };
|
||||
ensureDBOwnership = true;
|
||||
}];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,5 +14,9 @@ lib.extra.mkConfig {
|
|||
"peertube"
|
||||
];
|
||||
|
||||
extraConfig = {
|
||||
dgn-hardware.useZfs = true;
|
||||
};
|
||||
|
||||
root = ./.;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,58 +1,21 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, modulesPath, ... }:
|
||||
{ modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "ehci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.zfs.forceImportRoot = false;
|
||||
boot.zfs.extraPools = [ "fast01" "work01" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/278cb2a2-47b9-4ec5-8b68-a5a6d037d59e";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/8BD2-C908";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[{ device = "/dev/disk/by-uuid/65a6f6e4-e996-4718-a4d0-cd0c78dcb15b"; }];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
# networking.interfaces.eno1 = {
|
||||
# useDHCP = true;
|
||||
# ipv4 = {
|
||||
# addresses = [
|
||||
# { address = "129.199.146.148"; prefixLength = 24; }
|
||||
# { address = "192.168.1.148"; prefixLength = 24; }
|
||||
# ];
|
||||
#
|
||||
# routes = [
|
||||
# { address = "192.168.1.0"; prefixLength = 24; }
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
# networking.interfaces.eno2.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno3.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno4.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ in {
|
|||
|
||||
ensureUsers = [{
|
||||
name = "atticd";
|
||||
ensurePermissions = { "DATABASE \"atticd\"" = "ALL PRIVILEGES"; };
|
||||
ensureDBOwnership = true;
|
||||
}];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ in {
|
|||
user = "git";
|
||||
name = "gitea";
|
||||
passwordFile = config.age.secrets."forgejo-database_password_file".path;
|
||||
createDatabase = false;
|
||||
};
|
||||
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
host = "s3.dgnum.eu";
|
||||
|
|
@ -13,9 +13,13 @@ in {
|
|||
services.garage = {
|
||||
enable = true;
|
||||
|
||||
package = pkgs.garage_0_8;
|
||||
|
||||
settings = {
|
||||
inherit data_dir metadata_dir;
|
||||
|
||||
db_engine = "sled";
|
||||
|
||||
replication_mode = "none";
|
||||
compression_level = 7;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{ modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -9,13 +9,4 @@
|
|||
(let sources = import ../../npins; in sources.disko + "/module.nix")
|
||||
./disko.nix
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "ahci" "virtio_blk" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ let
|
|||
|
||||
deployment = { };
|
||||
|
||||
nixpkgs = "23.05";
|
||||
nixpkgs = "23.11";
|
||||
} // attrs;
|
||||
in
|
||||
|
||||
|
|
@ -27,6 +27,7 @@ builtins.mapAttrs mkNode {
|
|||
tags = [ "web" ];
|
||||
};
|
||||
|
||||
nixpkgs = "23.05";
|
||||
stateVersion = "23.05";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,36 @@
|
|||
{ config, lib, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkMerge;
|
||||
inherit (lib) mkEnableOption mkIf mkMerge;
|
||||
|
||||
cfg = config.dgn-hardware;
|
||||
in
|
||||
|
||||
{
|
||||
in {
|
||||
options.dgn-hardware = {
|
||||
enable = mkEnableOption "default hardware configuration." // { default = true; };
|
||||
enable = mkEnableOption "default hardware configuration." // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
useSystemd = mkEnableOption "sytemd boot and configuration." // { default = true; };
|
||||
useSystemd = mkEnableOption "sytemd boot and configuration." // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
useZfs = mkEnableOption "zfs configuration.";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
{ hardware.enableRedistributableFirmware = true; }
|
||||
{
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
hardware.cpu.intel.updateMicrocode = true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
||||
boot = {
|
||||
initrd.availableKernelModules =
|
||||
[ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "ahci" "virtio_blk" ];
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
};
|
||||
}
|
||||
|
||||
(mkIf cfg.useSystemd {
|
||||
boot.loader = {
|
||||
|
|
@ -25,5 +38,27 @@ in
|
|||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf cfg.useZfs {
|
||||
boot = {
|
||||
initrd.availableKernelModules = [
|
||||
"ahci"
|
||||
"ehci_pci"
|
||||
"megaraid_sas"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
];
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
supportedFilesystems = [ "zfs" ];
|
||||
|
||||
zfs = {
|
||||
forceImportRoot = false;
|
||||
extraPools = [ "fast01" "work01" ];
|
||||
package = pkgs.zfs_2_1;
|
||||
};
|
||||
};
|
||||
})
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@
|
|||
"repo": "attic"
|
||||
},
|
||||
"branch": "main",
|
||||
"revision": "b43d12082e34bceb26038bdad0438fd68804cfcd",
|
||||
"url": "https://github.com/zhaofengli/attic/archive/b43d12082e34bceb26038bdad0438fd68804cfcd.tar.gz",
|
||||
"hash": "0dfc4i32hl4qkcpm23kzrarswznaapbgbdx41ci2l6hn92z0vd4d"
|
||||
"revision": "e9918bc6be268da6fa97af6ced15193d8a0421c0",
|
||||
"url": "https://github.com/zhaofengli/attic/archive/e9918bc6be268da6fa97af6ced15193d8a0421c0.tar.gz",
|
||||
"hash": "13h7gqai2lbsp0qqp1spv76fjjsha2lygpvzxk7vzl09h9hnhy5a"
|
||||
},
|
||||
"disko": {
|
||||
"type": "GitRelease",
|
||||
|
|
@ -61,9 +61,9 @@
|
|||
"repo": "Linkal"
|
||||
},
|
||||
"branch": "main",
|
||||
"revision": "c4c6f0f858870f3713af351b1783faf628de4f44",
|
||||
"url": "https://github.com/JulienMalka/Linkal/archive/c4c6f0f858870f3713af351b1783faf628de4f44.tar.gz",
|
||||
"hash": "1qgn1k3bgx8w50az302bv6id62ly0x78276ak56qb91q9vmpmml7"
|
||||
"revision": "d1455d4fbea752bdf3717f97d92b662e678e31b3",
|
||||
"url": "https://github.com/JulienMalka/Linkal/archive/d1455d4fbea752bdf3717f97d92b662e678e31b3.tar.gz",
|
||||
"hash": "0xi2zz7chc8jhrbfsyn491hg7mlhggk2qhyiyq22rh9mnmwjgpy0"
|
||||
},
|
||||
"metis": {
|
||||
"type": "Git",
|
||||
|
|
@ -105,8 +105,8 @@
|
|||
"nixos-23.05": {
|
||||
"type": "Channel",
|
||||
"name": "nixos-23.05",
|
||||
"url": "https://releases.nixos.org/nixos/23.05/nixos-23.05.4420.679cadfdfed2/nixexprs.tar.xz",
|
||||
"hash": "0ln8vcrszdbkpzf7vcws0h6y4r9n5y05y9qfs6x0z8sl16dsncpp"
|
||||
"url": "https://releases.nixos.org/nixos/23.05/nixos-23.05.4981.5b528f99f73c/nixexprs.tar.xz",
|
||||
"hash": "1psdfcl5rjid66dhc8c0dfdrgqk5x76drwcads149pa45vbnri8k"
|
||||
},
|
||||
"nixos-23.11": {
|
||||
"type": "Channel",
|
||||
|
|
@ -117,14 +117,14 @@
|
|||
"nixos-unstable": {
|
||||
"type": "Channel",
|
||||
"name": "nixos-unstable",
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-23.11pre537656.7c9cc5a6e5d3/nixexprs.tar.xz",
|
||||
"hash": "1lmwllj7gwxk9172i2in5pjnzj90vjh9b79pisn3b90g24d3lspw"
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-24.05pre553283.8cfef6986adf/nixexprs.tar.xz",
|
||||
"hash": "0wj0nxz9ymz6jglvszvlnwgdahiyvkp7yggr12j9cpxbai72h4dn"
|
||||
},
|
||||
"nixpkgs": {
|
||||
"type": "Channel",
|
||||
"name": "nixpkgs-unstable",
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre538368.51d906d2341c/nixexprs.tar.xz",
|
||||
"hash": "19z6w8a70xallbg37c07i35z7n2isx4w7bq3q3gbabfw3s1rxymm"
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre553710.010c7296f3b1/nixexprs.tar.xz",
|
||||
"hash": "1h6q7vpy8rwcxfc7l34kvix1rhirgxysn7n0r7ivmwhd9s9rbbw7"
|
||||
}
|
||||
},
|
||||
"version": 3
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{
|
||||
"nixos-23.11" = [
|
||||
# [Backport release-23.11] zfs_2_1: init at 2.1.13
|
||||
{ id = 270117; hash = "sha256-ot80XDtxDvPM0kW2gEeAs/z22jjkGOHog4Ue/JQEnZ8="; }
|
||||
];
|
||||
|
||||
"nixos-23.05" = [
|
||||
# plausible: fix admin user password seed and SMTP passwords
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue