1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
diff --git a/flake.nix b/flake.nix
index 8d631b9b473de2ef9a330bdeedaa3be3e762487a..07a543e0c464c8499f3f3f68ebd43e941a0d670d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@ jolheiser = import jolheiser-nur {pkgs = prev;};
};
};
};
- commonConfig = {server ? false}: {
+ commonConfig = {gui ? true}: {
config,
pkgs,
...
@@ -46,33 +46,26 @@ file = path;
owner = username;
};
in {
- config =
- {
- nixpkgs.overlays = [overlays];
- home-manager = {
- useGlobalPkgs = true;
- useUserPackages = true;
- users.${username}.imports =
- if !server
- then [./apps]
- else [./apps/common.nix];
- extraSpecialArgs = {
- flakePath = "/home/${username}/.config/nixpkgs";
- };
+ config = {
+ nixpkgs.overlays = [overlays];
+ home-manager = {
+ useGlobalPkgs = true;
+ useUserPackages = true;
+ users.${username}.imports =
+ if gui
+ then [./apps/gui]
+ else [./apps/nogui];
+ extraSpecialArgs = {
+ flakePath = "/home/${username}/.config/nixpkgs";
};
- }
- // (
- if !server
- then {
- age.secrets = {
- ssh-config = userSecret ./secrets/shared/ssh-config.age;
- ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age;
- spotify-pw = userSecret ./secrets/shared/spotify-pw.age;
- irc-pw = userSecret ./secrets/shared/irc-pw.age;
- };
- }
- else {}
- );
+ };
+ age.secrets = {
+ ssh-config = userSecret ./secrets/shared/ssh-config.age;
+ ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age;
+ spotify-pw = userSecret ./secrets/shared/spotify-pw.age;
+ irc-pw = userSecret ./secrets/shared/irc-pw.age;
+ };
+ };
};
username = "jolheiser";
in
@@ -83,9 +76,8 @@ system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
agenix.nixosModules.default
- ./machines/common
./machines/chai
- commonConfig
+ (commonConfig {})
({pkgs, ...}: {
config = {
nixpkgs.overlays = [
@@ -95,7 +87,7 @@ })
];
home-manager.users.${username}.programs = {
git.package = pkgs.gitSVN;
- firefox.profiles.default.bookmarks = [(import ./apps/firefox/work.nix)];
+ firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)];
};
age.secrets = {
netrc = {
@@ -118,17 +110,17 @@ system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
agenix.nixosModules.default
- ./machines/common
./machines/matcha
- commonConfig
+ (commonConfig {})
];
};
"dragonwell" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
+ agenix.nixosModules.default
./machines/dragonwell
- (commonConfig {server = true;})
+ (commonConfig {gui = false;})
];
};
};
|