refactor: remove redundant aliases, comments, and fix lazygit pager config

This commit is contained in:
2026-04-14 13:53:04 +08:00
parent 5583970878
commit f6e2f92da3
6 changed files with 4 additions and 22 deletions
-2
View File
@@ -23,7 +23,6 @@
stateVersion = "24.11"; stateVersion = "24.11";
}; };
# ── User-level packages ────────────────────────────
home.packages = with pkgs; [ home.packages = with pkgs; [
# Modern CLI replacements # Modern CLI replacements
dust # du dust # du
@@ -56,6 +55,5 @@
pandoc pandoc
]; ];
# XDG directories
xdg.enable = true; xdg.enable = true;
} }
+2 -4
View File
@@ -1,4 +1,4 @@
{ ... }: _:
{ {
programs.git = { programs.git = {
@@ -34,9 +34,7 @@
nerdFontsVersion = "3"; nerdFontsVersion = "3";
showBottomLine = false; showBottomLine = false;
}; };
git.pagers = [ git.paging.pager = "delta --paging=never";
{ pager = "delta --paging=never"; }
];
update.method = "never"; update.method = "never";
disableStartupPopups = true; disableStartupPopups = true;
}; };
+1 -1
View File
@@ -1,4 +1,4 @@
{ ... }: _:
{ {
# Disable catppuccin/nix neovim integration — LazyVim manages its own colorscheme # Disable catppuccin/nix neovim integration — LazyVim manages its own colorscheme
-5
View File
@@ -28,18 +28,13 @@ in
ll = "eza -lh"; ll = "eza -lh";
lla = "eza -lah --time-style=long-iso"; lla = "eza -lah --time-style=long-iso";
# Tools
cat = "bat --paging=never"; cat = "bat --paging=never";
rm = "gomi"; rm = "gomi";
lg = "lazygit"; lg = "lazygit";
vi = "nvim";
}; };
interactiveShellInit = '' interactiveShellInit = ''
# No greeting
set -g fish_greeting set -g fish_greeting
# PATH
fish_add_path $HOME/go/bin $HOME/.bun/bin fish_add_path $HOME/go/bin $HOME/.bun/bin
# Sudo: double Escape to prepend sudo # Sudo: double Escape to prepend sudo
+1 -6
View File
@@ -6,10 +6,8 @@
}: }:
{ {
# ── Primary user (required by nix-darwin) ──────────
system.primaryUser = username; system.primaryUser = username;
# ── User ───────────────────────────────────────────
users.knownUsers = [ username ]; users.knownUsers = [ username ];
users.users.${username} = { users.users.${username} = {
home = "/Users/${username}"; home = "/Users/${username}";
@@ -32,10 +30,7 @@
wvous-bl-corner = 1; wvous-bl-corner = 1;
wvous-br-corner = 1; wvous-br-corner = 1;
}; };
finder = { finder.FXPreferredViewStyle = "clmv";
AppleShowAllExtensions = true;
FXPreferredViewStyle = "clmv";
};
NSGlobalDomain = { NSGlobalDomain = {
AppleShowAllExtensions = true; AppleShowAllExtensions = true;
InitialKeyRepeat = 15; InitialKeyRepeat = 15;
-4
View File
@@ -10,21 +10,18 @@
./docker.nix ./docker.nix
]; ];
# ── System-essential packages ──────────────────────
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
curl curl
git git
ghostty.terminfo ghostty.terminfo
]; ];
# ── Locale / Timezone ──────────────────────────────
i18n = { i18n = {
defaultLocale = "en_US.UTF-8"; defaultLocale = "en_US.UTF-8";
supportedLocales = [ "en_US.UTF-8/UTF-8" ]; supportedLocales = [ "en_US.UTF-8/UTF-8" ];
}; };
time.timeZone = "Asia/Shanghai"; time.timeZone = "Asia/Shanghai";
# ── Default user ───────────────────────────────────
users.users.${username} = { users.users.${username} = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.fish; shell = pkgs.fish;
@@ -32,6 +29,5 @@
openssh.authorizedKeys.keys = sshKeys; openssh.authorizedKeys.keys = sshKeys;
}; };
# ── sudo ───────────────────────────────────────────
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
} }