modularize configuration
This commit is contained in:
parent
fd5a03ec99
commit
ae1a91bc2d
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
result*
|
||||||
|
hardware-configuration.nix
|
@ -1,93 +0,0 @@
|
|||||||
{ config, pkgs, ... }:
|
|
||||||
let
|
|
||||||
unstable = import <nixos-unstable> { };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [ # Include the results of the hardware scan.
|
|
||||||
./hardware-configuration.nix
|
|
||||||
./services/matrix
|
|
||||||
./services/nginx
|
|
||||||
./services/postgres
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
inherit unstable;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Use the GRUB 2 boot loader.
|
|
||||||
boot.loader.grub.enable = true;
|
|
||||||
boot.loader.grub.version = 2;
|
|
||||||
boot.loader.grub.devices = [ "/dev/sda" ];
|
|
||||||
|
|
||||||
networking.hostName = "jokum"; # Define your hostname.
|
|
||||||
networking.domain = "pvv.ntnu.no";
|
|
||||||
|
|
||||||
# Set your time zone.
|
|
||||||
time.timeZone = "Europe/Oslo";
|
|
||||||
|
|
||||||
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
|
||||||
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
|
||||||
# replicates the default behaviour.
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.interfaces.ens18.useDHCP = false;
|
|
||||||
|
|
||||||
networking.defaultGateway = "129.241.210.129";
|
|
||||||
networking.interfaces.ens18.ipv4 = {
|
|
||||||
addresses = [
|
|
||||||
{
|
|
||||||
address = "129.241.210.169";
|
|
||||||
prefixLength = 25;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
networking.interfaces.ens18.ipv6 = {
|
|
||||||
addresses = [
|
|
||||||
{
|
|
||||||
address = "2001:700:300:1900::169";
|
|
||||||
prefixLength = 64;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
networking.nameservers = [ "129.241.0.200" "129.241.0.201" ];
|
|
||||||
|
|
||||||
# Select internationalisation properties.
|
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
|
||||||
console = {
|
|
||||||
font = "Lat2-Terminus16";
|
|
||||||
keyMap = "no";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
|
||||||
# users.users.jane = {
|
|
||||||
# isNormalUser = true;
|
|
||||||
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
|
||||||
# };
|
|
||||||
|
|
||||||
# List packages installed in system profile
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git
|
|
||||||
vim
|
|
||||||
nano
|
|
||||||
wget
|
|
||||||
tmux
|
|
||||||
kitty.terminfo
|
|
||||||
];
|
|
||||||
|
|
||||||
# List services that you want to enable:
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.openssh.permitRootLogin = "yes";
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
|
||||||
# settings for stateful data, like file locations and database versions
|
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
|
||||||
# this value at the release version of the first install of this system.
|
|
||||||
# Before changing this value read the documentation for this option
|
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
|
||||||
system.stateVersion = "21.05"; # Did you read the comment?
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
1
configuration.nix
Symbolic link
1
configuration.nix
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
hosts/jokum/configuration.nix
|
101
hosts/jokum/configuration.nix
Normal file
101
hosts/jokum/configuration.nix
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
let
|
||||||
|
unstable = import <nixos-unstable> { };
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
|
../../hardware-configuration.nix
|
||||||
|
|
||||||
|
# Users can just import any configuration they want even for non-user things. Improve the users/default.nix to just load some specific attributes if this isn't wanted
|
||||||
|
../../users
|
||||||
|
|
||||||
|
../../modules/rust-motd.nix
|
||||||
|
|
||||||
|
../../services/matrix
|
||||||
|
../../services/nginx
|
||||||
|
../../services/postgres
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
|
# Allow accessing <nixos-unstable> through pkgs.unstable.*
|
||||||
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
|
inherit unstable;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Use the GRUB 2 boot loader.
|
||||||
|
boot.loader.grub.enable = true;
|
||||||
|
boot.loader.grub.version = 2;
|
||||||
|
boot.loader.grub.devices = [ "/dev/sda" ];
|
||||||
|
|
||||||
|
networking.hostName = "jokum"; # Define your hostname.
|
||||||
|
networking.domain = "pvv.ntnu.no";
|
||||||
|
|
||||||
|
# Set your time zone.
|
||||||
|
time.timeZone = "Europe/Oslo";
|
||||||
|
|
||||||
|
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
||||||
|
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
||||||
|
# replicates the default behaviour.
|
||||||
|
networking.useDHCP = false;
|
||||||
|
networking.interfaces.ens18.useDHCP = false;
|
||||||
|
|
||||||
|
networking.defaultGateway = "129.241.210.129";
|
||||||
|
networking.interfaces.ens18.ipv4 = {
|
||||||
|
addresses = [
|
||||||
|
{
|
||||||
|
address = "129.241.210.169";
|
||||||
|
prefixLength = 25;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
networking.interfaces.ens18.ipv6 = {
|
||||||
|
addresses = [
|
||||||
|
{
|
||||||
|
address = "2001:700:300:1900::169";
|
||||||
|
prefixLength = 64;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
networking.nameservers = [ "129.241.0.200" "129.241.0.201" ];
|
||||||
|
|
||||||
|
# Select internationalisation properties.
|
||||||
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
console = {
|
||||||
|
font = "Lat2-Terminus16";
|
||||||
|
keyMap = "no";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
|
# users.users.jane = {
|
||||||
|
# isNormalUser = true;
|
||||||
|
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||||
|
# };
|
||||||
|
|
||||||
|
# List packages installed in system profile
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
git
|
||||||
|
vim
|
||||||
|
nano
|
||||||
|
wget
|
||||||
|
tmux
|
||||||
|
kitty.terminfo
|
||||||
|
];
|
||||||
|
|
||||||
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
# Enable the OpenSSH daemon.
|
||||||
|
services.openssh.enable = true;
|
||||||
|
services.openssh.permitRootLogin = "yes";
|
||||||
|
|
||||||
|
# This value determines the NixOS release from which the default
|
||||||
|
# settings for stateful data, like file locations and database versions
|
||||||
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
# this value at the release version of the first install of this system.
|
||||||
|
# Before changing this value read the documentation for this option
|
||||||
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
|
system.stateVersion = "21.05"; # Did you read the comment?
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.matrix-synapse-next;
|
cfg = config.services.matrix-synapse-next;
|
||||||
@ -69,6 +69,85 @@ in
|
|||||||
|
|
||||||
use_presence = true;
|
use_presence = true;
|
||||||
|
|
||||||
|
|
||||||
|
saml2_config = {
|
||||||
|
sp_config.metadata.remote = [
|
||||||
|
{ url = "https://idp.pvv.ntnu.no/simplesaml/saml2/idp/metadata.php"; }
|
||||||
|
];
|
||||||
|
|
||||||
|
description = [ "Matrix Synapse SP" "en" ];
|
||||||
|
name = [ "Matrix Synapse SP" "en" ];
|
||||||
|
|
||||||
|
ui_info = {
|
||||||
|
display_name = [
|
||||||
|
{
|
||||||
|
lang = "en";
|
||||||
|
text = "PVV Matrix login";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
description = [
|
||||||
|
{
|
||||||
|
lang = "en";
|
||||||
|
text = "Matrix is a modern free and open federated chat protocol";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
#information_url = [
|
||||||
|
# {
|
||||||
|
# lang = "en";
|
||||||
|
# text = "";
|
||||||
|
# };
|
||||||
|
#];
|
||||||
|
#privacy_statement_url = [
|
||||||
|
# {
|
||||||
|
# lang = "en";
|
||||||
|
# text = "";
|
||||||
|
# };
|
||||||
|
#];
|
||||||
|
keywords = [
|
||||||
|
{
|
||||||
|
lang = "en";
|
||||||
|
text = [ "Matrix" "Element" ];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
#logo = [
|
||||||
|
# {
|
||||||
|
# lang = "en";
|
||||||
|
# text = "";
|
||||||
|
# width = "";
|
||||||
|
# height = "";
|
||||||
|
# }
|
||||||
|
#];
|
||||||
|
};
|
||||||
|
|
||||||
|
organization = {
|
||||||
|
name = "Programvareverkstedet";
|
||||||
|
display_name = [ "Programvareverkstedet" "en" ];
|
||||||
|
url = "https://www.pvv.ntnu.no";
|
||||||
|
};
|
||||||
|
contact_person = [
|
||||||
|
{
|
||||||
|
given_name = "Drift";
|
||||||
|
sur_name = "King";
|
||||||
|
email_adress = [ "drift@pvv.ntnu.no" ];
|
||||||
|
contact_type = "technical";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
user_mapping_provider = {
|
||||||
|
config = {
|
||||||
|
mxid_source_attribute = "uid"; # What is this supposed to be?
|
||||||
|
mxid_mapping = "hexencode";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
#attribute_requirements = [
|
||||||
|
# {attribute = "userGroup"; value = "medlem";} # Do we have this?
|
||||||
|
#];
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
password_config.enable = lib.mkForce false;
|
||||||
|
|
||||||
signing_key_path = "${cfg.dataDir}/homeserver.signing.key";
|
signing_key_path = "${cfg.dataDir}/homeserver.signing.key";
|
||||||
media_store_path = "${cfg.dataDir}/media";
|
media_store_path = "${cfg.dataDir}/media";
|
||||||
|
|
||||||
|
20
users/default.nix
Normal file
20
users/default.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{lib, ...}:
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
# get all files in folder
|
||||||
|
getDir = dir: builtins.readDir dir;
|
||||||
|
|
||||||
|
# find all files ending in ".nix" which are not this file, or directories, which may or may not contain a default.nix
|
||||||
|
files = dir: filterAttrs
|
||||||
|
(file: type: (type == "regular" && hasSuffix ".nix" file && file != "default.nix") || type == "directory")
|
||||||
|
(getDir dir);
|
||||||
|
# Turn the attrset into a list of the filenames
|
||||||
|
flatten = dir: mapAttrsToList (file: type: file) (files dir);
|
||||||
|
# Turn the filenames into absolute paths
|
||||||
|
makeAbsolute = dir: map (file: ./. + "/${file}") (flatten dir);
|
||||||
|
in
|
||||||
|
{
|
||||||
|
|
||||||
|
imports = makeAbsolute ./.;
|
||||||
|
|
||||||
|
}
|
9
users/oysteikt.nix
Normal file
9
users/oysteikt.nix
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{pkgs, ...}:
|
||||||
|
|
||||||
|
{
|
||||||
|
users.users.oysteikt = {
|
||||||
|
isNormalUser = true;
|
||||||
|
#extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||||
|
shell = pkgs.zsh;
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user