tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Use mkFirefoxModule from hm module input

Browse source
This commit is contained in:
Tristan D. 2025-03-10 12:22:28 +01:00
parent 9a4a2b9698
commit 677265f22f
Signed by: tristan
SSH key fingerprint: SHA256:9oFM1J63hYWJjCnLG6C0fxBS15rwNcWwdQNMOHYKJ/4
7 changed files with 171 additions and 1304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
flake.lock generated
View file

@ -670,16 +670,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739920383, "lastModified": 1741605298,
"narHash": "sha256-n5NYJvnQbIW3XbBohbQK4YfJ38GgyDWDu/XTw0FsuHs=", "narHash": "sha256-XkuXEyNGzxeeytMR/Ys4grkvN0HFOqlw7cdmnXK45hE=",
"owner": "NovaViper", "owner": "vault81",
"repo": "home-manager", "repo": "home-manager",
"rev": "fc592ef0edd0681c3f91a1083cef53ec630f1d5f", "rev": "eda3ceeb21bbe3e6bd6dcf611a853cf870b57a7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NovaViper", "owner": "vault81",
"ref": "kde6-qt",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }

3
flake.nix
View file

@ -75,8 +75,9 @@
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
home-manager = { home-manager = {
url = "github:vault81/home-manager"; # Forked for firefox search fixes
# url = "github:nix-community/home-manager"; # url = "github:nix-community/home-manager";
url = "github:NovaViper/home-manager/kde6-qt"; # TODO Back to default after https://github.com/nix-community/home-manager/pull/6493 # url = "github:NovaViper/home-manager/kde6-qt"; # TODO Back to default after https://github.com/nix-community/home-manager/pull/6493
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay = { emacs-overlay = {

3
home-mods/desktop/default.nix
View file

@ -112,6 +112,9 @@
kdePackages.plasma-browser-integration kdePackages.plasma-browser-integration
kdePackages.kio-admin kdePackages.kio-admin
kdePackages.filelight kdePackages.filelight
kdePackages.kmail
kdePackages.pim-sieve-editor
kdePackages.libksieve
nextcloud-client nextcloud-client
onlyoffice-bin onlyoffice-bin
protonup-qt protonup-qt

314
home-mods/firefox/_base.nix
View file

@ -100,9 +100,9 @@
# shortcuts and suggestions will still work, but Firefox won't clutter # shortcuts and suggestions will still work, but Firefox won't clutter
# its UI with reminders that they exist. # its UI with reminders that they exist.
"browser.urlbar.suggest.searches" = true; # Let's hope duckduckgo doesn't sell it all :) "browser.urlbar.suggest.searches" = true; # Let's hope duckduckgo doesn't sell it all :)
"browser.urlbar.shortcuts.bookmarks" = false; "browser.urlbar.shortcuts.bookmarks" = true;
"browser.urlbar.shortcuts.history" = false; "browser.urlbar.shortcuts.history" = true;
"browser.urlbar.shortcuts.tabs" = false; "browser.urlbar.shortcuts.tabs" = true;
"browser.urlbar.showSearchSuggestionsFirst" = false; "browser.urlbar.showSearchSuggestionsFirst" = false;
"browser.urlbar.speculativeConnect.enabled" = false; "browser.urlbar.speculativeConnect.enabled" = false;
"browser.urlbar.suggest.quicksuggest.nonsponsored" = false; "browser.urlbar.suggest.quicksuggest.nonsponsored" = false;
@ -231,8 +231,12 @@
}; };
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
bitwarden
# clearurls # clearurls
# leechblock-ng
# localcdn
# skip-redirect
# unpaywall
bitwarden
consent-o-matic consent-o-matic
darkreader darkreader
dearrow dearrow
@ -241,178 +245,172 @@
df-youtube df-youtube
flagfox flagfox
ipvfoo ipvfoo
leechblock-ng
localcdn
kagi-search kagi-search
plasma-integration plasma-integration
privacy-badger privacy-badger
rust-search-extension rust-search-extension
sidebery sidebery
skip-redirect
sponsorblock sponsorblock
tab-stash tab-stash
ublock-origin ublock-origin
unpaywall
]; ];
search = { # TODO Reenable when fixed (currently works for setup but default settings is broken due to https://github.com/nix-community/home-manager/pull/6505#issuecomment-2673463728)
force = true; # search = {
default = "Kagi"; # force = true;
privateDefault = "DuckDuckGo"; # default = "Kagi";
# default = "DuckDuckGo"; # privateDefault = "DuckDuckGo";
# privateDefault = "Kagi"; # # default = "DuckDuckGo";
order = [ "Kagi" "DuckDuckGo" "Nix Packages" "Nix Options" "NixOS Wiki" ]; # # privateDefault = "Kagi";
# order = [ "Kagi" "DuckDuckGo" "Nix Packages" "Nix Options" "NixOS Wiki" "Home-Manager Options" ];
engines = { # engines = {
"Kagi" = { # "Kagi" = {
urls = [{ template = "https://kagi.com/search?q={searchTerms}"; }]; # id = "eacf4b1a-4c8a-4b75-abeb-6ae09e5ef4ae";
definedAliases = [ "@k" ]; # urls = [{ template = "https://kagi.com/search?q={searchTerms}"; }];
iconUpdateURL = "https://kagi.com/favicon.ico"; # definedAliases = [ "@k" ];
updateInterval = 24 * 60 * 60 * 1000; # every day # iconUpdateURL = "https://kagi.com/favicon.ico";
}; # updateInterval = 24 * 60 * 60 * 1000; # every day
"DuckDuckGo".metaData = { # };
alias = "@ddg"; # "DuckDuckGo".metaData = {
}; # alias = "@ddg";
"Nix Packages" = { # };
urls = [ # "Nix Packages" = {
{ # urls = [
template = "https://search.nixos.org/packages"; # {
params = [ # template = "https://search.nixos.org/packages";
{ # params = [
name = "type"; # {
value = "packages"; # name = "type";
} # value = "packages";
{ # }
name = "query"; # {
value = "{searchTerms}"; # name = "query";
} # value = "{searchTerms}";
]; # }
} # ];
]; # }
# ];
icon = "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; # icon = "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ]; # definedAliases = [ "@np" ];
}; # };
"Nix Options" = { # "Nix Options" = {
urls = [ # urls = [
{ # {
template = "https://search.nixos.org/options"; # template = "https://search.nixos.org/options";
params = [ # params = [
{ # {
name = "type"; # name = "type";
value = "options"; # value = "options";
} # }
{ # {
name = "query"; # name = "query";
value = "{searchTerms}"; # value = "{searchTerms}";
} # }
]; # ];
} # }
]; # ];
icon = "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; # icon = "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@no" ]; # definedAliases = [ "@no" ];
}; # };
"Home-Manager Options" = { # "Home-Manager Options" = {
urls = [ # urls = [
{ # {
template = "https://mipmip.github.io/home-manager-option-search"; # template = "https://home-manager-options.extranix.com";
params = [ # params = [
{ # {
name = "query"; # name = "query";
value = "{searchTerms}"; # value = "{searchTerms}";
} # }
{ # {
name = "release"; # name = "release";
value = "master"; # value = "master";
} # }
]; # ];
} # }
]; # ];
# icon = "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
# definedAliases = [ "@ho" ];
# };
icon = "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; # "NixOS Wiki" = {
# urls = [
# {
# template = "https://nixos.wiki/index.php?search={searchTerms}";
# }
# ];
# iconUpdateURL = "https://nixos.wiki/favicon.png";
# definedAliases = [ "@nw" ];
# };
definedAliases = [ "@ho" ]; # "Bing".metaData.hidden = true;
}; # "Amazon.de".metaData.hidden = true;
# "Google".metaData.hidden = true;
# };
# };
"NixOS Wiki" = { # TODO Check if possible to reenable without breaking tab stash ?
urls = [ # This currently overwrites existing bookmarks which kinda sucks.....
{ # bookmarks = [
template = "https://nixos.wiki/index.php?search={searchTerms}"; # {
} # toolbar = true;
]; # bookmarks = [
iconUpdateURL = "https://nixos.wiki/favicon.png"; # {
updateInterval = 24 * 60 * 60 * 1000; # name = "Home Manager";
definedAliases = [ "@nw" ]; # url = "https://nixos.wiki/wiki/Home_Manager";
}; # }
# {
"Bing".metaData.hidden = true; # name = "Nix PR Channel Tracker";
"Amazon.de".metaData.hidden = true; # url = "https://nixpk.gs/pr-tracker.html";
"Google".metaData = { # }
alias = "@g"; # {
hidden = true; # name = "Chaotic Nix";
}; # url = "https://www.nyx.chaotic.cx/";
}; # }
}; # ];
# }
bookmarks = [ # {
{ # name = "wikipedia";
toolbar = true; # tags = [ "wiki" ];
bookmarks = [ # keyword = "wiki";
{ # url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
name = "Home Manager"; # }
url = "https://nixos.wiki/wiki/Home_Manager"; # {
} # name = "kernel.org";
{ # url = "https://www.kernel.org";
name = "Nix PR Channel Tracker"; # }
url = "https://nixpk.gs/pr-tracker.html"; # {
} # name = "Nix sites";
{ # bookmarks = [
name = "Chaotic Nix"; # {
url = "https://www.nyx.chaotic.cx/"; # name = "homepage";
} # url = "https://nixos.org/";
]; # }
} # {
{ # name = "wiki";
name = "wikipedia"; # tags = [ "wiki" "nix" ];
tags = [ "wiki" ]; # url = "https://nixos.wiki/";
keyword = "wiki"; # }
url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go"; # {
} # name = "Nix sites";
{ # bookmarks = [
name = "kernel.org"; # {
url = "https://www.kernel.org"; # name = "homepage";
} # url = "https://nixos.org/";
{ # }
name = "Nix sites"; # {
bookmarks = [ # name = "wiki";
{ # url = "https://nixos.wiki/";
name = "homepage"; # }
url = "https://nixos.org/"; # ];
} # }
{ # ];
name = "wiki"; # }
tags = [ "wiki" "nix" ]; # ];
url = "https://nixos.wiki/";
}
{
name = "Nix sites";
bookmarks = [
{
name = "homepage";
url = "https://nixos.org/";
}
{
name = "wiki";
url = "https://nixos.wiki/";
}
];
}
];
}
];
}; };
}; };
} }

