diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 1f2209b5..cfb58b0a 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -17,6 +17,7 @@ ../swaync/default.nix ../alacritty/default.nix ../emacs/default.nix + ../firefox/default.nix ../nyxt/default.nix ../qutebrowser/default.nix ../obs/default.nix @@ -239,8 +240,8 @@ "SUPER, Return, exec, ${alacritty.package}/bin/alacritty" "SUPER SHIFT, Return, exec, ${emacs.finalPackage}/bin/emacsclient -c" "SUPER, S, exec, ${alacritty.package}/bin/alacritty -e btm --group --battery" - "SUPER, W, exec, ${pkgs.nyxt}/bin/nyxt --no-socket --with-file bookmarks=${../nyxt/bookmarks.lisp}" - "SUPER SHIFT, W, exec, ${qutebrowser.package}/bin/qutebrowser" + "SUPER, W, exec, ${qutebrowser.package}/bin/qutebrowser" + "SUPER SHIFT, W, exec, ${pkgs.nyxt}/bin/nyxt --no-socket --with-file bookmarks=${../nyxt/bookmarks.lisp}" # Misc useful binds '',Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"'' diff --git a/system/hyprland.nix b/system/hyprland.nix index 73c58c5f..f6915632 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - imports = [./desktop.nix ./chromium.nix]; + imports = [./desktop.nix ./firefox.nix ./chromium.nix]; nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; environment = { sessionVariables = { @@ -21,8 +21,8 @@ protonvpn-gui mpv streamlink - libreoffice webcord + teams-for-linux ]; }; security.pam.services.swaylock = {}; @@ -39,22 +39,17 @@ }; xdg.mime = let emacs = ["emacsclient.desktop" "emacs.desktop"]; - browser = ["org.qutebrowser.qutebrowser.desktop" "nyxt.desktop" "chromium-browser.desktop" "firefox.desktop"]; + browser = ["firefox.desktop" "org.qutebrowser.qutebrowser.desktop" "nyxt.desktop"]; applications = { - "application/pdf" = emacs; - "application/epub+zip" = emacs; - "application/oxps" = emacs; "image/jpeg" = ["swayimg.desktop"] ++ emacs; "image/png" = ["swayimg.desktop"] ++ emacs; "video/mp4" = ["mpv.desktop"]; "text/csv" = emacs; "text/html" = browser; - "x-scheme-handler/http" = browser; - "x-scheme-handler/https" = browser; - "x-scheme-handler/about" = browser; - "x-scheme-handler/chrome" = browser; - "x-scheme-handler/webcal" = browser; - "x-scheme-handler/unknown" = browser; + + "application/pdf" = emacs; + "application/epub+zip" = emacs; + "application/oxps" = emacs; "application/x-extension-htm" = browser; "application/x-extension-html" = browser; "application/x-extension-shtml" = browser; @@ -62,6 +57,16 @@ "application/x-extension-xhtml" = browser; "application/x-extension-xht" = browser; "application/x-mozilla-bookmarks" = browser; + + "x-scheme-handler/http" = browser; + "x-scheme-handler/https" = browser; + "x-scheme-handler/about" = browser; + "x-scheme-handler/chrome" = browser; + "x-scheme-handler/webcal" = browser; + "x-scheme-handler/ms-word" = emacs; + "x-scheme-handler/ms-powerpoint" = emacs; + "x-scheme-handler/ms-excel" = emacs; + "x-scheme-handler/unknown" = emacs; }; in { enable = true;