From 02bb49c8964b7b5c7195906561d00134136baf90 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Thu, 27 Feb 2025 23:12:35 +0100
Subject: [PATCH] git settings, try floorp browser and update nvidia driver
---
home-manager/.gitconfig | 23 +++-
home-manager/firefox/config/preferences.nix | 7 +
home-manager/floorp/default.nix | 142 ++++++++++++++++++++
home-manager/floorp/floorp-config.nix | 7 +
modules/hardware/nvidia.nix | 19 ++-
modules/services/kavita.nix | 1 +
users/kopatz/home.nix | 3 +-
7 files changed, 190 insertions(+), 12 deletions(-)
create mode 100644 home-manager/floorp/default.nix
create mode 100644 home-manager/floorp/floorp-config.nix
diff --git a/home-manager/.gitconfig b/home-manager/.gitconfig
index 4724ca6..a761577 100644
--- a/home-manager/.gitconfig
+++ b/home-manager/.gitconfig
@@ -24,14 +24,35 @@
ui = true
[rerere]
enabled = true
+ autoupdate = true
[mergetool]
keeptemporaries = false
keepbackups = false
prompt = false
trustexitcode = false
+[commit]
+ verbose = true
+[column]
+ ui = auto
[pull]
ff = true
-
+[push]
+ autoSetupRemote = true
+ followTags = true
+[fetch]
+ prune = true
+ pruneTags = true
+ all = true
+[diff]
+ algorithm = histogram
+ colorMoved = plain
+ renames = true
+ mnemonicPrefix = true
+[tag]
+ sort = version:refname
+[branch]
+ sort = -committerdate
+
[includeIf "gitdir/i:~/projects/github/**"]
path = .gitconfig-github
[includeIf "gitdir/i:~/projects/gitea/**"]
diff --git a/home-manager/firefox/config/preferences.nix b/home-manager/firefox/config/preferences.nix
index 6343c72..f3cb96a 100644
--- a/home-manager/firefox/config/preferences.nix
+++ b/home-manager/firefox/config/preferences.nix
@@ -5,6 +5,10 @@
# Disable new tab page intro
# Disable the intro to the newtab page on the first run
"browser.newtabpage.introShown" = false;
+ # Show bookmarks toolbar on new tab page
+ "browser.toolbars.bookmarks.visibility" = "never";
+ # Don't ask to save logins and passwords for websites
+ "signon.rememberSignons" = false;
# Pocket Reading List
# No details
"extensions.pocket.enabled" = false;
@@ -38,6 +42,9 @@
# Content of the new tab page
#
"browser.newtabpage.enhanced" = false;
+ # Disable the new tab page (blank page)
+ "browser.newtabpage.enabled" = false;
+ "browser.startup.homepage" = "about:blank";
# Disable autoplay of <video> tags.
# Per default, <video> tags are allowed to start automatically.
# Note: When disabling autoplay, you will have to click pause and play again on
diff --git a/home-manager/floorp/default.nix b/home-manager/floorp/default.nix
new file mode 100644
index 0000000..66d344f
--- /dev/null
+++ b/home-manager/floorp/default.nix
@@ -0,0 +1,142 @@
+{ lib, config, osConfig, pkgs, ... }:
+let
+ merge = lib.foldr (a: b: a // b) { };
+ search = {
+ default = "DuckDuckGo";
+ force = true;
+ engines = {
+ # don't need these default ones
+ "Amazon.com".metaData.hidden = true;
+ "Bing".metaData.hidden = true;
+ "eBay".metaData.hidden = true;
+
+ "DuckDuckGo" = {
+ urls = [{
+ template = "https://duckduckgo.com";
+ params = [{
+ name = "q";
+ value = "{searchTerms}";
+ }];
+ }];
+ definedAliases = [ ",d" ];
+ };
+ "Nix Packages" = {
+ urls = [{
+ template = "https://search.nixos.org/packages";
+ params = [
+ {
+ name = "type";
+ value = "packages";
+ }
+ {
+ name = "query";
+ value = "{searchTerms}";
+ }
+ ];
+ }];
+ definedAliases = [ ",n" ];
+ };
+ "Wikipedia" = {
+ urls = [{
+ template = "https://en.wikipedia.org/wiki/Special:Search";
+ params = [{
+ name = "search";
+ value = "{searchTerms}";
+ }];
+ }];
+ definedAliases = [ ",w" ];
+ };
+ "GitHub" = {
+ urls = [{
+ template = "https://github.com/search";
+ params = [{
+ name = "q";
+ value = "{searchTerms}";
+ }];
+ }];
+ definedAliases = [ ",gh" ];
+ };
+ };
+ };
+in {
+ programs.floorp = {
+ enable = true;
+ policies = {
+ DisableTelemetry = true;
+ DontCheckDefaultBrowser = true;
+ DisablePocket = true;
+ DisableFirefoxStudies = true;
+ DisableFeedbackCommands = true;
+ Extensions = {
+ Uninstall = [
+ "google@search.mozilla.org"
+ "bing@search.mozilla.org"
+ "amazondotcom@search.mozilla.org"
+ "ebay@search.mozilla.org"
+ "wikipedia@search.mozilla.org"
+ "webcompat-reporter@mozilla.org"
+ "addons-search-detection@mozilla.com"
+ ];
+ };
+ ExtensionSettings = {
+ "google@search.mozilla.org".installation_mode = "blocked";
+ "bing@search.mozilla.org".installation_mode = "blocked";
+ "amazondotcom@search.mozilla.org".installation_mode = "blocked";
+ "ebay@search.mozilla.org".installation_mode = "blocked";
+ "wikipedia@search.mozilla.org".installation_mode = "blocked";
+ "{5cd68d86-8324-4ab2-9e0d-3afcc60bee5f}" = {
+ install_url =
+ "https://addons.mozilla.org/firefox/downloads/latest/animated-pekora-dark-theme/latest.xpi";
+ installation_mode = "force_installed";
+ };
+ };
+ };
+ profiles.default = {
+ inherit search;
+ settings = merge ([
+ (import ../firefox/config/preferences.nix)
+ (import ../firefox/config/browser-features.nix)
+ (import ../firefox/config/privacy.nix)
+ (import ../firefox/config/tracking.nix)
+ (import ../firefox/config/tracking-webaudio.nix)
+ (import ../firefox/config/security.nix)
+ (import ../firefox/config/speed.nix)
+ (import ./floorp-config.nix)
+ ] ++ lib.optionals osConfig.custom.hardware.nvidia.enable
+ [ (import ../firefox/config/nvidia-fixes.nix) ]);
+ userChrome = ''
+ /* Hide tab bar. Used with Sidebery */
+ #TabsToolbar {
+ visibility: collapse !important;
+ }
+ '';
+ extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
+ clearurls
+ darkreader
+ sponsorblock
+ ublock-origin
+ keepassxc-browser
+ youtube-nonstop
+ sidebery
+ ];
+ };
+ profiles.standard = {
+ id = 2;
+ userChrome = ''
+ /* Hide tab bar. Used with Sidebery */
+ #TabsToolbar {
+ visibility: collapse !important;
+ }
+ '';
+ extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
+ clearurls
+ darkreader
+ sponsorblock
+ ublock-origin
+ keepassxc-browser
+ youtube-nonstop
+ sidebery
+ ];
+ };
+ };
+}
diff --git a/home-manager/floorp/floorp-config.nix b/home-manager/floorp/floorp-config.nix
new file mode 100644
index 0000000..4a38efa
--- /dev/null
+++ b/home-manager/floorp/floorp-config.nix
@@ -0,0 +1,7 @@
+{
+ "floorp.browser.tabs.verticaltab" = true;
+ "services.sync.prefs.sync.floorp.browser.note.memos" = false;
+ "floorp.browser.sidebar.enable" = false;
+ "floorp.browser.sidebar.is.displayed" = false;
+ "floorp.browser.sidebar.right" = false;
+}
diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix
index 9d84789..29e67a6 100644
--- a/modules/hardware/nvidia.nix
+++ b/modules/hardware/nvidia.nix
@@ -73,16 +73,15 @@ in {
# accessible via `nvidia-settings`.
nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU.
- package = config.boot.kernelPackages.nvidiaPackages.beta;
- #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
- # version = "570.86.16";
- # sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U=";
- # sha256_aarch64 = "sha256-RiO2njJ+z0DYBo/1DKa9GmAjFgZFfQ1/1Ga+vXG87vA=";
- # openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE=";
- # settingsSha256 = "sha256-9rtqh64TyhDF5fFAYiWl3oDHzKJqyOW3abpcf2iNRT8=";
- # persistencedSha256 =
- # "sha256-3mp9X/oV8o2TH9720NnoXROxQ4g98nNee+DucXpQy3w=";
- #};
+ #package = config.boot.kernelPackages.nvidiaPackages.beta;
+ package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+ version = "570.124.04";
+ sha256_64bit = "sha256-G3hqS3Ei18QhbFiuQAdoik93jBlsFI2RkWOBXuENU8Q=";
+ sha256_aarch64 = "";
+ openSha256 = "";
+ settingsSha256 = "sha256-LNL0J/sYHD8vagkV1w8tb52gMtzj/F0QmJTV1cMaso8=";
+ persistencedSha256 = "";
+ };
};
environment.systemPackages = with pkgs; [
diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix
index 7ec0949..081f370 100644
--- a/modules/services/kavita.nix
+++ b/modules/services/kavita.nix
@@ -112,6 +112,7 @@ in {
${mangal} inline -S Manganato --query "hidan_no_aria" --manga first --download
${mangal} inline -S AsuraScans --query "the_max_level_hero" --manga first --download
${mangal} inline -S Manganato --query "Parallel_City" --manga first --download
+ ${mangal} inline -S Manganato --query "Existence" --manga first --download
'';
serviceConfig = {
PrivateTmp = true;
diff --git a/users/kopatz/home.nix b/users/kopatz/home.nix
index 6a558b1..b5489b6 100644
--- a/users/kopatz/home.nix
+++ b/users/kopatz/home.nix
@@ -15,7 +15,8 @@
../../home-manager/code.nix
../../home-manager/fastfetch.nix
../../home-manager/direnv.nix
- ../../home-manager/firefox
+ #../../home-manager/firefox
+ ../../home-manager/floorp
../../home-manager/gitconfig.nix
../../home-manager/hyprland
#../../home-manager/kde-path.nix