From 910a1cdb545c34654440b1a63f7209a656b12c4f Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 29 Apr 2024 21:01:46 +0900 Subject: [PATCH] Updates --- flake.nix | 2 ++ home-manager/common/desktops/hyprland/default.nix | 2 +- home-manager/common/software/cli/atuin.nix | 5 ++++- home-manager/common/software/cli/zellij.nix | 7 +++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index eb0dd3a7..7652c33a 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,8 @@ hyprland.url = "github:hyprwm/Hyprland"; # Steam Deck configs for NixOS jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; + # Status line for Zellij + zjstatus.url = "github:dj95/zjstatus"; }; outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, nixos-generators, deploy-rs, jovian, ... } @inputs: let diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix index ea8e3a4b..367fc430 100644 --- a/home-manager/common/desktops/hyprland/default.nix +++ b/home-manager/common/desktops/hyprland/default.nix @@ -12,7 +12,7 @@ gtk.enable = true; - # Disable tmux on Hyprland + # Disable tmux/zellij on Hyprland programs.bash.sessionVariables = { DISABLE_TMUX = "true"; }; programs.fish.shellInit = ''set DISABLE_TMUX "true" ''; diff --git a/home-manager/common/software/cli/atuin.nix b/home-manager/common/software/cli/atuin.nix index 513e2b6c..3819e4a6 100644 --- a/home-manager/common/software/cli/atuin.nix +++ b/home-manager/common/software/cli/atuin.nix @@ -18,5 +18,8 @@ }; }; - sops.secrets.atuin_key.sopsFile = ../../../../secrets/secrets.yaml; + sops.secrets.atuin_key = { + sopsFile = ../../../../secrets/secrets.yaml; + restartUnits = [ "sops-nix.service" ]; + }; } diff --git a/home-manager/common/software/cli/zellij.nix b/home-manager/common/software/cli/zellij.nix index dc93155b..56486492 100644 --- a/home-manager/common/software/cli/zellij.nix +++ b/home-manager/common/software/cli/zellij.nix @@ -25,4 +25,11 @@ }; }; }; + + xdg.configFile."zjstatus-layout-default" = { + enable = true; + target = "zellij/layouts/default.kdl"; + text = builtins.readFile ./zellij/layouts/default.kdl; + }; + }