networkmanager is annoying me and nothing else works, need to fix dns

5 files changed, 39 insertions, 17 deletions

diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix
index b868a6e..8cf17d6 100644
--- a/hosts/laptop/cfg.nix
+++ b/hosts/laptop/cfg.nix
@@ -87,7 +87,22 @@
     };
 
     networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-    networking.networkmanager.enable = true;
+
+
+    # # 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;
+
+
     environment.persistence."/nix/persist".directories = [
       "/etc/NetworkManager/system-connections"
       {
@@ -97,6 +112,8 @@
       }
     ];
 
+    home-manager.users.tzlil.home.packages = [pkgs.schildichat-desktop pkgs.qutebrowser];
+
     nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
     powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
     hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
@@ -115,15 +132,15 @@
     services = {
       power-profiles-daemon.enable = true;
       thermald.enable = true;
-    };
-
-    services.tlp = {
-      settings = {
-        CPU_BOOST_ON_AC = 1;
-        CPU_BOOST_ON_BAT = 0;
-        CPU_SCALING_GOVERNOR_ON_AC = "performance";
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      tlp = {
+        settings = {
+          CPU_BOOST_ON_AC = 1;
+          CPU_BOOST_ON_BAT = 0;
+          CPU_SCALING_GOVERNOR_ON_AC = "performance";
+          CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+        };
       };
+      acpid.enable = true;
     };
   };
 }
diff --git a/mixins/cli.nix b/mixins/cli.nix
index db77ab8..84a5e3d 100644
--- a/mixins/cli.nix
+++ b/mixins/cli.nix
@@ -11,7 +11,7 @@
       config,
       nixosConfig,
       ...
-    } @ hm: {
+    }: {
       imports = [
         # inputs.viper-nix-common.homeModules.xdg
       ];
@@ -22,9 +22,14 @@
           ripgrep
           bat
           croc
-          (pkgs.python3.withPackages (ps: with ps; [
-            requests
-          ]))
+
+          # crap i need in my shell for general usage, mostly data science
+          (pkgs.python3.withPackages (ps:
+            with ps; [
+              requests
+              numpy
+              more-itertools
+            ]))
         ];
         sessionVariables = {
           EDITOR = "nvim";
diff --git a/mixins/emacs/default.nix b/mixins/emacs/default.nix
index 27e1106..b44da80 100644
--- a/mixins/emacs/default.nix
+++ b/mixins/emacs/default.nix
@@ -13,7 +13,7 @@
       config,
       nixosConfig,
       ...
-    } @ hm: {
+    }: {
       home = {
         packages = with pkgs; [
         ];
diff --git a/mixins/sway.nix b/mixins/sway.nix
index 42dfc73..c12d156 100644
--- a/mixins/sway.nix
+++ b/mixins/sway.nix
@@ -294,7 +294,7 @@ in {
           exec_always ${pkgs.kanshi}/bin/kanshi >/tmp/kanshi.log 2>&1
 
 
-          default_border pixel 0
+          default_border pixel 2
           gaps outer 0
           gaps inner 0
           include /etc/sway/config.d/*
diff --git a/profiles/network.nix b/profiles/network.nix
index ba6e9a2..90c5d47 100644
--- a/profiles/network.nix
+++ b/profiles/network.nix
@@ -17,7 +17,7 @@
       networkmanager.enable = true;
       useDHCP = false;
       nameservers = ["127.0.0.1" "::1"];
-      networkmanager.dns = "none";
+      # networkmanager.dns = "none";
       extraHosts = ''
         100.99.246.128 pc
         100.105.242.70 phone
@@ -49,7 +49,7 @@
         };
 
         # You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
-        server_names = []; # tailscale magicdns
+        server_names = [ ]; # tailscale magicdns
       };
     };