nvim: added tree-sitter, Satori: misc changes

hosts/personal/common/pipewire.nix

@@ -1,4 +1,4 @@
-{lib, config, ... }:
+{lib, config, pkgs, ... }:
 
 {
   services.pipewire = {

hosts/personal/satori.nix

@@ -13,5 +13,5 @@
       ./common/xorg.nix
       ../../configs/nvim.nix
     ];
-  system.stateVersion = "20.09";
+  system.stateVersion = "21.05";
 }

hosts/personal/satori/boot.nix

@@ -2,7 +2,7 @@
 
 {
   boot = {
- #   kernelPackages = pkgs.linuxPackages_lqx;
+    kernelPackages = pkgs.linuxPackages_latest;
     initrd={
       availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci"];
  /*     preDeviceCommands = ''
@@ -32,5 +32,6 @@
         configurationName = "nixbruh";
       };
     };
+    binfmt.emulatedSystems = [ "aarch64-linux" ];
   };
 }

hosts/personal/satori/pkgs.nix

@@ -10,15 +10,15 @@
     python3
     htop
     nodejs
-    wineWowPackages.staging
     wget
     ripgrep
     kbd
     cachix
     gcc
     rustc
-    jdk
+    openjdk
     virtmanager
+    tree-sitter
   ];
 
   programs = {
@@ -71,6 +71,26 @@
     dconf.enable = true;
     adb.enable = true;
     light.enable = true;
+    noisetorch.enable = true;
+    proxychains = {
+      enable = true;
+      chain.type = "dynamic";
+      proxyDNS = true;
+      proxies = {
+        remilia = {
+          enable = true;
+          type = "socks5";
+          host = "127.0.0.1";
+          port = 2217;
+        };
+        remilia4 = {
+          enable = true;
+          type = "socks4";
+          host = "127.0.0.1";
+          port = 2217;
+        };
+      };
+    };
   };
   nix = {
     package = pkgs.nixUnstable;
@@ -78,7 +98,5 @@
       experimental-features = nix-command ca-references flakes
     '';
     trustedUsers = [ "root" "natto" ];
- #   binaryCaches = ["http://152.67.11.101/" "https://cache.nixos.org/"];
- #   binaryCachePublicKeys = ["152.67.11.101:lbEG3jz8pB5IxxjCQcZwS1a85XK5HIYN7g2E9Zw0r1M="];
   };
 }

hosts/servers/marisa.nix

@@ -7,7 +7,7 @@
     ./marisa/networking.nix
     ./marisa/hardware.nix
     ./marisa/boot.nix
-    ./marisa/services.nix
+ #   ./marisa/services.nix
     ./marisa/cachix.nix
     ../../configs/nvim.nix
   ];

hosts/servers/pkgs.nix

@@ -6,6 +6,7 @@
     vim
     wireguard
     vault
+    tree-sitter
   ];
   programs = {
     zsh = {