From d45aa46728faf635aeacc3f69dfdbf5bfb50dd2a Mon Sep 17 00:00:00 2001 From: Jo Date: Thu, 27 Aug 2026 23:12:07 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Move=20ZSH=20config=20from=20nix?= =?UTF-8?q?os=20to=20home-manager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homes/aarch64-darwin/jo/default.nix | 21 +++++++++++++++++--- systems/aarch64-darwin/mcdonalds/default.nix | 6 ------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/homes/aarch64-darwin/jo/default.nix b/homes/aarch64-darwin/jo/default.nix index 7210e08..a387b77 100644 --- a/homes/aarch64-darwin/jo/default.nix +++ b/homes/aarch64-darwin/jo/default.nix @@ -1,4 +1,5 @@ { + pkgs, config, namespace, ... @@ -29,9 +30,23 @@ }; }; - cli.direnv.enable = true; - cli.editorconfig.enable = true; - cli.git.enable = true; + cli = { + direnv.enable = true; + editorconfig.enable = true; + git.enable = true; + }; + }; + + home.packages = [ pkgs.starship ]; + + programs.zsh = { + enable = true; + autosuggestion.enable = true; + + initContent = '' + eval "$(direnv hook zsh)" + eval "$(starship init zsh)" + ''; }; home.stateVersion = "26.05"; diff --git a/systems/aarch64-darwin/mcdonalds/default.nix b/systems/aarch64-darwin/mcdonalds/default.nix index 3b3bc5a..2542d6c 100644 --- a/systems/aarch64-darwin/mcdonalds/default.nix +++ b/systems/aarch64-darwin/mcdonalds/default.nix @@ -78,8 +78,6 @@ ]; }; - environment.systemPackages = [ pkgs.starship ]; - programs.zsh = { enable = true; @@ -89,10 +87,6 @@ enableFastSyntaxHighlighting = true; }; - environment.interactiveShellInit = '' - eval "$(starship init zsh)" - ''; - security.pam.services.sudo_local.touchIdAuth = true; system.primaryUser = "jo"; -- 2.51.2