Compare commits

..

13 commits

Author SHA1 Message Date
1bc94d36b5 WIP: ADD NOTE FOR FUTURE SELF
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-11-26 11:13:42 +00:00
0ae98e38c1 home: jujutsu: set 'ui.merge-editor'
Same reason as `ui.diff-editor`.
2025-11-26 11:13:42 +00:00
8ae4c039b6 home: jujutsu: set 'ui.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-26 11:12:38 +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
3 changed files with 30 additions and 27 deletions

36
flake.lock generated
View file

@ -53,11 +53,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
@ -73,11 +73,11 @@
]
},
"locked": {
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"lastModified": 1762980239,
"narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
"type": "github"
},
"original": {
@ -117,11 +117,11 @@
]
},
"locked": {
"lastModified": 1763988335,
"narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
"lastModified": 1763319842,
"narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
"rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
"type": "github"
},
"original": {
@ -159,11 +159,11 @@
]
},
"locked": {
"lastModified": 1764361670,
"narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
"lastModified": 1763313531,
"narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
"rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391",
"type": "github"
},
"original": {
@ -175,11 +175,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1764242076,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"lastModified": 1763283776,
"narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
"type": "github"
},
"original": {
@ -199,11 +199,11 @@
]
},
"locked": {
"lastModified": 1764449851,
"narHash": "sha256-VnodC1+3KML8MYLLnK84E6U2Fz4ioNacOeQd1pMCSTw=",
"lastModified": 1763378400,
"narHash": "sha256-9eZj8GNTBYnI8PQf9n8m9XbFCA/ugQ5r7sylY9DEx9M=",
"owner": "nix-community",
"repo": "NUR",
"rev": "b1781c0aa8935d8d1f35d228bcc7127fcebcd363",
"rev": "6bd477535ba71aa22d2712c8735c92812a1c74dc",
"type": "github"
},
"original": {

View file

@ -83,9 +83,18 @@ in
"servarr/autobrr/session-secret.age".publicKeys = all;
"servarr/cross-seed/configuration.json.age".publicKeys = all;
"sso/auth-key.age".publicKeys = all;
"sso/ambroisie/password-hash.age".publicKeys = all;
"sso/ambroisie/totp-secret.age".publicKeys = all;
"sso/auth-key.age" = {
owner = "nginx-sso";
publicKeys = all;
};
"sso/ambroisie/password-hash.age" = {
owner = "nginx-sso";
publicKeys = all;
};
"sso/ambroisie/totp-secret.age" = {
owner = "nginx-sso";
publicKeys = all;
};
"tandoor-recipes/secret-key.age".publicKeys = all;

View file

@ -54,12 +54,6 @@ in
};
};
my.services.backup = {
paths = [
"/var/lib/mealie"
];
};
services.fail2ban.jails = {
mealie = ''
enabled = true