From 014c19f30cd276d76f9864483e9e01874c5be6f8 Mon Sep 17 00:00:00 2001
From: rogueking <miguel@muniz.org>
Date: Thu, 13 Feb 2025 15:36:02 -0800
Subject: [PATCH] thefuck alias working

---
 configuration.nix          |  5 +++--
 flake.lock                 | 24 ++++++++++++------------
 home-manager/cli-tools.nix | 14 +++++++++-----
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index b40d2cd..60ba2a3 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -188,7 +188,7 @@
     #cider-2
     amneziawg-go
     fprintd
-    #ghostty
+    guacamole-client
     sddm-astronaut
     
     #cli tools
@@ -199,6 +199,7 @@
     docker
     dust
     file
+    findutils
     git
     hcxdumptool
     hcxtools
@@ -207,8 +208,8 @@
     nix-prefetch-github
     nmap
     openssh
+    plocate
     rosenpass
-    thefuck
     tailscale
     tlp
     unzip
diff --git a/flake.lock b/flake.lock
index 5c50139..227674a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -246,11 +246,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1738775476,
-        "narHash": "sha256-oFox7N1n+EE2I4WvuE0y4SI0a6h9RAoT216QQCtGcQ4=",
+        "lastModified": 1739018339,
+        "narHash": "sha256-/J2H70Gsi13nh8vGEV6aBr+e5avFaGOSr2TF4VjnVAk=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "82440e1d4ed9d252d09c4cd9edc8c9ef23ce1f3a",
+        "rev": "9f0cb35c26a7dbc0acce0658f73b08b2198487c6",
         "type": "github"
       },
       "original": {
@@ -270,11 +270,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737924095,
-        "narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=",
+        "lastModified": 1738508923,
+        "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18",
+        "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738070913,
-        "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=",
+        "lastModified": 1738953846,
+        "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3",
+        "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/cli-tools.nix b/home-manager/cli-tools.nix
index 6725458..3733166 100644
--- a/home-manager/cli-tools.nix
+++ b/home-manager/cli-tools.nix
@@ -15,8 +15,8 @@
     yazi.enable = true;
     starship.enable = true;
     lazygit.enable = true;
-    #thefuck.enable = true;
-    #thefuck.enableZshIntegration = true;
+    thefuck.enable = true;
+    thefuck.enableZshIntegration = true;
     
     git = {  
       enable = true;
@@ -64,8 +64,9 @@
       	cd = "z";
         cat = "bat";
         catp = "bat -p";
-        fk = "fuck";
-        fu = "fuck";
+        fk = "thefuck";
+        fu = "thefuck";
+        fuck = "thefuck";
         grep = "grep --color=auto";
         lg = "lazygit";
         ll = "eza -la";
@@ -75,7 +76,10 @@
         tulpn = "sudo netstat -tulpn";
         rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#default";
       };
-      
+
+      envExtra = ''
+        eval $(thefuck --alias)
+      '';
       
       profileExtra = ''
         export SSH_AUTH_SOCK=~/.1password/agent.sock