From 14ed44f8fdc156fae0fdbb8056c56808006b28f6 Mon Sep 17 00:00:00 2001
From: Tasia Iso <tasiaiso@proton.me>
Date: Thu, 6 Jun 2024 15:50:43 +0200
Subject: [PATCH] zoxide

---
 dotfiles/.bashrc                     |  4 ++++
 dotfiles/.zshrc                      |  4 ++++
 flake.nix                            |  1 +
 home/46d1/home.nix                   |  6 ++++--
 home/tasia-but-old-username/home.nix |  7 +++++--
 home/tasia/home.nix                  | 21 ++++++++++++---------
 home/user/home.nix                   |  7 +++++--
 hosts/enry/configuration.nix         |  2 +-
 hosts/yaseen/configuration.nix       |  2 --
 9 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 dotfiles/.bashrc
 create mode 100644 dotfiles/.zshrc

diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
new file mode 100644
index 0000000..946c7c9
--- /dev/null
+++ b/dotfiles/.bashrc
@@ -0,0 +1,4 @@
+sh ~/.shellrc
+
+eval "$(zoxide init bash)"
+eval "$(fzf --bash)"
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
new file mode 100644
index 0000000..aa3f87f
--- /dev/null
+++ b/dotfiles/.zshrc
@@ -0,0 +1,4 @@
+sh ~/.shellrc
+
+eval "$(zoxide init zsh)"
+source <(fzf --zsh)
diff --git a/flake.nix b/flake.nix
index 3e5bb45..4cbe9ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,7 @@
 
     # NixOS configuration entrypoint
     # Available through 'nixos-rebuild build --flake .#phoenix'
+    # or nixos-rebuild switch --flake .#$(cat /etc/hostname)
     nixosConfigurations = {
       phoenix = stable.lib.nixosSystem {
         system = "x86_64-linux";
diff --git a/home/46d1/home.nix b/home/46d1/home.nix
index b48d161..ebd9ccd 100644
--- a/home/46d1/home.nix
+++ b/home/46d1/home.nix
@@ -19,9 +19,11 @@
 
   home-manager.users.user = {pkgs, ...}: {
     home.file = {
-      ".zshrc".source = ../../dotfiles/.shellrc;
-      ".bashrc".source = ../../dotfiles/.shellrc;
+      ".zshrc".source = ../../dotfiles/.zshrc;
+      ".bashrc".source = ../../dotfiles/.bashrc;
+      ".shellrc".source = ../../dotfiles/.shellrc;
 
+      ".config/btop/btop.conf".source = ../../dotfiles/btop.conf;
       # ".librewolf/librewolf.overrides.cfg".source = ../../dotfiles/librewolf.overrides.cfg;
     };
 
diff --git a/home/tasia-but-old-username/home.nix b/home/tasia-but-old-username/home.nix
index 29fefbd..70ac7ca 100644
--- a/home/tasia-but-old-username/home.nix
+++ b/home/tasia-but-old-username/home.nix
@@ -21,8 +21,11 @@
 
   home-manager.users.user = {pkgs, ...}: {
     home.file = {
-      ".zshrc".source = ../../dotfiles/.shellrc;
-      ".bashrc".source = ../../dotfiles/.shellrc;
+      ".zshrc".source = ../../dotfiles/.zshrc;
+      ".bashrc".source = ../../dotfiles/.bashrc;
+      ".shellrc".source = ../../dotfiles/.shellrc;
+
+      ".config/btop/btop.conf".source = ../../dotfiles/btop.conf;
 
       ".librewolf/librewolf.overrides.cfg".source = ../../dotfiles/librewolf.overrides.cfg;
     };
diff --git a/home/tasia/home.nix b/home/tasia/home.nix
index 4b1796e..200b552 100644
--- a/home/tasia/home.nix
+++ b/home/tasia/home.nix
@@ -23,8 +23,10 @@
   home-manager.users.tasia = {pkgs, ...}: {
     home = {
       file = {
-        ".zshrc".source = ../../dotfiles/.shellrc;
-        ".bashrc".source = ../../dotfiles/.shellrc;
+        ".zshrc".source = ../../dotfiles/.zshrc;
+        ".bashrc".source = ../../dotfiles/.bashrc;
+        ".shellrc".source = ../../dotfiles/.shellrc;
+
         ".config/btop/btop.conf".source = ../../dotfiles/btop.conf;
         # ".gitconfig".source = ../../dotfiles/.gitconfig;
 
@@ -74,15 +76,19 @@
         # home-manager
         lsof
         appimage-run
-
-        atool
-        httpie
-        cowsay
+        zoxide
+        fzf
+        # atool
+        # httpie
+        # cowsay
         stress
         lazygit
+        inxi
 
         ssb-patchwork
         xonotic
+        amfora
+        # dive
 
         # android-tools
         # endless-sky
@@ -95,9 +101,6 @@
         # radicle-cli
         # opensnitch-ui
         # hurl https://github.com/Orange-OpenSource/hurl
-        amfora
-        dive
-        inxi
         # revolt-desktop
       ];
 
diff --git a/home/user/home.nix b/home/user/home.nix
index 38e372f..9c8f6d1 100644
--- a/home/user/home.nix
+++ b/home/user/home.nix
@@ -21,8 +21,11 @@
 
   home-manager.users.user = {pkgs, ...}: {
     home.file = {
-      ".zshrc".source = ../../dotfiles/.shellrc;
-      ".bashrc".source = ../../dotfiles/.shellrc;
+      ".zshrc".source = ../../dotfiles/.zshrc;
+      ".bashrc".source = ../../dotfiles/.bashrc;
+      ".shellrc".source = ../../dotfiles/.shellrc;
+
+      ".config/btop/btop.conf".source = ../../dotfiles/btop.conf;
     };
 
     home.packages = with pkgs; [
diff --git a/hosts/enry/configuration.nix b/hosts/enry/configuration.nix
index af5c1c2..b8958df 100644
--- a/hosts/enry/configuration.nix
+++ b/hosts/enry/configuration.nix
@@ -24,7 +24,7 @@ in {
       allowedTCPPorts = [
         2342
         8080 # ?
-        9000 
+        9000
         9002
       ];
     };
diff --git a/hosts/yaseen/configuration.nix b/hosts/yaseen/configuration.nix
index 8da2f6f..ea0a16b 100644
--- a/hosts/yaseen/configuration.nix
+++ b/hosts/yaseen/configuration.nix
@@ -22,7 +22,6 @@ in {
     ../../common/hardware/nvidia-gpu-offload.nix
     ../../common/hardware/ssd.nix
     ../../common/hardware/btrfs.nix
-    # ../../common/hardware/latest-kernel.nix
 
     ../../common/components/de/sddm.nix
     ../../common/components/de/plasma6.nix
@@ -92,7 +91,6 @@ in {
 
     osu-lazer-bin
     prismlauncher
-
     # inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
     # inputs.nix-software-center.packages.${system}.nix-software-center
   ];