This commit is contained in:
2025-08-12 19:32:49 +00:00
parent 2a40e49f70
commit fc6bf69f00
22 changed files with 102 additions and 98 deletions

View File

@@ -3,6 +3,7 @@
pkgs,
nixvim,
user,
constants,
...
}: {
imports = [
@@ -16,7 +17,7 @@
system = {
primaryUser = user;
stateVersion = 6;
stateVersion = constants.stateVersions.darwin;
};
nix = {
@@ -50,9 +51,10 @@
];
fonts.fontconfig.enable = true;
home = {
packages = pkgs.callPackage ../../packages {}
++ pkgs.callPackage ./packages.nix {};
stateVersion = "25.11";
packages =
pkgs.callPackage ../../packages {}
++ pkgs.callPackage ./packages.nix {};
stateVersion = constants.stateVersions.homeManager;
};
};
};

View File

@@ -1,7 +1,4 @@
{
user,
...
}: {
{user, ...}: {
age.identityPaths = [
"/Users/${user}/.ssh/id_ed25519"
];

View File

@@ -2,15 +2,10 @@
pkgs,
nixvim,
user,
constants,
sops-nix,
...
}: let
sshKeys = {
keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILw2lQn2yEwprOzz50kxG4fKXHzq6askh+XSGLSnWidd"
];
};
in {
}: {
imports = [
../../core
../../networking/firewall.nix
@@ -22,7 +17,7 @@ in {
security.sudo.enable = true;
system.stateVersion = "25.11";
system.stateVersion = constants.stateVersions.nixos;
time.timeZone = "UTC";
nix = {
@@ -31,8 +26,6 @@ in {
nixPath = ["nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos"];
};
users.users = {
${user} = {
isNormalUser = true;
@@ -45,16 +38,14 @@ in {
"docker"
];
shell = pkgs.fish;
openssh.authorizedKeys.keys = sshKeys.keys;
openssh.authorizedKeys.keys = constants.sshKeys;
};
root = {
openssh.authorizedKeys.keys = sshKeys.keys;
openssh.authorizedKeys.keys = constants.sshKeys;
};
};
home-manager = {
users.${user} = {
pkgs,
@@ -69,9 +60,10 @@ in {
../../home-manager/nixos
];
home = {
packages = pkgs.callPackage ../../packages {}
++ pkgs.callPackage ./packages.nix {};
stateVersion = "25.11";
packages =
pkgs.callPackage ../../packages {}
++ pkgs.callPackage ./packages.nix {};
stateVersion = constants.stateVersions.homeManager;
};
};
};

View File

@@ -5,4 +5,4 @@
useRoutingFeatures = "server";
openFirewall = true;
};
}
}