diff options
-rw-r--r-- | flake.lock | bin | 7775 -> 7797 bytes | |||
-rw-r--r-- | flake.nix | 1 | ||||
-rw-r--r-- | hosts/darwin.nix | 8 | ||||
-rw-r--r-- | hosts/default.nix | 15 | ||||
-rw-r--r-- | hosts/home-darwin.nix | 56 | ||||
-rw-r--r-- | secrets/default.nix | bin | 1071 -> 1109 bytes |
6 files changed, 78 insertions, 2 deletions
diff --git a/flake.lock b/flake.lock index d1174f7..c099faf 100644 --- a/flake.lock +++ b/flake.lock Binary files differdiff --git a/flake.nix b/flake.nix index d51c66d..44604b8 100644 --- a/flake.nix +++ b/flake.nix @@ -93,6 +93,7 @@ isMacOS = true; isIso = false; isHardware = true; + user = "${secrets.darwin_user}"; }); homeConfigurations = import ./hosts (commonInherits // { diff --git a/hosts/darwin.nix b/hosts/darwin.nix index 5c17eea..ada5ee3 100644 --- a/hosts/darwin.nix +++ b/hosts/darwin.nix @@ -1,4 +1,10 @@ -{...}: +{ pkgs, user, ...}: { + users.users."${user}".home = "/Users/${user}"; + + environment.systemPackages = + [ + ]; + services.nix-daemon.enable = true; } \ No newline at end of file diff --git a/hosts/default.nix b/hosts/default.nix index 0fc93e7..6808208 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -48,8 +48,21 @@ let nix-darwin.lib.darwinSystem { inherit system; - modules = [ ./darwin.nix ]; specialArgs = extraArgs; + modules = [ + ./darwin.nix + home-manager.darwinModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = extraArgs; + home-manager.users."manuel.palenzuela" = { + imports = [ + ./home-darwin.nix + ]; + }; + } + ]; } else home-manager.lib.homeManagerConfiguration diff --git a/hosts/home-darwin.nix b/hosts/home-darwin.nix new file mode 100644 index 0000000..4c177c0 --- /dev/null +++ b/hosts/home-darwin.nix @@ -0,0 +1,56 @@ +{ pkgs, stateVersion, lib, dotfiles, user, ... }: +{ + imports = [ + ]; + + home = { + username = "${user}"; + homeDirectory = "/Users/${user}"; + + packages = with pkgs; [ + git-crypt + ]; + }; + + services = { + }; + + programs = { + emacs = { + enable = true; + extraPackages = epkgs: with epkgs; [ + use-package + + direnv + + evil + evil-collection + + doom-modeline + dashboard + + projectile + lsp-ui + + manualPackages.custom.lsp-bridge + rust-mode + rustic + company + flycheck + lsp-haskell + + nix-mode + haskell-mode + typescript-mode + jq-mode + + doom-themes + + dired-sidebar + ]; + extraConfig = builtins.readFile "${dotfiles}/.emacs"; + }; + }; + + home.stateVersion = stateVersion; +} diff --git a/secrets/default.nix b/secrets/default.nix index bf1a52a..511beb1 100644 --- a/secrets/default.nix +++ b/secrets/default.nix Binary files differ |