feat: reprise de choix d'Omarchy (outils CLI, git, polices)
- git : rerere, tri des branches/tags, commit.verbose, column.ui, diff.mnemonicPrefix - CLI : eza (alias ls/ll/lt), fd, lazygit, lazydocker, alias ff (fzf + aperçu bat), lzg/lzd - tmux : config de base (vi, souris, index 1, splits dans le cwd) - système : polices JetBrains Mono Nerd Font, Noto, emoji et CJK Non testé : pas de Nix sur la machine où ces changements ont été écrits. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
9844b706cd
commit
f6e5bf6e2f
@@ -60,6 +60,32 @@
|
|||||||
|
|
||||||
programs.btop.enable = true;
|
programs.btop.enable = true;
|
||||||
programs.vim.enable = true;
|
programs.vim.enable = true;
|
||||||
|
|
||||||
|
# Outils CLI repris d'Omarchy - https://github.com/basecamp/omarchy
|
||||||
|
programs.eza = {
|
||||||
|
enable = true; # alias ls, ll, la, lt…
|
||||||
|
enableZshIntegration = true;
|
||||||
|
git = true;
|
||||||
|
icons = "auto";
|
||||||
|
};
|
||||||
|
programs.fd.enable = true;
|
||||||
|
programs.lazygit.enable = true;
|
||||||
|
programs.tmux = {
|
||||||
|
enable = true;
|
||||||
|
keyMode = "vi";
|
||||||
|
mouse = true;
|
||||||
|
baseIndex = 1;
|
||||||
|
escapeTime = 0;
|
||||||
|
historyLimit = 50000;
|
||||||
|
extraConfig = ''
|
||||||
|
# Nouveaux panneaux et fenêtres dans le répertoire courant
|
||||||
|
bind '"' split-window -v -c "#{pane_current_path}"
|
||||||
|
bind % split-window -h -c "#{pane_current_path}"
|
||||||
|
bind c new-window -c "#{pane_current_path}"
|
||||||
|
set -g renumber-windows on
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.vscode.fhs;
|
package = pkgs.vscode.fhs;
|
||||||
|
|||||||
@@ -125,6 +125,14 @@
|
|||||||
];
|
];
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
|
|
||||||
|
# Polices reprises d'Omarchy : Nerd Font pour les icônes (eza, starship) + emoji et CJK
|
||||||
|
fonts.packages = with pkgs; [
|
||||||
|
nerd-fonts.jetbrains-mono
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-cjk-sans
|
||||||
|
noto-fonts-color-emoji
|
||||||
|
];
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
# programs.mtr.enable = true;
|
# programs.mtr.enable = true;
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ in
|
|||||||
bun
|
bun
|
||||||
docker
|
docker
|
||||||
docker-compose
|
docker-compose
|
||||||
|
lazydocker
|
||||||
kubectl
|
kubectl
|
||||||
kubernetes-helm
|
kubernetes-helm
|
||||||
stern
|
stern
|
||||||
|
|||||||
@@ -66,6 +66,17 @@
|
|||||||
# see https://adamj.eu/tech/2022/10/15/how-to-rebase-stacked-git-branches/
|
# see https://adamj.eu/tech/2022/10/15/how-to-rebase-stacked-git-branches/
|
||||||
rebase.updateRefs = true;
|
rebase.updateRefs = true;
|
||||||
|
|
||||||
|
# Repris d'Omarchy - https://github.com/basecamp/omarchy/blob/master/config/git/config
|
||||||
|
rerere = {
|
||||||
|
enabled = true; # mémorise la résolution des conflits…
|
||||||
|
autoupdate = true; # … et la réapplique automatiquement
|
||||||
|
};
|
||||||
|
branch.sort = "-committerdate"; # branches les plus récentes en premier
|
||||||
|
tag.sort = "-version:refname"; # tri des tags par version (v1.10 après v1.9)
|
||||||
|
column.ui = "auto";
|
||||||
|
commit.verbose = true; # diff affiché dans l'éditeur du message de commit
|
||||||
|
diff.mnemonicPrefix = true; # préfixes i/ w/ c/ au lieu de a/ b/
|
||||||
|
|
||||||
"url \"git@gitlab.lundimatin.app:\"" = {
|
"url \"git@gitlab.lundimatin.app:\"" = {
|
||||||
insteadOf = "https://gitlab.lundimatin.app/";
|
insteadOf = "https://gitlab.lundimatin.app/";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -116,10 +116,13 @@
|
|||||||
s = "fzf"; # show / search / select
|
s = "fzf"; # show / search / select
|
||||||
f = "fzf"; # file
|
f = "fzf"; # file
|
||||||
sf = "fzf"; # interactive file selection
|
sf = "fzf"; # interactive file selection
|
||||||
|
ff = "fzf --preview 'bat --style=numbers --color=always {}'"; # fzf avec aperçu (Omarchy)
|
||||||
|
|
||||||
dc = "docker compose";
|
dc = "docker compose";
|
||||||
dcr = "docker compose run --rm";
|
dcr = "docker compose run --rm";
|
||||||
dcrm = "docker compose rm -fsv";
|
dcrm = "docker compose rm -fsv";
|
||||||
|
lzd = "lazydocker";
|
||||||
|
lzg = "lazygit";
|
||||||
copy = "xclip -selection c";
|
copy = "xclip -selection c";
|
||||||
|
|
||||||
bepo = "setxkbmap -layout fr -variant bepo";
|
bepo = "setxkbmap -layout fr -variant bepo";
|
||||||
|
|||||||
Reference in New Issue
Block a user