From e4b460475c246bf912078db30f50ea1704c5d502 Mon Sep 17 00:00:00 2001 From: asosnovsky Date: Wed, 10 Jan 2024 14:47:32 -0500 Subject: [PATCH] home maanger --- configuration.nix | 14 +------------- main.nix | 19 +++++++++++++++---- modules/user.nix | 10 +++++++++- 3 files changed, 25 insertions(+), 18 deletions(-) mode change 100644 => 120000 configuration.nix diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index 9c0c3d7..0000000 --- a/configuration.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: -{ - imports = - [ - (import ./main.nix { - systemStateVersion = "23.05"; - hostName = "framework1"; - user = { - name = "ari"; - }; - }) - ]; -} diff --git a/configuration.nix b/configuration.nix new file mode 120000 index 0000000..faf36fd --- /dev/null +++ b/configuration.nix @@ -0,0 +1 @@ +/etc/nixos/configuration.nix \ No newline at end of file diff --git a/main.nix b/main.nix index 8c1e638..2a95f43 100644 --- a/main.nix +++ b/main.nix @@ -1,17 +1,28 @@ { - systemStateVersion, + systemStateVersion ? "23.05", hostName, user, }: { ... }: +let + home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${systemStateVersion}.tar.gz"; +in { imports = [ /etc/nixos/hardware-configuration.nix - (import ./modules/os/nix.nix {systemStateVersion = systemStateVersion;}) - (import ./modules/os/core.nix {hostName = hostName;}) + (import ./modules/os/nix.nix { + systemStateVersion = systemStateVersion; + }) + (import ./modules/os/core.nix { + hostName = hostName; + }) + (import "${home-manager}/nixos") ./modules/os/services.nix ./modules/docker/core.nix - (import ./modules/user.nix {user = user;}) + (import ./modules/user.nix { + user = user; + systemStateVersion = systemStateVersion; + }) ]; } diff --git a/modules/user.nix b/modules/user.nix index e5f890c..43f85a8 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -1,4 +1,4 @@ -{ user }: +{ user, systemStateVersion }: { pkgs, ... }: { users.users.${user.name} = { @@ -13,4 +13,12 @@ firefox ]; }; + home-manager.users.${user.name} = { + home.stateVersion = systemStateVersion; + programs.git = { + enable = true; + userName = user.gitUser; + userEmail = user.email; + }; + }; } \ No newline at end of file