captive browser + dnscrypt

flake.lock

@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708950325,
+        "lastModified": 1709039791,
-        "narHash": "sha256-3dNPq8oFhIo7LlRhsnq6cuXNIbmwawLQkU8Aw/m0tro=",
+        "narHash": "sha256-M2PZlrXCaIVMKonM8dwsTCCS0Tp09mMWL4PqsEnCnK8=",
         "owner": "nix-community",
         "repo": "flake-firefox-nightly",
-        "rev": "5c5191909658996597eeb54d59294df1a3f7dab5",
+        "rev": "17696e176f5493c4959ff056df6b9b4751468fb5",
         "type": "github"
       },
       "original": {

home/home.nix

@@ -17,6 +17,24 @@
   services.blueman-applet.enable = true;
   services.network-manager-applet.enable = true;
 
+    programs.captive-browser = {
+    browser = builtins.concatStringsSep " " [
+    ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"''
+    ''${pkgs.chromium}/bin/chromium''
+    ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
+    ''--proxy-server="socks5://$PROXY"''
+    ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"''
+    ''--no-first-run''
+    ''--new-window''
+    ''--incognito''
+    ''-no-default-browser-check''
+    ''http://cache.nixos.org/''
+  ];
+    interface = "wlp1s0";
+    enable = true;
+  };
+
+
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
@@ -67,11 +85,12 @@
     swayidle
     nom
     vesktop
+    firefox
   ]) ++ (with stable; [ 
     localsend
     trayscale
   ]) ++ ([
-    inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin
+    # inputs.firefox.packages.${pkgs.system}.firefox-bin
   ]);
 
   dconf = {

hosts/dlaptop/configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ inputs, unstable, config, pkgs, ... }:
+{ inputs, stable, unstable, config, pkgs, ... }:
 
 {
   time.timeZone = "Europe/Moscow";
@@ -37,11 +37,27 @@
   environment.sessionVariables = {
     QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
     QT_QPA_PLATFORM = "wayland";
+    STEAM_FORCE_DESKTOPUI_SCALING = "2";
     NIXOS_OZONE_WL = "1";
   };
 
+  services.dnscrypt-proxy2 = {
+    enable = true;
+    settings = {
+      ipv6_servers = true;
+      require_dnssec = true;
+      server_names = [ "cloudflare" ];
+    };
+  };
+
+  systemd.services.dnscrypt-proxy2.serviceConfig = {
+    StateDirectory = "dnscrypt-proxy";
+  };
+
   networking = {
     hostName = "dlaptop";
+    nameservers = [ "127.0.0.1" "::1" ];
+    networkmanager.dns = "none"; 
     networkmanager.enable = true;
     firewall = {
       enable = false;

hosts/dlaptop/hardware-configuration.nix

@@ -63,8 +63,8 @@
     enable = true;
     driSupport = true;
     driSupport32Bit = true;
-    extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl amdvlk ];
+    #extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl amdvlk ];
-    extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
+    #extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
   };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/huanan/configuration.nix

@@ -106,12 +106,6 @@
     inputs.telegram-desktop-patched-unstable.packages.${pkgs.system}.default
   ];
 
-  users.users.test = {
-    isNormalUser = true;
-    description = "test";
-    extraGroups = [ "networkmanager" "wheel" "docker"];
-  };
-
   environment = {
     gnome.excludePackages = [
       #pkgs.gnome-connections