Compare commits

..

13 commits

Author SHA1 Message Date
b9b105a957 WIP: ADD NOTE FOR FUTURE SELF
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-11-17 13:58:14 +00:00
f80dc3f707 home: jujutsu: set 'home.diff-editor'
Otherwise it keeps nagging me with a hint to set it.

I'm not a big fan of this UI, I wish I add something closer to Git's
patch interface.
2025-11-17 13:58:14 +00:00
6c9cb5d5d8 homes: mousqueton: use system jujutsu
They have a custom `jj` with Piper CitC integration.
2025-11-17 13:58:14 +00:00
515f4c58c9 homes: bazin: use system jujutsu
They have a custom `jj` with Piper CitC integration.
2025-11-17 13:58:14 +00:00
22e4f07baf home: jujutsu: simplify 'jj jj' alias 2025-11-17 13:58:13 +00:00
99b5412f83 home: jujutsu: explicitly create 'conf.d'
This is to serve as a reminder of _how_ to add a local configuration
file.
2025-11-17 13:58:13 +00:00
09f20619ce home: jj: use verbose draft commit messages 2025-11-17 13:58:13 +00:00
1c1f20a324 home: delta: add 'jujutsu.enable' 2025-11-17 13:58:13 +00:00
59e3c9a128 home: add jujutsu
This is a very basic configuration, still missing most bells and
whistles.
2025-11-17 13:58:13 +00:00
649eb89742 pkgs: diff-flake: rename 'host' to 'nixos'
To avoid mixing them up with Nix-Darwin and System Manager hosts.
2025-11-17 13:58:13 +00:00
b553d21e56 pkgs: diff-flake: add system-manager support 2025-11-17 13:58:13 +00:00
db9d8e76cf pkgs: diff-flake: add nix-darwin support 2025-11-17 13:58:13 +00:00
29fb7c5066 home: discord: use upstream module
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-11-17 13:58:13 +00:00
2 changed files with 63 additions and 14 deletions

View file

@ -1,8 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.home.discord;
jsonFormat = pkgs.formats.json { };
in
{
options.my.home.discord = with lib; {
@ -12,14 +10,15 @@ in
};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
cfg.package
];
programs.discord = {
enable = true;
xdg.configFile."discord/settings.json".source =
jsonFormat.generate "discord.json" {
inherit (cfg) package;
settings = {
# Do not keep me from using the app just to force an update
SKIP_HOST_UPDATE = true;
};
};
};
}

View file

@ -24,11 +24,15 @@ current_system() {
nix eval --raw --impure --expr 'builtins.currentSystem'
}
add_darwin() {
FLAKE_OUTPUTS+=("darwinConfigurations.\"$1\".config.system.build.toplevel")
}
add_home() {
FLAKE_OUTPUTS+=("homeConfigurations.\"$1\".activationPackage")
}
add_host() {
add_nixos() {
FLAKE_OUTPUTS+=("nixosConfigurations.\"$1\".config.system.build.toplevel")
}
@ -37,6 +41,10 @@ add_shell() {
FLAKE_OUTPUTS+=("devShells.\"$(current_system)\".\"$1\".inputDerivation")
}
add_system() {
FLAKE_OUTPUTS+=("systemConfigs.\"$1\".config.system.build.toplevel")
}
usage() {
print_err "Usage: $0 [option]... [-- [nix build option]...]"
print_err ""
@ -54,11 +62,15 @@ usage() {
print_err " -p, --previous-rev"
print_err " which git revision should be considered the 'previous' state,"
print_err " defaults to HEAD~"
print_err " --darwin [name]"
print_err " specify the name of a nix-darwin output configuration whose"
print_err " closure should be diffed, can be used multiple times"
print_err " if no host name is given, defaults to current hostname"
print_err " --home [name]"
print_err " specify the name of a home-manager output configuration whose"
print_err " closure should be diffed, can be used multiple times"
print_err " if no configuration name is given, defaults to current username"
print_err " --host [name]"
print_err " --nixos [name]"
print_err " specify the name of a NixOS output configuration whose"
print_err " closure should be diffed, can be used multiple times"
print_err " if no host name is given, defaults to current hostname"
@ -66,6 +78,10 @@ usage() {
print_err " specify a specific devShell configuration name whose closure"
print_err " should be diffed, can be used multiple times"
print_err " if no name is given, defaults to 'default'"
print_err " --system [name]"
print_err " specify the name of a system-manager output configuration whose"
print_err " closure should be diffed, can be used multiple times"
print_err " if no host name is given, defaults to current hostname"
print_err ""
print_err "when no flake outputs are specified, automatically queries for"
print_err "all NixOS configurations, and devShells for current system"
@ -101,6 +117,14 @@ parse_args() {
PREVIOUS_REV="$(git rev-parse "$1")"
shift
;;
--darwin)
if [ $# -gt 0 ] && ! is_option "$1"; then
add_darwin "$1"
shift
else
add_darwin "$(hostname)"
fi
;;
--home)
if [ $# -gt 0 ] && ! is_option "$1"; then
add_home "$1"
@ -109,12 +133,12 @@ parse_args() {
add_home "$USER"
fi
;;
--host)
--nixos)
if [ $# -gt 0 ] && ! is_option "$1"; then
add_host "$1"
add_nixos "$1"
shift
else
add_host "$(hostname)"
add_nixos "$(hostname)"
fi
;;
--shell)
@ -125,6 +149,14 @@ parse_args() {
add_shell "default"
fi
;;
--system)
if [ $# -gt 0 ] && ! is_option "$1"; then
add_system "$1"
shift
else
add_system "$(hostname)"
fi
;;
--)
NIX_BUILD_ARGS=("$@")
break
@ -138,6 +170,12 @@ parse_args() {
done
}
list_darwin_configurations() {
nix eval '.#darwinConfigurations' \
--apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
--raw
}
list_home_configurations() {
nix eval '.#homeConfigurations' \
--apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
@ -156,6 +194,12 @@ list_dev_shells() {
--raw
}
list_system_configurations() {
nix eval '.#systemConfigs' \
--apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
--raw
}
diff_output() {
local PREV NEW
PREV="$(mktemp --dry-run)"
@ -175,15 +219,21 @@ diff_output() {
parse_args "$@"
if [ "${#FLAKE_OUTPUTS[@]}" -eq 0 ]; then
for darwin in $(list_darwin_configurations); do
add_darwin "$darwin"
done
for home in $(list_home_configurations); do
add_home "$home"
done
for host in $(list_nixos_configurations); do
add_host "$host"
for nixos in $(list_nixos_configurations); do
add_nixos "$nixos"
done
for shell in $(list_dev_shells); do
add_shell "$shell"
done
for system in $(list_system_configurations); do
add_system "$system"
done
fi
for out in "${FLAKE_OUTPUTS[@]}"; do