update: lock

jz8132543 · Jun 13, 2024 · 4242959 · 4242959
1 parent 790311a
commit 4242959
Show file tree

Hide file tree

Showing 14 changed files with 374 additions and 475 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -74,7 +74,6 @@
     pre-commit-hooks-nix = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.flake-compat.follows = "flake-compat";
-      inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
       inputs.gitignore.follows = "gitignore-nix";

diff --git a/home-manager/modules/desktop/apps.nix b/home-manager/modules/desktop/apps.nix
@@ -5,6 +5,7 @@
 }: {
   home.packages = with pkgs; [
     tdesktop
+    ffmpeg
     thunderbird
     neovide
     okular

diff --git a/home-manager/modules/desktop/gnome.nix b/home-manager/modules/desktop/gnome.nix
@@ -21,7 +21,7 @@
   toTitle = str: "${lib.toUpper (lib.substring 0 1 str)}${lib.substring 1 (lib.stringLength str) str}";
   orchis-theme = pkgs.orchis-theme.override {
     tweaks = [config.home.catppuccin.tweak];
-    withWallpapers = true;
+    # withWallpapers = true;
   };
   catppuccin-kvantum =
     pkgs.catppuccin-kvantum.override

diff --git a/home-manager/modules/tippy/nvim.nix b/home-manager/modules/tippy/nvim.nix
@@ -5,7 +5,7 @@
 }: {
   programs.neovim = {
     enable = true;
-    package = pkgs.neovim-nightly;
+    # package = pkgs.neovim-nightly;
     viAlias = false;
     vimAlias = true;
     vimdiffAlias = true;

diff --git a/nixos/hosts/arx8/hardware-configuration.nix b/nixos/hosts/arx8/hardware-configuration.nix
@@ -38,7 +38,8 @@ in {
         device = lib.mkForce "nodev";
         efiInstallAsRemovable = lib.mkForce false;
         # useOSProber = true;
-        default = 0;
+        default = 1;
+        # default = "saved";
         # gfxmodeEfi = lib.mkForce "1280x800";
         extraEntries = ''
           menuentry "Windows" {

diff --git a/nixos/modules/base/baseline-apps.nix b/nixos/modules/base/baseline-apps.nix
@@ -33,7 +33,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    nixVersions.unstable
     curlFull
     wget
     neofetch

diff --git a/nixos/modules/base/dns-client.nix b/nixos/modules/base/dns-client.nix
@@ -32,7 +32,7 @@ in {
           else [];
       }
       else {};
-    dnscrypt-proxy2 = {
+    dnscrypt-proxy2 = rec {
       enable = lib.mkDefault false;
       settings = {
         listen_addresses = ["127.0.0.55:53"];
@@ -48,23 +48,37 @@ in {
         # fallback_resolvers = ["1.1.1.1:53" "1.0.0.1:53" "119.29.29.29:53" "223.5.5.5:53"];
         cache = true;
 
-        sources.public-resolvers = {
-          urls = [
-            "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
-            "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
-          ];
-          cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md";
-          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
+        sources = {};
+        # sources = {
+        #   public-resolvers.urls = [];
+        #   relays.urls = [];
+        # };
+
+        # sources.public-resolvers = {
+        #   urls = [
+        #     "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
+        #     "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
+        #   ];
+        #   cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md";
+        #   minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
+        # };
+        static = {
+          quad9-doh-ip4-port5053-filter-pri.stamp = "sdns://AgMAAAAAAAAABzkuOS45LjkgKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zOS5xdWFkOS5uZXQ6NTA1MwovZG5zLXF1ZXJ5";
+          quad9-doh-ip4-port443-filter-pri.stamp = "sdns://AgMAAAAAAAAABzkuOS45LjkgKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoSZG5zOS5xdWFkOS5uZXQ6NDQzCi9kbnMtcXVlcnk";
+          quad9-doh-ip6-port5053-filter-pri.stamp = "sdns://AgMAAAAAAAAADVsyNjIwOmZlOjpmZV0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoSZG5zLnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk";
+          quad9-doh-ip6-port443-filter-pri.stamp = "sdns://AgMAAAAAAAAADVsyNjIwOmZlOjpmZV0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoRZG5zLnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ";
+          iij.stamp = "sdns://AgcAAAAAAAAACjEwMy4yLjU3LjYAEXB1YmxpYy5kbnMuaWlqLmpwCi9kbnMtcXVlcnk";
         };
 
         # You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
         server_names = [
-          "cloudflare"
-          "google"
+          # "cloudflare"
+          # "google"
           "quad9-doh-ip4-port5053-filter-pri"
           "quad9-doh-ip4-port443-filter-pri"
           "quad9-doh-ip6-port5053-filter-pri"
           "quad9-doh-ip6-port443-filter-pri"
+          "iij"
           # "cloudflare-security-ipv6"
           # "doh-crypto-sx"
           # "alidns-doh"

diff --git a/nixos/modules/base/nix.nix b/nixos/modules/base/nix.nix
@@ -12,7 +12,7 @@
     };
     settings = {
       nix-path = ["nixpkgs=${inputs.nixpkgs}"];
-      experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "cgroups" "repl-flake"];
+      experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "cgroups"];
       system-features = ["nixos-test" "benchmark" "big-parallel" "kvm"];
       auto-allocate-uids = true;
       use-cgroups = true;

diff --git a/nixos/modules/base/nixpkgs.nix b/nixos/modules/base/nixpkgs.nix
@@ -6,7 +6,7 @@
 }: let
   packages = [
     inputs.sops-nix.overlays.default
-    inputs.neovim-nightly-overlay.overlay
+    # inputs.neovim-nightly-overlay.overlay
     # inputs.nixd.overlays.default
     # inputs.nvfetcher.overlays.default
     (

diff --git a/nixos/modules/base/tailscale.nix b/nixos/modules/base/tailscale.nix
@@ -72,6 +72,7 @@ in {
 
   systemd.services.tailscaled = {
     before = ["network.target"];
+    after = ["dnscrypt-proxy2.service" "systemd-resolved.service"];
     serviceConfig = {
       Restart = "always";
       TimeoutStopSec = "5s";

diff --git a/nixos/modules/desktop/iwd.nix → nixos/modules/desktop/iwd.nix.bak b/nixos/modules/desktop/iwd.nix → nixos/modules/desktop/iwd.nix.bak
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
@@ -134,7 +134,7 @@ in {
     prometheus.urls = ["http://localhost:11334/metrics"];
   };
 
-  boot.kernel.sysctl."vm.overcommit_memory" = 1;
+  boot.kernel.sysctl."vm.overcommit_memory" = lib.mkForce 1;
 
   services.redis.servers.rspamd = {
     enable = true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     }: {
       home.packages = with pkgs; [
         tdesktop
+        ffmpeg
         thunderbird
         neovide
         okular
@@ Expand Down @@