nix: format with alejandra

This commit is contained in:
Primrose 2025-02-08 12:05:12 +01:00
parent d5cad148da
commit 95eb4b71e0
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
118 changed files with 1291 additions and 1703 deletions

View file

@ -1,50 +1,45 @@
{
self,
...
}@inputs:
let
inherit (self.lib)
{self, ...} @ inputs: let
inherit
(self.lib)
modulesFromDir
;
inherit (inputs.nixpkgs) lib;
in
in let
commonModules = {
pkgs,
hostname,
...
}: {
imports = [
self.nixosModules.home-manager
self.nixosModules.sudo-conf
self.nixosModules.system-nixconf
self.nixosModules.unfree-predicate
];
let
commonModules =
{ pkgs, hostname, ... }:
{
services.nix-daemon.enable = true;
imports = [
self.nixosModules.home-manager
self.nixosModules.sudo-conf
self.nixosModules.system-nixconf
self.nixosModules.unfree-predicate
];
networking.hostName = hostname;
environment.shells = [pkgs.fish];
services.nix-daemon.enable = true;
nix.settings.trusted-users = ["leana"];
networking.hostName = hostname;
environment.shells = [ pkgs.fish ];
nix.settings.trusted-users = [ "leana" ];
nix.gc = {
automatic = true;
interval.Weekday = 0;
options = "--delete-older-than 15d";
};
nix.optimise = {
automatic = true;
interval.Weekday = 0;
};
# https://github.com/nix-community/home-manager/issues/4026
users.users."leana".home = "/Users/leana";
nix.gc = {
automatic = true;
interval.Weekday = 0;
options = "--delete-older-than 15d";
};
nix.optimise = {
automatic = true;
interval.Weekday = 0;
};
# https://github.com/nix-community/home-manager/issues/4026
users.users."leana".home = "/Users/leana";
};
# per host configuration
named = lib.mapAttrs' (name: path: {
name = "named-" + name;
@ -55,7 +50,7 @@ let
{
home-manager = {
extraSpecialArgs.hostname = name;
users.leana.imports = [ (self.homeModules.${"named-" + name} or { }) ];
users.leana.imports = [(self.homeModules.${"named-" + name} or {})];
};
}
@ -63,8 +58,7 @@ let
];
}) (modulesFromDir ./named);
in
lib.mergeAttrsList [
{ inherit commonModules; }
named
]
lib.mergeAttrsList [
{inherit commonModules;}
named
]

View file

@ -1,8 +1,6 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
system.stateVersion = 4;
home-manager.sharedModules = [ { home.stateVersion = "24.05"; } ];
home-manager.sharedModules = [{home.stateVersion = "24.05";}];
environment.systemPackages = [
pkgs.vim

View file

@ -1,4 +1,4 @@
{
system.stateVersion = 4;
home-manager.sharedModules = [ { home.stateVersion = "24.05"; } ];
home-manager.sharedModules = [{home.stateVersion = "24.05";}];
}