From dc751016c01685399f26a71114261b48ec302004 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Thu, 25 Sep 2025 19:41:17 +0200 Subject: [PATCH] basic p10k module, remove omz --- flake.nix | 1 + homeConfigurations/vinzenz/zsh.nix | 18 +----------------- homeModules/zsh-powerlevel10k.nix | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 homeModules/zsh-powerlevel10k.nix diff --git a/flake.nix b/flake.nix index ea895a6..863a4c0 100644 --- a/flake.nix +++ b/flake.nix @@ -231,6 +231,7 @@ self.homeModules.zsh-basics self.homeModules.nano self.homeModules.gnome-extensions + self.homeModules.zsh-powerlevel10k ]; home-manager.users = home-manager-users; diff --git a/homeConfigurations/vinzenz/zsh.nix b/homeConfigurations/vinzenz/zsh.nix index 1278aca..e7dfcd9 100644 --- a/homeConfigurations/vinzenz/zsh.nix +++ b/homeConfigurations/vinzenz/zsh.nix @@ -2,11 +2,8 @@ { config.programs.zsh = { initContent = '' - # eval "$(direnv hook zsh)"; export PATH=$PATH:/home/vinzenz/.cargo/bin - source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme - source ${./.zsh/p10k.zsh} ''; enableCompletion = true; @@ -28,19 +25,6 @@ path = "${config.xdg.dataHome}/zsh/history"; expireDuplicatesFirst = true; }; - - oh-my-zsh = { - enable = true; - theme = "agnoster"; - plugins = [ - "git" - "sudo" - "systemadmin" - "battery" - "dotnet" - "rust" - "tailscale" - ]; - }; }; + config.programs.zsh-powerlevel10k.enable = true; } diff --git a/homeModules/zsh-powerlevel10k.nix b/homeModules/zsh-powerlevel10k.nix new file mode 100644 index 0000000..83701fc --- /dev/null +++ b/homeModules/zsh-powerlevel10k.nix @@ -0,0 +1,23 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + options.programs.zsh-powerlevel10k = { + enable = lib.mkEnableOption "powerlevel10k zsh theme"; + package = lib.mkPackageOption pkgs "zsh-powerlevel10k" { nullable = true; }; + }; + + config = + let + cfg = config.programs.zsh-powerlevel10k; + p10k = if (cfg.package != null) then cfg.package else pkgs.zsh-powerlevel10k; + in + lib.mkIf cfg.enable { + programs.zsh.initContent = '' + source ${p10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme + ''; + }; +}