diff options
| m--------- | config/nvim | 0 | ||||
| -rw-r--r-- | config/qutebrowser/security.py | 2 | ||||
| -rwxr-xr-x | config/qutebrowser/userscripts/pick_useragent | 2 | ||||
| m--------- | extras/notes | 0 | ||||
| -rw-r--r-- | hardware/thinkpad-e14/default.nix | 2 | ||||
| -rw-r--r-- | home.nix | 6 | ||||
| -rw-r--r-- | modules/firefox.home/chrome/customNewTab.uc.js | 8 | ||||
| -rw-r--r-- | modules/firefox.home/chrome/globalKeybindings.uc.js | 4 | ||||
| -rw-r--r-- | modules/firefox.home/default.nix | 30 | ||||
| -rw-r--r-- | modules/firefox.home/preferences.nix | 1 | ||||
| -rw-r--r-- | overlays-system.nix | 2 | ||||
| m--------- | packages/shotkey/source | 0 | ||||
| -rwxr-xr-x | scripts/fzfmenu.sh | 35 |
13 files changed, 77 insertions, 15 deletions
diff --git a/config/nvim b/config/nvim -Subproject a0334567e8f249ab81f8e6fe81768254afda4aa +Subproject 0c250898f8bc2251dc96a3a8706aa32be0f9efc diff --git a/config/qutebrowser/security.py b/config/qutebrowser/security.py index e016f7e..cdf80b8 100644 --- a/config/qutebrowser/security.py +++ b/config/qutebrowser/security.py @@ -21,7 +21,7 @@ def random_version(a, b): return rand_numstr(a, b) + '.' + rand_numstr(0, 100) def random_useragent(): - chrome_version = random_version(108, 112) + chrome_version = random_version(130, 150) # firefox_version = random_version(77, 80) build_version = random_version(1000, 3000) diff --git a/config/qutebrowser/userscripts/pick_useragent b/config/qutebrowser/userscripts/pick_useragent index e7a1f1d..2829a08 100755 --- a/config/qutebrowser/userscripts/pick_useragent +++ b/config/qutebrowser/userscripts/pick_useragent @@ -2,7 +2,7 @@ trim() { sed '/^$/ d'; } -chromium_version="112"; +chromium_version="136"; useragents=`echo " Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/$chromium_version.0.3729.169 Safari/537.36 diff --git a/extras/notes b/extras/notes -Subproject 6dda73d7bdfbf34cf505c9f1f287a0228c4a869 +Subproject 55340d4780c71d099cb1c7bdca6e2dd59c569f8 diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix index 45ee978..a3def9d 100644 --- a/hardware/thinkpad-e14/default.nix +++ b/hardware/thinkpad-e14/default.nix @@ -7,7 +7,7 @@ services.fwupd.enable = true; # boot.kernelPackages = pkgs.linuxPackages_6_9; - boot.kernelPackages = pkgs.linuxPackages_xanmod_stable; + boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; boot.initrd = { availableKernelModules = [ "xhci_pci" @@ -51,8 +51,14 @@ in programs.obs-studio = { enable = true; + # enableVirtualCamera = true; + # package = pkgs.obs-studio.override { + # browserSupport = true; + # }; plugins = [ pkgs.obs-studio-plugins.obs-pipewire-audio-capture + pkgs.obs-studio-plugins.obs-backgroundremoval + # pkgs.obs-studio-plugins.obs-webkitgtk ]; }; diff --git a/modules/firefox.home/chrome/customNewTab.uc.js b/modules/firefox.home/chrome/customNewTab.uc.js index 3a3a47e..4c8faca 100644 --- a/modules/firefox.home/chrome/customNewTab.uc.js +++ b/modules/firefox.home/chrome/customNewTab.uc.js @@ -10,6 +10,10 @@ // Managed in about:config const NEWTAB_URL_PREF = 'browser.newtab.url' + console.log('-------------------------------------------'); + console.log('-------------------------------------------'); + console.log('-------------------------------------------'); + if (!AboutNewTab) { globalThis.AboutNewTab = ChromeUtils.import('resource:///modules/AboutNewTab.jsm').AboutNewTab; } @@ -24,6 +28,10 @@ }, init() { + console.log('-------------------------------------------'); + console.log('init new tab'); + console.log('-------------------------------------------'); + module.updateNewTabURL(); Services.obs.addObserver(module.updateNewTabURL, 'newtab-url-changed'); }, diff --git a/modules/firefox.home/chrome/globalKeybindings.uc.js b/modules/firefox.home/chrome/globalKeybindings.uc.js index 204a510..d8c0f51 100644 --- a/modules/firefox.home/chrome/globalKeybindings.uc.js +++ b/modules/firefox.home/chrome/globalKeybindings.uc.js @@ -139,6 +139,10 @@ }, init(win) { + console.log('-------------------------------------------'); + console.log('init keys'); + console.log('-------------------------------------------'); + const observe = () => { Services.obs.removeObserver(observe, 'browser-window-before-show'); module.onWindowReady(win) diff --git a/modules/firefox.home/default.nix b/modules/firefox.home/default.nix index 6a84205..208d2e7 100644 --- a/modules/firefox.home/default.nix +++ b/modules/firefox.home/default.nix @@ -1,12 +1,16 @@ { config, pkgs, lib, ... }: let - unwrapped-firefox-package = pkgs.firefox-devedition-unwrapped; + unwrappedFirefoxPackage = pkgs.firefox-devedition-unwrapped; + + firefoxBinName = "firefox-devedition"; + + configDir = ".mozilla/firefox"; extensions = [ "https://addons.mozilla.org/firefox/downloads/file/3792127/firefox_dracula-1.0.xpi" - "https://addons.mozilla.org/firefox/downloads/file/4261352/tridactyl_vim-1.24.1.xpi" + # "https://addons.mozilla.org/firefox/downloads/file/4261352/tridactyl_vim-1.24.1.xpi" # "https://addons.mozilla.org/firefox/downloads/file/4240798/sidetabs-0.66.xpi" - # "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi" + "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi" # dev "https://addons.mozilla.org/firefox/downloads/file/4218479/font_inspect-0.5.8.xpi" @@ -25,26 +29,30 @@ let Preferences = lib.mapAttrs (_key: val: { Status = "locked"; Value = val; }) preferences; }; - firefox = pkgs.wrapFirefox unwrapped-firefox-package { + firefox = pkgs.wrapFirefox unwrappedFirefoxPackage { extraPrefs = builtins.readFile ./autoconfig.js; }; profilePath = "default"; in { programs.firefox = { - enable = true; + enable = false; package = firefox; - nativeMessagingHosts = [ pkgs.tridactyl-native ]; + # nativeMessagingHosts = [ pkgs.tridactyl-native ]; policies = policies; }; - home.file = { - ".config/tridactyl".source = ./tridactyl; + home.packages = if config.programs.firefox.enable then [ + (pkgs.writeShellScriptBin "firefox" ''exec ${firefox}/bin/${firefoxBinName}'') + ] else []; - ".mozilla/firefox/${profilePath}/chrome".source = ./chrome; + home.file = if config.programs.firefox.enable then { + # ".config/tridactyl".source = ./tridactyl; - ".mozilla/firefox/profiles.ini".text = lib.generators.toINI {} { + "${configDir}/${profilePath}/chrome".source = ./chrome; + + "${configDir}/profiles.ini".text = lib.generators.toINI {} { Profile1 = { Name = "default"; IsRelative = 1; @@ -61,5 +69,5 @@ in { Version = 2; }; }; - }; + } else {}; } diff --git a/modules/firefox.home/preferences.nix b/modules/firefox.home/preferences.nix index 762a960..accaa05 100644 --- a/modules/firefox.home/preferences.nix +++ b/modules/firefox.home/preferences.nix @@ -6,6 +6,7 @@ in { "browser.newtabpage.enabled" = false; "browser.startup.homepage" = homepage-url; "browser.newtab.url" = homepage-url; + "browser.ml.chat.enabled" = false; "sidebar.verticalTabs" = true; "sidebar.main.tools" = ""; diff --git a/overlays-system.nix b/overlays-system.nix index 8de97c5..e87d212 100644 --- a/overlays-system.nix +++ b/overlays-system.nix @@ -7,6 +7,6 @@ in pass-with-dmenu qutebrowser j4-dmenu-desktop - neovim-nightly + # neovim-nightly ]; } diff --git a/packages/shotkey/source b/packages/shotkey/source -Subproject eaddd02b16bde1c96e95ea62964fd17006489b2 +Subproject eb0a1842f4c9674c59156bf61b565dd1a46570b diff --git a/scripts/fzfmenu.sh b/scripts/fzfmenu.sh new file mode 100755 index 0000000..978b6b7 --- /dev/null +++ b/scripts/fzfmenu.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env sh + +# log_() { echo "$@" >> ~/dump/log; } + +set -e; + +screen_width=$(xdotool getdisplaygeometry 2>/dev/null | cut -d' ' -f1) + +width_px=1000 +height_lines=25 +top_offset=0 +font_width=7 + +win_width=$(($width_px / $font_width)) +win_offset=$((($screen_width - $width_px) / 2)) + +fzf_args=$([ -z "$*" ] && echo "" || printf "'%s' " "$@") + +stdin_pipe=$(mktemp -u /tmp/fzfmenu-input-XXXX) +stdout_pipe=$(mktemp -u /tmp/fzfmenu-output-XXXX) +mkfifo "$stdin_pipe" "$stdout_pipe" + +trap "rm -f '$stdin_pipe' '$stdout_pipe'" EXIT + +cat >"$stdin_pipe" <&0 & +cat "$stdout_pipe" & + +cmd="fzf --height=100% $fzf_args <'$stdin_pipe' >'$stdout_pipe'" + +st \ + -i -g "=${win_width}x${height_lines}+${win_offset}+${top_offset}" \ + -e sh -c "$cmd" \ + >/dev/null 2>&1; + +wait; |