misc update

home: some keybind changes
nvim: random lsp related changes
hosts/satori: add a separate nix.nix file
home/services: random mpd update

hosts/satori/default.nix

@@ -8,6 +8,7 @@
       ./networking.nix
       ./boot.nix
       ./services.nix
+      ./nix.nix
     ];
   system.stateVersion = "21.05";
 }

hosts/satori/hardware.nix

@@ -14,7 +14,7 @@
 
   fileSystems."/boot/efi" =
     {
-      device = "/dev/disk/by-uuid/58B1-4631";
+      device = "/dev/disk/by-uuid/ACBA-9B3F";
       fsType = "vfat";
     };
   fileSystems."/mnt/Games" =

hosts/satori/nix.nix

@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+{
+  nix = {
+    package = pkgs.nixUnstable;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+    settings = {
+      trusted-users = [ "root" "natto" ];
+      substituters = [
+        "https://nix-gaming.cachix.org"
+        "https://nix-community.cachix.org"
+        "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
+      ];
+      trusted-public-keys = [
+        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+    };
+  };
+}

hosts/satori/pkgs.nix

@@ -29,11 +29,10 @@
     ccls
     clang-tools
     nodePackages.typescript-language-server
-    nodePackages.svelte-language-server
+    nodePackages.vscode-langservers-extracted
     rnix-lsp
     python3Packages.python-lsp-server
     haskell-language-server
-    fly
     (steam.override {
       extraLibraries = pkgs: [ pkgs.pipewire ];
       extraProfile = ''
@@ -113,21 +112,6 @@
         };
       };
     };
-  };
-  nix = {
-    package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-    trustedUsers = [ "root" "natto" ];
-    binaryCaches = [
-      "https://nix-gaming.cachix.org"
-      "https://nix-community.cachix.org"
-      "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
-    ];
-    binaryCachePublicKeys = [
-      "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
+    slock.enable = true;
   };
 }

hosts/satori/services.nix

@@ -14,13 +14,6 @@
     '';
   };
   systemd.enableUnifiedCgroupHierarchy = false;
-  systemd.services = {
-    tor.wantedBy = lib.mkForce [ ];
-    logmein-hamachi.wantedBy = lib.mkForce [ ];
-    openssh.wantedBy = lib.mkForce [ ];
-    #printing.wantedBy = lib.mkForce [];
-    #vault.wantedBy = lib.mkForce [];
-  };
   security.pki.certificateFiles = [ ../../cert.pem ];
   virtualisation.libvirtd = {
     enable = true;