From 1c6a1a43056323a8fa1c4c27a0150246d169bea5 Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Thu, 28 Sep 2023 13:40:19 +1000
Subject: [PATCH] integrate nixd

---
 home/programs/helix.nix  | 19 ++++++++++++---
 result                   |  1 -
 system/configuration.nix | 50 +++++++++++++++++++++-------------------
 3 files changed, 42 insertions(+), 28 deletions(-)
 delete mode 120000 result

diff --git a/home/programs/helix.nix b/home/programs/helix.nix
index a28575d..eac8949 100644
--- a/home/programs/helix.nix
+++ b/home/programs/helix.nix
@@ -166,9 +166,22 @@ in {
           name = "rust";
           language-servers = ["rust-analyzer"];
         }
+        {
+          name = "nix";
+          language-servers = ["nixd"];
+          file-types = ["nix"];
+          auto-format = true;
+          formatter = {
+            command = "alejandra";
+          };
+        }
       ];
 
       language-server = {
+        nixd = {
+          command = "nixd";
+        };
+
         rust-analyzer = {
           config = {
             cargo = {
@@ -184,7 +197,7 @@ in {
             };
           };
         };
-      };
-    };
-  };
+      }; #language-server
+    }; #languages
+  }; #helix config
 }
diff --git a/result b/result
deleted file mode 120000
index e0489f8..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/mr7pczbgq3gj3ca23p4g7acz232jjnla-nixos-system-quiver-23.11.20230922.e35dcc0
\ No newline at end of file
diff --git a/system/configuration.nix b/system/configuration.nix
index 426f827..941e22d 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -95,7 +95,7 @@
     extraPackages = python3Packages:
       with python3Packages; [
         pkgs.stable.python3Packages.qtile-extras
-        coconut
+        # coconut
       ];
   };
 
@@ -119,6 +119,7 @@
     enable = true;
     extraPortals = with pkgs; [
       xdg-desktop-portal-gtk
+      xdg-desktop-portal-wlr
     ];
   };
 
@@ -146,7 +147,7 @@
   users.defaultUserShell = pkgs.zsh;
 
   services.tumbler.enable = true; # thumbnailer for thunar
-  services.tailscale.enable = true;
+  # services.tailscale.enable = true;
 
   environment.systemPackages = with pkgs; [
     man-pages
@@ -155,7 +156,7 @@
     rnix-lsp
     nixd
 
-    tailscale
+    # tailscale
 
     home-manager
     cachix
@@ -183,36 +184,37 @@
   programs.nix-index.enableZshIntegration = false;
   programs.nix-index.enableBashIntegration = false;
 
-  programs.sway = {
-    # to use home-manager
-    package = null;
-    enable = true;
-    wrapperFeatures = {
-      base = true;
-      gtk = true;
-    };
-    # extraPackages = with pkgs; [swaylock swayidle foot dmenu vulkan-validation-layers];
-  };
+  # programs.sway = {
+  #   # to use home-manager
+  #   package = null;
+  #   enable = true;
+  #   wrapperFeatures = {
+  #     base = true;
+  #     gtk = true;
+  #   };
+  #   # extraPackages = with pkgs; [swaylock swayidle foot dmenu vulkan-validation-layers];
+  # };
 
   services.mullvad-vpn.enable = true;
 
   networking.firewall.enable = true;
   networking.firewall = {
-    trustedInterfaces = ["tailscale0"];
+    # trustedInterfaces = ["tailscale0"];
     checkReversePath = "loose";
   };
 
-  systemd.services.fixNetworkingForTailscale = {
-    wantedBy = ["multi-user.target"];
-    after = ["network.target" "mullvad-daemon.service"];
-    description = "fix the damn routing table";
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-      ExecStart = ''${pkgs.bash}/bin/bash -c "if [[ \"$( ${pkgs.iproute2}/bin/ip rule | grep -e \"62:.*52\" | wc -l)\" -eq 0 ]]; then ${pkgs.iproute2}/bin/ip rule add pref 62 table 52; fi"'';
-    };
-  };
+  # systemd.services.fixNetworkingForTailscale = {
+  #   wantedBy = ["multi-user.target"];
+  #   after = ["network.target" "mullvad-daemon.service"];
+  #   description = "fix the damn routing table";
+  #   serviceConfig = {
+  #     Type = "oneshot";
+  #     User = "root";
+  #     ExecStart = ''${pkgs.bash}/bin/bash -c "if [[ \"$( ${pkgs.iproute2}/bin/ip rule | grep -e \"62:.*52\" | wc -l)\" -eq 0 ]]; then ${pkgs.iproute2}/bin/ip rule add pref 62 table 52; fi"'';
+  #   };
+  # };
 
+  # give cpuset to user
   systemd.services."user@".serviceConfig.Delegate = "memory pids cpu cpuset";
 
   security.pam.services.gtklock = {