split out version for home & system

This commit is contained in:
ari committed 2024-01-13 15:27:38 -05:00
1 parent 07dfb414b0
commit 10ac01ecd4
5 files changed
+28 -8

No files matched your search

+9 -4
View File
@@ -1,13 +1,15 @@
{
systemStateVersion ? "23.11",
homeMangerVersion ? "23.11",
hostName,
user,
enableSSHServer ? false,
firewall ? {enable = true;},
enableFingerPrint ? false,
}:
{ ... }:
{ pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${systemStateVersion}.tar.gz";
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${homeMangerVersion}.tar.gz";
in
{
imports =
@@ -20,6 +22,9 @@ in
hostName = hostName;
firewall = firewall;
})
(import ./modules/os/hardware.nix {
enableFingerPrint = enableFingerPrint;
})
(import ./modules/os/ssh.nix {
user = user;
enableSSHServer = enableSSHServer;
@@ -29,11 +34,11 @@ in
./modules/docker/core.nix
(import ./modules/user.nix {
user = user;
systemStateVersion = systemStateVersion;
homeMangerVersion = homeMangerVersion;
})
(import ./modules/rootUser.nix {
hostName = hostName;
systemStateVersion = systemStateVersion;
homeMangerVersion = homeMangerVersion;
})
];
}
+2
View File
@@ -23,6 +23,8 @@
vscode
nil
docker-compose
usbutils
wget
];
# Fonts
+13
View File
@@ -0,0 +1,13 @@
{ enableFingerPrint ? false }:
{ pkgs, ... }:
{
# Firmware Updater
services.fwupd.enable = true;
services.fprintd = if enableFingerPrint then {
enable = true;
# tod.enable = true;
# tod.driver = pkgs.libfprint-2-tod1-goodix;
} else {
};
}
+2 -2
View File
@@ -1,8 +1,8 @@
{ hostName, systemStateVersion }:
{ hostName, homeMangerVersion }:
{ pkgs, ... }:
{
home-manager.users.root = {
home.stateVersion = systemStateVersion;
home.stateVersion = homeMangerVersion;
programs.git = {
enable = true;
userName = "root";
+2 -2
View File
@@ -1,4 +1,4 @@
{ user, systemStateVersion }:
{ user, homeMangerVersion }:
{ pkgs, ... }:
{
users.users.${user.name} = {
@@ -18,7 +18,7 @@
};
home-manager.users.${user.name} = {
home = {
stateVersion = systemStateVersion;
stateVersion = homeMangerVersion;
shellAliases = {
cat = "bat";
};