From c7312e0ad8f31733b9f1d841639cf80d62aee033 Mon Sep 17 00:00:00 2001 From: nydragon Date: Tue, 18 Mar 2025 17:14:08 +0100 Subject: [PATCH] fix: mime type related stuff --- home/default.nix | 2 +- home/desktop/default.nix | 5 ----- hosts/brontes/default.nix | 1 - hosts/marr/default.nix | 1 - hosts/nihilus/default.nix | 5 +++++ hosts/raptus/headscale/dns.nix | 3 +++ modules/default.nix | 1 - modules/system/mime.nix | 23 ----------------------- options/media.nix | 2 ++ 9 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 modules/system/mime.nix diff --git a/home/default.nix b/home/default.nix index dcf855c..12b2fdc 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,7 +1,7 @@ # This file contains default settings used across different systems { imports = [ - ./themes/catppuccin.nix + ./themes/vanilla.nix ./graphical ./terminal ./desktop diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 441b2bf..cf0955e 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -2,7 +2,6 @@ self, pkgs, lib, - osConfig, ... }: let @@ -25,9 +24,5 @@ in (mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png") (mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png") ]; - mimeApps = { - enable = true; - defaultApplications = osConfig.xdg.mime.defaultApplications; - }; }; } diff --git a/hosts/brontes/default.nix b/hosts/brontes/default.nix index ffeb298..97120c5 100644 --- a/hosts/brontes/default.nix +++ b/hosts/brontes/default.nix @@ -39,7 +39,6 @@ in xdg = { portal.enable = true; - mime.enable = true; }; modules = { diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix index b4b9b2d..e9b721d 100644 --- a/hosts/marr/default.nix +++ b/hosts/marr/default.nix @@ -67,7 +67,6 @@ in xdg = { portal.enable = true; - mime.enable = true; }; specialisation = { diff --git a/hosts/nihilus/default.nix b/hosts/nihilus/default.nix index ba21297..37e5f1b 100644 --- a/hosts/nihilus/default.nix +++ b/hosts/nihilus/default.nix @@ -63,6 +63,11 @@ comment = "backup location for games"; mode = "write"; } + { + name = "brontes-backup"; + comment = "brontes's backup space"; + mode = "write"; + } ]; }; }; diff --git a/hosts/raptus/headscale/dns.nix b/hosts/raptus/headscale/dns.nix index d217cb0..ee20bea 100644 --- a/hosts/raptus/headscale/dns.nix +++ b/hosts/raptus/headscale/dns.nix @@ -48,6 +48,9 @@ "octoprint" "assistant" "rss" + "calibre" + "prometheus" + "grafana" ]; }; }; diff --git a/modules/default.nix b/modules/default.nix index d8f5059..e1fb2d9 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -10,7 +10,6 @@ ./system/printing.nix ./system/audio.nix - ./system/mime.nix ./system/polkit.nix ./users/ny.nix diff --git a/modules/system/mime.nix b/modules/system/mime.nix deleted file mode 100644 index 9f408b7..0000000 --- a/modules/system/mime.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - xdg.mime = { - defaultApplications = - let - fileManager = "org.gnome.Nautilus.desktop"; - browser = "firefox-esr.desktop"; - in - { - "inode/directory" = fileManager; - "application/zip" = fileManager; - "application/pdf" = browser; - "x-www-browser" = browser; - "text/html" = browser; - "application/vnd.comicbook+zip" = "com.github.johnfactotum.Foliate.desktop"; - "application/epub+zip" = "com.github.johnfactotum.Foliate.desktop"; - "image/*" = "org.gnome.Loupe.desktop"; - "image/png" = "org.gnome.Loupe.desktop"; - "image/jpeg" = "org.gnome.Loupe.desktop"; - "x-scheme-handler/http" = browser; - "x-scheme-handler/https" = browser; - }; - }; -} diff --git a/options/media.nix b/options/media.nix index eb5549d..7613633 100644 --- a/options/media.nix +++ b/options/media.nix @@ -88,6 +88,8 @@ in "audio/mpeg" = cfg.audio.default; # Ebooks sadly don't have a singular major type. "application/epub+zip" = cfg.ebook.default; + "application/pdf" = cfg.ebook.default; + "application/vnd.comicbook+zip" = cfg.ebook.default; }; }; };