Skip to content

Commit 9f3473a

Browse files
khanelimankhaneliman
committed
treewide: snowflake -> flake-parts
1 parent 8a49d62 commit 9f3473a

File tree

365 files changed

+2532
-2252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+2532
-2252
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,5 @@ node_modules
4040
.direnv/*
4141
result
4242
.ccls-cache
43-
flake
4443
.pre-commit-config.yaml
4544
.venv

‎checks/deploy/default.nix

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎checks/pre-commit-hooks/default.nix

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎systems/aarch64-darwin/khanelimac/default.nix renamed to ‎configurations/darwin/khanelimac/default.nix

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
{
2-
lib,
32
config,
4-
namespace,
3+
inputs,
4+
lib,
5+
root,
6+
khanelinix-lib,
57
...
68
}:
79
let
8-
inherit (lib.${namespace}) enabled;
10+
inherit (khanelinix-lib) enabled;
911

10-
cfg = config.${namespace}.user;
12+
cfg = config.khanelinix.user;
1113
in
1214
{
15+
imports = lib.optional (inputs.sops-nix ? darwinModules) inputs.sops-nix.darwinModules.sops;
16+
1317
khanelinix = {
1418
archetypes = {
1519
personal = enabled;
@@ -20,7 +24,7 @@ in
2024
sops = {
2125
enable = true;
2226
sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
23-
defaultSopsFile = lib.snowfall.fs.get-file "secrets/khanelimac/default.yaml";
27+
defaultSopsFile = root + "/secrets/khanelimac/default.yaml";
2428
};
2529
};
2630

@@ -72,5 +76,9 @@ in
7276
};
7377
};
7478

79+
nixpkgs.hostPlatform = {
80+
system = "aarch64-darwin";
81+
};
82+
7583
system.stateVersion = 5;
7684
}

‎homes/x86_64-linux/bruddy@bruddynix/default.nix renamed to ‎configurations/home/bruddy@bruddynix/default.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
lib,
3-
namespace,
2+
khanelinix-lib,
43
...
54
}:
65
let
7-
inherit (lib.${namespace}) enabled disabled;
6+
inherit (khanelinix-lib) enabled disabled;
87
in
98
{
109
khanelinix = {
@@ -79,7 +78,7 @@ in
7978

8079
# sops = {
8180
# enable = true;
82-
# defaultSopsFile = lib.snowfall.fs.get-file "secrets/khanelinix/khaneliman/default.yaml";
81+
# defaultSopsFile = root + "/secrets/khanelinix/khaneliman/default.yaml";
8382
# sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
8483
# };
8584
};

‎homes/aarch64-darwin/khaneliman@khanelimac/default.nix renamed to ‎configurations/home/khaneliman@khanelimac/default.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
config,
33
lib,
4-
namespace,
4+
root,
5+
khanelinix-lib,
56
...
67
}:
78
let
89
inherit (lib) mkForce;
9-
inherit (lib.${namespace}) enabled disabled;
10+
inherit (khanelinix-lib) enabled disabled;
1011
in
1112
{
1213
khanelinix = {
@@ -23,8 +24,8 @@ in
2324
extraAccounts =
2425
let
2526
# Not super secret, just doesn't need to be scraped so easily.
26-
outlook = lib.${namespace}.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
27-
personal = lib.${namespace}.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
27+
outlook = khanelinix-lib.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
28+
personal = khanelinix-lib.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
2829

2930
in
3031
{
@@ -84,7 +85,7 @@ in
8485
services = {
8586
sops = {
8687
enable = true;
87-
defaultSopsFile = lib.snowfall.fs.get-file "secrets/khanelimac/khaneliman/default.yaml";
88+
defaultSopsFile = root + "/secrets/khanelimac/khaneliman/default.yaml";
8889
sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
8990
};
9091
};

‎homes/x86_64-linux/khaneliman@khanelinix/default.nix renamed to ‎configurations/home/khaneliman@khanelinix/default.nix

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
config,
33
lib,
44
pkgs,
5-
namespace,
5+
root,
6+
khanelinix-lib,
7+
self,
8+
system,
69
...
710
}:
811
let
912
inherit (lib) getExe;
10-
inherit (lib.${namespace}) enabled;
13+
inherit (khanelinix-lib) enabled;
1114
in
1215
{
1316
khanelinix = {
@@ -25,8 +28,8 @@ in
2528
extraAccounts =
2629
let
2730
# Not super secret, just doesn't need to be scraped so easily.
28-
outlook = lib.${namespace}.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
29-
personal = lib.${namespace}.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
31+
outlook = khanelinix-lib.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
32+
personal = khanelinix-lib.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
3033

3134
in
3235
{
@@ -74,9 +77,7 @@ in
7477

7578
appendConfig = # bash
7679
''
77-
exec-once = hyprctl setcursor ${config.${namespace}.theme.gtk.cursor.name} ${
78-
builtins.toString config.${namespace}.theme.gtk.cursor.size
79-
}
80+
exec-once = hyprctl setcursor ${config.khanelinix.theme.gtk.cursor.name} ${builtins.toString config.khanelinix.theme.gtk.cursor.size}
8081
'';
8182

8283
prependConfig = # bash
@@ -190,23 +191,23 @@ in
190191
monitors = [
191192
{
192193
name = "DP-3";
193-
wallpaper = "${pkgs.${namespace}.wallpapers}/share/wallpapers/cat_pacman.png";
194+
wallpaper = "${self.packages.${system}.wallpapers}/share/wallpapers/cat_pacman.png";
194195
}
195196
{
196197
name = "DP-1";
197-
wallpaper = "${pkgs.${namespace}.wallpapers}/share/wallpapers/cat-sound.png";
198+
wallpaper = "${self.packages.${system}.wallpapers}/share/wallpapers/cat-sound.png";
198199
}
199200
];
200201

201202
wallpapers = [
202-
"${pkgs.${namespace}.wallpapers}/share/wallpapers/buttons.png"
203-
"${pkgs.${namespace}.wallpapers}/share/wallpapers/cat_pacman.png"
204-
"${pkgs.${namespace}.wallpapers}/share/wallpapers/cat-sound.png"
205-
"${pkgs.${namespace}.wallpapers}/share/wallpapers/flatppuccin_macchiato.png"
206-
"${pkgs.${namespace}.wallpapers}/share/wallpapers/hashtags-black.png"
207-
"${pkgs.${namespace}.wallpapers}/share/wallpapers/hashtags-new.png"
208-
"${pkgs.${namespace}.wallpapers}/share/wallpapers/hearts.png"
209-
"${pkgs.${namespace}.wallpapers}/share/wallpapers/tetris.png"
203+
"${self.packages.${system}.wallpapers}/share/wallpapers/buttons.png"
204+
"${self.packages.${system}.wallpapers}/share/wallpapers/cat_pacman.png"
205+
"${self.packages.${system}.wallpapers}/share/wallpapers/cat-sound.png"
206+
"${self.packages.${system}.wallpapers}/share/wallpapers/flatppuccin_macchiato.png"
207+
"${self.packages.${system}.wallpapers}/share/wallpapers/hashtags-black.png"
208+
"${self.packages.${system}.wallpapers}/share/wallpapers/hashtags-new.png"
209+
"${self.packages.${system}.wallpapers}/share/wallpapers/hearts.png"
210+
"${self.packages.${system}.wallpapers}/share/wallpapers/tetris.png"
210211
];
211212
};
212213

@@ -218,7 +219,7 @@ in
218219

219220
sops = {
220221
enable = true;
221-
defaultSopsFile = lib.snowfall.fs.get-file "secrets/khanelinix/khaneliman/default.yaml";
222+
defaultSopsFile = root + "/secrets/khanelinix/khaneliman/default.yaml";
222223
sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
223224
};
224225
};

‎homes/x86_64-linux/khaneliman@nixos/default.nix renamed to ‎configurations/home/khaneliman@nixos/default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
config,
3-
lib,
4-
namespace,
3+
root,
4+
khanelinix-lib,
55
...
66
}:
77
let
8-
inherit (lib.${namespace}) enabled;
8+
inherit (khanelinix-lib) enabled;
99
in
1010
{
1111
khanelinix = {
@@ -26,7 +26,7 @@ in
2626
services = {
2727
sops = {
2828
enable = true;
29-
defaultSopsFile = lib.snowfall.fs.get-file "secrets/khanelinix/khaneliman/default.yaml";
29+
defaultSopsFile = root + "/secrets/khanelinix/khaneliman/default.yaml";
3030
sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
3131
};
3232
};

‎homes/x86_64-linux/nixos@CORE-PW00LM92/default.nix renamed to ‎configurations/home/nixos@CORE-PW00LM92/default.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
config,
33
lib,
4-
namespace,
54
osConfig,
5+
root,
6+
khanelinix-lib,
67
...
78
}:
89
let
910
inherit (lib) mkForce;
10-
inherit (lib.${namespace}) enabled disabled;
11+
inherit (khanelinix-lib) enabled disabled;
1112
in
1213
{
1314
khanelinix = {
@@ -49,7 +50,7 @@ in
4950
services = {
5051
sops = {
5152
enable = true;
52-
defaultSopsFile = lib.snowfall.fs.get-file "secrets/CORE/nixos/default.yaml";
53+
defaultSopsFile = root + "/secrets/CORE/nixos/default.yaml";
5354
sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
5455
};
5556
};
@@ -71,7 +72,7 @@ in
7172
theme.catppuccin = enabled;
7273
};
7374

74-
sops.secrets = lib.mkIf osConfig.${namespace}.security.sops.enable {
75+
sops.secrets = lib.mkIf osConfig.khanelinix.security.sops.enable {
7576
kubernetes = {
7677
path = "${config.home.homeDirectory}/.kube/config";
7778
};

‎homes/x86_64-linux/nixos@CORE-PW00LM92/git/windows-compat-config renamed to ‎configurations/home/nixos@CORE-PW00LM92/git/windows-compat-config

File renamed without changes.

0 commit comments

Comments
 (0)