Compare commits

..

No commits in common. "931febdc0cedaa1a3ba000b2d0ad8cdbf9805b22" and "f254307c8ff799f346e387efa8dd686181fbac23" have entirely different histories.

7 changed files with 43 additions and 39 deletions

View file

@ -1,6 +1,7 @@
{ {
programs.bat.enable = true; programs.bat.enable = true;
home.sessionVariables = { home.sessionVariables = {
"PAGER" = "bat";
"MANPAGER" = "sh -c 'col -bx | bat -l man -p'"; "MANPAGER" = "sh -c 'col -bx | bat -l man -p'";
"MANROFFOPT" = "-c"; "MANROFFOPT" = "-c";
}; };

View file

@ -8,10 +8,7 @@
signing.signByDefault = true; signing.signByDefault = true;
signing.key = "91F97D9ED12639CF"; signing.key = "91F97D9ED12639CF";
extraConfig = { extraConfig.pull.rebase = true;
pull.rebase = true;
push.autoSetupRemote = true;
};
}; };
programs.gh.enable = true; programs.gh.enable = true;

View file

@ -1,18 +0,0 @@
{
# nickcao's config
programs.tmux = {
enable = true;
baseIndex = 1;
escapeTime = 10;
keyMode = "vi";
terminal = "screen-256color";
extraConfig = ''
# set -g status-position top
set -g set-clipboard on
set -g mouse on
# set -g status-right ""
# set -g renumber-windows on
# new-session -s main
'';
};
}

View file

@ -0,0 +1,35 @@
{lib, ...}: {
programs.zellij = {
enable = true;
enableFishIntegration = true;
};
# Unsure about the syntax for defining keybindings in Nix (refer to line 16)
xdg.configFile."zellij/config.kdl".text = lib.mkForce ''
simplified_ui true
pane_frames false
default_layout "compact"
on_force_close "quit"
mirror_session false
// WORKAROUND: This feature slows down startup speed, and I don't need it anyway.
// See: https://github.com/zellij-org/zellij/issues/1757#issuecomment-1962981641
session_serialization false
keybinds {
normal {
bind "Alt 1" { GoToTab 1; }
bind "Alt 2" { GoToTab 2; }
bind "Alt 3" { GoToTab 3; }
bind "Alt 4" { GoToTab 4; }
bind "Alt 5" { GoToTab 5; }
bind "Alt 6" { GoToTab 6; }
bind "Alt 7" { GoToTab 7; }
bind "Alt 8" { GoToTab 8; }
bind "Alt 9" { GoToTab 9; }
bind "Alt 0" { GoToTab 10; }
}
}
'';
}

View file

@ -38,17 +38,16 @@
./applications/bash ./applications/bash
./applications/bat ./applications/bat
./applications/eza ./applications/eza
./applications/neovim
./applications/fish ./applications/fish
./applications/git ./applications/git
./applications/gpg ./applications/gpg
./applications/neovim
./applications/skim ./applications/skim
./applications/starship ./applications/starship
./applications/tealdeer ./applications/tealdeer
./applications/tmux ./applications/zellij
]; ];
programs.jq.enable = true;
programs.ripgrep.enable = true; programs.ripgrep.enable = true;
programs.zoxide.enable = true; programs.zoxide.enable = true;
home.packages = home.packages =

View file

@ -193,16 +193,10 @@
services.samba = { services.samba = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
shares = { shares."share" = {
"share" = {
path = "/srv/samba/share"; path = "/srv/samba/share";
"read only" = "no"; "read only" = "no";
}; };
"external" = {
path = "/mnt";
"read only" = "no";
};
};
}; };
services.samba-wsdd = { services.samba-wsdd = {

View file

@ -22,9 +22,5 @@
### misc ### misc
programs.prettier.enable = true; programs.prettier.enable = true;
settings.formatter.prettier.excludes = [ settings.formatter.prettier.excludes = ["secrets.yaml"];
"secrets.yaml"
"hosts/blacksteel/secrets.yaml"
"hosts/lightsail-tokyo/secrets.yaml"
];
} }