Compare commits

...

22 commits

Author SHA1 Message Date
a3bf8b8cbf REMOVE THIS ONE
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-02-24 15:59:59 +00:00
1c923842f6 home: terminal: termite: add MIME associations 2025-02-24 15:59:59 +00:00
432e7a83e5 home: terminal: alacritty: add MIME associations 2025-02-24 15:59:58 +00:00
9e519d55eb home: zathura: add MIME associations 2025-02-24 15:59:58 +00:00
3b3c1eb0e3 home: nvim: add MIME associations 2025-02-24 15:59:58 +00:00
a55ee3cebd home: mpv: add MIME associations 2025-02-24 15:59:58 +00:00
43f99c3d33 home: himalaya: add MIME associations 2025-02-24 15:59:58 +00:00
ca208db43c home: firefox: add MIME associations 2025-02-24 15:59:58 +00:00
46114d1f73 home: feh: add MIME association 2025-02-24 15:59:58 +00:00
f813b6fd4f WIP: home: xdg: add 'mime-apps' 2025-02-24 15:59:58 +00:00
d3a953247c home: packages: disable on 'useGlobalPkgs'
All checks were successful
ci/woodpecker/push/check Pipeline was successful
It doesn't do anything when `useGlobalPkgs` is set, and has started
warning about its upcoming deprecation.
2025-02-24 14:15:04 +00:00
337d7309c6 home: git: use 'mkAfter' for config includes
All checks were successful
ci/woodpecker/push/check Pipeline was successful
This should ensure that they will be included at the very end of the
configuration, even if other modules add more includes.

Notably, this ensures that the local configuration can override any
other setting.
2025-02-24 14:02:06 +00:00
1237ef4174 home: git: include local configuration properly
All checks were successful
ci/woodpecker/push/check Pipeline was successful
Using `includes` ensures that the local configuration is included at the
end of the configuration file.
2025-02-21 16:22:44 +00:00
8f5be69a4e flake: bump inputs
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-02-17 15:33:53 +01:00
f474c033d5 nixos: services: nginx: remove zstd compression
All checks were successful
ci/woodpecker/push/check Pipeline was successful
The zstd module is unmaintained and buggy, remove it preventively.

The option itself will probably be removed soon [1].

[1]: https://github.com/NixOS/nixpkgs/pull/381678
2025-02-13 22:55:25 +01:00
80b4c9ffcd home: mail: accounts: use 'migadu' flavor 2025-02-13 22:55:25 +01:00
374886a63f nixos: services: servarr: remove build work-around
It's been fixed upstream.

This partially reverts commit ad1cfbd6f0.
2025-02-13 22:55:25 +01:00
40a841031f flake: bump inputs 2025-02-13 22:55:25 +01:00
b6d58a274a pkgs: lohr: use 'useFetchCargoVendor'
The previous fetcher is in the process of being deprecated.
2025-02-13 22:55:25 +01:00
9c4d853037 home: secrets: github: update token 2025-02-13 22:55:25 +01:00
2cbcbb7b3a home: secrets: fix path to 'keys' 2025-02-13 22:55:25 +01:00
533e3b9a9f nixos: services: add homebox 2025-02-13 22:55:25 +01:00
21 changed files with 394 additions and 48 deletions

24
flake.lock generated
View file

@ -73,11 +73,11 @@
]
},
"locked": {
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@ -136,11 +136,11 @@
]
},
"locked": {
"lastModified": 1737968762,
"narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=",
"lastModified": 1739790043,
"narHash": "sha256-4gK4zdNDQ4PyGFs7B6zp9iPIBy9E+bVJiZ0XAmncvgQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e",
"rev": "c1ea92cdfb85bd7b0995b550581d9fd1c3370bf9",
"type": "github"
},
"original": {
@ -152,11 +152,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1737885589,
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
"lastModified": 1739580444,
"narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
"rev": "8bb37161a0488b89830168b81c48aed11569cb93",
"type": "github"
},
"original": {
@ -177,11 +177,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1738059992,
"narHash": "sha256-VeNLLucQTlED2cqD3uofh968tm7u7UgwCdY5+jo/BSc=",
"lastModified": 1739796551,
"narHash": "sha256-XcTK29rOc0WxcSJDHUK8JQege9CzSVVAcjHdswOVFPA=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c46c836963685acbd2430439f859b60f230b3643",
"rev": "827aa6eeaf92cc085f84947f6c32002792b67497",
"type": "github"
},
"original": {

View file

@ -10,4 +10,11 @@ in
config.programs.feh = lib.mkIf cfg.enable {
enable = true;
};
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
applications.media.image = {
bitmap = [ "feh.desktop" ];
vector = [ "feh.desktop" ];
};
};
}

