reformat all the nix files

using
    nix run -f channel:nixos-unstable nixfmt -c nixfmt $(git ls-files *.nix)
This commit is contained in:
Raphael Borun Das Gupta 2020-04-05 19:05:38 +02:00
parent a7f51f92f1
commit bf0be939cc
14 changed files with 312 additions and 312 deletions

View file

@ -4,47 +4,44 @@
{ config, pkgs, ... }:
let routerConfig = {
wanInterface = "wwp0s19u1u3i12";
wireless = {
wleInterface = "wlp5s0";
wleSSID = "hauser";
wlePassphrase = "mifatielma";
};
lanInterfaces = [ "enp1s0" "enp2s0" "enp3s0" "enp4s0" ];
lanNetwork = {
routerAddress = "10.2.1.1";
netid = "10.2.1.0";
revIpDomain = "1.2.10";
prefixLength = 24;
domain = "rappi.fh2.ch";
dhcpRange = "10.2.1.2,10.2.1.249";
routerHostName = "bachtel";
};
};
in
{
imports =
[
../hardware/apu.nix
../hardware/wle900vx.nix
../role/base
../role/wwan
(import ../role/router routerConfig)
];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5";
fsType = "btrfs";
options = [ "defaults" "subvol=nixos" "noatime" ];
let
routerConfig = {
wanInterface = "wwp0s19u1u3i12";
wireless = {
wleInterface = "wlp5s0";
wleSSID = "hauser";
wlePassphrase = "mifatielma";
};
lanInterfaces = [ "enp1s0" "enp2s0" "enp3s0" "enp4s0" ];
lanNetwork = {
routerAddress = "10.2.1.1";
netid = "10.2.1.0";
revIpDomain = "1.2.10";
prefixLength = 24;
domain = "rappi.fh2.ch";
dhcpRange = "10.2.1.2,10.2.1.249";
routerHostName = "bachtel";
};
};
in {
imports = [
../hardware/apu.nix
../hardware/wle900vx.nix
../role/base
../role/wwan
(import ../role/router routerConfig)
];
fileSystems."/" = {
device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5";
fsType = "btrfs";
options = [ "defaults" "subvol=nixos" "noatime" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/73f91e99-d856-4504-b6b2-d60f855d6d95"; }
];
[{ device = "/dev/disk/by-uuid/73f91e99-d856-4504-b6b2-d60f855d6d95"; }];
services.wwan = {
enable = true;
@ -61,7 +58,8 @@ in
# Define on which hard drive you want to install Grub.
boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
networking.hostName = routerConfig.lanNetwork.routerHostName; # Define your hostname.
networking.hostName =
routerConfig.lanNetwork.routerHostName; # Define your hostname.
#networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
#networking.wireless.networks = {
# yummi = {

View file

@ -5,22 +5,20 @@
{ config, pkgs, ... }:
{
imports =
[
../hardware/apu.nix
../role/base
# ../role/router.nix #TODO
];
imports = [
../hardware/apu.nix
../role/base
# ../role/router.nix #TODO
];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625";
fsType = "btrfs";
options = [ "defaults" "subvol=nixos" "noatime" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625";
fsType = "btrfs";
options = [ "defaults" "subvol=nixos" "noatime" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/b5104a7c-4a4a-4048-a9f8-44ddb0082632"; }
];
[{ device = "/dev/disk/by-uuid/b5104a7c-4a4a-4048-a9f8-44ddb0082632"; }];
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;

View file

@ -5,17 +5,13 @@
{ config, pkgs, ... }:
{
imports =
[
../hardware/apu.nix
../role/base
];
imports = [ ../hardware/apu.nix ../role/base ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/ab5a598b-6609-465f-8ab8-b894b8a5e32a";
fsType = "btrfs";
options = [ "defaults" "noatime" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/ab5a598b-6609-465f-8ab8-b894b8a5e32a";
fsType = "btrfs";
options = [ "defaults" "noatime" ];
};
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;

View file

@ -6,13 +6,15 @@
{
imports =
[
../hardware/nuc.nix
../role/base
../role/dropbear
(import ../role/backup { systemdMount = "var-backup.mount"; borgArchiveFolder = "/var/backup/montalin";})
];
imports = [
../hardware/nuc.nix
../role/base
../role/dropbear
(import ../role/backup {
systemdMount = "var-backup.mount";
borgArchiveFolder = "/var/backup/montalin";
})
];
boot.initrd.luks.devices = {
"root".device = "/dev/disk/by-uuid/3a0a5071-67ab-4e13-a0b7-d31b86f5e8b1";
@ -21,9 +23,21 @@
};
fileSystems = {
"/" = { device = "/dev/mapper/root"; fsType = "btrfs"; options = [ "defaults" "noatime" ]; };
"/var/backup" = { device = "/dev/mapper/backup"; fsType = "ext4"; options = [ "defaults" "noauto" "noatime" ]; };
"/boot" = { device = "/dev/disk/by-uuid/0065-E4EA"; fsType = "vfat"; options = [ "defaults" "noatime" ]; };
"/" = {
device = "/dev/mapper/root";
fsType = "btrfs";
options = [ "defaults" "noatime" ];
};
"/var/backup" = {
device = "/dev/mapper/backup";
fsType = "ext4";
options = [ "defaults" "noauto" "noatime" ];
};
"/boot" = {
device = "/dev/disk/by-uuid/0065-E4EA";
fsType = "vfat";
options = [ "defaults" "noatime" ];
};
};
swapDevices = [{ device = "/dev/mapper/swap"; }];