Compare commits

...

2 Commits

Author SHA1 Message Date
lyrathorpe e125296015 feat(shell.nix): add htop installation 2026-06-16 10:55:57 +01:00
lyrathorpe e0b3eb2393 feat(git.nix): add GitHub and Gitea CLI 2026-06-16 10:50:49 +01:00
2 changed files with 9 additions and 2 deletions
+3 -1
View File
@@ -12,6 +12,8 @@ in
{ {
home.packages = [ home.packages = [
pkgs.commitizen pkgs.commitizen
pkgs.gh
pkgs.tea
]; ];
programs.git = { programs.git = {
@@ -82,7 +84,7 @@ in
# can override to false -- otherwise commits there would fail. Reuses the # can override to false -- otherwise commits there would fail. Reuses the
# existing ssh key; a dedicated personal key can be swapped in later. # existing ssh key; a dedicated personal key can be swapped in later.
gpg.format = "ssh"; gpg.format = "ssh";
user.signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJMVgeRKnfX1G8coU3nAobI485aeUpGTMqH7+zbKI8o emma.thorpe@cloud.com"; user.signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDxHvdMTOzpFWUFMtCP7C/4tIOUO3GIO2QPvaifSnWH lyrathorpe@Lyra-MBA";
commit.gpgsign = lib.mkDefault true; commit.gpgsign = lib.mkDefault true;
tag.gpgsign = lib.mkDefault true; tag.gpgsign = lib.mkDefault true;
}; };
+6 -1
View File
@@ -26,6 +26,7 @@ in
pkgs.tea pkgs.tea
pkgs.hyperfine # command-line benchmarking pkgs.hyperfine # command-line benchmarking
pkgs.sd # saner find-and-replace than sed pkgs.sd # saner find-and-replace than sed
pkgs.htop # ensure there's a system monitor
]; ];
# Resource monitor, themed Catppuccin Mocha to match the rest of the desktop. # Resource monitor, themed Catppuccin Mocha to match the rest of the desktop.
@@ -345,13 +346,17 @@ in
# enables this in the work module; both being true merges cleanly. # enables this in the work module; both being true merges cleanly.
services.ssh-agent.enable = lib.mkIf pkgs.stdenv.hostPlatform.isLinux true; services.ssh-agent.enable = lib.mkIf pkgs.stdenv.hostPlatform.isLinux true;
programs.htop = {
enable = true;
};
# Drop the zsh completion dump on every activation. A stale .zcompdump caches # Drop the zsh completion dump on every activation. A stale .zcompdump caches
# /nix/store paths to completion functions; once a rebuild or a manual GC # /nix/store paths to completion functions; once a rebuild or a manual GC
# removes them, compinit fails with "_git: function definition file not found" # removes them, compinit fails with "_git: function definition file not found"
# for every completion. Deleting it forces a fresh rebuild from the current # for every completion. Deleting it forces a fresh rebuild from the current
# fpath on the next shell. compinit dumps to $ZDOTDIR (~/.config/zsh now); the # fpath on the next shell. compinit dumps to $ZDOTDIR (~/.config/zsh now); the
# $HOME and cache paths are also swept to clear any legacy leftovers. # $HOME and cache paths are also swept to clear any legacy leftovers.
home.activation.resetZcompdump = lib.hm.dag.entryAfter [ "writeBoundary" ] '' home.actiVation.resetZcompdump = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
$DRY_RUN_CMD rm -f \ $DRY_RUN_CMD rm -f \
"${config.xdg.configHome}"/zsh/.zcompdump* \ "${config.xdg.configHome}"/zsh/.zcompdump* \
"$HOME"/.zcompdump* \ "$HOME"/.zcompdump* \