From 754caf00d4b615d363ee59ba7b2455eaac1adbed Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Fri, 23 Jan 2026 21:16:35 +0800 Subject: [PATCH] feat: shotwell -> loupe --- hosts/imxyy-nix-x16/home.nix | 6 +++--- hosts/imxyy-nix/home.nix | 6 +++--- modules/desktop/media/all.nix | 2 +- modules/desktop/media/loupe.nix | 18 ++++++++++++++++++ modules/desktop/media/shotwell.nix | 18 ------------------ 5 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 modules/desktop/media/loupe.nix delete mode 100644 modules/desktop/media/shotwell.nix diff --git a/hosts/imxyy-nix-x16/home.nix b/hosts/imxyy-nix-x16/home.nix index e9b0dcd..f144e74 100644 --- a/hosts/imxyy-nix-x16/home.nix +++ b/hosts/imxyy-nix-x16/home.nix @@ -64,8 +64,8 @@ defaultApplications = let browser = [ config.my.desktop.browser.default.desktop ]; - editor = [ "codium.desktop" ]; - imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ]; + editor = [ "nvim.desktop" ]; + imageviewer = [ "org.gnome.Loupe.desktop" ]; in { "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; @@ -74,7 +74,6 @@ "text/*" = editor; "application/json" = editor; - "text/html" = editor; "text/xml" = editor; "application/xml" = editor; "application/xhtml+xml" = editor; @@ -87,6 +86,7 @@ "application/x-extension-xht" = editor; "application/x-extension-xhtml" = editor; + "text/html" = browser; "x-scheme-handler/about" = browser; "x-scheme-handler/ftp" = browser; "x-scheme-handler/http" = browser; diff --git a/hosts/imxyy-nix/home.nix b/hosts/imxyy-nix/home.nix index d677bc2..0f88ccf 100644 --- a/hosts/imxyy-nix/home.nix +++ b/hosts/imxyy-nix/home.nix @@ -96,8 +96,8 @@ defaultApplications = let browser = [ config.my.desktop.browser.default.desktop ]; - editor = [ "codium.desktop" ]; - imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ]; + editor = [ "nvim.desktop" ]; + imageviewer = [ "org.gnome.Loupe.desktop" ]; in { "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; @@ -106,7 +106,6 @@ "text/*" = editor; "application/json" = editor; - "text/html" = editor; "text/xml" = editor; "application/xml" = editor; "application/xhtml+xml" = editor; @@ -119,6 +118,7 @@ "application/x-extension-xht" = editor; "application/x-extension-xhtml" = editor; + "text/html" = browser; "x-scheme-handler/about" = browser; "x-scheme-handler/ftp" = browser; "x-scheme-handler/http" = browser; diff --git a/modules/desktop/media/all.nix b/modules/desktop/media/all.nix index 28ec7f4..2c9955c 100644 --- a/modules/desktop/media/all.nix +++ b/modules/desktop/media/all.nix @@ -10,7 +10,7 @@ in config = lib.mkIf cfg.enable { my.desktop.media = { mpv.enable = true; - shotwell.enable = true; + loupe.enable = true; thunderbird.enable = true; vlc.enable = true; splayer.enable = true; diff --git a/modules/desktop/media/loupe.nix b/modules/desktop/media/loupe.nix new file mode 100644 index 0000000..2aad4d8 --- /dev/null +++ b/modules/desktop/media/loupe.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.my.desktop.media.loupe; +in +{ + options.my.desktop.media.loupe = { + enable = lib.mkEnableOption "loupe"; + }; + + config = lib.mkIf cfg.enable { + my.hm.home.packages = [ pkgs.loupe ]; + }; +} diff --git a/modules/desktop/media/shotwell.nix b/modules/desktop/media/shotwell.nix deleted file mode 100644 index dadb046..0000000 --- a/modules/desktop/media/shotwell.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.my.desktop.media.shotwell; -in -{ - options.my.desktop.media.shotwell = { - enable = lib.mkEnableOption "shotwell"; - }; - - config = lib.mkIf cfg.enable { - my.hm.home.packages = [ pkgs.shotwell ]; - }; -}