Nixfmt
This commit is contained in:
parent
1e35472464
commit
cf648f81ad
|
@ -23,7 +23,10 @@
|
||||||
"/share"
|
"/share"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
libPackages = with pkgs; [ readline70 openssl ];
|
libPackages = with pkgs; [
|
||||||
|
readline70
|
||||||
|
openssl
|
||||||
|
];
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
|
|
@ -19,8 +19,7 @@
|
||||||
controlMaster = "auto";
|
controlMaster = "auto";
|
||||||
controlPersist = "10m";
|
controlPersist = "10m";
|
||||||
# Configure known hosts
|
# Configure known hosts
|
||||||
matchBlocks =
|
matchBlocks = {
|
||||||
{
|
};
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,37 +5,43 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[
|
|
||||||
];
|
|
||||||
|
|
||||||
nix.settings.trusted-users = [ "root" "nathan" ];
|
|
||||||
|
|
||||||
programs.ssh.extraConfig = ''
|
|
||||||
Host eu.nixbuild.net
|
|
||||||
PubkeyAcceptedKeyTypes ssh-ed25519
|
|
||||||
ServerAliveInterval 60
|
|
||||||
IPQoS throughput
|
|
||||||
IdentityFile /home/nathan/.ssh/id_ed25519
|
|
||||||
'';
|
|
||||||
|
|
||||||
programs.ssh.knownHosts = {
|
|
||||||
nixbuild = {
|
|
||||||
hostNames = [ "eu.nixbuild.net" ];
|
|
||||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
nix = {
|
|
||||||
distributedBuilds = true;
|
|
||||||
buildMachines = [
|
|
||||||
{ hostName = "eu.nixbuild.net";
|
|
||||||
system = "x86_64-linux";
|
|
||||||
maxJobs = 100;
|
|
||||||
supportedFeatures = [ "benchmark" "big-parallel" ];
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
nix.settings.trusted-users = [
|
||||||
|
"root"
|
||||||
|
"nathan"
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.ssh.extraConfig = ''
|
||||||
|
Host eu.nixbuild.net
|
||||||
|
PubkeyAcceptedKeyTypes ssh-ed25519
|
||||||
|
ServerAliveInterval 60
|
||||||
|
IPQoS throughput
|
||||||
|
IdentityFile /home/nathan/.ssh/id_ed25519
|
||||||
|
'';
|
||||||
|
|
||||||
|
programs.ssh.knownHosts = {
|
||||||
|
nixbuild = {
|
||||||
|
hostNames = [ "eu.nixbuild.net" ];
|
||||||
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nix = {
|
||||||
|
distributedBuilds = true;
|
||||||
|
buildMachines = [
|
||||||
|
{
|
||||||
|
hostName = "eu.nixbuild.net";
|
||||||
|
system = "x86_64-linux";
|
||||||
|
maxJobs = 100;
|
||||||
|
supportedFeatures = [
|
||||||
|
"benchmark"
|
||||||
|
"big-parallel"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
@ -113,8 +119,8 @@ nix = {
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||||
# wget
|
# wget
|
||||||
];
|
];
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
|
|
|
@ -1,32 +1,46 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"nvme"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964";
|
device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/D1C9-AFA9";
|
device = "/dev/disk/by-uuid/D1C9-AFA9";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [
|
||||||
};
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; }
|
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; }
|
||||||
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# 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
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
# Hardware support
|
# Hardware support
|
||||||
inputs.nixos-hardware.nixosModules.microsoft-surface-common
|
inputs.nixos-hardware.nixosModules.microsoft-surface-common
|
||||||
# Our modules
|
# Our modules
|
||||||
(import ../../modules/base.nix { inherit inputs; })
|
(import ../../modules/base.nix { inherit inputs; })
|
||||||
(import ./configuration.nix)
|
(import ./configuration.nix)
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
|
|
||||||
nix.settings.system-features = ["x86_64-linux"];
|
nix.settings.system-features = [ "x86_64-linux" ];
|
||||||
|
|
||||||
nix.settings.experimental-features = [
|
nix.settings.experimental-features = [
|
||||||
"nix-command"
|
"nix-command"
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
];
|
];
|
||||||
hashedPassword = "$6$ShBAPGwzKZuB7eEv$cbb3erUqtVGFo/Vux9UwT2NkbVG9VGCxJxPiZFYL0DIc3t4GpYxjkM0M7fFnh.6V8MoSKLM/TvOtzdWbYwI58.";
|
hashedPassword = "$6$ShBAPGwzKZuB7eEv$cbb3erUqtVGFo/Vux9UwT2NkbVG9VGCxJxPiZFYL0DIc3t4GpYxjkM0M7fFnh.6V8MoSKLM/TvOtzdWbYwI58.";
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtE+KjKuHUj5bKKQBDKqhO5dpEQf8E8u1G6kRj7y6dI nathan@nixos"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtE+KjKuHUj5bKKQBDKqhO5dpEQf8E8u1G6kRj7y6dI nathan@nixos"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue