Compare commits

..

9 commits

Author SHA1 Message Date
3feb7fe10d WIP: ADD NOTE FOR FUTURE SELF
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-11-17 12:23:38 +00:00
c66d0dbabc 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 12:23:38 +00:00
d8b9917ac3 homes: mousqueton: use system jujutsu
They have a custom `jj` with Piper CitC integration.
2025-11-17 12:23:38 +00:00
c706cd4bb4 homes: bazin: use system jujutsu
They have a custom `jj` with Piper CitC integration.
2025-11-17 12:23:38 +00:00
d87bf3070b home: jujutsu: simplify 'jj jj' alias 2025-11-17 12:23:38 +00:00
93414ebfe7 home: jujutsu: explicitly create 'conf.d'
This is to serve as a reminder of _how_ to add a local configuration
file.
2025-11-17 12:23:38 +00:00
93071f3288 home: jj: use verbose draft commit messages 2025-11-17 12:23:38 +00:00
34adfd17fa home: delta: add 'jujutsu.enable' 2025-11-17 12:23:38 +00:00
f5598f862f home: add jujutsu
This is a very basic configuration, still missing most bells and
whistles.
2025-11-17 12:23:38 +00:00
2 changed files with 14 additions and 63 deletions

View file

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

View file

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