From b7d4f6255167f55768871f7155312d536970c43f Mon Sep 17 00:00:00 2001
From: xqtc <xqtc@tutanota.com>
Date: Thu, 17 Oct 2024 17:41:03 +0200
Subject: [PATCH] forgor

---
 flake.nix                               |  7 +++++++
 home/config-files/wezterm.lua           |  1 +
 home/modules/home-pkgs.nix              |  2 ++
 home/modules/nixvim.nix                 |  6 +++++-
 home/modules/shell.nix                  | 28 +++++++++++++++++++++----
 hosts/aarch64-linux/alastor/default.nix |  1 -
 justfile                                |  5 +++--
 result                                  |  1 -
 8 files changed, 42 insertions(+), 9 deletions(-)
 delete mode 120000 result

diff --git a/flake.nix b/flake.nix
index 5b14605..73bb18c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,5 +59,12 @@
         ...
       }: {};
       flake = {};
+      #      colmena = {
+      # "beleth" = {
+      #   deployment.targetHost = "heroin.trade";
+      #   deployment.replaceUnknownProfiles = false;
+      #   deployment.buildOnTarget = true;
+      # };
+      #      };
     };
 }
diff --git a/home/config-files/wezterm.lua b/home/config-files/wezterm.lua
index 0edb0bd..52d2297 100644
--- a/home/config-files/wezterm.lua
+++ b/home/config-files/wezterm.lua
@@ -126,6 +126,7 @@ wezterm.on('update-status', function(window, pane)
 	})
 end)
 
+config.front_end = 'WebGpu'
 for _, gpu in ipairs(wezterm.gui.enumerate_gpus()) do
 	if gpu.backend == 'Vulkan' and gpu.device_type == 'IntegratedGpu' or gpu.device_type == "DiscreteGpu" then
 		config.webgpu_preferred_adapter = gpu
diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix
index b0cf8f0..1411d17 100644
--- a/home/modules/home-pkgs.nix
+++ b/home/modules/home-pkgs.nix
@@ -11,6 +11,7 @@
 in {
   home.packages =
     (lib.optionals (config.os == "linux") (with pkgs; [
+      cargo
       yubioath-flutter
       steam
       heroic
@@ -98,6 +99,7 @@ in {
       ipafont
 
       vesktop
+      discord
       element-desktop
 
       qbittorrent
diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix
index 4b7b2d2..d779742 100644
--- a/home/modules/nixvim.nix
+++ b/home/modules/nixvim.nix
@@ -134,6 +134,10 @@
         panel.enabled = false;
       };
       copilot-cmp.enable = false;
+      copilot-chat = {
+        enable = true;
+        settings.context = "buffers";
+      };
       neocord.enable = true;
       rustaceanvim = {
         enable = false;
@@ -168,7 +172,7 @@
         servers = {
           # disabled due to compile error
           # typst-lsp.enable = true;
-          typos-lsp.enable = true;
+          typos-lsp.enable = false;
           docker-compose-language-service.enable = true;
           pylsp.enable = true;
           bashls.enable = true;
diff --git a/home/modules/shell.nix b/home/modules/shell.nix
index 284c617..7232892 100644
--- a/home/modules/shell.nix
+++ b/home/modules/shell.nix
@@ -1,14 +1,34 @@
 {
   config,
   pkgs,
+  lib,
   inputs,
   ...
 }: {
   programs = {
-    zsh.enable =
-      if config.os == "linux"
-      then true
-      else false;
+    zsh = {
+      enable = if (config.os == "linux") then true else false;
+      oh-my-zsh = {
+        enable = true;
+        plugins = ["git"];
+        theme = "lambda";
+      };
+      initExtraFirst =
+        if !(config.os == "linux")
+        then "export PATH=$PATH:~/.cargo/bin/\n"
+        else "";
+      plugins = [
+        {
+          name = "zsh-autocomplete";
+          src = pkgs.fetchFromGitHub {
+            owner = "marlonrichert";
+            repo = "zsh-autocomplete";
+            rev = "23.07.13";
+            sha256 = "sha256-/6V6IHwB5p0GT1u5SAiUa20LjFDSrMo731jFBq/bnpw=";
+          };
+        }
+      ];
+    };
     atuin = {
       enable = true;
       enableNushellIntegration = true;
diff --git a/hosts/aarch64-linux/alastor/default.nix b/hosts/aarch64-linux/alastor/default.nix
index b465f63..c0c50b9 100644
--- a/hosts/aarch64-linux/alastor/default.nix
+++ b/hosts/aarch64-linux/alastor/default.nix
@@ -115,7 +115,6 @@
     gcc13
 
     cargo
-    rustc
 
     wl-clipboard
     xclip
diff --git a/justfile b/justfile
index 4d516b6..068d595 100644
--- a/justfile
+++ b/justfile
@@ -21,7 +21,7 @@ beleth:
   # arch_sanitized=$(echo $arch | sed 's/^"//;s/"$//')
   # if [ $arch_sanitized == "x86_64-linux" ]; then
   nixos-rebuild switch --flake '.#beleth' --build-host {{beleth-host}} --target-host {{beleth-host}};
-  ssh {{beleth-user-host}} "cd && cd nixos-config && git pull && cd && sh build_website.sh";
+  ssh {{beleth-user-host}} "cd nixos-config && git pull && cd && sh build_website.sh";
   ssh {{beleth-user-host}} "cd && cd /var/www/cheats-rs/ && git pull && zola build";
   exit
   # fi
@@ -29,7 +29,8 @@ beleth:
 
 beleth-non-nixos:
   set -euxo pipefail
-  ssh {{beleth-user-host}} "cd nixos-config && git pull && nixos-rebuild --flake . switch && echo meow"
+  ssh {{beleth-user-host}} "cd nixos-config && git pull"
+  ssh {{beleth-host}} "cd /home/xqtc/nixos-config && nixos-rebuild --flake . switch && echo meow"
   ssh {{beleth-user-host}} "cd && cd /var/www/cheats-rs/ && git pull && zola build && cd && sh build_website.sh";
 
 website:
diff --git a/result b/result
deleted file mode 120000
index 2769881..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/7nlb2hg141qvsbychf5kd0pqb49yp579-home-manager-generation
\ No newline at end of file