From 762f1ef71d50f831f0a7de8a4c319998d7fd0b58 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 29 Jan 2024 11:33:05 +0000 Subject: [PATCH] Remove teams-for-linux, switch back to chromium for backup browser Add emacsclient as preferred mime entry with emacs as fallback --- system/chromium.nix | 3 ++- system/hyprland.nix | 38 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/system/chromium.nix b/system/chromium.nix index ec62cb5c..cc4d1086 100644 --- a/system/chromium.nix +++ b/system/chromium.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ pkgs, ... }: { + environment.systemPackages = [ pkgs.chromium ]; programs.chromium = rec { enable = true; defaultSearchProviderEnabled = true; diff --git a/system/hyprland.nix b/system/hyprland.nix index 6807412a..73cf23db 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - imports = [ ./desktop.nix ./firefox.nix ./chromium.nix ]; + imports = [ ./desktop.nix ./chromium.nix ]; nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; environment = { @@ -33,7 +33,6 @@ mpg123 libreoffice webcord - teams-for-linux ]; }; security.pam.services.swaylock = { }; @@ -52,26 +51,27 @@ xdg.mime = rec { enable = true; defaultApplications = { - "application/pdf" = [ "emacs.desktop" ]; - "application/epub+zip" = [ "emacs.desktop" ]; - "application/oxps" = [ "emacs.desktop" ]; + "application/pdf" = [ "emacsclient.desktop" "emacs.desktop" ]; + "application/epub+zip" = [ "emacsclient.desktop" "emacs.desktop" ]; + "application/oxps" = [ "emacsclient.desktop" "emacs.desktop" ]; "image/jpeg" = [ "swayimg.desktop" ]; "image/png" = [ "swayimg.desktop" ]; "video/mp4" = [ "mpv.desktop" ]; - "text/csv" = [ "emacs.desktop" ]; - "text/html" = [ "firefox.desktop" ]; - "x-scheme-handler/http" = [ "firefox.desktop" ]; - "x-scheme-handler/https" = [ "firefox.desktop" ]; - "x-scheme-handler/about" = [ "firefox.desktop" ]; - "x-scheme-handler/chrome" = [ "firefox.desktop" ]; - "application/x-extension-htm" = [ "firefox.desktop" ]; - "application/x-extension-html" = [ "firefox.desktop" ]; - "application/x-extension-shtml" = [ "firefox.desktop" ]; - "application/xhtml+xml" = [ "firefox.desktop" ]; - "application/x-extension-xhtml" = [ "firefox.desktop" ]; - "application/x-extension-xht" = [ "firefox.desktop" ]; - "application/x-mozilla-bookmarks" = [ "firefox.desktop" ]; - "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ]; + "text/csv" = [ "emacsclient.desktop" "emacs.desktop" ]; + "text/html" = [ "chromium.desktop" ]; + "x-scheme-handler/http" = [ "chromium.desktop" ]; + "x-scheme-handler/https" = [ "chromium.desktop" ]; + "x-scheme-handler/about" = [ "chromium.desktop" ]; + "x-scheme-handler/chrome" = [ "chromium.desktop" ]; + "application/x-extension-htm" = [ "chromium.desktop" ]; + "application/x-extension-html" = [ "chromium.desktop" ]; + "application/x-extension-shtml" = [ "chromium.desktop" ]; + "application/xhtml+xml" = [ "chromium.desktop" ]; + "application/x-extension-xhtml" = [ "chromium.desktop" ]; + "application/x-extension-xht" = [ "chromium.desktop" ]; + "application/x-mozilla-bookmarks" = [ "chromium.desktop" ]; + "x-scheme-handler/msteams" = [ "chromium.desktop" ]; + "x-scheme-handler/zoomus" = [ "chromium.desktop" ]; }; addedAssociations = defaultApplications; };