Apply nixfmt to the whole tree

This commit is contained in:
Greg Hellings
2024-11-18 21:22:32 -06:00
parent 18b7cddaaa
commit e7d1b0f7bd
34 changed files with 822 additions and 714 deletions
+68 -60
View File
@@ -1,67 +1,75 @@
{config, pkgs, lib, ...}:
{
config,
pkgs,
lib,
...
}:
{
imports = [
./hardware-configuration.nix
./guest-agent.nix
];
imports = [
./hardware-configuration.nix
./guest-agent.nix
];
system.stateVersion = "23.05";
system.stateVersion = "23.05";
# Packages installed on the whole system
environment.systemPackages = with pkgs; [
curl
nano
python3
];
# Services that are running
services = {
openssh.enable = true;
#xserver.enable = true;
};
# User setup
users.groups.vagrant = {};
users.users.vagrant = {
isNormalUser = true;
group = "vagrant";
extraGroups = [ "wheel" ];
password = "vagrant";
};
security.sudo.extraRules = [
{
users = [ "vagrant" ];
groups = [ "vagrant" ];
commands = [
{ command = "ALL"; options = [ "NOPASSWD" ]; }
];
}
];
# Packages installed on the whole system
environment.systemPackages = with pkgs; [
curl
nano
python3
];
# Services that are running
services = {
openssh.enable = true;
#xserver.enable = true;
};
# User setup
users.groups.vagrant = { };
users.users.vagrant = {
isNormalUser = true;
group = "vagrant";
extraGroups = [ "wheel" ];
password = "vagrant";
};
security.sudo.extraRules = [
{
users = [ "vagrant" ];
groups = [ "vagrant" ];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
}
];
boot.loader = {
systemd-boot = {
enable = true;
};
efi.canTouchEfiVariables = true;
};
networking = {
hostName = "vagrant";
networkmanager.enable = true;
#proxy.default = "http://user:password@proxy:port/";
#proxy.noProxy = "127.0.0.1,localhost,internal.domain";
};
time.timeZone = "UTC";
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminux16";
keyMap = lib.mkForce "us";
useXkbConfig = true;
};
boot.loader = {
systemd-boot = {
enable = true;
};
efi.canTouchEfiVariables = true;
};
networking = {
hostName = "vagrant";
networkmanager.enable = true;
#proxy.default = "http://user:password@proxy:port/";
#proxy.noProxy = "127.0.0.1,localhost,internal.domain";
};
time.timeZone = "UTC";
nix = {
package = pkgs.nixFlakes;
settings = {
experimental-features = "nix-command flakes";
};
};
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminux16";
keyMap = lib.mkForce "us";
useXkbConfig = true;
};
nix = {
package = pkgs.nixFlakes;
settings = {
experimental-features = "nix-command flakes";
};
};
}
+12 -11
View File
@@ -1,15 +1,16 @@
{
description = "A basic NixOS Vagrant install";
description = "A basic NixOS Vagrant install";
inputs = {
nixstable.url = "github:nixos/nixpkgs/nixos-23.05";
};
inputs = {
nixstable.url = "github:nixos/nixpkgs/nixos-23.05";
};
outputs = { nixstable, self, ... }@inputs:
{
nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./configuration.nix ];
};
};
outputs =
{ nixstable, self, ... }@inputs:
{
nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./configuration.nix ];
};
};
}
-1
View File
@@ -1 +0,0 @@
ga-qemu.nix
+4
View File
@@ -0,0 +1,4 @@
{ ... }:
{
services.qemuGuest.enable = true;
}
+3 -3
View File
@@ -1,4 +1,4 @@
{...}:
{ ... }:
{
virtualisation.hypervGuest.enable = true;
}
virtualisation.hypervGuest.enable = true;
}
+6 -6
View File
@@ -1,7 +1,7 @@
{...}:
{ ... }:
{
virtualisation.virtualbox.guest = {
enable = true;
x11 = false;
};
}
virtualisation.virtualbox.guest = {
enable = true;
x11 = false;
};
}
+3 -3
View File
@@ -1,4 +1,4 @@
{...}:
{ ... }:
{
services.qemuGuest.enable = true;
}
services.qemuGuest.enable = true;
}
+68 -60
View File
@@ -1,67 +1,75 @@
{config, pkgs, lib, ...}:
{
config,
pkgs,
lib,
...
}:
{
imports = [
./hardware-configuration.nix
./guest-agent.nix
];
imports = [
./hardware-configuration.nix
./guest-agent.nix
];
system.stateVersion = "23.11";
system.stateVersion = "23.11";
# Packages installed on the whole system
environment.systemPackages = with pkgs; [
curl
nano
python3
];
# Services that are running
services = {
openssh.enable = true;
#xserver.enable = true;
};
# User setup
users.groups.vagrant = {};
users.users.vagrant = {
isNormalUser = true;
group = "vagrant";
extraGroups = [ "wheel" ];
password = "vagrant";
};
security.sudo.extraRules = [
{
users = [ "vagrant" ];
groups = [ "vagrant" ];
commands = [
{ command = "ALL"; options = [ "NOPASSWD" ]; }
];
}
];
# Packages installed on the whole system
environment.systemPackages = with pkgs; [
curl
nano
python3
];
# Services that are running
services = {
openssh.enable = true;
#xserver.enable = true;
};
# User setup
users.groups.vagrant = { };
users.users.vagrant = {
isNormalUser = true;
group = "vagrant";
extraGroups = [ "wheel" ];
password = "vagrant";
};
security.sudo.extraRules = [
{
users = [ "vagrant" ];
groups = [ "vagrant" ];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
}
];
boot.loader = {
systemd-boot = {
enable = true;
};
efi.canTouchEfiVariables = true;
};
networking = {
hostName = "vagrant";
networkmanager.enable = true;
#proxy.default = "http://user:password@proxy:port/";
#proxy.noProxy = "127.0.0.1,localhost,internal.domain";
};
time.timeZone = "UTC";
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminux16";
keyMap = lib.mkForce "us";
useXkbConfig = true;
};
boot.loader = {
systemd-boot = {
enable = true;
};
efi.canTouchEfiVariables = true;
};
networking = {
hostName = "vagrant";
networkmanager.enable = true;
#proxy.default = "http://user:password@proxy:port/";
#proxy.noProxy = "127.0.0.1,localhost,internal.domain";
};
time.timeZone = "UTC";
nix = {
package = pkgs.nixFlakes;
settings = {
experimental-features = "nix-command flakes";
};
};
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminux16";
keyMap = lib.mkForce "us";
useXkbConfig = true;
};
nix = {
package = pkgs.nixFlakes;
settings = {
experimental-features = "nix-command flakes";
};
};
}
+12 -11
View File
@@ -1,15 +1,16 @@
{
description = "A basic NixOS Vagrant install";
description = "A basic NixOS Vagrant install";
inputs = {
nixstable.url = "github:nixos/nixpkgs/nixos-23.11";
};
inputs = {
nixstable.url = "github:nixos/nixpkgs/nixos-23.11";
};
outputs = { nixstable, self, ... }@inputs:
{
nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./configuration.nix ];
};
};
outputs =
{ nixstable, self, ... }@inputs:
{
nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./configuration.nix ];
};
};
}
-1
View File
@@ -1 +0,0 @@
ga-qemu.nix
+4
View File
@@ -0,0 +1,4 @@
{ ... }:
{
services.qemuGuest.enable = true;
}
+3 -3
View File
@@ -1,4 +1,4 @@
{...}:
{ ... }:
{
virtualisation.hypervGuest.enable = true;
}
virtualisation.hypervGuest.enable = true;
}
+6 -6
View File
@@ -1,7 +1,7 @@
{...}:
{ ... }:
{
virtualisation.virtualbox.guest = {
enable = true;
x11 = false;
};
}
virtualisation.virtualbox.guest = {
enable = true;
x11 = false;
};
}
+3 -3
View File
@@ -1,4 +1,4 @@
{...}:
{ ... }:
{
services.qemuGuest.enable = true;
}
services.qemuGuest.enable = true;
}
+68 -60
View File
@@ -1,67 +1,75 @@
{config, pkgs, lib, ...}:
{
config,
pkgs,
lib,
...
}:
{
imports = [
./hardware-configuration.nix
./guest-agent.nix
];
imports = [
./hardware-configuration.nix
./guest-agent.nix
];
system.stateVersion = "24.05";
system.stateVersion = "24.05";
# Packages installed on the whole system
environment.systemPackages = with pkgs; [
curl
nano
python3
];
# Services that are running
services = {
openssh.enable = true;
#xserver.enable = true;
};
# User setup
users.groups.vagrant = {};
users.users.vagrant = {
isNormalUser = true;
group = "vagrant";
extraGroups = [ "wheel" ];
password = "vagrant";
};
security.sudo.extraRules = [
{
users = [ "vagrant" ];
groups = [ "vagrant" ];
commands = [
{ command = "ALL"; options = [ "NOPASSWD" ]; }
];
}
];
# Packages installed on the whole system
environment.systemPackages = with pkgs; [
curl
nano
python3
];
# Services that are running
services = {
openssh.enable = true;
#xserver.enable = true;
};
# User setup
users.groups.vagrant = { };
users.users.vagrant = {
isNormalUser = true;
group = "vagrant";
extraGroups = [ "wheel" ];
password = "vagrant";
};
security.sudo.extraRules = [
{
users = [ "vagrant" ];
groups = [ "vagrant" ];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
}
];
boot.loader = {
systemd-boot = {
enable = true;
};
efi.canTouchEfiVariables = true;
};
networking = {
hostName = "vagrant";
networkmanager.enable = true;
#proxy.default = "http://user:password@proxy:port/";
#proxy.noProxy = "127.0.0.1,localhost,internal.domain";
};
time.timeZone = "UTC";
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminux16";
keyMap = lib.mkForce "us";
useXkbConfig = true;
};
boot.loader = {
systemd-boot = {
enable = true;
};
efi.canTouchEfiVariables = true;
};
networking = {
hostName = "vagrant";
networkmanager.enable = true;
#proxy.default = "http://user:password@proxy:port/";
#proxy.noProxy = "127.0.0.1,localhost,internal.domain";
};
time.timeZone = "UTC";
nix = {
package = pkgs.nixFlakes;
settings = {
experimental-features = "nix-command flakes";
};
};
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminux16";
keyMap = lib.mkForce "us";
useXkbConfig = true;
};
nix = {
package = pkgs.nixFlakes;
settings = {
experimental-features = "nix-command flakes";
};
};
}
+12 -11
View File
@@ -1,15 +1,16 @@
{
description = "A basic NixOS Vagrant install";
description = "A basic NixOS Vagrant install";
inputs = {
nixstable.url = "github:nixos/nixpkgs/nixos-24.05";
};
inputs = {
nixstable.url = "github:nixos/nixpkgs/nixos-24.05";
};
outputs = { nixstable, self, ... }@inputs:
{
nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./configuration.nix ];
};
};
outputs =
{ nixstable, self, ... }@inputs:
{
nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./configuration.nix ];
};
};
}
-1
View File
@@ -1 +0,0 @@
ga-qemu.nix
+4
View File
@@ -0,0 +1,4 @@
{ ... }:
{
services.qemuGuest.enable = true;
}
+3 -3
View File
@@ -1,4 +1,4 @@
{...}:
{ ... }:
{
virtualisation.hypervGuest.enable = true;
}
virtualisation.hypervGuest.enable = true;
}
+4 -4
View File
@@ -1,6 +1,6 @@
{...}:
{ ... }:
{
virtualisation.virtualbox.guest = {
enable = true;
};
virtualisation.virtualbox.guest = {
enable = true;
};
}
+3 -3
View File
@@ -1,4 +1,4 @@
{...}:
{ ... }:
{
services.qemuGuest.enable = true;
}
services.qemuGuest.enable = true;
}
+17 -13
View File
@@ -1,13 +1,17 @@
[ {
version = "23.05";
arch = "amd64";
eol = true;
} {
version = "23.11";
arch = "amd64";
eol = true;
} {
version = "24.05";
arch = "amd64";
eol = false;
} ]
[
{
version = "23.05";
arch = "amd64";
eol = true;
}
{
version = "23.11";
arch = "amd64";
eol = true;
}
{
version = "24.05";
arch = "amd64";
eol = false;
}
]