Compare commits

..

19 commits

Author SHA1 Message Date
b24d6e0e9d REMOVE THIS ONE
Some checks failed
ci/woodpecker/push/check Pipeline failed
2025-09-04 11:41:49 +00:00
c082cea569 home: terminal: termite: add MIME associations 2025-09-04 11:41:49 +00:00
a3e3644c55 home: terminal: alacritty: add MIME associations 2025-09-04 11:41:49 +00:00
8f837d95a3 home: zathura: add MIME associations 2025-09-04 11:41:49 +00:00
981503a5f6 home: trgui: add MIME associations 2025-09-04 11:41:49 +00:00
f7c9d0a78b home: nvim: add MIME associations 2025-09-04 11:41:49 +00:00
5a2a60c791 home: mpv: add MIME associations 2025-09-04 11:41:49 +00:00
90bd56b59f home: himalaya: add MIME associations 2025-09-04 11:41:49 +00:00
1df29d4c47 home: firefox: add MIME associations 2025-09-04 11:41:49 +00:00
dc60a8219a home: feh: add MIME association 2025-09-04 11:41:48 +00:00
ba9e8abcb6 WIP: home: xdg: add 'mime-apps' 2025-09-04 11:41:48 +00:00
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
5 changed files with 51 additions and 39 deletions

18
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": {
@ -159,11 +159,11 @@
]
},
"locked": {
"lastModified": 1756022458,
"narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
"lastModified": 1756954499,
"narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
"rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25",
"type": "github"
},
"original": {
@ -175,11 +175,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1756125398,
"narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=",
"lastModified": 1756936398,
"narHash": "sha256-/o1TTpMIICpjrMHBilL9lYm/r69uhdK1L8j1pfY6tWU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5",
"rev": "47f28ad9378956563df9a884fd1b209b64336ba3",
"type": "github"
},
"original": {

View file

@ -18,7 +18,6 @@
# Machine specific packages
packages.additionalPackages = with pkgs; [
element-desktop # Matrix client
jellyfin-media-player # Wraps the webui and mpv together
pavucontrol # Audio mixer GUI
];
# Minimal video player

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

@ -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

@ -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";