Skip to content

Commit

Permalink
fix: alejandra formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
hbjydev committed May 1, 2024
1 parent 5dfad62 commit f2b7495
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 23 deletions.
20 changes: 12 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,23 @@
srvos.inputs.nixpkgs.follows = "nixpkgs";
};

outputs = inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" "aarch64-linux" ];
outputs = inputs @ {flake-parts, ...}:
flake-parts.lib.mkFlake {inherit inputs;} {
systems = ["x86_64-linux" "aarch64-linux"];

perSystem = { pkgs, system, ... }:
let
perSystem = {
pkgs,
system,
...
}: let
inherit (pkgs) awscli2 just;
in
{
in {
devShells.default = pkgs.mkShell {
buildInputs = [ awscli2 just ];
buildInputs = [awscli2 just];
};

formatter = pkgs.alejandra;

packages = {
gc-fwd = inputs.nixos-generators.nixosGenerate {
inherit system;
Expand Down
7 changes: 3 additions & 4 deletions modules/mixins/alloy-forwarder/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{ lib, ... }:
{
imports = [ ../alloy ];
{lib, ...}: {
imports = [../alloy];

# Only change from normal Alloy mixin is an overridden config file
environment.etc."alloy/config.alloy".source = lib.mkForce ./config.alloy;

virtualisation.oci-containers.containers.alloy = {
environmentFiles = [ "/run/keys/grafana-cloud" ];
environmentFiles = ["/run/keys/grafana-cloud"];

environment = {
GRAFANA_CLOUD_STACK = "altf4llc";
Expand Down
5 changes: 2 additions & 3 deletions modules/mixins/alloy/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ config, ... }:
{
{config, ...}: {
# see TODO further down
imports = [ ../docker ];
imports = [../docker];

environment.etc."alloy/config.alloy" = {
source = ./config.alloy;
Expand Down
3 changes: 1 addition & 2 deletions modules/mixins/docker/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
virtualisation.docker.enable = true;
virtualisation.oci-containers.backend = "docker";
}
5 changes: 2 additions & 3 deletions modules/mixins/ecs-agent/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
imports = [
../docker
../alloy
Expand Down Expand Up @@ -28,7 +27,7 @@
"--net=host"
];

environmentFiles = [ "/run/keys/ecs.config" ];
environmentFiles = ["/run/keys/ecs.config"];
environment = {
ECS_LOGFILE = "/log/ecs-agent.log";
ECS_LOGLEVEL = "info";
Expand Down
5 changes: 2 additions & 3 deletions modules/profiles/common.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
services.cachix-agent.enable = true;

boot.loader.efi.canTouchEfiVariables = true;
Expand All @@ -16,7 +15,7 @@

users.users.altf4 = {
isNormalUser = true;
extraGroups = [ "wheel" ];
extraGroups = ["wheel"];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDkhuhfzyg7R+O62XSktHufGmmhy6FNDi/NuPPJt7bI+"
];
Expand Down

0 comments on commit f2b7495

Please sign in to comment.