mirror of
https://github.com/donovanglover/nix-config.git
synced 2025-04-23 18:58:41 +02:00
chore: improve formatting
This commit is contained in:
parent
6009841203
commit
ec1e48b793
@ -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;
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -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",
|
||||||
|
@ -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;
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user