diff --git a/home/xin/common/default.nix b/home/xin/common/default.nix index 8fbf3bb..728dd93 100644 --- a/home/xin/common/default.nix +++ b/home/xin/common/default.nix @@ -5,13 +5,12 @@ ... }: { - imports = [ ]; + imports = [ + ./modern-unix.nix + ]; home.packages = with pkgs; [ dig - du-dust # du + rust - zoxide # autojumper - ripgrep file man-pages unar @@ -19,7 +18,6 @@ wget tmux ffmpeg - tealdeer rclone wl-clipboard diff --git a/home/xin/common/modern-unix.nix b/home/xin/common/modern-unix.nix new file mode 100644 index 0000000..298fae2 --- /dev/null +++ b/home/xin/common/modern-unix.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + httpie + curlie + bat + htop + procs + rust-parallel + jq + fd + du-dust # du + rust + zoxide # autojumper + ripgrep + tealdeer + ]; +} diff --git a/modules/home-manager/fish.nix b/modules/home-manager/fish.nix index 4d265d5..1b9f626 100644 --- a/modules/home-manager/fish.nix +++ b/modules/home-manager/fish.nix @@ -91,6 +91,10 @@ in ${pkgs.comma}/bin/comma $argv end set -gx LS_COLORS (${lib.getExe pkgs.vivid} generate catppuccin-mocha) + alias ctlsp="systemctl stop" + alias ctlst="systemctl start" + alias ctlrt="systemctl restart" + alias ctls="systemctl status" '' else ""; diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix index d28eb50..56bc382 100644 --- a/modules/home-manager/git.nix +++ b/modules/home-manager/git.nix @@ -25,8 +25,9 @@ in }; }; }; - config = { - programs.git = mkIf cfg.enable { + config = mkIf cfg.enable { + home.packages = [ pkgs.git-absorb ]; + programs.git = { enable = true; delta.enable = true; userName = "Xinyang Li"; @@ -42,6 +43,10 @@ in signByDefault = true; key = cfg.signing.keyFile; }; + extraConfig.absorb = { + oneFixupPerCommit = true; + maxStack = 20; + }; extraConfig.user = mkIf cfg.signing.enable { signingkey = cfg.signing.keyFile; }; extraConfig.gpg = mkIf cfg.signing.enable { format = "ssh"; }; };