Reformat using nixpkgs-fmt

This commit is contained in:
Tim Schubert 2021-01-02 14:23:50 +01:00
parent 368ed0797d
commit 5a734099bf
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
36 changed files with 209 additions and 168 deletions

View file

@ -7,7 +7,8 @@ let
"media.local"
];
backups = "/mnt/storage/backup";
in {
in
{
imports = [
../../modules/profiles/base
];
@ -107,13 +108,22 @@ in {
allowPing = true;
allowedTCPPorts = [
22 # SSH
80 443 # HTTP(S)
111 2049 # NFS
137 138 139 445 # SMB
80
443 # HTTP(S)
111
2049 # NFS
137
138
139
445 # SMB
];
allowedUDPPorts = [
137 138 139 445 # SMB
111 2049 # NFS
137
138
139
445 # SMB
111
2049 # NFS
51234 # Wireguard
];
};

View file

@ -2,7 +2,8 @@
let
hostName = "surgat";
this = import ../.. { inherit pkgs; };
in {
in
{
imports = [ this.profiles.base ];
networking.hostName = hostName;
@ -43,7 +44,8 @@ in {
allowPing = true;
allowedTCPPorts = [
22 # SSH
80 443 # HTTPS
80
443 # HTTPS
];
allowedUDPPorts = [
51234 # Wireguard

View file

@ -3,7 +3,8 @@
with lib;
let
cfg = config.dadada.admin;
in {
in
{
options.dadada.admin = {
enable = mkEnableOption "Enable admin access";
@ -32,12 +33,14 @@ in {
users.mutableUsers = false;
users.users = mapAttrs (user: keys: (
users.users = mapAttrs
(user: keys: (
{
extraGroups = [ "wheel" ];
isNormalUser = true;
openssh.authorizedKeys.keyFiles = keys;
})) cfg.users;
}))
cfg.users;
networking.firewall.allowedTCPPorts = [ 22 ];
@ -54,4 +57,3 @@ in {
};
};
}

View file

@ -20,7 +20,8 @@ let
"/var/tmp"
];
cfg = config.dadada.backupClient;
in {
in
{
options.dadada.backupClient = {
enable = mkEnableOption "Enable backup client";
gs = mkEnableOption "Enable backup to GS location";

View file

@ -1,7 +1,8 @@
{ config, pkgs, lib, ... }:
let
cfg = config.dadada.element;
in {
in
{
options.dadada.element = {
enable = lib.mkEnableOption "Enable element webapp";
};

View file

@ -3,7 +3,8 @@ with lib;
let
luks = config.dadada.luks;
fido2 = config.dadada.fido2;
in {
in
{
options = {
dadada.luks = {

View file

@ -6,7 +6,8 @@ let
ipv6 = "fd42:dead:beef::/48";
ipv4 = "192.168.42.0/24";
allow = "192.168.42.0 fd42:dead:beef::";
in {
in
{
options.dadada.fileShare = {
enable = mkEnableOption "Enable file share server";
};
@ -47,4 +48,3 @@ in {
};
};
}

View file

@ -1,7 +1,8 @@
{ config, pkgs, lib, ... }:
let
cfg = config.dadada.gitea;
in {
in
{
options.dadada.gitea = {
enable = lib.mkEnableOption "Enable gitea";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.fish;
in {
in
{
options.dadada.home.fish = {
enable = mkEnableOption "Enable fish config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.gpg;
in {
in
{
options.dadada.home.gpg = {
enable = mkEnableOption "Enable GnuPG config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.keyring;
in {
in
{
options.dadada.home.keyring = {
enable = mkEnableOption "Enable keyring config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.kitty;
in {
in
{
options.dadada.home.kitty = {
enable = mkEnableOption "Enable kitty config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.mako;
in {
in
{
options.dadada.home.mako = {
enable = mkEnableOption "Enable mako config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.session;
in {
in
{
options.dadada.home.session = {
enable = mkEnableOption "Enable session variable management";
sessionVars = mkOption {

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.ssh;
in {
in
{
options.dadada.home.ssh = {
enable = mkEnableOption "Enable SSH config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.sway;
in {
in
{
options.dadada.home.sway = {
enable = mkEnableOption "Enable Sway config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.syncthing;
in {
in
{
options.dadada.home.syncthing = {
enable = mkEnableOption "Enable Syncthing config";
};

View file

@ -1,14 +1,14 @@
{
config,
lib,
pkgs,
colors ? ../../lib/colors.nix,
...
{ config
, lib
, pkgs
, colors ? ../../lib/colors.nix
, ...
}:
with lib;
let
cfg = config.dadada.home.termite;
in {
in
{
options.dadada.home.termite = {
enable = mkEnableOption "Enable termite config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.tmux;
in {
in
{
options.dadada.home.tmux = {
enable = mkEnableOption "Enable tmux config";
};

View file

@ -32,6 +32,9 @@ in
#pkgs.vimPlugins.clang_complete
];
};
home.packages = [ pkgs.languagetool ];
home.packages = with pkgs; [
languagetool
nixpkgs-fmt
];
};
}

View file

@ -19,7 +19,8 @@ let
"application/pdf" = "org.pwmt.zathura.desktop";
};
cfg = config.dadada.home.xdg;
in {
in
{
options.dadada.home.xdg = {
enable = mkEnableOption "Enable XDG config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.zsh;
in {
in
{
options.dadada.home.zsh = {
enable = mkEnableOption "Enable ZSH config";
};

View file

@ -1,8 +1,8 @@
{ config, pkgs, lib, ... }:
let
cfg = config.dadada.homePage;
in with lib; {
in
with lib; {
options.dadada.homePage = {
enable = mkEnableOption "Enable home page";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.networking;
in {
in
{
options.dadada.networking = {
useLocalResolver = mkEnableOption "Enable local caching name server";
wanInterfaces = mkOption {

View file

@ -3,7 +3,8 @@
with lib;
let
cfg = config.dadada.share;
in {
in
{
options.dadada.share = {
enable = mkEnableOption "Enable file share";
};
@ -27,4 +28,3 @@ in {
};
};
}

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.steam;
in {
in
{
options.dadada.steam = {
enable = mkEnableOption "Enable Steam config";
};

View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.autoUpgrade;
in {
in
{
options.dadada.autoUpgrade = {
enable = mkEnableOption "Enable automatic upgrades";

View file

@ -21,7 +21,8 @@ let
};
};
};
in {
in
{
options.dadada.vpnServer = {
enable = mkEnableOption "Enable wireguard gateway";
peers = mkOption {
@ -37,11 +38,13 @@ in {
privateKeyFile = "/var/lib/wireguard/wg0-key";
ips = [ "fd42:dead:beef:1337::0/64" ];
listenPort = 51234;
peers = map (peer: (
peers = map
(peer: (
{
allowedIPs = [ "fd42:dead:beef:1337::${peer.id}/128" ];
publicKey = peer.key;
})) (attrValues cfg.peers);
}))
(attrValues cfg.peers);
};
};
}

View file

@ -3,7 +3,8 @@
with lib;
let
cfg = config.dadada.weechat;
in {
in
{
options.dadada.weechat = {
enable = mkEnableOption "Enable weechat relay";
};
@ -55,4 +56,3 @@ in {
};
};
}

View file

@ -1,5 +1,4 @@
self: super:
let
isReserved = n: n == "lib" || n == "overlays" || n == "modules";
nameValuePair = n: v: { name = n; value = v; };

View file

@ -1,10 +1,12 @@
self: super:
{
# Based on https://gist.github.com/clefru/9ed1186bf0b76d27e0ad20cbd9966b87
tubslatex = super.lib.overrideDerivation (super.texlive.combine {
tubslatex = super.lib.overrideDerivation
(super.texlive.combine {
inherit (super.texlive) scheme-full;
tubslatex.pkgs = [ (super.callPackage ../pkgs/tubslatex { }) ];
}) (oldAttrs: {
})
(oldAttrs: {
postBuild = ''
# Save the udpmap.cfg because texlive.combine removes it.
cat $out/share/texmf/web2c/updmap.cfg > $out/share/texmf/web2c/updmap.cfg.1
@ -22,4 +24,3 @@ self: super:
});
}

View file

@ -1,3 +1,5 @@
setlocal expandtab
setlocal shiftwidth=2
setlocal softtabstop=2
let b:ale_fixers = [ 'nixpkgs-fmt', 'remove_trailing_lines', 'trim_whitespace']