From 8353554315564b89dfe27d5130080ed04a0a65ad Mon Sep 17 00:00:00 2001 From: Linnnus Date: Sat, 21 Dec 2024 15:47:33 +0100 Subject: Move to a profile-based configuration where common This patch makes it so common configuration is now located in shared/ and each host basically just becomes a bunch of import statements. The exception here is host-specific configuration like the `*.linus.onl` that live inside `hosts/ahmed/`. Specifically I have: - moved common configuration `shared/{nixos,home-manager,nix-darwin}`. - moved `hosts/common.nix` to `shared/nixos/common-{nix,shell}-settings.nix`. - split `hosts/muhammed/{dev-utils,neovim}` into per-language configuration. This patch was done in preparation for the arrival of a new host, which will need to share a lot of configuration with Muhammed. --- hosts/muhammed/configuration.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'hosts/muhammed/configuration.nix') diff --git a/hosts/muhammed/configuration.nix b/hosts/muhammed/configuration.nix index cb2216e..81ebca0 100644 --- a/hosts/muhammed/configuration.nix +++ b/hosts/muhammed/configuration.nix @@ -6,7 +6,10 @@ ... }: { imports = [ - ./home + ../../shared/nixos/common-shell-settings + ../../shared/nixos/common-nix-settings + ../../shared/nixos/common-hm-settings + ./remote-builders ]; @@ -20,12 +23,26 @@ # Use the Nix daemon. services.nix-daemon.enable = true; - # Set up main account with ZSH. + # Set up main account. users.users.linus = { description = "Personal user account"; home = "/Users/linus"; }; + home-manager.users.linus = { + imports = [ + ../../shared/home-manager/development-full + ../../shared/home-manager/qbittorrent + ../../shared/home-manager/iterm2 + ({pkgs, ...}: { + home.packages = with pkgs; [ + imagemagick + ffmpeg_6-full + ]; + }) + ]; + }; + # Should match containing folder. networking.hostName = "muhammed"; -- cgit v1.2.3