From 40c6221aa708895e4cdd97af854807a9dfe826a9 Mon Sep 17 00:00:00 2001 From: vali Date: Wed, 7 Aug 2024 00:12:28 +0200 Subject: [PATCH] changed or somehting idk --- README.md | 1 + modules/gui/schizofox/default.nix | 72 +++++++++++++++++++++++++------ modules/gui/steam.nix | 3 +- modules/system/keyboard.nix | 2 +- modules/tui/yazi.nix | 2 +- 5 files changed, 65 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7f877a7..6b32b81 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ No Idea at this point *heavily* inspired by https://git.jacekpoz.pl/jacekpoz/niksos.git ! Sioodmy: https://github.com/sioodmy/dotfiles Heinrik Lissner: https://github.com/hlissner/dotfiles/ +Diniamo: https://github.com/diniamo/niqs Fufexan: https://github.com/fufexan Lokasku: https://github.com/lokasku/nix-config NotAShelf: https://github.com/notashelf/Nyx diff --git a/modules/gui/schizofox/default.nix b/modules/gui/schizofox/default.nix index 3f70865..fc04254 100644 --- a/modules/gui/schizofox/default.nix +++ b/modules/gui/schizofox/default.nix @@ -2,12 +2,14 @@ config, inputs, lib, + pkgs, ... }: let cfg = config.modules.system.programs.firefox; inherit (config.modules.other.system) username; inherit (lib) mkIf; + inherit (builtins) listToAttrs; in { config = mkIf cfg.enable { home-manager.users.${username} = { @@ -23,7 +25,7 @@ in { foreground = "f7f7f7"; }; - font = "ComicShannsMono Nerd Font"; + font = "Lexend"; extraUserChrome = '' @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */ @@ -103,19 +105,36 @@ in { ]; }; extensions = { - # simplefox.enable = true; + simplefox.enable = true; darkreader.enable = true; + enableExtraExtensions = true; + enableDefaultExtensions = true; extraExtensions = let - mkUrl = name: "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi"; extensions = [ - { - id = "1018e4d6-728f-4b20-ad56-37578a4de76"; - name = "flagfox"; - } { id = "{c2c003ee-bd69-42a2-b0e9-6f34222cb046}"; name = "auto-tab-discard"; } + { + id = "{74145f27-f039-47ce-a470-a662b129930a}"; + name = "clearurls"; + } + { + id = "DontFuckWithPaste@raim.ist"; + name = "dont-fuck-with-paste"; + } + { + id = "{96ef5869-e3ba-4d21-b86e-21b163096400}"; + name = "font-fingerprint-defender"; + } + { + id = "uBlock0@raymondhill.net"; + name = "uBlock Origin"; + } + { + id = "{d7742d87-e61d-4b78-b8a1-b469842139fa}"; + name = "vimium-ff"; + } { id = "{a4c4eda4-fb84-4a84-b4a1-f7c1cbf2a1ad}"; name = "refined-github-"; @@ -125,14 +144,24 @@ in { name = "sponsorblock"; } { - id = "uBlock0@raymondhill.net"; - name = "UBlock Origin"; + id = "treestyletab@piro.sakura.ne.jp"; + name = "Tree Style Tab"; } ]; - extraExtensions = builtins.foldl' (acc: ext: acc // {ext.id = {install_url = mkUrl ext.name;};}) {} extensions; + + # shamelessly stolen from raf, thanks. + mappedExtensions = + map (extension: { + name = extension.id; + value = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/${extension.name}/latest.xpi"; + }; + }) + extensions; in - extraExtensions; + listToAttrs mappedExtensions; }; + security = { sanitizeOnShutdown = false; sandbox = true; @@ -142,7 +171,26 @@ in { misc = { drm.enable = true; - disableWebgl = false; + contextMenu.enable = true; + }; + + # taken from diniamo + settings = { + "gfx.webrender.all" = true; + "media.ffmpeg.vaapi.enabled" = true; + "media.rdd-ffmpeg.enabled" = true; + "media.av1.enabled" = true; + "gfx.x11-egl.force-enabled" = true; + "widget.dmabuf.force-enabled" = true; + + "browser.ctrlTab.sortByRecentlyUsed" = true; + # This makes websites prefer a dark theme (in theory) + "layout.css.prefers-color-scheme.content-override" = 0; + "widget.use-xdg-desktop-portal.file-picker" = 1; + # Leaving this on breaks a lot + # "privacy.resistFingerprinting" = false; + "permissions.fullscreen.allowed" = true; + "dom.webnotifications.enabled" = true; }; }; }; diff --git a/modules/gui/steam.nix b/modules/gui/steam.nix index 0f85195..04d9112 100644 --- a/modules/gui/steam.nix +++ b/modules/gui/steam.nix @@ -19,9 +19,10 @@ in { remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; gamescopeSession.enable = mkIf cfg.gamescope true; + extraCompatPackages = with pkgs; [proton-ge-bin]; }; programs.gamemode.enable = true; - environment.systemPackages = [pkgs.protonup-ng]; + # environment.systemPackages = [pkgs.protonup-ng]; environment.sessionVariables = { STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/${username}/.steam/root/compatibilitytoolds.d"; }; diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix index 3e733f6..7360c89 100644 --- a/modules/system/keyboard.nix +++ b/modules/system/keyboard.nix @@ -1,6 +1,6 @@ { services.xserver = { - layout = "de,us"; + xkb.layout = "de,us"; # xkbVariant = ",cmk_ed_dh"; # xkbModel = ",pc105awide"; # xkbOptions = ",misc:extend,lv5:caps_switch_lock,compose:menu"; diff --git a/modules/tui/yazi.nix b/modules/tui/yazi.nix index ca35d84..879dd77 100644 --- a/modules/tui/yazi.nix +++ b/modules/tui/yazi.nix @@ -13,7 +13,7 @@ in { home-manager.users.${username} = { programs.yazi = { enable = true; - enableZshIntegration = true; + enableFishIntegration = true; }; }; };