View file

@ -77,4 +77,8 @@ in
};
};
};
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
applications.editor = [ "firefox.desktop" ];
};
}

View file

@ -123,11 +123,6 @@ in
defaultBranch = "main";
};
# Local configuration, not-versioned
include = {
path = "config.local";
};
merge = {
conflictStyle = "zdiff3";
};
@ -167,8 +162,8 @@ in
};
};
# Multiple identities
includes = [
includes = lib.mkAfter [
# Multiple identities
{
condition = "gitdir:~/git/EPITA/";
contents = {
@ -187,6 +182,10 @@ in
};
};
}
# Local configuration, not-versioned
{
path = "config.local";
}
];
ignores =

View file

@ -26,20 +26,7 @@ let
};
migaduConfig = {
imap = {
host = "imap.migadu.com";
port = 993;
tls = {
enable = true;
};
};
smtp = {
host = "smtp.migadu.com";
port = 465;
tls = {
enable = true;
};
};
flavor = "migadu.com";
};
gmailConfig = {

View file

@ -20,4 +20,8 @@ in
'';
};
};
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
applications.editor = [ "himalaya.desktop" ];
};
}

View file

@ -17,5 +17,12 @@ in
pkgs.mpvScripts.uosc # Nicer UI
];
};
my.home.xdg.mime-apps = {
applications.media = {
audio = [ "mpv.desktop" ];
video = [ "mpv.desktop" ];
};
};
};
}

View file

@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, osConfig, ... }:
let
cfg = config.my.home.packages;
useGlobalPkgs = osConfig.home-manager.useGlobalPkgs or false;
in
{
options.my.home.packages = with lib; {
@ -29,7 +30,7 @@ in
tree
] ++ cfg.additionalPackages);
nixpkgs.config = {
nixpkgs.config = lib.mkIf (!useGlobalPkgs) {
inherit (cfg) allowAliases allowUnfree;
};
};

View file

@ -1,6 +1,6 @@
# Common secrets
let
keys = import ../../keys;
keys = import ../../../keys;
all = builtins.attrValues keys.users;
in

View file

@ -48,5 +48,9 @@ in
};
};
};
my.home.xdg.mime-apps = {
applications.terminal = [ "Alacritty.desktop" ];
};
};
}

View file

@ -49,5 +49,9 @@ in
color15 = ${whiteBold}
'';
};
my.home.xdg.mime-apps = {
applications.terminal = [ "termite.desktop" ];
};
};
}

View file

@ -107,4 +107,8 @@ in
};
config.xdg.configFile = lib.mkIf cfg.enable configFiles;
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
applications.editor = [ "nvim.desktop" ];
};
}

View file

