From 6419639c599620dd7890e80853648411218b0b8f Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 7 Aug 2023 21:38:01 +0200 Subject: [PATCH] Update deps --- flake.lock | 36 +++++++++---------- hardware/hosts/argon.nix | 1 + home/programs/nvim/plugins.nix | 18 +++++----- system/nixos/adguardhome.nix | 66 ++++++++++++++++++---------------- 4 files changed, 63 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 943424e..70e7fcc 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1690739034, - "narHash": "sha256-roW02IaiQ3gnEEDMCDWL5YyN+C4nBf/te6vfL7rG0jk=", + "lastModified": 1691423834, + "narHash": "sha256-xcjbbK7j0xbX6VvYg03mI0DbcpjtVC6FuoO5SRYLPe4=", "owner": "nix-community", "repo": "disko", - "rev": "4015740375676402a2ee6adebc3c30ea625b9a94", + "rev": "5a9bfa9fa612cc1888a886f6900bf7afcdfd8d92", "type": "github" }, "original": { @@ -463,11 +463,11 @@ "weewx-proxy-flake": "weewx-proxy-flake" }, "locked": { - "lastModified": 1691309862, - "narHash": "sha256-n7tuw9+/Wgql9/P+t/H0u0MbFnGcsoLj4sKDrygFzRo=", + "lastModified": 1691396390, + "narHash": "sha256-W9xHiUbDtBo8EsRYoueQijmk7+MtPZBWUNnjV3qd6IE=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "c62a92e5b59a874920549a8c2882812fd3ae8eec", + "rev": "85e9e58d52051f4fe09c1048e317998c51e2df95", "type": "github" }, "original": { @@ -514,11 +514,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1691252436, - "narHash": "sha256-SKKPKYOnFcwqECehxoFBMLv29CZXC5qCDuETSuXd82g=", + "lastModified": 1691328192, + "narHash": "sha256-w59N1zyDQ7SupfMJLFvtms/SIVbdryqlw5AS4+DiH+Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9607b9149c9d81fdf3dc4f3bcc278da146ffbd77", + "rev": "61676e4dcfeeb058f255294bcb08ea7f3bc3ce56", "type": "github" }, "original": { @@ -530,11 +530,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691313029, - "narHash": "sha256-JCdafAmmuOkcRGFEUkXckRZ3Q/PBBtcm1Mq0GBA3XEY=", + "lastModified": 1691371061, + "narHash": "sha256-BxPbPVlBIoneaXIBiHd0LVzA+L4nmvFCNBU6TmQAiMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0bab81e6319eb418e1509fe4b88401a022f3bf99", + "rev": "5068bc8fe943bde3c446326da8d0ca9c93d5a682", "type": "github" }, "original": { @@ -669,11 +669,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1691256628, - "narHash": "sha256-M0YXHemR3zbyhM7PvJa5lzGhWVf6kM/fpZ4cWe/VIhI=", + "lastModified": 1691397944, + "narHash": "sha256-4fa4bX3kPYKpEssgrFRxRCPVXczidArDeSWaUMSzQAU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3139c4d1f7732cab89f06492bdd4677b877e3785", + "rev": "e5588ddffd4c3578547a86ef40ec9a6fbdae2986", "type": "github" }, "original": { @@ -801,11 +801,11 @@ ] }, "locked": { - "lastModified": 1690874496, - "narHash": "sha256-qYZJVAfilFbUL6U+euMjKLXUADueMNQBqwihpNzTbDU=", + "lastModified": 1691397152, + "narHash": "sha256-C2YpkJGVzpZHU7jWxemnG/pZ3X1lsDFVVKEKCEVzRR4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "fab56c8ce88f593300cd8c7351c9f97d10c333c5", + "rev": "13680c81f1ed7969bdba0185ae319a570fc4e4ab", "type": "github" }, "original": { diff --git a/hardware/hosts/argon.nix b/hardware/hosts/argon.nix index e010517..d5543d9 100644 --- a/hardware/hosts/argon.nix +++ b/hardware/hosts/argon.nix @@ -13,6 +13,7 @@ "net.ipv4.tcp_timestamps" = 1; "net.ipv4.tcp_window_scaling" = 1; "net.core.rmem_max" = 2500000; + "net.core.wmem_max" = 2500000; }; }; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index ea5e832..bc5032d 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -118,12 +118,12 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-05"; + version = "2023-08-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8d5e5dc40a4c480483690777cefb8cf67e710702"; - sha256 = "1dhpv1xwz1srq0x1i5ziqssxnhq2q2vg9ja3cghgxvhyavq81ax5"; + rev = "d9e75a1736a960a104ff3086fc553a054f51835b"; + sha256 = "1rv91rpij9gvlnhp9anhvxca038q9c999yvwqlggzycxjcxxbpfp"; fetchSubmodules = false; }; }; @@ -162,12 +162,12 @@ in }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-08-05"; + version = "2023-08-07"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "31b05ad3c313210039fae6958fb00449d72c259e"; - sha256 = "03c1yn8mlkwcvvq4cqfhr2xkkr4xf4g82rgdcr22csr34ddfwxka"; + rev = "dc192faceb2db64231ead71539761e055df66d73"; + sha256 = "08d4k4z0ixz3y0kwpixry7zzbrb03zb570d13zdp5d0if7p9h68a"; fetchSubmodules = false; }; }; @@ -308,12 +308,12 @@ in }; comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-08-02"; + version = "2023-08-07"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "d0cbbfb539898a275dc4398446ab0ae3b94819bf"; - sha256 = "0dqb5ydpdsxzhf2v1dqg1vdqyvg8iqzc7ydiybvxik29mvc4ybp9"; + rev = "0236521ea582747b58869cb72f70ccfa967d2e89"; + sha256 = "1mvi7c6n9ybgs6lfylzhkidifa6jkgsbj808knx57blvi5k7blgr"; fetchSubmodules = false; }; }; diff --git a/system/nixos/adguardhome.nix b/system/nixos/adguardhome.nix index 6668ca2..66e4364 100644 --- a/system/nixos/adguardhome.nix +++ b/system/nixos/adguardhome.nix @@ -4,38 +4,42 @@ services.adguardhome = { enable = true; - settings = { - bind_host = "127.0.0.1"; - bind_port = 3000; + mutableSettings = true; + settings = null; - users = [ - { - inherit (secret.adguardhome.users.daniel) name password; - } - ]; - - auth_attempts = 3; - debug_pprof = false; - - dns = { - inherit (secret.adguardhome) bind_hosts; - port = 53; - - bootstrap_dns = [ - "9.9.9.11" - "149.112.112.11" - "2620:fe::11" - "2620:fe::fe:11" - ]; - }; - - tls = { - enabled = false; - allow_unencrypted_doh = true; - }; - - dhcp.enabled = false; - }; + # settings = { + # schema_version = 20; + # bind_host = "127.0.0.1"; + # bind_port = 3000; + # + # users = [ + # { + # inherit (secret.adguardhome.users.daniel) name password; + # } + # ]; + # + # auth_attempts = 3; + # debug_pprof = false; + # + # dns = { + # inherit (secret.adguardhome) bind_hosts; + # port = 53; + # + # bootstrap_dns = [ + # "9.9.9.11" + # "149.112.112.11" + # "2620:fe::11" + # "2620:fe::fe:11" + # ]; + # }; + # + # tls = { + # enabled = false; + # allow_unencrypted_doh = true; + # }; + # + # dhcp.enabled = false; + # }; }; networking.firewall.interfaces =