From 84ce2ad9126ad41958dc2e7492d989c7c63acf08 Mon Sep 17 00:00:00 2001
From: tzlil <tzlils@protonmail.com>
Date: Thu, 24 Aug 2023 19:17:56 +0300
Subject: uhhh work a bit on firefox and add yank to mpv

---
 hosts/navi/default.nix | 40 +++++++++++++++++++++++++++++-----------
 hosts/vps/default.nix  | 16 +++++++++++++++-
 2 files changed, 44 insertions(+), 12 deletions(-)

(limited to 'hosts')

diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix
index a5ad367..3ad9dbd 100644
--- a/hosts/navi/default.nix
+++ b/hosts/navi/default.nix
@@ -16,6 +16,7 @@
     ../../mixins/multimedia.nix
     ../../mixins/syncthing.nix
     ../../mixins/firefox
+    # ../../mixins/firefox/absolute-minimum.nix
   ];
 
   config = {
@@ -50,27 +51,43 @@
     systemd.network.networks."10-wlp1s0" = {
       matchConfig.Name = "wlp1s0";
       networkConfig.DHCP = "yes";
-      dns = ["127.0.0.1" "::1"];
       dhcpV4Config = {
         UseDNS = false;
       };
       dhcpV6Config = {
         UseDNS = false;
       };
+      # apparently this is what i need to disable dhcpv6 dns servers, but this breaks my network
+      #ipv6AcceptRAConfig = {
+      #  UseDNS = false;
+      #  DHCPv6Client = false;
+      #};
     };
 
     # # iwd networking stuffs
     # networking.networkmanager.enable = lib.mkForce false;
-    # networking.wireless.iwd.enable = true;
-    # services.connman = {
-    #   enable = true;
-    #   wifi.backend = "iwd";
-    # };
-    # networking.wireless.dbusControlled = true;
-    # home-manager.users.tzlil.home.packages = [pkgs.cmst];
-    # networking.wireless.userControlled.enable = true;
-    # networking.wireless.enable = true;
-    # services.connman.enable = true;
+    #networking.wireless.iwd = {
+    #  enable = true;
+    #  settings = {
+    #    Settings.AutoConnect = true;
+    #  };
+    #};
+    services.connman = {
+      enable = true;
+      #wifi.backend = "iwd";
+    };
+
+    # fucks up wpa_supplicant
+    security.lockKernelModules = lib.mkForce false;
+    networking.wireless = {
+      dbusControlled = true;
+      userControlled.enable = true;
+      enable = true;
+    };
+    #networking.wireless.dbusControlled = true;
+    # home-manager.users.tzlil.home.packages = [];
+    #networking.wireless.userControlled.enable = true;
+    #networking.wireless.enable = true;
 
     # services.tor = {
     #   enable = true;
@@ -93,6 +110,7 @@
         pkgs.schildichat-desktop-wayland
         pkgs.keepassxc
         pkgs.gtkcord4
+        pkgs.cmst
 
         (pkgs.stdenv.mkDerivation rec {
           name = "pragmata";
diff --git a/hosts/vps/default.nix b/hosts/vps/default.nix
index ba0fdb9..cfa50c7 100644
--- a/hosts/vps/default.nix
+++ b/hosts/vps/default.nix
@@ -32,12 +32,15 @@
     systemd.network.networks."10-ens3" = {
       matchConfig.Name = "ens3";
       networkConfig.DHCP = "yes";
-      dns = ["127.0.0.1" "::1"];
       dhcpV4Config = {
         UseDNS = false;
       };
+      dhcpV6Config = {
+        UseDNS = false;
+      };
       ipv6AcceptRAConfig = {
         UseDNS = false;
+        DHCPv6Client = false;
       };
     };
 
@@ -48,6 +51,11 @@
         user = "terraria";
         group = "terraria";
       }
+      {
+        directory = "/var/lib/private/${config.services.factorio.stateDirName}";
+        user = "root";
+        group = "root";
+      }
     ];
 
     services.terraria = {
@@ -56,5 +64,11 @@
       password = "???";
       openFirewall = true;
     };
+    services.factorio = {
+      enable = true;
+      openFirewall = true;
+      game-password = "???";
+      requireUserVerification = false;
+    };
   };
 }
-- 
cgit 1.4.1