Skip to content

Commit ee499fe

Browse files
all: format nix file using nixfmt
1 parent b879181 commit ee499fe

File tree

18 files changed

+302
-237
lines changed

18 files changed

+302
-237
lines changed

flake.nix

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,18 @@
33

44
inputs = {
55
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
6-
dt = {
7-
url = "github:minizilla/dt";
8-
inputs.nixpkgs.follows = "nixpkgs";
9-
};
10-
home-manager = {
11-
url = "github:nix-community/home-manager";
12-
inputs.nixpkgs.follows = "nixpkgs";
13-
};
14-
darwin = {
15-
url = "github:LnL7/nix-darwin";
16-
inputs.nixpkgs.follows = "nixpkgs";
17-
};
18-
homini = {
19-
url = "github:minizilla/homini";
20-
inputs.nixpkgs.follows = "nixpkgs";
21-
};
6+
dt.url = "github:minizilla/dt";
7+
dt.inputs.nixpkgs.follows = "nixpkgs";
8+
home-manager.url = "github:nix-community/home-manager";
9+
home-manager.inputs.nixpkgs.follows = "nixpkgs";
10+
darwin.url = "github:LnL7/nix-darwin";
11+
darwin.inputs.nixpkgs.follows = "nixpkgs";
12+
homini.url = "github:minizilla/homini";
13+
homini.inputs.nixpkgs.follows = "nixpkgs";
2214
};
2315

24-
outputs = { self, nixpkgs, ... }@inputs:
16+
outputs =
17+
{ nixpkgs, ... }@inputs:
2518
let
2619
# This value determines the NixOS release from which the default
2720
# settings for stateful data, like file locations and database versions
@@ -44,7 +37,10 @@
4437
system = "aarch64-linux";
4538
machine = "vm/vmware-aarch64";
4639
hashedPassword = "$y$j9T$jmTClkK2hbljvadc2kkPF/$dtnPG2OntoiGxVJ7gLXh8pXebfghHNbLBtTFm7KUvy7";
47-
resolution = { x = 2880; y = 1752; };
40+
resolution = {
41+
x = 2880;
42+
y = 1752;
43+
};
4844
dpi = 192;
4945
};
5046

@@ -54,7 +50,10 @@
5450
system = "aarch64-linux";
5551
machine = "vm/vmware-aarch64";
5652
hashedPassword = "$y$j9T$PBJ.vcjXKANpepO44J7Li/$SGY0lCPkgzTsc70/TJP9ADhkJpkqTGGCJpcF07TnmdA";
57-
resolution = { x = 2880; y = 1752; };
53+
resolution = {
54+
x = 2880;
55+
y = 1752;
56+
};
5857
dpi = 192;
5958
};
6059
};
@@ -72,14 +71,15 @@
7271
machine = "darwin";
7372
};
7473
};
75-
} // (
74+
}
75+
// (
7676
let
7777
forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
7878
in
7979
{
80-
devShells = forAllSystems (system:
81-
{ default = import ./shell.nix { pkgs = nixpkgs.legacyPackages.${system}; }; }
82-
);
80+
devShells = forAllSystems (system: {
81+
default = import ./shell.nix { pkgs = nixpkgs.legacyPackages.${system}; };
82+
});
8383
}
8484
);
8585
}

lib/mkdarwin.nix

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,39 @@
1-
{ stateVersion
2-
, nixpkgs
3-
, darwin
4-
, home-manager
5-
, ...
6-
}: darwinConfigurations:
1+
{
2+
stateVersion,
3+
nixpkgs,
4+
darwin,
5+
home-manager,
6+
...
7+
}:
8+
darwinConfigurations:
79

8-
# darwinConfigurations = {
10+
# darwinConfigurations = mkDarwin {
911
# ${hostname} = {
1012
# system = ${system};
1113
# machine = ${machine};
1214
# user = ${user};
1315
# };
1416
# };
1517

16-
builtins.mapAttrs
17-
(hostname: settings: darwin.lib.darwinSystem {
18+
builtins.mapAttrs (
19+
hostname: settings:
20+
darwin.lib.darwinSystem {
1821
inherit (settings) system;
1922
specialArgs = {
2023
inherit stateVersion hostname;
2124
inherit (settings) user;
2225
};
2326
modules = [
2427
home-manager.darwinModules.default
25-
26-
({ config, lib, pkgs, home-manager, ... }: {
27-
nixpkgs.overlays = [ (import ./overlays.nix) ];
28-
nix.registry.nixpkgs.flake = nixpkgs;
29-
nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
30-
})
31-
28+
(
29+
{ ... }:
30+
{
31+
nixpkgs.overlays = [ (import ./overlays.nix) ];
32+
nix.registry.nixpkgs.flake = nixpkgs;
33+
nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
34+
}
35+
)
3236
../machines/${settings.machine}
3337
];
34-
})
35-
darwinConfigurations
38+
}
39+
) darwinConfigurations

lib/mknixos.nix

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
{ nixpkgs
2-
, dt
3-
, home-manager
4-
, homini
5-
, ...
6-
}: nixosConfigurations:
1+
{
2+
nixpkgs,
3+
dt,
4+
home-manager,
5+
homini,
6+
...
7+
}:
8+
nixosConfigurations:
79

