fish + NO MORE SYNC + SYNC IS BAD

5 files changed, 51 insertions, 32 deletions

diff --git a/install.sh b/install.sh
index 69b066a..a9f7bf1 100755
--- a/install.sh
+++ b/install.sh
@@ -1,17 +1,8 @@
 #!/usr/bin/env bash
 
 echo "Inserting files..."
-mkdir -p ~/.config
-sudo cp -r hypr foot nvim tmux waybar wofi yazi starship.toml ~/.config
 sudo cp -r Wallpapers ~/Pictures
 
 echo "Rebuilding..."
-
-# Although we are sending the configs to /etc/nixos, we aren't actually using them with the flake setup
-# Consider the operation purely for vanity
-sudo cp -r nixos /etc
-sudo cp -r hardware-configuration.nix /etc/nixos
-
 sudo nixos-generate-config --show-hardware-config > hardware-configuration.nix
-
 sudo nixos-rebuild switch --flake .#main
diff --git a/nixos/home.nix b/nixos/home.nix
index 054d002..3810f70 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -8,7 +8,57 @@
     shell = pkgs.fish;
   };
   programs.adb.enable = true;
-  programs.fish.enable = true;
+  programs.fish = {
+    enable = true;
+    shellInit = ''
+function fish_prompt -d "Write out the prompt"
+    # This shows up as USER@HOST /home/user/ >, with the directory colored
+    # $USER and $hostname are set by fish, so you can just use them
+    # instead of using `whoami` and `hostname`
+    printf '%s@%s %s%s%s > ' $USER $hostname \
+        (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+end
+
+if status is-interactive
+    set fish_greeting
+
+    if not set -q TMUX
+        tmux new-session -d -s "main" -c "~/dev"
+        if not set -q VSCODE_PID
+            tmux -u a
+        end
+    end
+end
+
+function tsnode
+    set filename (basename $argv[1] .ts)
+    tsc $filename.ts
+    node $filename.js
+    rm $filename.js
+end
+
+zoxide init --cmd cd fish | source
+starship init fish | source
+if test -f ~/.cache/ags/user/generated/terminal/sequences.txt
+    cat ~/.cache/ags/user/generated/terminal/sequences.txt
+end
+
+alias pamcan=pacman
+alias py=python
+alias tmux="tmux -u"
+alias snvim="sudo -E -s nvim"
+alias ls="eza"
+
+set -U fish_user_paths /home/comet/.cargo/bin $fish_user_paths
+set -U fish_user_paths /opt/android-sdk/cmdline-tools/latest/bin $fish_user_paths
+set -U fish_user_paths /opt/android-sdk/platform-tools $fish_user_paths
+set -U fish_user_paths /opt/android-sdk/emulator $fish_user_paths
+
+set ANDROID_NDK_HOME /opt/android-ndk
+set ANDROID_NDK_ROOT /opt/android-ndk
+set ANDROID_HOME /opt/android-sdk
+    '';
+  };
   programs.firefox.enable = true;
   environment.systemPackages = with pkgs; [
     home-manager
diff --git a/sync.sh b/sync.sh
deleted file mode 100755
index cde8640..0000000
--- a/sync.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-sudo rm -rf hypr foot nixos nvim tmux waybar wofi yazi Wallpapers starship.toml
-sudo cp -r ~/.config/hypr .
-sudo cp -r ~/.config/foot .
-sudo cp -r ~/.config/nvim .
-sudo cp -r ~/.config/tmux .
-sudo cp -r ~/.config/waybar .
-sudo cp -r ~/.config/wofi .
-sudo cp -r ~/.config/yazi .
-sudo cp -r ~/.config/home-manager .
-sudo cp -r ~/.config/starship.toml .
-sudo cp -r ~/Pictures/Wallpapers .
-
-sudo cp -r /etc/nixos .
-sudo rm -rf ./nixos/hardware-configuration.nix
diff --git a/sync_out.sh b/sync_out.sh
deleted file mode 100755
index 05fdaca..0000000
--- a/sync_out.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Inserting files..."
-mkdir -p ~/.config
-sudo cp -r hypr foot nvim tmux waybar wofi yazi starship.toml ~/.config
-sudo cp -r Wallpapers ~/Pictures
diff --git a/yazi/yazi.toml-1757177451075527 b/yazi/yazi.toml-1757177451075527
deleted file mode 100644
index 1e34bb0..0000000
--- a/yazi/yazi.toml-1757177451075527
+++ /dev/null
@@ -1,2 +0,0 @@
-[manager]
-show_hidden=true