From 211d085dfae21f7df847d57377dfb8e54c1ba9e9 Mon Sep 17 00:00:00 2001 From: tzlil Date: Thu, 3 Aug 2023 13:35:57 +0300 Subject: add thumbnail plugin to mpv, try to fix impermanence --- flake.lock | 24 +++++++-------- hosts/navi/hardware-configuration.nix | 3 ++ mixins/firefox/default.nix | 4 +++ mixins/multimedia.nix | 1 + profiles/impermanence-fix.patch | 12 ++++++++ profiles/stdenv.nix | 55 ++++++++++++++++++----------------- 6 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 profiles/impermanence-fix.patch diff --git a/flake.lock b/flake.lock index c564839..98b65f6 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1690887506, - "narHash": "sha256-yrv5EeBgYceL4WkdMH6nx9JvokAvaarJxrygchIYIcw=", + "lastModified": 1691056147, + "narHash": "sha256-VK/l/h18Ab9diaJCQUpZaaSDpFD9o7CPzlOw/0WfTdM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "77e7adbf84f50eda000d67e548bfb876a54bfdf5", + "rev": "24bfc65664c50b81ead652db87f6f58c4eacdde8", "type": "gitlab" }, "original": { @@ -102,11 +102,11 @@ }, "hardware": { "locked": { - "lastModified": 1690704397, - "narHash": "sha256-sgIWjcz0e+x87xlKg324VtHgH55J5rIuFF0ZWRDvQoE=", + "lastModified": 1690957133, + "narHash": "sha256-0Y4CiOIszhHDDXHFmvHUpmhUotKOIn0m3jpMlm6zUTE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "96e5a0a0e8568c998135ea05575a9ed2c87f5492", + "rev": "24f9162b26f0debd163f6d94752aa2acb9db395a", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1690846843, - "narHash": "sha256-sfguzocpi42+juoiUNLMtXws33DeEZkbEVTLtx/LKC8=", + "lastModified": 1691039228, + "narHash": "sha256-iPNZJ1LvfUf1Y456ewC0DXgf99TNssG8OLObOyqxO6M=", "owner": "nix-community", "repo": "home-manager", - "rev": "310c0063b2558e94ad8bc3c1f2ddead82e0872cd", + "rev": "86dd48d70a2e2c17e84e747ba4faa92453e68d4a", "type": "github" }, "original": { @@ -229,11 +229,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1690789960, - "narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=", + "lastModified": 1691006197, + "narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb942492b7accdee4e6d17f5447091c65897dde4", + "rev": "66aedfd010204949cb225cf749be08cb13ce1813", "type": "github" }, "original": { diff --git a/hosts/navi/hardware-configuration.nix b/hosts/navi/hardware-configuration.nix index c0a9661..f556950 100644 --- a/hosts/navi/hardware-configuration.nix +++ b/hosts/navi/hardware-configuration.nix @@ -3,6 +3,7 @@ pkgs, lib, config, + # modulesPath, ... }: let device = "/dev/nvme0n1"; @@ -11,6 +12,8 @@ in { inputs.disko.nixosModules.disko inputs.hardware.nixosModules.common-cpu-intel inputs.hardware.nixosModules.common-gpu-intel + + # (modulesPath + "/virtualisation/qemu-vm.nix") ]; hardware.firmware = [pkgs.rtw88-firmware]; diff --git a/mixins/firefox/default.nix b/mixins/firefox/default.nix index 990c51e..4c22e9e 100644 --- a/mixins/firefox/default.nix +++ b/mixins/firefox/default.nix @@ -204,6 +204,7 @@ in }; OverrideFirstRunPage = ""; Extensions.Install = map (x: x.src.outPath) config.home-manager.users.tzlil.programs.firefox.profiles."default".extensions; + SearchEngines.Default = "DuckDuckGo"; }; }; profiles.default = { @@ -278,6 +279,9 @@ in user_pref('keyword.enabled', true); user_pref("browser.startup.homepage", "https://lobste.rs"); user_pref("browser.startup.page", 1); + + + // if your websites make you use RFP use different websites user_pref("privacy.resistFingerprinting", false); ''; settings = { diff --git a/mixins/multimedia.nix b/mixins/multimedia.nix index b1ad501..123037c 100644 --- a/mixins/multimedia.nix +++ b/mixins/multimedia.nix @@ -44,6 +44,7 @@ enable = true; scripts = with pkgs.mpvScripts; [ mpris + thumbnail (pkgs.callPackage ./youtube-quality.nix {}) ]; config = { diff --git a/profiles/impermanence-fix.patch b/profiles/impermanence-fix.patch new file mode 100644 index 0000000..c71a85e --- /dev/null +++ b/profiles/impermanence-fix.patch @@ -0,0 +1,12 @@ +diff --git a/create-directories.bash b/create-directories.bash +index 0c7c7f0..b959586 100755 +--- a/create-directories.bash ++++ b/create-directories.bash +@@ -52,7 +52,7 @@ target="${target%/}" + realSource="$(realpath -m "$sourceBase$target")" + if [[ ! -d "$realSource" ]]; then + printf "Warning: Source directory '%s' does not exist; it will be created for you with the following permissions: owner: '%s:%s', mode: '%s'.\n" "$realSource" "$user" "$group" "$mode" +- mkdir --mode="$mode" "$realSource" ++ mkdir -p --mode="$mode" "$realSource" + chown "$user:$group" "$realSource" + fi \ No newline at end of file diff --git a/profiles/stdenv.nix b/profiles/stdenv.nix index 337a306..93d5918 100644 --- a/profiles/stdenv.nix +++ b/profiles/stdenv.nix @@ -5,33 +5,34 @@ inputs, ... }: { - imports = []; - config = { - nix.binaryCaches = [ - "https://cache.nixos.org/" - "https://cache.allvm.org/" - ]; + nix.binaryCaches = [ + "https://cache.nixos.org/" + "https://cache.allvm.org/" + ]; - nix.binaryCachePublicKeys = [ - "gravity.cs.illinois.edu-1:yymmNS/WMf0iTj2NnD0nrVV8cBOXM9ivAkEdO1Lro3U=" - ]; + nix.binaryCachePublicKeys = [ + "gravity.cs.illinois.edu-1:yymmNS/WMf0iTj2NnD0nrVV8cBOXM9ivAkEdO1Lro3U=" + ]; - nativeStdenv = - prev.stdenvAdapters.withCFlags ["-O3" "-pipe" "-march=native"] - (prev.overrideCC prev.llvmPackages_latest.stdenv - (prev.wrapCCWith rec { - cc = prev.llvmPackages_latest.clang-unwrapped; - bintools = final.wrapBintoolsWith { - coreutils = final.uutils-coreutils; - libc = final.musl; - bintools = - final.binutils-unwrapped.overrideAttrs - (old: { - postInstall = '' - ln -sf ${final.mold}/bin/mold $out/bin/ld - ''; - }); - }; - })); - }; + overlays = [ + (final: prev: { + nativeStdenv = + prev.stdenvAdapters.withCFlags ["-O3" "-pipe" "-march=native"] + (prev.overrideCC prev.llvmPackages_latest.stdenv + (prev.wrapCCWith rec { + cc = prev.llvmPackages_latest.clang-unwrapped; + bintools = final.wrapBintoolsWith { + coreutils = final.uutils-coreutils; + libc = final.musl; + bintools = + final.binutils-unwrapped.overrideAttrs + (old: { + postInstall = '' + ln -sf ${final.mold}/bin/mold $out/bin/ld + ''; + }); + }; + })); + }) + ]; } -- cgit 1.4.1