8-
# nixosConfigurations = {
10+
# nixosConfigurations = mkNixOS {
911
# ${hostname} = {
1012
# system = ${system};
1113
# machine = ${machine};
@@ -17,28 +19,36 @@
1719
# };
1820
# };
1921

20-
builtins.mapAttrs
21-
(hostname: settings: nixpkgs.lib.nixosSystem {
22+
builtins.mapAttrs (
23+
hostname: settings:
24+
nixpkgs.lib.nixosSystem {
2225
inherit (settings) system;
2326
specialArgs = {
2427
inherit hostname;
25-
inherit (settings) stateVersion user hashedPassword resolution dpi;
28+
inherit (settings)
29+
stateVersion
30+
user
31+
hashedPassword
32+
resolution
33+
dpi
34+
;
2635
};
2736
modules = [
2837
home-manager.nixosModules.default
2938
homini.nixosModules.default
30-
31-
({ config, lib, pkgs, ... }: {
32-
imports = import ../modules;
33-
nixpkgs.overlays = [ (import ./overlays.nix) ];
34-
nix.registry = {
35-
nixpkgs.flake = nixpkgs;
36-
dt.flake = dt;
37-
};
38-
nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
39-
})
40-
39+
(
40+
{ ... }:
41+
{
42+
imports = import ../modules;
43+
nixpkgs.overlays = [ (import ./overlays.nix) ];
44+
nix.registry = {
45+
nixpkgs.flake = nixpkgs;
46+
dt.flake = dt;
47+
};
48+
nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
49+
}
50+
)
4151
../machines/${settings.machine}
4252
];
43-
})
44-
nixosConfigurations
53+
}
54+
) nixosConfigurations

lib/overlays.nix

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
self: super:
2-
let
3-
callPackage = super.callPackage;
4-
in
5-
{
6-
lib = (super.lib or { }) // { };
7-
}
1+
self: super: { lib = (super.lib or { }) // { }; }

machines/darwin/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ config, lib, pkgs, ... }@args:
1+
{ pkgs, ... }@args:
22

33
{
44
# Managed daemon service.

machines/vm/shared.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ config, lib, pkgs, ... }@args:
1+
{ pkgs, ... }@args:
22

33
{
44
# Using the latest kernel, especially useful for arm64.

machines/vm/vmware-aarch64/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ config, lib, pkgs, ... }@args:
1+
{ ... }@args:
22

33
{
44
imports = [

machines/vm/vmware-aarch64/hardware-configuration.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
{ config, lib, pkgs, modulesPath, ... }:
1+
{ ... }:
22

33
{
44
imports = [ ];
55

6-
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "nvme" "usbhid" "sr_mod" ];
6+
boot.initrd.availableKernelModules = [
7+
"ahci"
8+
"xhci_pci"
9+
"nvme"
10+
"usbhid"
11+
"sr_mod"
12+
];
713
boot.initrd.kernelModules = [ ];
814
boot.kernelModules = [ ];
915
boot.extraModulePackages = [ ];

modules/conky/default.nix

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
{ config, lib, pkgs, home-manager, ... }:
1+
{
2+
config,
3+
lib,
4+
pkgs,
5+
...
6+
}:
27

38
let
49
cfg = config.conf.conky;
510
in
611
{
712
options.conf.conky.enable = lib.mkEnableOption "conky";
813
config = lib.mkIf cfg.enable {
9-
home-manager.sharedModules = [{
10-
xsession.initExtra = ''
11-
${pkgs.conky}/bin/conky
12-
'';
13-
}];
14+
home-manager.sharedModules = [
15+
{
16+
xsession.initExtra = ''
17+
${pkgs.conky}/bin/conky
18+
'';
19+
}
20+
];
1421
};
1522
}

modules/firefox/default.nix

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
1-
{ config, lib, pkgs, home-manager, user, ... }:
1+
{
2+
config,
3+
lib,
4+
pkgs,
5+
user,
6+
...
7+
}:
28

39
let
410
cfg = config.conf.firefox;
511
in
612
{
713
options.conf.firefox.enable = lib.mkEnableOption "firefox";
814
config = lib.mkIf cfg.enable {
9-
home-manager.sharedModules = [{
10-
programs.firefox = {
11-
enable = true;
12-
profiles.${user} = {
13-
id = 0;
14-
isDefault = true;
15-
extraConfig = builtins.readFile ./user.js + builtins.readFile ./user-overrides.js;
16-
bookmarks = import ./bookmarks.nix;
17-
search = import ./search-engines.nix { inherit pkgs; };
15+
home-manager.sharedModules = [
16+
{
17+
programs.firefox = {
18+
enable = true;
19+
profiles.${user} = {
20+
id = 0;
21+
isDefault = true;
22+
extraConfig = builtins.readFile ./user.js + builtins.readFile ./user-overrides.js;
23+
bookmarks = import ./bookmarks.nix;
24+
search = import ./search-engines.nix { inherit pkgs; };
25+
};
1826
};
19-
};
20-
}];
27+
}
28+
];
2129
};
2230
}

0 commit comments

Comments
 (0)