diff options
| author | seth <[email protected]> | 2024-06-30 09:56:30 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2024-06-30 10:23:04 -0400 |
| commit | 088facf700946cb8f2d96c6089185bdc2a67180a (patch) | |
| tree | c5b4e4cffbb3ee4ad2498c2251892bd457e9d3c7 /systems | |
| parent | 5d3045a0769af3a94fba7b5cf646e8498aaef595 (diff) | |
alejandra -> nixfmt-rfc-style
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/atlas/default.nix | 5 | ||||
| -rw-r--r-- | systems/atlas/hardware-configuration.nix | 20 | ||||
| -rw-r--r-- | systems/atlas/miniflux.nix | 7 | ||||
| -rw-r--r-- | systems/atlas/nginx.nix | 10 | ||||
| -rw-r--r-- | systems/atlas/nixpkgs-tracker-bot.nix | 5 | ||||
| -rw-r--r-- | systems/atlas/teawiebot.nix | 5 | ||||
| -rw-r--r-- | systems/caroline/default.nix | 5 | ||||
| -rw-r--r-- | systems/darwin.nix | 15 | ||||
| -rw-r--r-- | systems/glados-wsl/default.nix | 3 | ||||
| -rw-r--r-- | systems/glados/boot.nix | 9 | ||||
| -rw-r--r-- | systems/glados/default.nix | 5 | ||||
| -rw-r--r-- | systems/glados/hardware-configuration.nix | 50 | ||||
| -rw-r--r-- | systems/nixinate.nix | 13 | ||||
| -rw-r--r-- | systems/nixos.nix | 23 |
14 files changed, 97 insertions, 78 deletions
diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix index 4bceca8..735a526 100644 --- a/systems/atlas/default.nix +++ b/systems/atlas/default.nix @@ -1,8 +1,5 @@ +{ config, modulesPath, ... }: { - config, - modulesPath, - ... -}: { imports = [ (modulesPath + "/profiles/minimal.nix") ./hardware-configuration.nix diff --git a/systems/atlas/hardware-configuration.nix b/systems/atlas/hardware-configuration.nix index 00c6cd8..9188d85 100644 --- a/systems/atlas/hardware-configuration.nix +++ b/systems/atlas/hardware-configuration.nix @@ -1,15 +1,17 @@ -{modulesPath, ...}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; +{ modulesPath, ... }: +{ + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; boot = { - extraModulePackages = []; - kernelModules = []; + extraModulePackages = [ ]; + kernelModules = [ ]; initrd = { - availableKernelModules = ["virtio_pci" "usbhid"]; - kernelModules = []; + availableKernelModules = [ + "virtio_pci" + "usbhid" + ]; + kernelModules = [ ]; }; }; @@ -25,5 +27,5 @@ }; }; - swapDevices = []; + swapDevices = [ ]; } diff --git a/systems/atlas/miniflux.nix b/systems/atlas/miniflux.nix index 73ed2c6..ec5bd3a 100644 --- a/systems/atlas/miniflux.nix +++ b/systems/atlas/miniflux.nix @@ -1,9 +1,6 @@ +{ config, secretsDir, ... }: { - config, - secretsDir, - ... -}: { - age.secrets .miniflux.file = secretsDir + "/miniflux.age"; + age.secrets.miniflux.file = secretsDir + "/miniflux.age"; services.miniflux = { enable = true; diff --git a/systems/atlas/nginx.nix b/systems/atlas/nginx.nix index 9fe0b38..bdd3cc3 100644 --- a/systems/atlas/nginx.nix +++ b/systems/atlas/nginx.nix @@ -1,10 +1,8 @@ -{ - config, - inputs, - ... -}: let +{ config, inputs, ... }: +let inherit (inputs.self.lib.nginx) mkProxy toVHosts; -in { +in +{ services.nginx = { virtualHosts = toVHosts config.networking.domain { miniflux = { diff --git a/systems/atlas/nixpkgs-tracker-bot.nix b/systems/atlas/nixpkgs-tracker-bot.nix index d02042d..74a7ed9 100644 --- a/systems/atlas/nixpkgs-tracker-bot.nix +++ b/systems/atlas/nixpkgs-tracker-bot.nix @@ -3,8 +3,9 @@ inputs, secretsDir, ... -}: { - imports = [inputs.nixpkgs-tracker-bot.nixosModules.default]; +}: +{ + imports = [ inputs.nixpkgs-tracker-bot.nixosModules.default ]; age.secrets.nixpkgs-tracker-bot.file = secretsDir + "/nixpkgs-tracker-bot.age"; diff --git a/systems/atlas/teawiebot.nix b/systems/atlas/teawiebot.nix index 8d4da63..8f6d560 100644 --- a/systems/atlas/teawiebot.nix +++ b/systems/atlas/teawiebot.nix @@ -3,8 +3,9 @@ secretsDir, inputs, ... -}: { - imports = [inputs.teawiebot.nixosModules.default]; +}: +{ + imports = [ inputs.teawiebot.nixosModules.default ]; age.secrets.teawiebot.file = secretsDir + "/teawieBot.age"; diff --git a/systems/caroline/default.nix b/systems/caroline/default.nix index 9a6efae..0788cc7 100644 --- a/systems/caroline/default.nix +++ b/systems/caroline/default.nix @@ -1,4 +1,5 @@ -{config, ...}: { +{ config, ... }: +{ archetypes.personal.enable = true; homebrew.casks = [ @@ -13,7 +14,7 @@ hostName = "caroline"; }; - nix.settings.trusted-users = ["seth"]; + nix.settings.trusted-users = [ "seth" ]; nixpkgs.hostPlatform = "x86_64-darwin"; services.tailscale.enable = true; diff --git a/systems/darwin.nix b/systems/darwin.nix index f36d152..a1b91f3 100644 --- a/systems/darwin.nix +++ b/systems/darwin.nix @@ -1,11 +1,12 @@ -{self, ...}: { +{ self, ... }: +{ flake = { - darwinConfigurations = let - inherit (self.lib) darwinSystem; - in { - caroline = darwinSystem { - modules = [./caroline]; + darwinConfigurations = + let + inherit (self.lib) darwinSystem; + in + { + caroline = darwinSystem { modules = [ ./caroline ]; }; }; - }; }; } diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix index cd53a82..9088f3c 100644 --- a/systems/glados-wsl/default.nix +++ b/systems/glados-wsl/default.nix @@ -4,7 +4,8 @@ pkgs, inputs, ... -}: { +}: +{ imports = [ (modulesPath + "/profiles/minimal.nix") inputs.nixos-wsl.nixosModules.wsl diff --git a/systems/glados/boot.nix b/systems/glados/boot.nix index 7f6793e..0aa6f9e 100644 --- a/systems/glados/boot.nix +++ b/systems/glados/boot.nix @@ -3,8 +3,9 @@ pkgs, inputs, ... -}: { - imports = [inputs.lanzaboote.nixosModules.lanzaboote]; +}: +{ + imports = [ inputs.lanzaboote.nixosModules.lanzaboote ]; environment.systemPackages = with pkgs; [ sbctl @@ -15,7 +16,7 @@ initrd.systemd.enable = true; kernelPackages = pkgs.linuxPackages_latest; - kernelParams = ["amd_pstate=active"]; + kernelParams = [ "amd_pstate=active" ]; loader.systemd-boot.enable = lib.mkForce false; @@ -24,6 +25,6 @@ pkiBundle = "/etc/secureboot"; }; - supportedFilesystems = ["ntfs"]; + supportedFilesystems = [ "ntfs" ]; }; } diff --git a/systems/glados/default.nix b/systems/glados/default.nix index 491285d..7a096db 100644 --- a/systems/glados/default.nix +++ b/systems/glados/default.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ imports = [ ./boot.nix ./hardware-configuration.nix @@ -11,7 +12,7 @@ plasma.enable = true; }; - environment.systemPackages = [pkgs.obs-studio]; + environment.systemPackages = [ pkgs.obs-studio ]; networking.hostName = "glados"; diff --git a/systems/glados/hardware-configuration.nix b/systems/glados/hardware-configuration.nix index a7ff9e9..bd5f220 100644 --- a/systems/glados/hardware-configuration.nix +++ b/systems/glados/hardware-configuration.nix @@ -6,23 +6,28 @@ lib, modulesPath, ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; +}: +{ + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { - extraModulePackages = []; - kernelModules = ["kvm-amd"]; + extraModulePackages = [ ]; + kernelModules = [ "kvm-amd" ]; initrd = { - availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; - kernelModules = []; + availableKernelModules = [ + "xhci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + ]; + kernelModules = [ ]; luks.devices."cryptroot" = { device = "/dev/disk/by-uuid/bbbc1f37-53f5-4776-a70e-f2779179de50"; allowDiscards = true; - crypttabExtraOpts = ["tpm2-device=auto"]; + crypttabExtraOpts = [ "tpm2-device=auto" ]; }; }; }; @@ -31,25 +36,42 @@ "/" = { device = "/dev/mapper/cryptroot"; fsType = "btrfs"; - options = ["subvol=root" "compress=zstd" "noatime"]; + options = [ + "subvol=root" + "compress=zstd" + "noatime" + ]; }; "/var/log" = { device = "/dev/mapper/cryptroot"; fsType = "btrfs"; - options = ["subvol=var_log" "compress=zstd" "noatime"]; + options = [ + "subvol=var_log" + "compress=zstd" + "noatime" + ]; }; "/nix" = { device = "/dev/mapper/cryptroot"; fsType = "btrfs"; - options = ["subvol=nix" "compress=zstd" "noatime" "nodatacow"]; + options = [ + "subvol=nix" + "compress=zstd" + "noatime" + "nodatacow" + ]; }; "/home" = { device = "/dev/mapper/cryptroot"; fsType = "btrfs"; - options = ["subvol=home" "compress=zstd" "noatime"]; + options = [ + "subvol=home" + "compress=zstd" + "noatime" + ]; }; "/boot" = { @@ -58,7 +80,7 @@ }; }; - swapDevices = []; + swapDevices = [ ]; # 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 diff --git a/systems/nixinate.nix b/systems/nixinate.nix index 5f1c66f..0c54e9c 100644 --- a/systems/nixinate.nix +++ b/systems/nixinate.nix @@ -1,9 +1,8 @@ +{ inputs, self, ... }: { - inputs, - self, - ... -}: { - perSystem = {system, ...}: { - apps = (inputs.nixinate.nixinate.${system} self).nixinate; - }; + perSystem = + { system, ... }: + { + apps = (inputs.nixinate.nixinate.${system} self).nixinate; + }; } diff --git a/systems/nixos.nix b/systems/nixos.nix index 9f95f02..2cd9b31 100644 --- a/systems/nixos.nix +++ b/systems/nixos.nix @@ -1,19 +1,16 @@ -{self, ...}: { +{ self, ... }: +{ flake = { - nixosConfigurations = let - inherit (self.lib) nixosSystem nixosSystemStable; - in { - glados = nixosSystem { - modules = [./glados]; - }; + nixosConfigurations = + let + inherit (self.lib) nixosSystem nixosSystemStable; + in + { + glados = nixosSystem { modules = [ ./glados ]; }; - glados-wsl = nixosSystem { - modules = [./glados-wsl]; - }; + glados-wsl = nixosSystem { modules = [ ./glados-wsl ]; }; - atlas = nixosSystemStable { - modules = [./atlas]; + atlas = nixosSystemStable { modules = [ ./atlas ]; }; }; - }; }; } |
