From 7e7c8947fc2ff5598124c4a4c18bd28432fa017e Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Mon, 8 Sep 2025 14:01:35 -0500 Subject: rework most of config; probably broke jupiter again; working to add ganymede (non-nixos) to this repo --- modules/desktop/nixos/programs/firefox.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 modules/desktop/nixos/programs/firefox.nix (limited to 'modules/desktop/nixos/programs/firefox.nix') diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix new file mode 100644 index 0000000..8ca4b30 --- /dev/null +++ b/modules/desktop/nixos/programs/firefox.nix @@ -0,0 +1,37 @@ +{ + lib, + config, + ... +}: let + cfg = config.collinux.desktop.programs.firefox; +in + lib.mkIf cfg.enable { + programs.firefox = { + enable = true; + policies = { + PasswordManagerEnabled = false; # use bitwarden instead + DisableAccounts = true; + DisablePocket = true; + + OverrideFirstRunPage = ""; + OverridePostUpdatePage = ""; + + ExtensionSettings = let + ext = name: { + installation_mode = "force_installed"; + install_url = "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi"; + }; + in + lib.mkMerge [ + { + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = ext "bitwarden-password-manager"; + "uBlock0@raymondhill.net" = ext "uBlock0@raymondhill.net"; + "addon@darkreader.org" = ext "addon@darkreader.org"; + } + (lib.optionalAttrs (cfg.theme == "catppuccin") { + "{88b098c8-19be-421e-8ffa-85ddd1f3f004}" = ext "catppuccin-mocha-blue"; + }) + ]; + }; + }; + } -- cgit v1.3.1 From 6fabcf9a21bddc9a69f63a32535cfc25fcf668e2 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Sun, 14 Sep 2025 13:51:43 -0500 Subject: work on firefox cfg --- hosts/mercury/nixos.nix | 2 -- modules/desktop/nixos/programs/firefox.nix | 45 +++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 12 deletions(-) (limited to 'modules/desktop/nixos/programs/firefox.nix') diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 9e59671..26fda63 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -23,8 +23,6 @@ nerd-fonts.iosevka ]; }; - - services.speechd.enable = lib.mkForce false; # idk, im not disabled environment.defaultPackages = lib.mkForce []; # im not a noob networking.firewall.allowedUDPPorts = [445]; diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix index 8ca4b30..569a464 100644 --- a/modules/desktop/nixos/programs/firefox.nix +++ b/modules/desktop/nixos/programs/firefox.nix @@ -1,4 +1,5 @@ { + pkgs, lib, config, ... @@ -12,26 +13,50 @@ in PasswordManagerEnabled = false; # use bitwarden instead DisableAccounts = true; DisablePocket = true; + DisplayBookmarksToolbar = "always"; OverrideFirstRunPage = ""; OverridePostUpdatePage = ""; + NewTabPage = false; + + Preferences = let + opt = Value: { + inherit Value; + Status = "locked"; + }; + in { + "toolkit.legacyUserProfileCustomizations.stylesheets" = opt true; + "browser.tabs.inTitlebar" = opt 0; + "browser.tabs.hoverPreview.enabled" = opt 0; + + "browser.tabs.loadBookmarksInTabs" = opt true; + + "accessibility.force_disabled" = opt 1; + + "browser.compactmode.show" = opt true; + "browser.uidensity" = opt 1; + + "media.webspeech.synth.enabled" = opt false; # im not disabled + "media.webspeech.synth.dont_notify_on_error" = opt true; + }; + ExtensionSettings = let ext = name: { installation_mode = "force_installed"; install_url = "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi"; }; in - lib.mkMerge [ - { - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = ext "bitwarden-password-manager"; - "uBlock0@raymondhill.net" = ext "uBlock0@raymondhill.net"; - "addon@darkreader.org" = ext "addon@darkreader.org"; - } - (lib.optionalAttrs (cfg.theme == "catppuccin") { - "{88b098c8-19be-421e-8ffa-85ddd1f3f004}" = ext "catppuccin-mocha-blue"; - }) - ]; + { + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = ext "bitwarden-password-manager"; + "uBlock0@raymondhill.net" = ext "uBlock0@raymondhill.net"; + "addon@darkreader.org" = ext "addon@darkreader.org"; + } + // (lib.optionalAttrs (cfg.theme == "catppuccin") { + "{88b098c8-19be-421e-8ffa-85ddd1f3f004}" = ext "catppuccin-mocha-blue"; + }) }; }; + + services.speechd.enable = lib.mkForce false; # gets installed by firefox, but we don't need it } -- cgit v1.3.1 From 64d6e9664bbcbe4125df56f8f228f92222c13188 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Sun, 14 Sep 2025 13:52:55 -0500 Subject: cfg for research applications for mercury --- hosts/mercury/config.nix | 2 ++ hosts/mercury/hjem.nix | 4 ---- modules/desktop/hjem/default.nix | 1 + modules/desktop/hjem/programs/research.nix | 26 ++++++++++++++++++++++++++ modules/desktop/nixos/programs/firefox.nix | 6 ++++++ modules/desktop/options.nix | 6 ++++++ 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 modules/desktop/hjem/programs/research.nix (limited to 'modules/desktop/nixos/programs/firefox.nix') diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index a80a871..462c144 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -21,6 +21,8 @@ programs = { firefox.enable = true; foot.enable = true; + + research.enable = true; }; }; diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix index b2182e9..463290c 100644 --- a/hosts/mercury/hjem.nix +++ b/hosts/mercury/hjem.nix @@ -6,9 +6,5 @@ kdePackages.kleopatra mpv musescore - qutebrowser - - zotero - zathura ]; } diff --git a/modules/desktop/hjem/default.nix b/modules/desktop/hjem/default.nix index a1a28c5..f7dd95e 100644 --- a/modules/desktop/hjem/default.nix +++ b/modules/desktop/hjem/default.nix @@ -8,5 +8,6 @@ ./programs/foot.nix ./programs/firefox.nix + ./programs/research.nix ]; } diff --git a/modules/desktop/hjem/programs/research.nix b/modules/desktop/hjem/programs/research.nix new file mode 100644 index 0000000..3bfde76 --- /dev/null +++ b/modules/desktop/hjem/programs/research.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.collinux.desktop.programs.research; +in + lib.mkIf cfg.enable { + packages = with pkgs; [ + zotero + zathura + xournalpp + ]; + files = { + ".config/xournalpp/toolbar.ini" = { + generator = lib.generators.toINI {}; + value = { + "Default" = { + toolbarTop1 = "ERASER,PEN,HIGHLIGHTER,SELECT_PDF_TEXT_LINEAR,SEPARATOR,TEXT,MATH_TEX,IMAGE,SPACER,FINE,MEDIUM,THICK,VERY_THICK,SEPARATOR,SELECT_FONT,COLOR(6),COLOR(8),COLOR(9),COLOR(3),COLOR(2),COLOR(4),COLOR(7),COLOR(5),COLOR(0),SEPARATOR"; + name = "Default"; + }; + }; + }; + }; + } diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix index 569a464..f2daf43 100644 --- a/modules/desktop/nixos/programs/firefox.nix +++ b/modules/desktop/nixos/programs/firefox.nix @@ -55,6 +55,12 @@ in // (lib.optionalAttrs (cfg.theme == "catppuccin") { "{88b098c8-19be-421e-8ffa-85ddd1f3f004}" = ext "catppuccin-mocha-blue"; }) + // (lib.optionalAttrs (cfg.extensions.zotero.enable) { + "zotero@chnm.gmu.edu" = { + installation_mode = "force_installed"; + install_url = "https://download.zotero.org/connector/firefox/release/Zotero_Connector-5.0.181.xpi"; + }; + }); }; }; diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix index 9a60ff6..1837f8b 100644 --- a/modules/desktop/options.nix +++ b/modules/desktop/options.nix @@ -102,10 +102,16 @@ in { type = types.enum ["none" "catppuccin" "adwaita"]; default = config.collinux.theme; }; + extensions.zotero.enable = mkOption { + description = "install Zotero Connector for Firefox"; + default = config.collinux.desktop.programs.research.enable; + }; }; foot.enable = mkEnableOption "foot"; blackbox.enable = mkEnableOption "blackbox"; + + research.enable = mkEnableOption "zathura, Xournal++, Zotero, Zotero Connector"; }; }; }; -- cgit v1.3.1