From 84f0261121d003db834584df37e599b4546310ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 11:54:18 +0200 Subject: [PATCH] Let's try to install zjstatus like conduwuit --- flake.nix | 2 +- home-manager/shared/shell/zellij.nix | 34 ++++++++++++++++++++++++---- overlays/default.nix | 6 ----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 4263779..219d683 100644 --- a/flake.nix +++ b/flake.nix @@ -129,7 +129,7 @@ homeManagerModules = import ./modules/home-manager; # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs zjstatus;}; + overlays = import ./overlays {inherit inputs;}; # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 9ee6d6b..66d14c7 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -1,6 +1,7 @@ { lib, pkgs, + inputs, ... }: { home.packages = with pkgs; [ @@ -11,12 +12,35 @@ # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; - }; + settings = { + session_serialization = true; + theme = "catppuccin-macchiato"; - home.file = { - "zellij" = { - source = ./zellij.kdl; - target = ".config/zellij/config.kdl"; + themes = { + catppuccin-macchiato = { + bg = "#5b6078"; + fg = "#cad3f5"; + red = "#ed8796"; + green = "#a6da95"; + blue = "#8aadf4"; + yellow = "#eed49f"; + magenta = "#f5bde6"; + orange = "#f5a97f"; + cyan = "#91d7e3"; + black = "#1e2030"; + white = "#cad3f5"; + }; + }; + pane = { + plugin.location = "${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; + }; }; }; + + # home.file = { + # "zellij" = { + # source = ./zellij.kdl; + # target = ".config/zellij/config.kdl"; + # }; + # }; } diff --git a/overlays/default.nix b/overlays/default.nix index b56db9c..bc1a9c0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -13,12 +13,6 @@ # }; }; - zjstatus = ( - final: prev: { - zjstatus = zjstatus.packages.${prev.system}.default; - } - ); - # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../pkgs {