diff options
| -rw-r--r-- | flake.lock | 113 | ||||
| -rw-r--r-- | modules/common/nix.nix | 2 | ||||
| -rw-r--r-- | modules/common/shell/default.nix | 4 | ||||
| -rw-r--r-- | modules/profiles/dev/containers.nix | 1 | ||||
| -rw-r--r-- | nixosConfigurations/varda/default.nix | 6 | ||||
| -rw-r--r-- | overlay.nix | 8 | ||||
| -rw-r--r-- | patches/telegram-desktop-no-ads.patch | 10 |
7 files changed, 61 insertions, 83 deletions
diff --git a/flake.lock b/flake.lock index bb99b05..75e6c07 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1714136352, + "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", "type": "github" }, "original": { @@ -117,39 +117,6 @@ "type": "github" } }, - "base16-alacritty": { - "flake": false, - "locked": { - "lastModified": 1703982197, - "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "type": "github" - } - }, - "base16-alacritty-yaml": { - "flake": false, - "locked": { - "lastModified": 1674275109, - "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - } - }, "base16-fish": { "flake": false, "locked": { @@ -270,11 +237,11 @@ ] }, "locked": { - "lastModified": 1713543876, - "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -420,11 +387,11 @@ ] }, "locked": { - "lastModified": 1713294767, - "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", + "lastModified": 1714203603, + "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", + "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", "type": "github" }, "original": { @@ -462,11 +429,11 @@ ] }, "locked": { - "lastModified": 1713012165, - "narHash": "sha256-z/soXKDnz+w4Nw0LkRaM73YqolhSmIYy6cpg1F2ps8I=", + "lastModified": 1714298568, + "narHash": "sha256-HzgySE+n7Ri8faGo+uxYdjlCicgVGV0eJT86cWYIvo4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "9f6635a0351c190179dc6904545f950108a23dd8", + "rev": "ef4756bcfc8a6791adbcae2b32f87e2f0a00525d", "type": "gitlab" }, "original": { @@ -488,11 +455,11 @@ ] }, "locked": { - "lastModified": 1713316655, - "narHash": "sha256-9RrR91JlhQFdrANMMgBJP3QYTOKUSkczV2xfn3q7eKs=", + "lastModified": 1714180709, + "narHash": "sha256-UgvCa4nhcgcbMfqJhziwOjMlHPzxzbNzr9AkQb2nc/U=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "40ad0f919af82dde9664732351871108c1f03215", + "rev": "94da995402d449a9e8a68ca379338e002ed9e3ae", "type": "github" }, "original": { @@ -508,11 +475,11 @@ ] }, "locked": { - "lastModified": 1713067146, - "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=", + "lastModified": 1714273701, + "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c", + "rev": "941c4973c824509e0356be455d89613611f76c8a", "type": "github" }, "original": { @@ -523,11 +490,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713377320, - "narHash": "sha256-OrBm62B+X9jylr6cPgKc+5OSgF2PRW9IY0ARCOtURMY=", + "lastModified": 1714201532, + "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f2d364de6589f7a029624983593eafc3c4dac726", + "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", "type": "github" }, "original": { @@ -538,11 +505,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713254108, - "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", + "lastModified": 1714245158, + "narHash": "sha256-9P2M0+tf1TE7Z5PwDVwhheuD2mFf6/phPr0Jvl7cxcc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", + "rev": "2b1f64b358f2cab62617f26b3870fd0ee375d848", "type": "github" }, "original": { @@ -554,11 +521,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1713385445, - "narHash": "sha256-h8dbHXiFMHBVxiOhUtIDCQXkp5p0T+Z2AespYrIJ1a0=", + "lastModified": 1714334083, + "narHash": "sha256-J+8rWV1oLXADlyk7kKPnTkOKal050884rt2g3bZ1KwY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0edd8f2a9f5768eb115f84e8ac848fd6c14ba8e7", + "rev": "d9fd2b2c31f1f983060af97da8bf56f2abe7c7fc", "type": "github" }, "original": { @@ -570,11 +537,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713384257, - "narHash": "sha256-p02PQxiyp4FjuoQLpqBcC3WMV1/GiNwMWJ2f9Iq43g4=", + "lastModified": 1714333746, + "narHash": "sha256-4PvKjtV5nINMzhe2RKmtTvlE5FGzuLbhjM4UHfMUPYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "429d6735f20e1741e096aa1c72ffa3d0127cf78e", + "rev": "007064b6be0e8cb970d6e1a8902c30a3e99167e3", "type": "github" }, "original": { @@ -635,11 +602,11 @@ ] }, "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "lastModified": 1713954846, + "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f", "type": "github" }, "original": { @@ -680,8 +647,6 @@ "stylix": { "inputs": { "base16": "base16", - "base16-alacritty": "base16-alacritty", - "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", "base16-foot": "base16-foot", "base16-helix": "base16-helix", @@ -700,11 +665,11 @@ ] }, "locked": { - "lastModified": 1713025302, - "narHash": "sha256-za4w2wYt1fg9EdTv5fYLwEqAyHgPmPq88HmlxirXuEk=", + "lastModified": 1713821140, + "narHash": "sha256-/kGc9R01h8mTmZKhrVyGWaK/w9zgettmHIE3GZW8Khs=", "owner": "danth", "repo": "stylix", - "rev": "83866ed8800ed39519a79ea30b18c8eb21f26080", + "rev": "0fe277a3641a849478a94c7900c2d5a90609a306", "type": "github" }, "original": { @@ -741,11 +706,11 @@ ] }, "locked": { - "lastModified": 1713316726, - "narHash": "sha256-VIQkEgU1xUD4nEh7w3uL0xRsTYZdC7p5+v35G9wv8U0=", + "lastModified": 1714267526, + "narHash": "sha256-92vUWmEZgINBgC2uT39Ihpbc/Ok86iOT2DjPrmrnFnA=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c1b75aedd50054ff43bb26ddb2702a2ac3475ea2", + "rev": "6be0c88ffc813c82a6d3c99129c5cdaed5499468", "type": "github" }, "original": { diff --git a/modules/common/nix.nix b/modules/common/nix.nix index db46336..d6e8edb 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -125,7 +125,7 @@ in overlays = with inputs; [ self.overlays.default - (_: _: { }) + (_: _super: { }) ]; }; diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix index 437ce57..9ef1c22 100644 --- a/modules/common/shell/default.nix +++ b/modules/common/shell/default.nix @@ -89,8 +89,8 @@ in _: super: { patches = (super.patches or [ ]) ++ [ (fetchpatch { - url = "https://raw.githubusercontent.com/jarun/advcpmv/a1f8b505e691737db2f7f2b96275802c45f65c59/advcpmv-0.9-9.4.patch"; - hash = "sha256-4fdqpkENPfra4nFQU4+xNrlfq6Dw/2JIZXUOMmdMtcM="; + url = "https://raw.githubusercontent.com/jarun/advcpmv/1e2b1c6b74fa0974896bf94604279a3f74b37a63/advcpmv-0.9-9.5.patch"; + hash = "sha256-LRfb4heZlAUKiXl/hC/HgoqeGMxCt8ruBYZUrbzSH+Y="; }) ]; } diff --git a/modules/profiles/dev/containers.nix b/modules/profiles/dev/containers.nix index f75a26b..3fb8774 100644 --- a/modules/profiles/dev/containers.nix +++ b/modules/profiles/dev/containers.nix @@ -37,6 +37,7 @@ in WERF_LOG_DEBUG = "true"; WERF_LOG_PRETTY = "false"; WERF_LOG_VERBOSE = "true"; + WERF_NELM = "true"; WERF_SYNCHRONIZATION = ":local"; WERF_TELEMETRY = "false"; }; diff --git a/nixosConfigurations/varda/default.nix b/nixosConfigurations/varda/default.nix index 58b3507..c8ecef2 100644 --- a/nixosConfigurations/varda/default.nix +++ b/nixosConfigurations/varda/default.nix @@ -1,4 +1,8 @@ -_: { +{ lib, ... }: +with lib; +{ + imports = attrValues (modulesIn ./.); + nixfiles.modules = { wireguard.client.enable = true; diff --git a/overlay.nix b/overlay.nix index fb5ab8c..a37d3e7 100644 --- a/overlay.nix +++ b/overlay.nix @@ -60,6 +60,14 @@ final: prev: { parinfer-rust = prev.callPackage ./packages/parinfer-rust.nix { }; + # FIXME https://nixpk.gs/pr-tracker.html?pr=307505 + poetry = prev.poetry.overrideAttrs (finalAttrs: { + nativeBuildInputs = (finalAttrs.nativeBuildInputs or [ ]) ++ [ + prev.python3Packages.pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ "dulwich" ]; + }); + prismlauncher-unwrapped = (prev.prismlauncher-unwrapped.override (finalAttrs: { stdenv = final.useMoldLinker finalAttrs.stdenv; diff --git a/patches/telegram-desktop-no-ads.patch b/patches/telegram-desktop-no-ads.patch index d066066..2a88cbf 100644 --- a/patches/telegram-desktop-no-ads.patch +++ b/patches/telegram-desktop-no-ads.patch @@ -1,8 +1,8 @@ -diff --git i/Telegram/SourceFiles/data/data_sponsored_messages.cpp w/Telegram/SourceFiles/data/data_sponsored_messages.cpp -index fa21af469..263ea3e61 100644 ---- i/Telegram/SourceFiles/data/data_sponsored_messages.cpp -+++ w/Telegram/SourceFiles/data/data_sponsored_messages.cpp -@@ -179,39 +179,7 @@ bool SponsoredMessages::canHaveFor(not_null<History*> history) const { +diff --git i/Telegram/SourceFiles/data/components/sponsored_messages.cpp w/Telegram/SourceFiles/data/components/sponsored_messages.cpp +index a60d7c3fd..070694b64 100644 +--- i/Telegram/SourceFiles/data/components/sponsored_messages.cpp ++++ w/Telegram/SourceFiles/data/components/sponsored_messages.cpp +@@ -185,39 +185,7 @@ bool SponsoredMessages::canHaveFor(not_null<History*> history) const { } void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) { |