@ -3,6 +3,10 @@ let
cfg = config.my.home.xdg;
in
{
imports = [
./mime-apps.nix
];
options.my.home.xdg = with lib; {
enable = my.mkDisableOption "XDG configuration";
};

View file

@ -0,0 +1,280 @@
{ config, lib, ... }:
let
cfg = config.my.home.xdg.mime-apps;
app = cfg.applications;
strOrStrList = with lib.types; coercedTo str lib.singleton (listOf str);
mkMimeAppOption = kind: lib.mkOption {
description = "Application to associate as ${kind}";
default = null;
type = lib.types.nullOr strOrStrList;
};
in
{
options.my.home.xdg.mime-apps = with lib; {
enable = my.mkDisableOption "XDG MIME Applications configuration";
applications = lib.mapAttrsRecursive (_: mkMimeAppOption) {
archive = "archive manager";
browser = "internet browser";
calendar = "calendar";
editor = "text editor";
fileManager = "file manager";
mail = "mail client";
media = {
audio = "audio player";
document = {
comic = "comic book reader";
ebook = "ebook reader";
pdf = "PDF reader";
};
image = {
bitmap = "bitmap image viewer";
vector = "vector image viewer";
editor = "image editor";
};
video = "video player";
};
office = {
database = "database management program";
formula = "formula editor";
graphics = "graphics editor";
presentation = "presentation editor";
spreadsheet = "spreadsheet editor";
text = "word processor";
};
terminal = "terminal";
torrent = "bittorrent client";
};
};
config = lib.mkIf cfg.enable {
xdg = {
mimeApps = {
enable = true;
defaultApplications = lib.filterAttrs (_: apps: apps != null) {
"application/epub+zip" = app.media.document.ebook;
"application/gzip" = app.archive;
"application/json" = app.editor;
"application/ld+json" = app.editor;
"application/mxf " = app.media.video;
"application/ogg" = app.media.audio;
"application/pdf" = app.media.document.pdf;
"application/rss+xml" = app.editor;
"application/smil+xml " = app.media.video;
"application/vnd.amazon.ebook" = app.media.document.ebook;
"application/vnd.apple.mpegurl " = app.media.video;
"application/vnd.comicbook+zip" = app.media.document.comic;
"application/vnd.comicbook-rar" = app.media.document.comic;
"application/vnd.mozilla.xul+xml" = app.browser;
"application/vnd.ms-excel" = app.office.spreadsheet;
"application/vnd.ms-powerpoint" = app.office.presentation;
"application/vnd.ms-word" = app.office.text;
"application/vnd.oasis.opendocument.database" = app.office.database;
"application/vnd.oasis.opendocument.formula" = app.office.formula;
"application/vnd.oasis.opendocument.graphics" = app.office.graphics;
"application/vnd.oasis.opendocument.graphics-template" = app.office.graphics;
"application/vnd.oasis.opendocument.presentation" = app.office.presentation;
"application/vnd.oasis.opendocument.presentation-template" = app.office.presentation;
"application/vnd.oasis.opendocument.spreadsheet" = app.office.spreadsheet;
"application/vnd.oasis.opendocument.spreadsheet-template" = app.office.spreadsheet;
"application/vnd.oasis.opendocument.text" = app.office.text;
"application/vnd.oasis.opendocument.text-master" = app.office.text;
"application/vnd.oasis.opendocument.text-template" = app.office.text;
"application/vnd.oasis.opendocument.text-web" = app.office.text;
"application/vnd.openxmlformats-officedocument.presentationml.presentation" = app.office.presentation;
"application/vnd.openxmlformats-officedocument.presentationml.template" = app.office.presentation;
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = app.office.spreadsheet;
"application/vnd.openxmlformats-officedocument.spreadsheetml.template" = app.office.spreadsheet;
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = app.office.text;
"application/vnd.openxmlformats-officedocument.wordprocessingml.template" = app.office.text;
"application/vnd.rar" = app.archive;
"application/vnd.stardivision.calc" = app.office.spreadsheet;
"application/vnd.stardivision.draw" = app.office.graphics;
"application/vnd.stardivision.impress" = app.office.presentation;
"application/vnd.stardivision.math" = app.office.formula;
"application/vnd.stardivision.writer" = app.office.text;
"application/vnd.sun.xml.base" = app.office.database;
"application/vnd.sun.xml.calc" = app.office.spreadsheet;
"application/vnd.sun.xml.calc.template" = app.office.spreadsheet;
"application/vnd.sun.xml.draw" = app.office.graphics;
"application/vnd.sun.xml.draw.template" = app.office.graphics;
"application/vnd.sun.xml.impress" = app.office.presentation;
"application/vnd.sun.xml.impress.template" = app.office.presentation;
"application/vnd.sun.xml.math" = app.office.formula;
"application/vnd.sun.xml.writer" = app.office.text;
"application/vnd.sun.xml.writer.global" = app.office.text;
"application/vnd.sun.xml.writer.template" = app.office.text;
"application/vnd.wordperfect" = app.office.text;
"application/x-7z-compressed" = app.archive;
"application/x-arj" = app.archive;
"application/x-bittorrent" = app.torrent;
"application/x-bzip" = app.archive;
"application/x-bzip-compressed-tar" = app.archive;
"application/x-bzip2" = app.archive;
"application/x-cb7" = app.media.document.comic;
"application/x-cbr" = app.media.document.comic;
"application/x-cbt" = app.media.document.comic;
"application/x-cbz" = app.media.document.comic;
"application/x-compress" = app.archive;
"application/x-compressed-tar" = app.archive;
"application/x-csh" = app.editor;
"application/x-cue" = app.media.audio;
"application/x-directory" = app.fileManager;
"application/x-extension-htm" = app.browser;
"application/x-extension-html" = app.browser;
"application/x-extension-ics" = app.calendar;
"application/x-extension-m4a" = app.media.audio;
"application/x-extension-mp4" = app.media.video;
"application/x-extension-shtml" = app.browser;
"application/x-extension-xht" = app.browser;
"application/x-extension-xhtml" = app.browser;
"application/x-fictionbook" = app.media.document.ebook;
"application/x-fictionbook+xml" = app.media.document.ebook;
"application/x-flac" = app.media.audio;
"application/x-gzip" = app.archive;
"application/x-lha" = app.archive;
"application/x-lhz" = app.archive;
"application/x-lzop" = app.archive;
"application/x-matroska" = app.media.video;
"application/x-netshow-channel" = app.media.video;
"application/x-quicktime-media-link" = app.media.video;
"application/x-quicktimeplayer" = app.media.video;
"application/x-rar" = app.archive;
"application/x-sh" = app.editor;
"application/x-shellscript" = app.editor;
"application/x-shorten " = app.media.audio;
"application/x-smil" = app.media.video;
"application/x-tar" = app.archive;
"application/x-tarz" = app.archive;
"application/x-wine-extension-ini" = app.editor;
"application/x-zip-compressed" = app.archive;
"application/x-zoo" = app.archive;
"application/xhtml+xml" = app.browser;
"application/xml" = app.editor;
"application/zip" = app.archive;
"audio/*" = app.media.video;
"image/*" = app.media.image.bitmap;
"image/svg+xml" = app.media.image.vector;
"image/x-compressed-xcf" = app.media.image.editor;
"image/x-fits" = app.media.image.editor;
"image/x-psd" = app.media.image.editor;
"image/x-xcf" = app.media.image.editor;
"inode/directory" = app.fileManager;
"message/rfc822" = app.mail;
"text/*" = app.editor;
"text/calendar" = app.calendar;
"text/html" = app.browser;
"text/plain" = app.editor;
"video/*" = app.media.video;
"x-scheme-handler/about" = app.browser;
"x-scheme-handler/chrome" = app.browser;
"x-scheme-handler/file" = app.fileManager;
"x-scheme-handler/ftp" = app.browser;
"x-scheme-handler/http" = app.browser;
"x-scheme-handler/https" = app.browser;
"x-scheme-handler/mailto" = app.mail;
"x-scheme-handler/mid" = app.mail;
"x-scheme-handler/terminal" = app.terminal;
"x-scheme-handler/unknown" = app.browser;
"x-scheme-handler/webcal" = app.calendar;
"x-scheme-handler/webcals" = app.calendar;
"x-www-browser" = app.browser;
# FIXME: relevant? https://bbs.archlinux.org/viewtopic.php?id=243125
# FIXME: shouldn't be necessary then
# "audio/AMR" = app.media.audio;
# "audio/aac" = app.media.audio;
# "audio/ac3" = app.media.audio;
# "audio/flac" = app.media.audio;
# "audio/mp2" = app.media.audio;
# "audio/mp4" = app.media.audio;
# "audio/mpeg" = app.media.audio;
# "audio/ogg" = app.media.audio;
# "audio/vnd.dts" = app.media.audio;
# "audio/vnd.dts.hd" = app.media.audio;
# "audio/vnd.rn-realaudio" = app.media.audio;
# "audio/webm" = app.media.audio;
# "audio/x-adpcm" = app.media.audio;
# "audio/x-aiff" = app.media.audio;
# "audio/x-ape" = app.media.audio;
# "audio/x-matroska" = app.media.audio;
# "audio/x-mpegurl" = app.media.audio;
# "audio/x-ms-asx" = app.media.audio;
# "audio/x-ms-wma" = app.media.audio;
# "audio/x-musepack" = app.media.audio;
# "audio/x-scpls" = app.media.audio;
# "audio/x-tta" = app.media.audio;
# "audio/x-vorbis+ogg" = app.media.audio;
# "audio/x-wav" = app.media.audio;
# "audio/x-wavpack" = app.media.audio;
# "image/bmp" = app.media.image.bitmap;
# "image/gif" = app.media.image.bitmap;
# "image/heif" = app.media.image.bitmap;
# "image/jpeg" = app.media.image.bitmap;
# "image/jpg" = app.media.image.bitmap;
# "image/pjpeg" = app.media.image.bitmap;
# "image/png" = app.media.image.bitmap;
# "image/tiff" = app.media.image.bitmap;
# "image/vnd.zbrush.pcx" = app.media.image.bitmap;
# "image/webp" = app.media.image.bitmap;
# "image/x-icb" = app.media.image.bitmap;
# "image/x-ico" = app.media.image.bitmap;
# "image/x-pcx" = app.media.image.bitmap;
# "image/x-portable-anymap" = app.media.image.bitmap;
# "image/x-portable-bitmap" = app.media.image.bitmap;
# "image/x-portable-graymap" = app.media.image.bitmap;
# "image/x-portable-pixmap" = app.media.image.bitmap;
# "image/x-tga" = app.media.image.bitmap;
# "image/x-xbitmap" = app.media.image.bitmap;
# "image/x-xpixmap" = app.media.image.bitmap;
# "image/x-xwindowdump" = app.media.image.bitmap;
# "text/tcl" = app.editor;
# "text/x-c++hdr" = app.editor;
# "text/x-c++src" = app.editor;
# "text/x-chdr" = app.editor;
# "text/x-csrc" = app.editor;
# "text/x-java" = app.editor;
# "text/x-makefile" = app.editor;
# "text/x-moc" = app.editor;
# "text/x-pascal" = app.editor;
# "text/x-tex" = app.editor;
# "video/3gpp" = app.media.video;
# "video/3gpp2" = app.media.video;
# "video/dv" = app.media.video;
# "video/mp2t" = app.media.video;
# "video/mp4" = app.media.video;
# "video/mpeg" = app.media.video;
# "video/ogg" = app.media.video;
# "video/quicktime" = app.media.video;
# "video/vnd.mpegurl" = app.media.video;
# "video/vnd.rn-realvideo" = app.media.video;
# "video/webm" = app.media.video;
# "video/x-flic" = app.media.video;
# "video/x-flv" = app.media.video;
# "video/x-matroska" = app.media.video;
# "video/x-ms-wmv" = app.media.video;
# "video/x-msvideo" = app.media.video;
# "video/x-ogm+ogg" = app.media.video;
# "video/x-theora+ogg" = app.media.video;
# FIXME: kind of weird formats, not quite adapted to attribute name
# "application/eps" = app.media.document.pdf
# "application/oxps" = app.media.document.pdf
# "application/postscript" = app.media.document.pdf
# "application/x-eps" = app.media.document.pdf
# "image/eps" = app.media.document.pdf
# "image/vnd.djvu" = app.media.document.pdf
# "image/vnd.djvu+multipage" = app.media.document.pdf
# "image/x-eps" = app.media.document.pdf
# FIXME: additionally interesting, but not necessary
# "x-scheme-handler/discord" = [ "discord.desktop" ];
# "x-scheme-handler/msteams" = [ "teams.desktop" ];
# "x-scheme-handler/slack" = [ "slack.desktop" ];
};
};
};
};
}

View file

@ -17,4 +17,12 @@ in
"statusbar-home-tilde" = true;
};
};
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
applications.media.document = {
comic = [ "org.pwmt.zathura.desktop" ];
ebook = [ "org.pwmt.zathura.desktop" ];
pdf = [ "org.pwmt.zathura.desktop" ];
};
};
}

