diff --git a/modules/darwin/home-manager/default.nix b/modules/darwin/home-manager/default.nix index a22fc11..a5e08a7 100644 --- a/modules/darwin/home-manager/default.nix +++ b/modules/darwin/home-manager/default.nix @@ -18,7 +18,7 @@ in { options.sysc.home-manager = { enable = mkOption { type = types.bool; - default = false; + default = true; description = "Whether to enable home-manager."; }; }; diff --git a/modules/darwin/home-manager/users/bddvlpr.nix b/modules/darwin/home-manager/users/bddvlpr.nix index 50fb184..b57f0f2 100644 --- a/modules/darwin/home-manager/users/bddvlpr.nix +++ b/modules/darwin/home-manager/users/bddvlpr.nix @@ -1,13 +1,28 @@ -{outputs, ...}: { +{ + outputs, + lib, + ... +}: { imports = with outputs.homeManagerModules; [ + comma dev + direnv fish + fzf git + gitui gpg helix + impermanence + mpv + starship + #steel vscode zsh ]; + # Shim to disable persistence + home.persistence = lib.mkForce {}; + home.stateVersion = "24.05"; } diff --git a/modules/home/helix/settings.nix b/modules/home/helix/settings.nix index 690b113..2c38897 100644 --- a/modules/home/helix/settings.nix +++ b/modules/home/helix/settings.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + pkgs, + ... +}: { editor = { scrolloff = 8; line-number = "relative"; @@ -10,7 +14,10 @@ select = "block"; }; - terminal.command = config.home.sessionVariables.TERMINAL; + terminal.command = + if pkgs.stdenv.isLinux + then config.home.sessionVariables.TERMINAL + else "/System/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal"; inline-diagnostics = { cursor-line = "hint";