diff --git a/flake.nix b/flake.nix index 5142687..f9093bf 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ modules = [ { # https://devenv.sh/reference/options/ - packages = [pkgs.hello pkgs.delta pkgs.difftastic]; + packages = [pkgs.hello pkgs.delta pkgs.difftastic pkgs.alejandra]; enterShell = '' hello diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 6ea11cf..9511bb7 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1684321175, - "narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=", + "lastModified": 1684484967, + "narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=", "owner": "nix-community", "repo": "home-manager", - "rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86", + "rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715", "type": "github" }, "original": { @@ -205,11 +205,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1684215771, - "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=", + "lastModified": 1684385584, + "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28", + "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "type": "github" }, "original": { diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix index a1d04e3..42e28d4 100644 --- a/nix/home-manager/home.nix +++ b/nix/home-manager/home.nix @@ -1,6 +1,7 @@ { config, pkgs, + system, ... }: { # Home Manager needs a bit of information about you and the paths it should diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index dbd4901..9b3f547 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -2,9 +2,15 @@ pkgs, lib, config, + system, ... }: { - imports = [./git.nix ./starship.nix ./zellij.nix]; + imports = [ + ./emacs.nix + ./git.nix + ./starship.nix + ./zellij.nix + ]; home.packages = with pkgs; [ bandwhich bat diff --git a/nix/home-manager/modules/packages/emacs.nix b/nix/home-manager/modules/packages/emacs.nix new file mode 100644 index 0000000..837b935 --- /dev/null +++ b/nix/home-manager/modules/packages/emacs.nix @@ -0,0 +1,11 @@ +{ + config, + lib, + pkgs, + system, + ... +}: { + home.file.".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el; + home.file.".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el; + home.file.".doom.d/packages.el".source = ../../../../emacs/emacs.doom/packages.el; +} diff --git a/nix/setup.sh b/nix/setup.sh index d845872..2b6a991 100755 --- a/nix/setup.sh +++ b/nix/setup.sh @@ -16,3 +16,6 @@ else # we're linux home-manager switch --flake "$PWD/home-manager#x86_64-linux-acicchetti" fi + +git clone https://github.com/doomemacs/doomemacs ~/.emacs.d +~/.emacs.d/bin/doom install