1130
home-mods/firefox/mkFirefoxModule.nix
View file

File diff suppressed because it is too large Load diff

10
home-mods/firefox/zen-browser.nix
View file

@ -1,32 +1,28 @@
{ config { config
, lib , lib
, pkgs , pkgs
, inputs
, ... , ...
} @ args: { } @ args: {
imports = imports =
let let
modulePath = [ "programs" "zen-browser" ]; modulePath = [ "programs" "zen-browser" ];
mkFirefoxModule = import ./mkFirefoxModule.nix; mkFirefoxModule = import "${inputs.home-manager}/modules/programs/firefox/mkFirefoxModule.nix";
in in
[ [
(mkFirefoxModule { (mkFirefoxModule {
inherit modulePath; inherit modulePath;
name = "Zen Browser"; name = "Zen Browser";
wrappedPackageName = "zen-browser"; wrappedPackageName = "zen-browser";
wrappedPkg = pkgs.my.zen-browser;
visible = true; visible = true;
platforms.linux = rec { platforms.linux = rec {
vendorPath = ".zen"; vendorPath = ".zen";
configPath = "${vendorPath}"; configPath = "${vendorPath}";
}; };
platforms.darwin = rec {
vendorPath = "Library/Application Support/Zen";
configPath = "${vendorPath}";
};
}) })
]; ];
programs.zen-browser = import ./_base.nix args; programs.zen-browser = (import ./_base.nix args) // { package = pkgs.my.zen-browser;};
home.sessionVariables = { home.sessionVariables = {
BROWSER = "zen-browser"; BROWSER = "zen-browser";

4
home-mods/plasma/default.nix
View file

@ -16,7 +16,7 @@
{ {
location = "bottom"; location = "bottom";
screen = "all"; screen = "all";
height = 42; height = 40;
widgets = [ widgets = [
{ {
name = "org.kde.plasma.kicker"; name = "org.kde.plasma.kicker";
@ -79,7 +79,7 @@
{ {
location = "top"; location = "top";
screen = "all"; screen = "all";
height = 26; height = 24;
widgets = [ widgets = [
{ {
applicationTitleBar = { applicationTitleBar = {