View file

@ -14,6 +14,7 @@
./forgejo
./gitea
./grocy
./homebox
./indexers
./jellyfin
./komga

View file

@ -0,0 +1,42 @@
# Home inventory made easy
{ config, lib, ... }:
let
cfg = config.my.services.homebox;
in
{
options.my.services.homebox = with lib; {
enable = mkEnableOption "Homebox home inventory";
port = mkOption {
type = types.port;
default = 7745;
example = 8080;
description = "Internal port for webui";
};
};
config = lib.mkIf cfg.enable {
services.homebox = {
enable = true;
settings = {
# FIXME: mailer?
HBOX_WEB_PORT = toString cfg.port;
};
};
my.services.nginx.virtualHosts = {
homebox = {
inherit (cfg) port;
};
};
my.services.backup = {
paths = [
config.services.homebox.settings.HBOX_STORAGE_DATA
];
};
# NOTE: unfortunately homebox does not log connection failures for fail2ban
};
}

View file

@ -253,7 +253,6 @@ in
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
recommendedZstdSettings = true;
virtualHosts =
let

View file

@ -96,15 +96,5 @@ in
# Sonarr for shows
(mkFullConfig "sonarr")
(mkFail2Ban "sonarr")
# HACK: until https://github.com/NixOS/nixpkgs/issues/360592 is resolved
(lib.mkIf cfg.sonarr.enable {
nixpkgs.config.permittedInsecurePackages = [
"aspnetcore-runtime-6.0.36"
"aspnetcore-runtime-wrapped-6.0.36"
"dotnet-sdk-6.0.428"
"dotnet-sdk-wrapped-6.0.428"
];
})
]);
}

View file

@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-dunQgtap+XCK5LoSyOqIY/6p6HizBeiyPWNuCffwjDU=";
};
cargoHash = "sha256-EUhyrhPe+mUgMmm4o+bxRIiSNReJRfw+/O1fPr8r7lo=";
useFetchCargoVendor = true;
cargoHash = "sha256-R3/N/43+bGx6acE/rhBcrk6kS5zQu8NJ1sVvKJJkK9w=";
meta = with lib; {
description = "Git mirroring daemon";