From d412f1ac6cea14f0fd3fea1bc9bab893d95cf036 Mon Sep 17 00:00:00 2001
From: autumn <autumnal.musing@gmail.com>
Date: Fri, 19 Sep 2025 07:57:03 +0000
Subject: [PATCH] sync

---
 home-manager/autumn/home.nix               | 19 ++-----
 home-manager/autumn/sysconfs/lesbos.nix    |  5 ++
 home-manager/autumn/sysconfs/wsl-hive.nix  |  1 +
 home-manager/autumn/sysconfs/yukigekko.nix | 13 +++++
 home-manager/packages/zsh/zsh.nix          | 62 ++++++++++++++--------
 system/yukigekko/configuration.nix         | 14 -----
 6 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/home-manager/autumn/home.nix b/home-manager/autumn/home.nix
index 8930d31..e67011e 100644
--- a/home-manager/autumn/home.nix
+++ b/home-manager/autumn/home.nix
@@ -6,7 +6,6 @@
     homeDirectory = "/home/autumn";
     stateVersion = "25.11";
     packages = with pkgs; [
-      avizo
       eza
       fm
       felix
@@ -14,11 +13,6 @@
       htop
       nerd-fonts.hack
       neofetch
-      obsidian
-      swaybg
-      tiramisu
-      vscodium-fhs
-      vesktop
       uv
       wev
     ];
@@ -26,19 +20,14 @@
       EDITOR = "helix";
       TERM = "alacritty";
     };
-    file = {
-      "config.ini" = {
-        enable = true;
-        source = ../packages/avizo/config.ini;
-        target = ".config/avizo/config.ini";
-      };
-    };
   };
   programs = {
     home-manager.enable = true;
     htop.enable = true;
-    bash.initExtra= ''fish'';
-    pls = {enable = true;enableFishIntegration = true;};
+    pls = {
+      enable = true;
+      enableFishIntegration = true;
+    };
   };
   nixpkgs.config = {
     alowUnfree = true;
diff --git a/home-manager/autumn/sysconfs/lesbos.nix b/home-manager/autumn/sysconfs/lesbos.nix
index 6e7bed2..3cccf98 100644
--- a/home-manager/autumn/sysconfs/lesbos.nix
+++ b/home-manager/autumn/sysconfs/lesbos.nix
@@ -1,5 +1,10 @@
 {config, pkgs, ...}:
 {
+  home.packags = with pkgs; [
+    obsidian
+    vscodium-fhs
+    vesktop
+  ];
   imports = [
     ../../packages/fish/fish.nix
   ];
diff --git a/home-manager/autumn/sysconfs/wsl-hive.nix b/home-manager/autumn/sysconfs/wsl-hive.nix
index 025dc85..16f4646 100644
--- a/home-manager/autumn/sysconfs/wsl-hive.nix
+++ b/home-manager/autumn/sysconfs/wsl-hive.nix
@@ -1,6 +1,7 @@
 {config, pkgs, ...}:
 
 {
+  programs.bash.initExtra= ''zsh'';
   imports = [
     ../../packages/zsh/zsh.nix
     ../../packages/zellij/zellij.nix
diff --git a/home-manager/autumn/sysconfs/yukigekko.nix b/home-manager/autumn/sysconfs/yukigekko.nix
index 33d734e..b45dd40 100644
--- a/home-manager/autumn/sysconfs/yukigekko.nix
+++ b/home-manager/autumn/sysconfs/yukigekko.nix
@@ -1,5 +1,18 @@
 {config, pkgs, ...}:
 {
+  home.packags = with pkgs; [
+    obsidian
+    vscodium-fhs
+    vesktop
+  ];
+  programs.bash.initExtra= ''fish'';
+  home.file = {
+    "config.ini" = {
+      enable = true;
+      source = ../packages/avizo/config.ini;
+      target = ".config/avizo/config.ini";
+    };
+  };
   imports = [
     ../../packages/fish/fish.nix
     ../../packages/river/river.nix
diff --git a/home-manager/packages/zsh/zsh.nix b/home-manager/packages/zsh/zsh.nix
index ad43516..bb07a51 100644
--- a/home-manager/packages/zsh/zsh.nix
+++ b/home-manager/packages/zsh/zsh.nix
@@ -6,31 +6,47 @@
     oh-my-zsh
   ];
 
-  programs.zsh = {
-    enable = true;
-    antidote = {
+  programs ={
+    zsh = {
       enable = true;
-      # plugins = [
-      #   "colored-man-pages"
-      #   "colorize"
-      #   "cp"
-      #   "history"
-      #   "ssh-agent"
-      #   "zoxide"
-      # ];
-      useFriendlyNames = true;
-    };
-    autosuggestion = {
-      enable = true;
-    };
-    shellAliases = {
-      ".." = "cd ..";
-      "..." = "cd ../..";
-      "...." = "cd ../../..";
-      "pls" = "pls -d typ -d perm -d user -d group -d size -d mtime -d git";
-      "z" = "zoxide";
+      antidote = {
+        enable = true;
+        plugins = [
+          "zsh-users/zsh-autosuggestions"
+          "zsh-users/zsh-syntax-highlighting"
+        #   "colored-man-pages"
+        #   "colorize"
+        #   "cp"
+        #   "history"
+        #   "ssh-agent"
+        #   "zoxide"
+        ];
+        useFriendlyNames = true;
+      };
+      autosuggestion = {
+        enable = true;
+      };
+      shellAliases = {
+        ".." = "cd ..";
+        "..." = "cd ../..";
+        "...." = "cd ../../..";
+        "pls" = "pls -d typ -d perm -d user -d group -d size -d mtime -d git";
+        "z" = "zoxide";
+      };
+      oh-my-zsh = {
+        enable = true;
+        plugins = [
+          "git"
+          "sudo"
+          "colored-man-pages"
+          "colorize"
+          "cp"
+          "zoxide"
+          "ssh-agent"
+          "command-not-found"
+        ];
+      };
     };
   };
-  
 }
 
diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix
index 61ce708..663e6e1 100644
--- a/system/yukigekko/configuration.nix
+++ b/system/yukigekko/configuration.nix
@@ -92,20 +92,6 @@
   };
   
   nix.settings.experimental-features = ["nix-command" "flakes"];
-  # nix.settings.download-buffer-size = 5242880000;
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
 
   system.stateVersion = "25.05";