diff --git a/flake.lock b/flake.lock
index d10c523..f42db9e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -82,16 +82,15 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1730374010,
- "narHash": "sha256-nEw0d7gbH5vFdr+ps5zlRywzaQ6zjbHFoQLjYyHhIeg=",
+ "lastModified": 1739259543,
+ "narHash": "sha256-AW5UFLVstsfzTUVRJGJLmyhc9wDxo/1aROjsawEBD/c=",
"ref": "refs/heads/main",
- "rev": "1bd3af310ea074d0ea9de6233376476c6ca9149a",
- "revCount": 4535,
+ "rev": "15e8df894e8ca457dadb8953750b28363f1bae6c",
+ "revCount": 5648,
"type": "git",
"url": "https://git.clan.lol/clan/clan-core"
},
"original": {
- "rev": "1bd3af310ea074d0ea9de6233376476c6ca9149a",
"type": "git",
"url": "https://git.clan.lol/clan/clan-core"
}
@@ -147,11 +146,11 @@
]
},
"locked": {
- "lastModified": 1730045523,
- "narHash": "sha256-W5Avk1THhZALXITHGazKfZbIZ5+Bc4nSYvAYHUn96EU=",
+ "lastModified": 1738765162,
+ "narHash": "sha256-3Z40qHaFScWUCVQrGc4Y+RdoPsh1R/wIh+AN4cTXP0I=",
"owner": "nix-community",
"repo": "disko",
- "rev": "89e458a3bb3693e769bfb2b2447c3fe72092d498",
+ "rev": "ff3568858c54bd306e9e1f2886f0f781df307dff",
"type": "github"
},
"original": {
@@ -698,11 +697,11 @@
},
"nixos-facter-modules": {
"locked": {
- "lastModified": 1730026316,
- "narHash": "sha256-AzP+trH/ykBJGTx3twkpuwbkhFSmsY1PJDQtRmK4k4c=",
+ "lastModified": 1736931726,
+ "narHash": "sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks=",
"owner": "numtide",
"repo": "nixos-facter-modules",
- "rev": "15b6531d44aa6f0bbd2fd8309cd2a6d7f183ba32",
+ "rev": "fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c",
"type": "github"
},
"original": {
@@ -1174,21 +1173,19 @@
"nixpkgs": [
"clan-core",
"nixpkgs"
- ],
- "nixpkgs-stable": [
- "clan-core"
]
},
"locked": {
- "lastModified": 1729999681,
- "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
- "owner": "Mic92",
+ "lastModified": 1736953253,
+ "narHash": "sha256-shJxzy7qypjq9hpETQ3gJsBZXO5E3KR0INca/xwiVp4=",
+ "owner": "pinpox",
"repo": "sops-nix",
- "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
+ "rev": "a7c6e64401b6dde13c0de90230cb64087c9d9693",
"type": "github"
},
"original": {
- "owner": "Mic92",
+ "owner": "pinpox",
+ "ref": "lazy-assertions",
"repo": "sops-nix",
"type": "github"
}
@@ -1449,11 +1446,11 @@
]
},
"locked": {
- "lastModified": 1729242555,
- "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
+ "lastModified": 1738953846,
+ "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
+ "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 4177d7c..a48cee8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
clan-core.inputs.flake-parts.follows = "flake-parts";
clan-core.inputs.nixpkgs.follows = "nixpkgs";
- clan-core.url = "git+https://git.clan.lol/clan/clan-core?rev=1bd3af310ea074d0ea9de6233376476c6ca9149a"; # last time clan was using facts instead of vars
+ clan-core.url = "git+https://git.clan.lol/clan/clan-core";
clan-fact-generators.inputs.clan-core.follows = "clan-core";
clan-fact-generators.url = "github:mrvandalo/clan-fact-generators";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
@@ -239,9 +239,9 @@
# yubikey key
./assets/mrvandalo_rsa.pub
# backup key
- "${config.clan.core.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub"
- "${config.clan.core.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub"
- "${config.clan.core.clanDir}/machines/chungus/facts/ssh.paperless-ngx.id_ed25519.pub"
+ "${config.clan.core.settings.directory}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub"
+ "${config.clan.core.settings.directory}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub"
+ "${config.clan.core.settings.directory}/machines/chungus/facts/ssh.paperless-ngx.id_ed25519.pub"
];
environment.systemPackages = [ pkgs.borgbackup ];
};
@@ -294,7 +294,7 @@
clan-core.nixosModules.clanCore
telemetry.nixosModules.telemetry
{
- clan.core.clanDir = ./.; # fixes issues with clanCore https://git.clan.lol/clan/clan-core/issues/1979
+ clan.core.settings.directory = ./.; # fixes issues with clanCore https://git.clan.lol/clan/clan-core/issues/1979
}
# inputs.stylix.nixosModules.stylix # fixme: not working
permown.nixosModules.permown
@@ -448,7 +448,7 @@
{
# keys only to access cherry
users.users.root.openssh.authorizedKeys.keyFiles = [
- "${config.clan.core.clanDir}/machines/cherry/facts/ssh.root.cherry.id_ed25519.pub"
+ "${config.clan.core.settings.directory}/machines/cherry/facts/ssh.root.cherry.id_ed25519.pub"
];
}
)
@@ -478,7 +478,7 @@
{
# keys only to access chungus
users.users.root.openssh.authorizedKeys.keyFiles = [
- "${config.clan.core.clanDir}/machines/cherry/facts/ssh.root.chungus.id_ed25519.pub"
+ "${config.clan.core.settings.directory}/machines/cherry/facts/ssh.root.chungus.id_ed25519.pub"
];
}
)