From 10ac01ecd4e82f941eddd6195d2967fc935c954f Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 13 Jan 2024 15:27:38 -0500 Subject: [PATCH] split out version for home & system --- main.nix | 13 +++++++++---- modules/os/core.nix | 2 ++ modules/os/hardware.nix | 13 +++++++++++++ modules/rootUser.nix | 4 ++-- modules/user.nix | 4 ++-- 5 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 modules/os/hardware.nix diff --git a/main.nix b/main.nix index 4175ad0..2402918 100644 --- a/main.nix +++ b/main.nix @@ -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; }) ]; } diff --git a/modules/os/core.nix b/modules/os/core.nix index 056b186..1f2c4d9 100644 --- a/modules/os/core.nix +++ b/modules/os/core.nix @@ -23,6 +23,8 @@ vscode nil docker-compose + usbutils + wget ]; # Fonts diff --git a/modules/os/hardware.nix b/modules/os/hardware.nix new file mode 100644 index 0000000..ac0e407 --- /dev/null +++ b/modules/os/hardware.nix @@ -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 { + + }; +} \ No newline at end of file diff --git a/modules/rootUser.nix b/modules/rootUser.nix index 2a0fce2..f19df20 100644 --- a/modules/rootUser.nix +++ b/modules/rootUser.nix @@ -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"; diff --git a/modules/user.nix b/modules/user.nix index b791246..3591f46 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -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"; };