From dfcb75be6a85f66e88ab12c7fefd6b4ef9de71ae Mon Sep 17 00:00:00 2001 From: parasrah Date: Mon, 24 Apr 2023 09:30:49 -0600 Subject: [PATCH] users: support some users using different browser --- .../modules/{web-browser.nix => firefox.nix} | 0 users/parasrah/athena.nix | 4 +++- users/parasrah/cfg/mimeApps.nix | 22 +++++++++---------- users/parasrah/default.nix | 2 -- users/parasrah/lexi.nix | 4 +++- users/parasrah/rei.nix | 4 +++- 6 files changed, 20 insertions(+), 16 deletions(-) rename users/modules/{web-browser.nix => firefox.nix} (100%) diff --git a/users/modules/web-browser.nix b/users/modules/firefox.nix similarity index 100% rename from users/modules/web-browser.nix rename to users/modules/firefox.nix diff --git a/users/parasrah/athena.nix b/users/parasrah/athena.nix index aef29a1..739bed0 100644 --- a/users/parasrah/athena.nix +++ b/users/parasrah/athena.nix @@ -30,7 +30,6 @@ in ../modules/utilities.nix ../modules/vdirsyncer.nix ../modules/wayland.nix - ../modules/web-browser.nix ../modules/web.nix ../modules/wlsunset.nix ]; @@ -75,6 +74,7 @@ in home.packages = with pkgs; [ dbus + brave wmctrl polkit ncurses @@ -95,4 +95,6 @@ in ]; services.screen-locker.enable = false; + + xdg.mimeApps = import ./cfg/mimeApps.nix { browser = "brave-browser.desktop"; }; } diff --git a/users/parasrah/cfg/mimeApps.nix b/users/parasrah/cfg/mimeApps.nix index 8ddd2ae..d951bcf 100644 --- a/users/parasrah/cfg/mimeApps.nix +++ b/users/parasrah/cfg/mimeApps.nix @@ -1,4 +1,4 @@ -{ +{ browser ? "firefox.desktop" }: { enable = true; associations = { removed = { }; @@ -22,16 +22,16 @@ "text/x-shellscript" = "kakoune.desktop"; # web browser - "application/x-extension-htm" = "firefox.desktop"; - "application/x-extension-html" = "firefox.desktop"; - "application/x-extension-shtml" = "firefox.desktop"; - "application/x-extension-xht" = "firefox.desktop"; - "application/x-extension-xhtml" = "firefox.desktop"; - "application/xhtml+xml" = "firefox.desktop"; - "text/html" = "firefox.desktop"; - "x-scheme-handler/chrome" = "firefox.desktop"; - "x-scheme-handler/http" = "firefox.desktop"; - "x-scheme-handler/https" = "firefox.desktop"; + "application/x-extension-htm" = browser; + "application/x-extension-html" = browser; + "application/x-extension-shtml" = browser; + "application/x-extension-xht" = browser; + "application/x-extension-xhtml" = browser; + "application/xhtml+xml" = browser; + "text/html" = browser; + "x-scheme-handler/chrome" = browser; + "x-scheme-handler/http" = browser; + "x-scheme-handler/https" = browser; # other "inode/directory" = "org.kde.dolphin.desktop"; diff --git a/users/parasrah/default.nix b/users/parasrah/default.nix index 5fdcfc5..9ec20be 100644 --- a/users/parasrah/default.nix +++ b/users/parasrah/default.nix @@ -193,8 +193,6 @@ in kaksys.source = "${pkgs.kakoune-unwrapped}/share/kak/autoload/rc"; }; - xdg.mimeApps = import ./cfg/mimeApps.nix; - qt = { enable = true; platformTheme = "gnome"; diff --git a/users/parasrah/lexi.nix b/users/parasrah/lexi.nix index d299a26..87942f6 100644 --- a/users/parasrah/lexi.nix +++ b/users/parasrah/lexi.nix @@ -38,7 +38,7 @@ in ../modules/utilities.nix ../modules/vdirsyncer.nix ../modules/wayland.nix - ../modules/web-browser.nix + ../modules/firefox.nix ../modules/web.nix ]; @@ -77,4 +77,6 @@ in deluge libva-utils ]; + + xdg.mimeApps = import ./cfg/mimeApps.nix { }; } diff --git a/users/parasrah/rei.nix b/users/parasrah/rei.nix index d54359d..e8533ee 100644 --- a/users/parasrah/rei.nix +++ b/users/parasrah/rei.nix @@ -28,7 +28,7 @@ in ../modules/fonts.nix ../modules/roguelike.nix ../modules/media.nix - ../modules/web-browser.nix + ../modules/firefox.nix ../modules/rkyv.nix ]; @@ -64,4 +64,6 @@ in home.packages = with pkgs; [ ]; + + xdg.mimeApps = import ./cfg/mimeApps.nix { }; } -- 2.45.2