istg i have to make smaller commits
This commit is contained in:
parent
1ed9ce6864
commit
29473532c7
SSH key fingerprint:
SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
28 changed files with 483 additions and 361 deletions
|
|
@ -1,93 +0,0 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
profiles.xun = {
|
||||
extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
|
||||
ublock-origin
|
||||
darkreader
|
||||
sponsorblock
|
||||
tridactyl
|
||||
translate-web-pages
|
||||
cookie-quick-manager
|
||||
istilldontcareaboutcookies
|
||||
tree-style-tab
|
||||
(lib.mkIf (builtins.elem pkgs.keepassxc config.home.packages) keepassxc-browser)
|
||||
];
|
||||
bookmarks = {};
|
||||
settings = {
|
||||
"browser.tabs.inTitleBar" = "0"; # use system title bar
|
||||
"browser.newtabpage.enabled" = false;
|
||||
"browser.newtab.url" = "about:blank";
|
||||
"general.autoScroll" = "true"; # mmb scroll mode
|
||||
|
||||
"browser.newtabpage.enhanced" = false;
|
||||
"browser.newtabpage.introShown" = true;
|
||||
"browser.newtab.preload" = false;
|
||||
"browser.newtabpage.directory.ping" = "";
|
||||
"browser.newtabpage.directory.source" = "data:text/plain,{}";
|
||||
# Reduce search engine noise in the urlbar's completion window. The
|
||||
# shortcuts and suggestions will still work, but Firefox won't clutter
|
||||
# its UI with reminders that they exist.
|
||||
"browser.urlbar.suggest.searches" = false;
|
||||
"browser.urlbar.shortcuts.bookmarks" = false;
|
||||
"browser.urlbar.shortcuts.history" = false;
|
||||
"browser.urlbar.shortcuts.tabs" = false;
|
||||
"browser.urlbar.showSearchSuggestionsFirst" = false;
|
||||
"browser.urlbar.speculativeConnect.enabled" = false;
|
||||
|
||||
"browser.download.useDownloadDir" = false;
|
||||
"signon.rememberSignons" = false;
|
||||
"browser.shell.checkDefaultBrowser" = false;
|
||||
# Show whole URL in address bar
|
||||
"browser.urlbar.trimURLs" = false;
|
||||
# Disable some not so useful functionality.
|
||||
"browser.disableResetPrompt" = true; # "Looks like you haven't started Firefox in a while."
|
||||
"browser.onboarding.enabled" = false; # "New to Firefox? Let's get started!" tour
|
||||
"browser.aboutConfig.showWarning" = false; # Warning when opening about:config
|
||||
"media.videocontrols.picture-in-picture.video-toggle.enabled" = false;
|
||||
"extensions.pocket.enabled" = false;
|
||||
"extensions.shield-recipe-client.enabled" = false;
|
||||
#"reader.parse-on-load.enabled" = false; # "reader view"
|
||||
|
||||
# disable telemetry
|
||||
# https://github.com/hlissner/dotfiles/blob/089f1a9da9018df9e5fc200c2d7bef70f4546026/modules/desktop/browsers/firefox.nix
|
||||
"toolkit.telemetry.unified" = false;
|
||||
"toolkit.telemetry.enabled" = false;
|
||||
"toolkit.telemetry.server" = "data:,";
|
||||
"toolkit.telemetry.archive.enabled" = false;
|
||||
"toolkit.telemetry.coverage.opt-out" = true;
|
||||
"toolkit.coverage.opt-out" = true;
|
||||
"toolkit.coverage.endpoint.base" = "";
|
||||
"experiments.supported" = false;
|
||||
"experiments.enabled" = false;
|
||||
"experiments.manifest.uri" = "";
|
||||
"browser.ping-centre.telemetry" = false;
|
||||
"app.normandy.enabled" = false;
|
||||
"app.normandy.api_url" = "";
|
||||
"app.shield.optoutstudies.enabled" = false;
|
||||
"datareporting.healthreport.uploadEnabled" = false;
|
||||
"datareporting.healthreport.service.enabled" = false;
|
||||
"datareporting.policy.dataSubmissionEnabled" = false;
|
||||
# Disable crash reports
|
||||
"breakpad.reportURL" = "";
|
||||
"browser.tabs.crashReporting.sendReport" = false;
|
||||
"browser.crashReports.unsubmittedCheck.autoSubmit2" = false;
|
||||
|
||||
# Disable Form autofill
|
||||
# https://wiki.mozilla.org/Firefox/Features/Form_Autofill
|
||||
"browser.formfill.enable" = false;
|
||||
"extensions.formautofill.addresses.enabled" = false;
|
||||
"extensions.formautofill.available" = "off";
|
||||
"extensions.formautofill.creditCards.available" = false;
|
||||
"extensions.formautofill.creditCards.enabled" = false;
|
||||
"extensions.formautofill.heuristics.enabled" = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
211
home/programs/browsers/firefox/default.nix
Normal file
211
home/programs/browsers/firefox/default.nix
Normal file
|
|
@ -0,0 +1,211 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
xdg.configFile."tridactyl/tridactylrc" = {
|
||||
text = ''
|
||||
unbind <C-e>
|
||||
unbind <C-b>
|
||||
unbind <C-a> # why would you ever want to increment the current url??
|
||||
bind J tabnext
|
||||
bind K tabprev
|
||||
|
||||
set smoothscroll true
|
||||
set newtab about:blank
|
||||
set modeindicator false
|
||||
'';
|
||||
};
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.firefox.override {
|
||||
nativeMessagingHosts = with pkgs; [
|
||||
tridactyl-native
|
||||
keepassxc
|
||||
];
|
||||
};
|
||||
profiles.xun = {
|
||||
extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
|
||||
ublock-origin
|
||||
darkreader
|
||||
sponsorblock
|
||||
tridactyl
|
||||
translate-web-pages
|
||||
cookie-quick-manager
|
||||
istilldontcareaboutcookies
|
||||
sidebery
|
||||
(lib.mkIf (builtins.elem pkgs.keepassxc config.home.packages) keepassxc-browser)
|
||||
];
|
||||
bookmarks = {};
|
||||
search = {
|
||||
force = true;
|
||||
default = "Brave";
|
||||
order = [
|
||||
"Brave"
|
||||
"Google"
|
||||
"DuckDuckGo"
|
||||
];
|
||||
engines = let
|
||||
inherit (lib.attrsets) attrsToList;
|
||||
inherit (lib.lists) singleton;
|
||||
in {
|
||||
"Home Manager" = {
|
||||
urls = singleton {
|
||||
template = "https://home-manager-options.extranix.com";
|
||||
params = attrsToList {
|
||||
query = "{searchTerms}";
|
||||
release = "master";
|
||||
};
|
||||
};
|
||||
iconUpdateURL = "https://home-manager-options.extranix.com/images/favicon.png";
|
||||
definedAliases = ["@hm"];
|
||||
};
|
||||
"Nix Packages" = {
|
||||
urls = singleton {
|
||||
template = "https://search.nixos.org/packages";
|
||||
params = attrsToList {
|
||||
query = "{searchTerms}";
|
||||
channel = "unstable";
|
||||
};
|
||||
};
|
||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
definedAliases = ["@np"];
|
||||
};
|
||||
"NixOS Options" = {
|
||||
urls = singleton {
|
||||
template = "https://search.nixos.org/options";
|
||||
params = attrsToList {
|
||||
query = "{searchTerms}";
|
||||
channel = "unstable";
|
||||
};
|
||||
};
|
||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
definedAliases = ["@no"];
|
||||
};
|
||||
"GitHub" = {
|
||||
urls = singleton {
|
||||
template = "https://github.com/search";
|
||||
params = attrsToList {
|
||||
q = "{searchTerms}";
|
||||
type = "code";
|
||||
};
|
||||
};
|
||||
iconUpdateURL = "https://github.githubassets.com/favicons/favicon-dark.svg";
|
||||
definedAliases = ["@gh"];
|
||||
};
|
||||
"GitHub Repos" = {
|
||||
urls = singleton {
|
||||
template = "https://github.com/search";
|
||||
params = attrsToList {
|
||||
q = "{searchTerms}";
|
||||
type = "repositories";
|
||||
};
|
||||
};
|
||||
iconUpdateURL = "https://github.githubassets.com/favicons/favicon-dark.svg";
|
||||
definedAliases = ["@ghr"];
|
||||
};
|
||||
"GitHub Nix" = {
|
||||
urls = singleton {
|
||||
template = "https://github.com/search";
|
||||
params = attrsToList {
|
||||
"q" = "lang:nix {searchTerms}";
|
||||
"type" = "code";
|
||||
};
|
||||
};
|
||||
iconUpdateURL = "https://github.githubassets.com/favicons/favicon-dark.svg";
|
||||
definedAliases = ["@ghn"];
|
||||
};
|
||||
"Brave" = {
|
||||
urls = singleton {
|
||||
template = "https://search.brave.com/search";
|
||||
params = attrsToList {
|
||||
"q" = "{searchTerms}";
|
||||
};
|
||||
};
|
||||
iconUpdateURL = "https://brave.com/static-assets/images/brave-favicon.png";
|
||||
definedAliases = ["@b"];
|
||||
};
|
||||
|
||||
"Google".metaData.alias = "@go";
|
||||
"DuckDuckGo".metaData.alias = "@ddg";
|
||||
"Wikipedia".metaData.alias = "@wiki";
|
||||
"Bind".metaData.hidden = true;
|
||||
};
|
||||
};
|
||||
userChrome = builtins.readFile ./userChrome.css;
|
||||
settings = {
|
||||
"browser.display.use_system_colors" = true; # about:blank colour match colourscheme
|
||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; # enable userChrome
|
||||
"browser.tabs.inTitleBar" = "0"; # use system title bar
|
||||
"browser.newtabpage.enabled" = false;
|
||||
"browser.newtab.url" = "about:blank";
|
||||
"general.autoScroll" = true; # mmb scroll mode
|
||||
|
||||
"browser.newtabpage.enhanced" = false;
|
||||
"browser.newtabpage.introShown" = true;
|
||||
"browser.newtab.preload" = false;
|
||||
"browser.newtabpage.directory.ping" = "";
|
||||
"browser.newtabpage.directory.source" = "data:text/plain,{}";
|
||||
# Reduce search engine noise in the urlbar's completion window. The
|
||||
# shortcuts and suggestions will still work, but Firefox won't clutter
|
||||
# its UI with reminders that they exist.
|
||||
"browser.urlbar.suggest.searches" = false;
|
||||
"browser.urlbar.shortcuts.bookmarks" = false;
|
||||
"browser.urlbar.shortcuts.history" = false;
|
||||
"browser.urlbar.shortcuts.tabs" = false;
|
||||
"browser.urlbar.showSearchSuggestionsFirst" = false;
|
||||
"browser.urlbar.speculativeConnect.enabled" = false;
|
||||
|
||||
"browser.download.useDownloadDir" = false;
|
||||
"signon.rememberSignons" = false;
|
||||
"browser.shell.checkDefaultBrowser" = false;
|
||||
# Show whole URL in address bar
|
||||
"browser.urlbar.trimURLs" = false;
|
||||
# Disable some not so useful functionality.
|
||||
"browser.disableResetPrompt" = true; # "Looks like you haven't started Firefox in a while."
|
||||
"browser.onboarding.enabled" = false; # "New to Firefox? Let's get started!" tour
|
||||
"browser.aboutConfig.showWarning" = false; # Warning when opening about:config
|
||||
"media.videocontrols.picture-in-picture.video-toggle.enabled" = false;
|
||||
"extensions.autoDisableScopes" = "0"; # Automatically enable extensions
|
||||
"extensions.pocket.enabled" = false;
|
||||
"extensions.shield-recipe-client.enabled" = false;
|
||||
#"reader.parse-on-load.enabled" = false; # "reader view"
|
||||
|
||||
# disable telemetry
|
||||
# https://github.com/hlissner/dotfiles/blob/089f1a9da9018df9e5fc200c2d7bef70f4546026/modules/desktop/browsers/firefox.nix
|
||||
"toolkit.telemetry.unified" = false;
|
||||
"toolkit.telemetry.enabled" = false;
|
||||
"toolkit.telemetry.server" = "data:,";
|
||||
"toolkit.telemetry.archive.enabled" = false;
|
||||
"toolkit.telemetry.coverage.opt-out" = true;
|
||||
"toolkit.coverage.opt-out" = true;
|
||||
"toolkit.coverage.endpoint.base" = "";
|
||||
"experiments.supported" = false;
|
||||
"experiments.enabled" = false;
|
||||
"experiments.manifest.uri" = "";
|
||||
"browser.ping-centre.telemetry" = false;
|
||||
"app.normandy.enabled" = false;
|
||||
"app.normandy.api_url" = "";
|
||||
"app.shield.optoutstudies.enabled" = false;
|
||||
"datareporting.healthreport.uploadEnabled" = false;
|
||||
"datareporting.healthreport.service.enabled" = false;
|
||||
"datareporting.policy.dataSubmissionEnabled" = false;
|
||||
# Disable crash reports
|
||||
"breakpad.reportURL" = "";
|
||||
"browser.tabs.crashReporting.sendReport" = false;
|
||||
"browser.crashReports.unsubmittedCheck.autoSubmit2" = false;
|
||||
|
||||
# Disable Form autofill
|
||||
# https://wiki.mozilla.org/Firefox/Features/Form_Autofill
|
||||
"browser.formfill.enable" = false;
|
||||
"extensions.formautofill.addresses.enabled" = false;
|
||||
"extensions.formautofill.available" = "off";
|
||||
"extensions.formautofill.creditCards.available" = false;
|
||||
"extensions.formautofill.creditCards.enabled" = false;
|
||||
"extensions.formautofill.heuristics.enabled" = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
19
home/programs/browsers/firefox/userChrome.css
Normal file
19
home/programs/browsers/firefox/userChrome.css
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
/* Hide sidebar header */
|
||||
#sidebar-header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Hide tab bar */
|
||||
#TabsToolbar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* urlbar same color as background */
|
||||
#urlbar-background, #searchbar {
|
||||
background-color: var(--toolbar-bgcolor) !important;
|
||||
}
|
||||
|
||||
/* Hide tiny strip below the main top bar */
|
||||
#navigator-toolbox {
|
||||
border-bottom: none !important;
|
||||
}
|
||||
7
home/programs/browsers/tor.nix
Normal file
7
home/programs/browsers/tor.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
(tor-browser.override {
|
||||
mediaSupport = false;
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -42,7 +42,23 @@
|
|||
mod = config.wayland.windowManager.sway.config.modifier;
|
||||
wobVolume = "${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_SINK@ | awk '{print $2*100}' > $XDG_RUNTIME_DIR/wob.sock";
|
||||
setVolume = limit: amount: "${pkgs.wireplumber}/bin/wpctl set-volume -l ${limit} @DEFAULT_AUDIO_SINK@ ${amount}";
|
||||
perMonitor = workspace: "\"$(swaymsg -t get_outputs | ${lib.getExe pkgs.jq} -r '.[] | select(.focused == true).name' | ${lib.getExe pkgs.perl} -ne '$s=0;for(split//){$s+=ord}print\"$s\"')${toString workspace}\"";
|
||||
#perMonitor = workspace: "\"$(swaymsg -t get_outputs | ${lib.getExe pkgs.jq} -r '.[] | select(.focused == true).name' | ${lib.getExe pkgs.perl} -ne '$s=0;for(split//){$s+=ord}print\"$s\"')${toString workspace}\"";
|
||||
monitorId = pkgs.writers.writeBash "monitor-id" ''
|
||||
swaymsg -t get_outputs \
|
||||
| ${lib.getExe pkgs.jq} -r '.[] | select (.focused == true).name' \
|
||||
| ${lib.getExe pkgs.perl} -ne '$s=0;for(split//){$s+=ord}print"$s"'
|
||||
'';
|
||||
pauseApp = pkgs.writers.writeBash "pause-app" ''
|
||||
set -e
|
||||
pid=$(swaymsg -t get_tree \
|
||||
| ${lib.getExe pkgs.jq} -re '.. | select (.type? == "con" and .focused? == true).pid')
|
||||
|
||||
if [ $(cat "/proc/$pid/wchan") == "do_signal_stop" ]; then
|
||||
kill -s SIGCONT $pid
|
||||
else
|
||||
kill -s SIGSTOP $pid
|
||||
fi
|
||||
'';
|
||||
dir = with config.wayland.windowManager.sway.config; {
|
||||
inherit up down left right;
|
||||
};
|
||||
|
|
@ -61,7 +77,10 @@
|
|||
"${mod}+Ctrl+Shift+${dir.down}" = "move output down";
|
||||
|
||||
"${mod}+Shift+Backspace" = "exec systemctl suspend";
|
||||
"${mod}+Shift+s" = "exec ${lib.getExe pkgs.grimblast} copy area";
|
||||
"${mod}+Shift+s" = "exec ${lib.getExe pkgs.sway-contrib.grimshot} copy anything";
|
||||
"${mod}+Ctrl+Shift+s" = "exec XDG_PICTURES_DIR=$XDG_PICTURES_DIR/screenshots ${lib.getExe pkgs.sway-contrib.grimshot} savecopy anything";
|
||||
|
||||
"${mod}+Shift+p" = "exec ${pauseApp}";
|
||||
|
||||
"XF86AudioRaiseVolume" = "exec ${setVolume "1.5" "3%+"} && ${wobVolume}";
|
||||
"XF86AudioLowerVolume" = "exec ${setVolume "1.5" "3%-"} && ${wobVolume}";
|
||||
|
|
@ -70,19 +89,20 @@
|
|||
"XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next";
|
||||
"XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous";
|
||||
}
|
||||
// builtins.listToAttrs (lib.flatten
|
||||
(builtins.map (x: let
|
||||
x' = toString x;
|
||||
in [
|
||||
{
|
||||
name = "${mod}+${x'}";
|
||||
value = "exec swaymsg workspace number ${perMonitor x'}:${x'}";
|
||||
}
|
||||
{
|
||||
name = "${mod}+Shift+${toString x'}";
|
||||
value = "exec swaymsg move container to workspace number ${perMonitor x'}:${x'}";
|
||||
}
|
||||
]) (lib.range 0 9)))
|
||||
// (let
|
||||
inherit (builtins) foldl';
|
||||
inherit (lib) range;
|
||||
in
|
||||
foldl' (acc: x:
|
||||
acc
|
||||
// (let
|
||||
y = toString x;
|
||||
in {
|
||||
"${mod}+${y}" = "exec swaymsg workspace number \"$(${monitorId})${y}:${y}\"";
|
||||
"${mod}+Shift+${y}" = "exec swaymsg move container to workspace number \"$(${monitorId})${y}:${y}\"";
|
||||
}))
|
||||
{}
|
||||
(range 0 9))
|
||||
);
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
pavucontrol
|
||||
pwvucontrol
|
||||
];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue