this repo has no description
style: format all Nix code
+143
-97
+5
-2
base/darwin.nix
+5
-2
base/darwin.nix
···
35
35
linux-builder = {
36
36
enable = false; # TODO fix bootstrap
37
37
ephemeral = true;
38
-
systems = ["aarch64-linux" "x86_64-linux"];
38
+
systems = [
39
+
"aarch64-linux"
40
+
"x86_64-linux"
41
+
];
39
42
config = {
40
-
boot.binfmt.emulatedSystems = ["x86_64-linux"];
43
+
boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
41
44
virtualisation = {
42
45
cores = 4;
43
46
darwin-builder = {
+7
-2
base/default.nix
+7
-2
base/default.nix
···
1
-
{ lib, pkgs, platform, ... }:
1
+
{
2
+
lib,
3
+
pkgs,
4
+
platform,
5
+
...
6
+
}:
2
7
3
8
{
4
9
imports = [
···
12
17
};
13
18
authorizedKeys = lib.mkOption {
14
19
type = lib.types.listOf lib.types.str;
15
-
default = [];
20
+
default = [ ];
16
21
description = "SSH public keys authorized for the primary user on this host.";
17
22
};
18
23
};
+87
-68
flake.nix
+87
-68
flake.nix
···
17
17
};
18
18
};
19
19
20
-
outputs = { nixpkgs, nixpkgs-unstable, darwin, disko, nixos-hardware, home-manager, ... }:
21
-
let
22
-
baseModules = [
23
-
./base
24
-
{
25
-
nixpkgs.overlays = [
26
-
(final: prev: {
27
-
unstable = import nixpkgs-unstable {
28
-
inherit (prev.stdenv.hostPlatform) system;
29
-
config = prev.config;
30
-
};
31
-
})
32
-
];
33
-
}
34
-
];
20
+
outputs =
21
+
{
22
+
nixpkgs,
23
+
nixpkgs-unstable,
24
+
darwin,
25
+
disko,
26
+
nixos-hardware,
27
+
home-manager,
28
+
...
29
+
}:
30
+
let
31
+
baseModules = [
32
+
./base
33
+
{
34
+
nixpkgs.overlays = [
35
+
(final: prev: {
36
+
unstable = import nixpkgs-unstable {
37
+
inherit (prev.stdenv.hostPlatform) system;
38
+
config = prev.config;
39
+
};
40
+
})
41
+
];
42
+
}
43
+
];
35
44
36
-
mkHost = {
37
-
host,
38
-
system,
39
-
extraModules ? [],
40
-
}:
41
-
let
42
-
platform = nixpkgs.lib.systems.elaborate system;
43
-
builder = if platform.isDarwin then darwin.lib.darwinSystem else nixpkgs.lib.nixosSystem;
44
-
systemModules = if platform.isDarwin then [
45
-
home-manager.darwinModules.home-manager
46
-
] else [
47
-
disko.nixosModules.disko
48
-
home-manager.nixosModules.home-manager
49
-
];
50
-
in
51
-
builder {
52
-
inherit system;
53
-
specialArgs = {
54
-
inherit platform;
45
+
mkHost =
46
+
{
47
+
host,
48
+
system,
49
+
extraModules ? [ ],
50
+
}:
51
+
let
52
+
platform = nixpkgs.lib.systems.elaborate system;
53
+
builder = if platform.isDarwin then darwin.lib.darwinSystem else nixpkgs.lib.nixosSystem;
54
+
systemModules =
55
+
if platform.isDarwin then
56
+
[
57
+
home-manager.darwinModules.home-manager
58
+
]
59
+
else
60
+
[
61
+
disko.nixosModules.disko
62
+
home-manager.nixosModules.home-manager
63
+
];
64
+
in
65
+
builder {
66
+
inherit system;
67
+
specialArgs = {
68
+
inherit platform;
69
+
};
70
+
modules =
71
+
baseModules
72
+
++ systemModules
73
+
++ extraModules
74
+
++ [
75
+
./hosts/${host}.nix
76
+
];
77
+
};
78
+
in
79
+
{
80
+
nixosConfigurations = {
81
+
ryzentower = mkHost {
82
+
host = "ryzentower";
83
+
system = "x86_64-linux";
84
+
};
85
+
thinkpadz13 = mkHost {
86
+
host = "thinkpadz13";
87
+
system = "x86_64-linux";
88
+
extraModules = [
89
+
nixos-hardware.nixosModules.lenovo-thinkpad-z13-gen1
90
+
];
91
+
};
92
+
codeserver = mkHost {
93
+
host = "codeserver";
94
+
system = "x86_64-linux";
55
95
};
56
-
modules = baseModules ++ systemModules ++ extraModules ++ [
57
-
./hosts/${host}.nix
58
-
];
59
-
};
60
-
in {
61
-
nixosConfigurations = {
62
-
ryzentower = mkHost {
63
-
host = "ryzentower";
64
-
system = "x86_64-linux";
65
96
};
66
-
thinkpadz13 = mkHost {
67
-
host = "thinkpadz13";
68
-
system = "x86_64-linux";
69
-
extraModules = [
70
-
nixos-hardware.nixosModules.lenovo-thinkpad-z13-gen1
71
-
];
72
-
};
73
-
codeserver = mkHost {
74
-
host = "codeserver";
75
-
system = "x86_64-linux";
76
-
};
77
-
};
78
97
79
-
darwinConfigurations = {
80
-
"MacBookPro" = mkHost {
81
-
host = "MacBookPro";
82
-
system = "aarch64-darwin";
83
-
};
84
-
"AS-GXL19NXYYQ" = mkHost {
85
-
host = "AS-GXL19NXYYQ";
86
-
system = "aarch64-darwin";
87
-
};
88
-
macos-test = mkHost {
89
-
host = "macos-test";
90
-
system = "aarch64-darwin";
98
+
darwinConfigurations = {
99
+
"MacBookPro" = mkHost {
100
+
host = "MacBookPro";
101
+
system = "aarch64-darwin";
102
+
};
103
+
"AS-GXL19NXYYQ" = mkHost {
104
+
host = "AS-GXL19NXYYQ";
105
+
system = "aarch64-darwin";
106
+
};
107
+
macos-test = mkHost {
108
+
host = "macos-test";
109
+
system = "aarch64-darwin";
110
+
};
91
111
};
92
112
};
93
-
};
94
113
}
+1
-1
hosts/macos-test.nix
+1
-1
hosts/macos-test.nix
+12
-9
hosts/ryzentower.nix
+12
-9
hosts/ryzentower.nix
···
29
29
hostPlatform = "x86_64-linux";
30
30
config = {
31
31
rocmSupport = true;
32
-
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
33
-
"steam"
34
-
"steam-unwrapped"
35
-
];
32
+
allowUnfreePredicate =
33
+
pkg:
34
+
builtins.elem (lib.getName pkg) [
35
+
"steam"
36
+
"steam-unwrapped"
37
+
];
36
38
};
37
39
};
38
40
···
101
103
};
102
104
};
103
105
104
-
home-manager.users.${config.primaryUser.username}.home.file.".config/sway/config.d/hardware".text = ''
105
-
output "DP-3" {
106
-
mode 2560x1440@180Hz
107
-
}
108
-
'';
106
+
home-manager.users.${config.primaryUser.username}.home.file.".config/sway/config.d/hardware".text =
107
+
''
108
+
output "DP-3" {
109
+
mode 2560x1440@180Hz
110
+
}
111
+
'';
109
112
}
+8
-7
hosts/thinkpadz13.nix
+8
-7
hosts/thinkpadz13.nix
···
96
96
};
97
97
};
98
98
99
-
home-manager.users.${config.primaryUser.username}.home.file.".config/sway/config.d/hardware".text = ''
100
-
output "eDP-1" {
101
-
scale 1.333
102
-
}
99
+
home-manager.users.${config.primaryUser.username}.home.file.".config/sway/config.d/hardware".text =
100
+
''
101
+
output "eDP-1" {
102
+
scale 1.333
103
+
}
103
104
104
-
bindswitch --reload --locked lid:on output eDP-1 disable
105
-
bindswitch --reload --locked lid:off output eDP-1 enable
106
-
'';
105
+
bindswitch --reload --locked lid:on output eDP-1 disable
106
+
bindswitch --reload --locked lid:off output eDP-1 enable
107
+
'';
107
108
}
+12
-5
modules/cli/default.nix
+12
-5
modules/cli/default.nix
···
1
-
{ config, pkgs, platform, ... }:
1
+
{
2
+
config,
3
+
pkgs,
4
+
platform,
5
+
...
6
+
}:
2
7
3
8
{
4
9
imports = [
···
43
48
zk
44
49
zoxide
45
50
46
-
(pass.withExtensions (ext: with ext; [
47
-
# pass-import # TODO fix build on darwin
48
-
pass-otp
49
-
]))
51
+
(pass.withExtensions (
52
+
ext: with ext; [
53
+
# pass-import # TODO fix build on darwin
54
+
pass-otp
55
+
]
56
+
))
50
57
51
58
# Language servers
52
59
gopls
+4
-1
modules/gui/darwin.nix
+4
-1
modules/gui/darwin.nix
···
57
57
enable = true;
58
58
config = {
59
59
KeepAlive = true;
60
-
ProgramArguments = [ "${pkgs.unstable.ollama}/bin/ollama" "serve" ];
60
+
ProgramArguments = [
61
+
"${pkgs.unstable.ollama}/bin/ollama"
62
+
"serve"
63
+
];
61
64
RunAtLoad = true;
62
65
StandardErrorPath = "/tmp/ollama.log";
63
66
StandardOutPath = "/tmp/ollama.log";
+1
-1
modules/gui/linux.nix
+1
-1
modules/gui/linux.nix