chore: improve formatting

This commit is contained in:
Donovan Glover 2024-12-15 18:56:39 -05:00
parent 6009841203
commit ec1e48b793
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
5 changed files with 10 additions and 0 deletions

View File

@ -7,6 +7,7 @@
outputs = outputs =
{ nix-config, ... }@attrs: { nix-config, ... }@attrs:
let let
inherit (nix-config.inputs) nixpkgs; inherit (nix-config.inputs) nixpkgs;
inherit (nixpkgs.lib) nixosSystem optional; inherit (nixpkgs.lib) nixosSystem optional;
@ -17,6 +18,7 @@
hyprland = nixosSystem { hyprland = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = attrs; specialArgs = attrs;
modules = [ modules = [
./configuration.nix ./configuration.nix
] ++ optional (pathExists ./hardware-configuration.nix) ./hardware-configuration.nix; ] ++ optional (pathExists ./hardware-configuration.nix) ./hardware-configuration.nix;

View File

@ -29,12 +29,14 @@
outputs = outputs =
{ self, nixpkgs, ... }: { self, nixpkgs, ... }:
let let
inherit (nixpkgs.lib) nixosSystem genAttrs replaceStrings; inherit (nixpkgs.lib) nixosSystem genAttrs replaceStrings;
inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive; inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive;
forAllSystems = forAllSystems =
function: function:
genAttrs [ genAttrs [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
@ -45,6 +47,7 @@
{ {
packages = forAllSystems ( packages = forAllSystems (
pkgs: pkgs:
packagesFromDirectoryRecursive { packagesFromDirectoryRecursive {
inherit (pkgs) callPackage; inherit (pkgs) callPackage;
@ -64,8 +67,10 @@
checks = forAllSystems ( checks = forAllSystems (
pkgs: pkgs:
genAttrs (map nameOf (listFilesRecursive ./tests)) ( genAttrs (map nameOf (listFilesRecursive ./tests)) (
name: name:
import ./tests/${name}.nix { import ./tests/${name}.nix {
inherit self pkgs; inherit self pkgs;
} }

View File

@ -37,6 +37,7 @@ in
static const int user_bh = 10; static const int user_bh = 10;
static const int showbar = 1; static const int showbar = 1;
static const int topbar = 1; static const int topbar = 1;
static const char *fonts[] = { static const char *fonts[] = {
"Maple Mono:size=10", "Maple Mono:size=10",
"Noto Sans Mono CJK JP:size=10", "Noto Sans Mono CJK JP:size=10",

View File

@ -61,6 +61,7 @@ in
localAddress = "192.168.100.49"; localAddress = "192.168.100.49";
config = config =
{ nix-config, pkgs, ... }: { nix-config, pkgs, ... }:
{ {
imports = imports =
with nix-config.nixosModules; with nix-config.nixosModules;

View File

@ -7,6 +7,7 @@ self.inputs.nixpkgs.lib.nixos.runTest {
nodes.machine = nodes.machine =
{ nix-config, config, ... }: { nix-config, config, ... }:
{ {
imports = with nix-config.nixosModules; [ imports = with nix-config.nixosModules; [
shell shell