Compare commits

...

8 commits

Author SHA1 Message Date
e6c95245b2 home: ssh: disable default config
All checks were successful
ci/woodpecker/push/check Pipeline was successful
It's been deprecated.

This also makes my `addKeysToAgent` configuration more explicit.
2025-09-04 11:37:17 +00:00
b9bc37d365 flake: bump inputs 2025-09-04 11:37:17 +00:00
3dd4f07609 hosts: nixos: aramis: home: drop 'jellyfin-media-player'
It's about to be made broken due to using QtWebEngine 5, which is EOL
and marked insecure in new nixpkgs.
2025-09-04 11:37:17 +00:00
3fa1664b5c home: delta: use stand-alone configuration file
Ideally, I'd like for `delta` to just read a configuration file at
`$XDG_CONFIG_HOME/delta/config` by default, but upstream seems somewhat
reticent to the idea :-/.

So instead, let's keep relying on `git` being enabled, but rather than
inlining the configuration, let's store it where I think it should
belong and include it into `gitconfig`.
2025-09-04 11:20:57 +00:00
1800cb9daa hosts: nixos: aramis: use 'trgui' module 2025-09-04 11:20:57 +00:00
31147abd91 home: add trgui 2025-09-04 11:20:57 +00:00
a889dfbb1a home: nix: fix renamed option 2025-09-04 11:20:57 +00:00
1a109b6b1f flake: bump inputs
And fix a renamed package.
2025-09-04 11:20:57 +00:00
8 changed files with 75 additions and 44 deletions

24
flake.lock generated
View file

@ -73,11 +73,11 @@
]
},
"locked": {
"lastModified": 1754487366,
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
"lastModified": 1756770412,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
"rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github"
},
"original": {
@ -117,11 +117,11 @@
]
},
"locked": {
"lastModified": 1755446520,
"narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=",
"lastModified": 1755960406,
"narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e",
"rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
"type": "github"
},
"original": {
@ -159,11 +159,11 @@
]
},
"locked": {
"lastModified": 1755491080,
"narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=",
"lastModified": 1756954499,
"narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d",
"rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25",
"type": "github"
},
"original": {
@ -175,11 +175,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1755186698,
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
"lastModified": 1756936398,
"narHash": "sha256-/o1TTpMIICpjrMHBilL9lYm/r69uhdK1L8j1pfY6tWU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
"rev": "47f28ad9378956563df9a884fd1b209b64336ba3",
"type": "github"
},
"original": {

View file

@ -18,9 +18,7 @@
# Machine specific packages
packages.additionalPackages = with pkgs; [
element-desktop # Matrix client
jellyfin-media-player # Wraps the webui and mpv together
pavucontrol # Audio mixer GUI
trgui-ng # Transmission remote
];
# Minimal video player
mpv.enable = true;
@ -28,6 +26,8 @@
nm-applet.enable = true;
# Terminal
terminal.program = "alacritty";
# Transmission remote
trgui.enable = true;
# Zathura document viewer
zathura.enable = true;
};

View file

@ -38,6 +38,7 @@
./ssh
./terminal
./tmux
./trgui
./udiskie
./vim
./wget

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
let
cfg = config.my.home.delta;
configFormat = pkgs.formats.gitIni { };
configPath = "${config.xdg.configHome}/delta/config";
in
{
options.my.home.delta = with lib; {
@ -34,35 +37,43 @@ in
home.packages = [ cfg.package ];
xdg.configFile."delta/config".source = configFormat.generate "delta-config" {
delta = {
features = "diff-highlight decorations";
# Less jarring style for `diff-highlight` emulation
diff-highlight = {
minus-style = "red";
minus-non-emph-style = "red";
minus-emph-style = "bold red 52";
plus-style = "green";
plus-non-emph-style = "green";
plus-emph-style = "bold green 22";
whitespace-error-style = "reverse red";
};
# Personal preference for easier reading
decorations = {
commit-style = "raw"; # Do not recolor meta information
keep-plus-minus-markers = true;
paging = "always";
};
};
};
programs.git = lib.mkIf cfg.git.enable {
delta = {
enable = true;
inherit (cfg) package;
options = {
features = "diff-highlight decorations";
# Less jarring style for `diff-highlight` emulation
diff-highlight = {
minus-style = "red";
minus-non-emph-style = "red";
minus-emph-style = "bold red 52";
plus-style = "green";
plus-non-emph-style = "green";
plus-emph-style = "bold green 22";
whitespace-error-style = "reverse red";
};
# Personal preference for easier reading
decorations = {
commit-style = "raw"; # Do not recolor meta information
keep-plus-minus-markers = true;
paging = "always";
};
};
};
includes = [
{
path = configPath;
}
];
};
};
}

View file

@ -69,7 +69,7 @@ in
automatic = true;
# Every week, with some wiggle room
frequency = "weekly";
dates = "weekly";
randomizedDelaySec = "10min";
# Use a persistent timer for e.g: laptops

View file

@ -17,6 +17,7 @@ in
{
programs.ssh = {
enable = true;
enableDefaultConfig = false;
includes = [
# Local configuration, not-versioned
@ -53,11 +54,12 @@ in
identityFile = "~/.ssh/shared_rsa";
user = "ambroisie";
};
};
extraConfig = ''
AddKeysToAgent yes
'';
# `*` is automatically made the last match block by the module
"*" = {
addKeysToAgent = "yes";
};
};
};
}

View file

@ -0,0 +1,17 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.home.trgui;
in
{
options.my.home.trgui = with lib; {
enable = mkEnableOption "Transmission GUI onfiguration";
package = mkPackageOption pkgs "TrguiNG" { default = "trgui-ng"; };
};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
cfg.package
];
};
}

View file

@ -13,7 +13,7 @@ in
# Nice wallpaper
services.xserver.displayManager.lightdm.background =
let
wallpapers = "${pkgs.plasma5Packages.plasma-workspace-wallpapers}/share/wallpapers";
wallpapers = "${pkgs.kdePackages.plasma-workspace-wallpapers}/share/wallpapers";
in
"${wallpapers}/summer_1am/contents/images/2560x1600.jpg";