From c81438603c48ff3426ef829ebda17f814aee3d8c Mon Sep 17 00:00:00 2001 From: larstvei Date: Sat, 23 Aug 2025 16:04:21 +0200 Subject: [PATCH] Move user specific stuff to host --- hosts/macbook/default.nix | 11 ++++++++++- system/darwin/default.nix | 9 --------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix index 56a6ffe..da35cff 100644 --- a/hosts/macbook/default.nix +++ b/hosts/macbook/default.nix @@ -1,12 +1,21 @@ -{ emacs-larstvei, ... }: +{ pkgs, emacs-larstvei, ... }: { imports = [ ../../system ../../system/darwin ]; + system.primaryUser = "larstvei"; + networking.hostName = "larstvei-macbookpro"; + users.users = { + larstvei = { + home = "/Users/larstvei"; + shell = pkgs.fish; + }; + }; + home-manager = { useGlobalPkgs = true; useUserPackages = true; diff --git a/system/darwin/default.nix b/system/darwin/default.nix index 29c1b3e..4abcc03 100644 --- a/system/darwin/default.nix +++ b/system/darwin/default.nix @@ -5,19 +5,10 @@ nix.linux-builder.enable = true; - users.users = { - larstvei = { - home = "/Users/larstvei"; - shell = pkgs.fish; - }; - }; - programs.fish.enable = true; environment.shells = [ pkgs.fish ]; system = { - primaryUser = "larstvei"; - stateVersion = 4; keyboard = {