dot013/nix
1
0
Fork 0
Code Issues Pull Requests Activity

feat(devkit): add zellij back

Browse Source
This commit is contained in:
Guz
2025-03-01 19:33:22 -03:00
parent ca45c71b89
commit 85de5c982e
4 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@@ -118,7 +118,7 @@
}; };
packages = forAllSystems (pkgs: { packages = forAllSystems (pkgs: {
devkit = import ./packages/devkit {inherit pkgs;}; devkit = import ./packages/devkit {inherit pkgs inputs;};
}); });
}; };
} }

49
modules/home-manager/devkit.nix
View File

@@ -100,7 +100,6 @@ in {
programs.ghostty = lib.mkIf cfg.ghostty.enable { programs.ghostty = lib.mkIf cfg.ghostty.enable {
enable = true; enable = true;
package = devkitPkgs.ghostty; package = devkitPkgs.ghostty;
# package = pkgs.ghostty;
}; };
## Git ## Git
@@ -135,53 +134,19 @@ in {
# package = pkgs.yazi; # package = pkgs.yazi;
}; };
## Zellij (Terminal multiplexer) # Zellij (Terminal multiplexer)
#
# CURRENTLY BORKED https://github.com/zellij-org/zellij/issues/3970 # CURRENTLY BORKED https://github.com/zellij-org/zellij/issues/3970
#
# programs.zellij = lib.mkIf cfg.zellij.enable { programs.zellij = lib.mkIf cfg.zellij.enable {
# enable = true; enable = true;
# package = devkitPkgs.zellij; package = devkitPkgs.zellij;
# # package = pkgs.zellij; };
# };
## Tmux (Backup terminal multiplexer) ## Tmux (Backup terminal multiplexer)
programs.tmux = lib.mkIf cfg.tmux.enable { programs.tmux = lib.mkIf cfg.tmux.enable {
enable = true; enable = true;
package = devkitPkgs.tmux; package = devkitPkgs.tmux;
# baseIndex = 1;
# keyMode = "vi";
# mouse = true;
# prefix = "Ctrl-G";
# shell = lib.getExe config.programs.zsh.package;
# terminal = "screen-256color";
# plugins = with pkgs; [
# {
# plugin = tmuxPlugins.catppuccin.overrideAttrs (_: {
# src = fetchFromGitHub {
# owner = "guz013";
# repo = "frappuccino-tmux";
# rev = "4255b0a769cc6f35e12595fe5a33273a247630aa";
# sha256 = "0k8yprhx5cd8v1ddpcr0dkssspc17lq2a51qniwafkkzxi3kz3i5";
# };
# });
# }
# {plugin = tmuxPlugins.better-mouse-mode;}
# {
# plugin = tmuxPlugins.mkTmuxPlugin {
# pluginName = "tmux.nvim";
# version = "unstable-2024-04-05";
# src = fetchFromGitHub {
# owner = "aserowy";
# repo = "tmux.nvim";
# rev = "63e9c5e054099dd30af306bd8ceaa2f1086e1b07";
# sha256 = "0ynzljwq6hv7415p7pr0aqx8kycp84p3p3dy4jcx61dxfgdpgc4c";
# };
# };
# }
# {plugin = tmuxPlugins.resurrect;}
# {plugin = tmuxPlugins.continuum;}
# ];
}; };
## ZSH (Default shell) ## ZSH (Default shell)

12
packages/devkit/default.nix
View File

@@ -1,4 +1,9 @@
{pkgs}: rec { {
pkgs,
inputs,
}: let
unstable = import inputs.nixpkgs-unstable {inherit (pkgs) system;};
in rec {
ghostty = pkgs.callPackage ./ghostty {}; ghostty = pkgs.callPackage ./ghostty {};
git = pkgs.callPackage ./git {}; git = pkgs.callPackage ./git {};
lazygit = pkgs.callPackage ./lazygit {}; lazygit = pkgs.callPackage ./lazygit {};
@@ -6,6 +11,9 @@
tmux = pkgs.callPackage ./tmux {shell = zsh;}; tmux = pkgs.callPackage ./tmux {shell = zsh;};
yazi = pkgs.callPackage ./yazi {}; yazi = pkgs.callPackage ./yazi {};
# CURRENTLY BORKED https://github.com/zellij-org/zellij/issues/3970 # CURRENTLY BORKED https://github.com/zellij-org/zellij/issues/3970
# zellij = pkgs.callPackage ./zellij {shell = zsh;}; zellij = pkgs.callPackage ./zellij {
shell = zsh;
zellij = unstable.zellij;
};
zsh = pkgs.callPackage ./zsh {}; zsh = pkgs.callPackage ./zsh {};
} }

9
packages/devkit/tmux/config.conf
View File

@@ -32,10 +32,11 @@ bind 'j' select-pane -D # move down after prefix
bind 'k' select-pane -U # move up after prefix bind 'k' select-pane -U # move up after prefix
bind 'l' select-pane -R # move right after prefix bind 'l' select-pane -R # move right after prefix
bind -n 'C-h' select-pane -L # move left # Conflicts with neovim
bind -n 'C-j' select-pane -D # move down # bind -n 'C-h' select-pane -L # move left
bind -n 'C-k' select-pane -U # move up # bind -n 'C-j' select-pane -D # move down
bind -n 'C-l' select-pane -R # move right # bind -n 'C-k' select-pane -U # move up
# bind -n 'C-l' select-pane -R # move right
# bind -r 'S-h' resize-pane -L 5 # bind -r 'S-h' resize-pane -L 5
# bind -r 'S-j' resize-pane -D 5 # bind -r 'S-j' resize-pane -D 5