From a763e32e42f75c642dbe387a991db7fbac026917 Mon Sep 17 00:00:00 2001
From: ficache <dixxe.mail@proton.me>
Date: Sun, 10 Nov 2024 19:46:13 +0300
Subject: [PATCH] update
---
flake.lock | 115 ++++++++++++++++++++------------
home-manager/your-packages.nix | 3 +-
nixos/modules/minimal/fonts.nix | 2 -
nixos/modules/zapret_test.nix | 60 +++++++++++++++++
nixos/user_modules.nix | 2 +-
5 files changed, 135 insertions(+), 47 deletions(-)
create mode 100644 nixos/modules/zapret_test.nix
diff --git a/flake.lock b/flake.lock
index 0dea1f0..15bb924 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,11 +92,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1724028178,
- "narHash": "sha256-3FPpsd43xXXV6ErlMxdQabg9uMS2OW8nm2QklKKe600=",
+ "lastModified": 1728738753,
+ "narHash": "sha256-NkV9mVSoC/IZsyd2+MjZszExUbStPDqCFep4PnCt2c4=",
"owner": "bayasdev",
"repo": "envycontrol",
- "rev": "0b502c4027133694e82db9b56eaffbb34fc98642",
+ "rev": "3097c7185177b5e69230dea8ad5ee0f078add176",
"type": "github"
},
"original": {
@@ -143,11 +143,11 @@
]
},
"locked": {
- "lastModified": 1727826117,
- "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+ "lastModified": 1730504689,
+ "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+ "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
@@ -228,11 +228,11 @@
]
},
"locked": {
- "lastModified": 1728092656,
- "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
+ "lastModified": 1730814269,
+ "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
+ "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"type": "github"
},
"original": {
@@ -287,11 +287,11 @@
]
},
"locked": {
- "lastModified": 1728337164,
- "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
+ "lastModified": 1731235328,
+ "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
+ "rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github"
},
"original": {
@@ -308,11 +308,11 @@
]
},
"locked": {
- "lastModified": 1728337164,
- "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
+ "lastModified": 1730837930,
+ "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
+ "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github"
},
"original": {
@@ -342,6 +342,34 @@
"type": "github"
}
},
+ "ixx": {
+ "inputs": {
+ "flake-utils": [
+ "nixvim",
+ "nuschtosSearch",
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "nixvim",
+ "nuschtosSearch",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1729958008,
+ "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+ "owner": "NuschtOS",
+ "repo": "ixx",
+ "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NuschtOS",
+ "ref": "v0.0.6",
+ "repo": "ixx",
+ "type": "github"
+ }
+ },
"nix-darwin": {
"inputs": {
"nixpkgs": [
@@ -350,11 +378,11 @@
]
},
"locked": {
- "lastModified": 1728385805,
- "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
+ "lastModified": 1731153869,
+ "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
+ "rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
"type": "github"
},
"original": {
@@ -365,11 +393,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1728538411,
- "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+ "lastModified": 1730958623,
+ "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+ "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
"type": "github"
},
"original": {
@@ -381,11 +409,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1728492678,
- "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+ "lastModified": 1730785428,
+ "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+ "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github"
},
"original": {
@@ -426,11 +454,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1728485062,
- "narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=",
+ "lastModified": 1731155487,
+ "narHash": "sha256-+D57j7BcV5O3XH9za3c3XXVLHr+F+enThAN2EeF6H/M=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135",
+ "rev": "31364af1990067d5529846a2ebf17a42c5ab22ff",
"type": "github"
},
"original": {
@@ -442,17 +470,18 @@
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
+ "ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1728423244,
- "narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=",
+ "lastModified": 1731060242,
+ "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=",
"owner": "NuschtOS",
"repo": "search",
- "rev": "f276cc3b391493ba3a8b30170776860f9520b7fa",
+ "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e",
"type": "github"
},
"original": {
@@ -487,11 +516,11 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
- "lastModified": 1728487226,
- "narHash": "sha256-gTOUdO94Y24QgnPVnHTQ/Kch0eM6pHEk/c1WoIxg+qE=",
+ "lastModified": 1731090365,
+ "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=",
"owner": "danth",
"repo": "stylix",
- "rev": "5699ba97c60455ebafde0fd4e78ca0a2e5a58282",
+ "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68",
"type": "github"
},
"original": {
@@ -533,32 +562,34 @@
"tinted-foot": {
"flake": false,
"locked": {
- "lastModified": 1696725948,
- "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
+ "lastModified": 1726913040,
+ "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
- "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+ "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
+ "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": {
"flake": false,
"locked": {
- "lastModified": 1727867815,
- "narHash": "sha256-cghdwzPyve13JFeW+Mpqy/sDswlJ4DTffY24R0R7r/U=",
+ "lastModified": 1716423189,
+ "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
- "rev": "81b15cb9eb696247af857808d37122188423f73b",
+ "rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
+ "rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
}
},
@@ -586,11 +617,11 @@
]
},
"locked": {
- "lastModified": 1727984844,
- "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
+ "lastModified": 1730321837,
+ "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
+ "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github"
},
"original": {
diff --git a/home-manager/your-packages.nix b/home-manager/your-packages.nix
index d3e055d..638ea53 100644
--- a/home-manager/your-packages.nix
+++ b/home-manager/your-packages.nix
@@ -26,8 +26,7 @@
#Random stuff
krita
-
- ];
+ ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"obsidian"
diff --git a/nixos/modules/minimal/fonts.nix b/nixos/modules/minimal/fonts.nix
index 3450dea..b7b8bcd 100644
--- a/nixos/modules/minimal/fonts.nix
+++ b/nixos/modules/minimal/fonts.nix
@@ -4,8 +4,6 @@
fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "Ubuntu" ]; })
noto-fonts
- noto-fonts-cjk
- noto-fonts-extra
hack-font
];
}
diff --git a/nixos/modules/zapret_test.nix b/nixos/modules/zapret_test.nix
new file mode 100644
index 0000000..5f2a973
--- /dev/null
+++ b/nixos/modules/zapret_test.nix
@@ -0,0 +1,60 @@
+{ ... }:
+{
+ services = {
+ zapret = {
+ enable = true;
+ params = [
+ "--dpi-desync-autottl=3"
+ "--wssize 1:6"
+ "--dpi-desync-fake-tls=0x00000000"
+ "--dpi-desync-split-pos=1"
+ "--dpi-desync=syndata,fake,split2"
+ "--dpi-desync-repeats=6"
+ "--dpi-desync-fooling=md5sig"
+ "--new"
+ ];
+ whitelist = [
+ "googlevideo.com"
+ "youtu.be"
+ "youtube.com"
+ "youtubei.googleapis.com"
+ "googlevideo.com"
+ "youtu.be"
+ "youtube.com"
+ "youtubei.googleapis.com"
+ "youtubeembeddedplayer.googleapis.com"
+ "ytimg.l.google.com"
+ "ytimg.com"
+ "jnn-pa.googleapis.com"
+ "youtube-nocookie.com"
+ "youtube-ui.l.google.com"
+ "yt-video-upload.l.google.com"
+ "wide-youtube.l.google.com"
+ "youtubekids.com"
+ "ggpht.com"
+ "discord.com"
+ "gateway.discord.gg"
+ "cdn.discordapp.com"
+ "discordapp.net"
+ "discordapp.com"
+ "discord.gg"
+ "media.discordapp.net"
+ "images-ext-1.discordapp.net"
+ "discord.app"
+ "discord.media"
+ "discordcdn.com"
+ "discord.dev"
+ "discord.new"
+ "discord.gift"
+ "discordstatus.com"
+ "dis.gd"
+ "discord.co"
+ "discord-attachments-uploads-prd.storage.googleapis.com"
+ "7tv.app"
+ "7tv.io"
+ "10tv.app"
+ ];
+ };
+ };
+}
+
diff --git a/nixos/user_modules.nix b/nixos/user_modules.nix
index 4133304..a451baa 100644
--- a/nixos/user_modules.nix
+++ b/nixos/user_modules.nix
@@ -4,7 +4,7 @@
./modules/pipewire.nix
./modules/auto-cpufreq.nix
./modules/privoxy.nix
- ./modules/zapret.nix
+ ./modules/zapret_test.nix
./modules/hardware/nvidia.nix
./modules/hardware/battery-threshold.nix