From d3c1433509d76e3cc596385085247f27022d503f Mon Sep 17 00:00:00 2001 From: Myned Date: Sat, 21 Dec 2024 13:40:32 -0500 Subject: [PATCH] custom: add browser option Signed-off-by: Myned --- options/custom/default.nix | 5 +++++ options/custom/desktops/hyprland/binds.nix | 3 +-- options/custom/desktops/hyprland/settings.nix | 2 -- options/custom/desktops/sway/binds.nix | 3 +-- options/custom/desktops/sway/settings.nix | 1 - options/custom/settings/dconf/gnome-shell.nix | 2 +- options/custom/settings/dconf/gnome.nix | 2 +- options/custom/settings/xdg.nix | 5 ++--- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/options/custom/default.nix b/options/custom/default.nix index 876535f..550f745 100644 --- a/options/custom/default.nix +++ b/options/custom/default.nix @@ -38,6 +38,11 @@ in { ### Misc wallpaper = mkOption {default = false;}; + browser = { + command = mkOption {default = "${config.custom.programs.chromium.package}/bin/google-chrome-stable";}; + desktop = mkOption {default = "google-chrome.desktop";}; + }; + font = { emoji = mkOption {default = "Noto Color Emoji";}; monospace = mkOption {default = "IosevkaTermSlab NFP Medium";}; diff --git a/options/custom/desktops/hyprland/binds.nix b/options/custom/desktops/hyprland/binds.nix index 295364f..2fb0337 100644 --- a/options/custom/desktops/hyprland/binds.nix +++ b/options/custom/desktops/hyprland/binds.nix @@ -10,7 +10,6 @@ with lib; let cat = "${pkgs.coreutils}/bin/cat"; clipse = "${pkgs.clipse}/bin/clipse"; codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium"; - firefox-esr = "${config.home-manager.users.${config.custom.username}.programs.firefox.finalPackage}/bin/firefox-esr"; gnome-text-editor = "${pkgs.gnome-text-editor}/bin/gnome-text-editor"; hyprctl = "${config.programs.hyprland.package}/bin/hyprctl"; hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock"; @@ -238,7 +237,7 @@ in { (key "A" "Ctrl+Alt" "exec" "${waydroid} session stop") (key "A" "Super" "togglespecialworkspace" "android") (key "A" "Super+Shift" "movetoworkspacesilent" "special:android") - (key "B" "Super" "exec" firefox-esr) + (key "B" "Super" "exec" config.custom.browser.command) (key "C" "Super" "exec" codium) (key "E" "Super" "exec" gnome-text-editor) (key "F" "Super" "exec" "${nautilus} --new-window") diff --git a/options/custom/desktops/hyprland/settings.nix b/options/custom/desktops/hyprland/settings.nix index ee1e9ff..da83d7f 100644 --- a/options/custom/desktops/hyprland/settings.nix +++ b/options/custom/desktops/hyprland/settings.nix @@ -8,7 +8,6 @@ with lib; let _1password = "${config.programs._1password-gui.package}/bin/1password"; audio = config.home-manager.users.${config.custom.username}.home.file.".local/bin/audio".source; clipse = "${pkgs.clipse}/bin/clipse"; - firefox-esr = "${config.home-manager.users.${config.custom.username}.programs.firefox.finalPackage}/bin/firefox-esr"; grep = "${pkgs.gnugrep}/bin/grep"; left = config.home-manager.users.${config.custom.username}.home.file.".local/bin/left".source; loupe = "${pkgs.loupe}/bin/loupe"; @@ -74,7 +73,6 @@ in { "${audio} --init" # Enforce audio profile state "${rm} ~/.cache/walker/clipboard.gob" # Clear clipboard history "${_1password} --silent" # Launch password manager in background - #// "[group new; tile] ${firefox-esr}" # HACK: Launch hidden GTK windows to reduce startup time "[workspace special:hidden silent] ${loupe}" diff --git a/options/custom/desktops/sway/binds.nix b/options/custom/desktops/sway/binds.nix index 8092772..cee635f 100644 --- a/options/custom/desktops/sway/binds.nix +++ b/options/custom/desktops/sway/binds.nix @@ -8,7 +8,6 @@ with lib; let audio = "~/.local/bin/audio"; clipse = "${pkgs.clipse}/bin/clipse"; codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium"; - firefox-esr = "${config.home-manager.users.${config.custom.username}.programs.firefox.finalPackage}/bin/firefox-esr"; gnome-text-editor = "${pkgs.gnome-text-editor}/bin/gnome-text-editor"; hyprctl = "${config.programs.hyprland.package}/bin/hyprctl"; hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock"; @@ -147,7 +146,7 @@ in { "9+${super}+${shift}" = "move to workspace 9"; "a+${super}" = "[con_mark=android] scratchpad show"; "a+${super}+${shift}" = "exec ${waydroid} session stop"; - "b+${super}" = "exec ${firefox-esr}"; + "b+${super}" = "exec ${config.custom.browser.command}"; "backslash+${super}" = "split toggle"; "backslash+${super}+${shift}" = "split none"; "backspace+${super}" = "focus mode_toggle"; diff --git a/options/custom/desktops/sway/settings.nix b/options/custom/desktops/sway/settings.nix index 58421b7..da69769 100644 --- a/options/custom/desktops/sway/settings.nix +++ b/options/custom/desktops/sway/settings.nix @@ -99,7 +99,6 @@ in { # (once "${rm} ~/.config/qalculate/qalc.dmenu.history") # Clear calc history # (once "${rm} ~/.cache/cliphist/db") # Clear clipboard database - # (once firefox-esr) ]; }; diff --git a/options/custom/settings/dconf/gnome-shell.nix b/options/custom/settings/dconf/gnome-shell.nix index a73d19b..4cbd736 100644 --- a/options/custom/settings/dconf/gnome-shell.nix +++ b/options/custom/settings/dconf/gnome-shell.nix @@ -22,9 +22,9 @@ in { # Auto Move Windows "org/gnome/shell/extensions/auto-move-windows" = { application-list = mkArray type.string [ + "${config.custom.browser.desktop}:1" "codium.desktop:1" "discord.desktop:1" - "firefox-esr.desktop:1" "obsidian.desktop:1" "org.telegram.desktop.desktop:1" "signal-desktop.desktop:1" diff --git a/options/custom/settings/dconf/gnome.nix b/options/custom/settings/dconf/gnome.nix index c206a39..3c1bf60 100644 --- a/options/custom/settings/dconf/gnome.nix +++ b/options/custom/settings/dconf/gnome.nix @@ -152,7 +152,7 @@ in { "org/gnome/shell" = { favorite-apps = mkArray type.string [ "org.gnome.Nautilus.desktop" - "firefox-esr.desktop" + config.custom.browser.desktop "signal-desktop.desktop" "org.telegram.desktop.desktop" "discord.desktop" diff --git a/options/custom/settings/xdg.nix b/options/custom/settings/xdg.nix index 50ecbf7..b67a29b 100644 --- a/options/custom/settings/xdg.nix +++ b/options/custom/settings/xdg.nix @@ -8,7 +8,6 @@ with lib; let clapper = "com.github.rafostar.Clapper.desktop"; decibels = "org.gnome.Decibels.desktop"; file-roller = "org.gnome.File Roller.desktop"; - firefox-esr = "firefox-esr.desktop"; font-viewer = "org.gnome.font-viewer.desktop"; gnome-text-editor = "org.gnome.TextEditor.desktop"; libreoffice = "base.desktop"; @@ -131,8 +130,8 @@ in { "text/x-scss" = gnome-text-editor; "video/mp4" = clapper; "video/x-matroska" = clapper; - "x-scheme-handler/http" = firefox-esr; - "x-scheme-handler/https" = firefox-esr; + "x-scheme-handler/http" = config.custom.browser.desktop; + "x-scheme-handler/https" = config.custom.browser.desktop; }; };