From e8323e1fdc785cb910060535920c93a8d299a515 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Mon, 23 Jan 2023 21:40:08 -0800 Subject: [PATCH] Don't manage Doom config with Nix --- emacs/default.nix | 8 +++----- flake.nix | 3 ++- hosts/default.nix | 9 +++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/emacs/default.nix b/emacs/default.nix index 6bcc036..81a3aa7 100644 --- a/emacs/default.nix +++ b/emacs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, ... }: +{ pkgs, lib, config, configDir, fetchFromGitHub, ... }: { programs.emacs.enable = true; @@ -7,12 +7,10 @@ if [ ! -d .emacs.d ]; then git clone --depth 1 https://github.com/doomemacs/doomemacs .emacs.d fi + mkdir -p .doom.d + ln -sf ${config.home.homeDirectory}/${configDir}/emacs/.doom.d/* .doom.d ''; home.file = { - ".doom.d" = { - source = ./.doom.d; - recursive = true; - }; ".emacs.d/everforest".source = pkgs.fetchFromGitHub { owner = "Theory-of-Everything"; repo = "everforest-emacs"; diff --git a/flake.nix b/flake.nix index 840821b..fb30a94 100644 --- a/flake.nix +++ b/flake.nix @@ -12,10 +12,11 @@ outputs = inputs@{ self, nixpkgs, home-manager }: let user = "elnu"; + configDir = "nix-config"; in { nixosConfigurations = import ./hosts { inherit (nixpkgs) lib; - inherit inputs nixpkgs home-manager user; + inherit inputs nixpkgs home-manager user configDir; }; }; } diff --git a/hosts/default.nix b/hosts/default.nix index 7b709dc..6c85f31 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, inputs, nixpkgs, home-manager, user, ... }: +{ lib, inputs, nixpkgs, home-manager, user, configDir, ... }: let system = "x86_64-linux"; @@ -10,6 +10,7 @@ let hmImports = [ (import ./home.nix) ]; + hmArgs = { inherit user configDir; }; in { desktop = lib.nixosSystem { @@ -26,7 +27,7 @@ in home-manager.nixosModules.home-manager { home-manager = { useUserPackages = true; - extraSpecialArgs = { inherit user; }; + extraSpecialArgs = hmArgs; users.${user} = { imports = hmImports ++ [ (import ./desktop/home.nix) @@ -55,7 +56,7 @@ in home-manager.nixosModules.home-manager { home-manager = { useUserPackages = true; - extraSpecialArgs = { inherit user; }; + extraSpecialArgs = hmArgs; users.${user} = { imports = hmImports ++ [ (import ./thinkpads/home.nix) @@ -80,7 +81,7 @@ in home-manager.nixosModules.home-manager { home-manager = { useUserPackages = true; - extraSpecialArgs = { inherit user; }; + extraSpecialArgs = hmArgs; users.${user} = { imports = hmImports ++ [ (import ./thinkpads/home.nix)