From db09dfc988d98980fd78c62e3a09d418b68a1b82 Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sun, 7 Apr 2024 19:39:21 +0200 Subject: [PATCH] refactor: use outOfStoreSymlink instead of manually linking in home.activation --- home/modules/profiles/development/emacs/default.nix | 5 ++--- nixos/modules/nixos-config.nix | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home/modules/profiles/development/emacs/default.nix b/home/modules/profiles/development/emacs/default.nix index 94191f5..a6c1a49 100644 --- a/home/modules/profiles/development/emacs/default.nix +++ b/home/modules/profiles/development/emacs/default.nix @@ -51,13 +51,12 @@ in { (cd $EMACS && ${lib.getExe pkgs.git} fetch --all && ${lib.getExe pkgs.git} checkout ${doomRev}) fi fi - if [ ! -d "$HOME/.doom.d" ]; then - ln -s ${config.nixos-config.location}/modules/editors/emacs/doom.d $HOME/.doom.d - fi ''; }; }; + home.file.".doom.d".source = config.lib.file.mkOutOfStoreSymlink "${config.nixos-config.location}/home/modules/profiles/development/emacs/doom.d"; + home.packages = with pkgs; [ emacs-all-the-icons-fonts #binutils # for native comp diff --git a/nixos/modules/nixos-config.nix b/nixos/modules/nixos-config.nix index 3815936..f3e02e3 100644 --- a/nixos/modules/nixos-config.nix +++ b/nixos/modules/nixos-config.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ lib, config, ... }: { options.nixos-config = { @@ -9,7 +9,8 @@ location = lib.mkOption { type = lib.types.str; - default = "$HOME/.setup"; + default = "${config.home-manager.users.${config.nixos-config.defaultUser}.home.homeDirectory}/.setup"; + defaultText = "$HOME/.setup"; }; isLaptop = lib.mkOption { -- 2.48.1