From e83de257ad30a7177b511a6e4c3de4467ad455e3 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Tue, 8 Oct 2024 11:29:59 +0200
Subject: [PATCH] Update

---
 docs/TODO.md                         |  2 ++
 docs/src/README_template.md          |  3 +++
 home/programs/nvim/keymaps.nix       |  7 ++++++-
 home/programs/nvim/plugins/utils.nix | 18 ++++++++++++++++++
 home/programs/shell/starship.nix     |  2 +-
 home/system/hyprland/default.nix     |  2 +-
 home/system/hyprpanel/default.nix    |  4 +++-
 7 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/docs/TODO.md b/docs/TODO.md
index cc7affd..bad1f0e 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -10,6 +10,7 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 - [ ] OS Hardening with nix-mineral
 
 - [ ] Nixvim
+  - [ ] Telescope Theme
   - [ ] Markdown tab size 2
   - [ ] Harpoon
   - [ ] UFO for folding
@@ -19,3 +20,4 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
   - [ ] <https://github.com/redyf/Neve/blob/main/config/utils/whichkey.nix>
 
 - [ ] Workflow README
+- [ ] Update config screenshots
diff --git a/docs/src/README_template.md b/docs/src/README_template.md
index 0fa2451..dc886e4 100644
--- a/docs/src/README_template.md
+++ b/docs/src/README_template.md
@@ -77,6 +77,9 @@ git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 - Add your `hardware-configuration.nix` to your new host's folder
 - Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
 
+> [!INFO]
+> I added few `# CHANGEME` comments in the files to help you find what to change
+
 > [!NOTE]
 > When you add new files, don't forget to run `git add .` to add them to the git repository
 
diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix
index 645909e..4b31324 100644
--- a/home/programs/nvim/keymaps.nix
+++ b/home/programs/nvim/keymaps.nix
@@ -40,9 +40,14 @@
             mode = "n";
             group = "+windows";
           }
+          {
+            __unkeyed-1 = "<leader>h";
+            mode = "n";
+            group = "+harpoon";
+          }
         ];
         win = {
-          border = "none";
+          border = "rounded";
           wo.winblend = 0;
         };
       };
diff --git a/home/programs/nvim/plugins/utils.nix b/home/programs/nvim/plugins/utils.nix
index 7f28d94..6e6b58f 100644
--- a/home/programs/nvim/plugins/utils.nix
+++ b/home/programs/nvim/plugins/utils.nix
@@ -34,6 +34,24 @@
           highlight.enable = true;
         };
       };
+      # TODO: Add not working
+      harpoon = {
+        enable = true;
+        enableTelescope = true;
+        keymapsSilent = true;
+        keymaps = {
+          addFile = "<leader>ha";
+          toggleQuickMenu = "<leader>hu";
+          navNext = "<leader>hl";
+          navPrev = "<leader>hh";
+          navFile = {
+            "1" = "<leader>h1";
+            "2" = "<leader>h2";
+            "3" = "<leader>h3";
+            "4" = "<leader>h4";
+          };
+        };
+      };
       treesitter-context.enable = true;
     };
   };
diff --git a/home/programs/shell/starship.nix b/home/programs/shell/starship.nix
index 751af2e..97ec334 100644
--- a/home/programs/shell/starship.nix
+++ b/home/programs/shell/starship.nix
@@ -28,7 +28,7 @@
 
       git_status = {
         format =
-          "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)";
+          "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218)($ahead_behind$stashed)]($style)";
         style = "cyan";
         conflicted = "";
         renamed = "";
diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index 394c373..f9ceada 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -68,7 +68,7 @@
         "XDG_SESSION_TYPE,wayland"
         "SDL_VIDEODRIVER,wayland"
         "CLUTTER_BACKEND,wayland"
-        "AQ_DRM_DEVICES,/dev/dri/card2" # FIXME: Why the fuck this is needed
+        "AQ_DRM_DEVICES,/dev/dri/card2" # CHANGEME: Related to the GPU
       ];
 
       cursor = {
diff --git a/home/system/hyprpanel/default.nix b/home/system/hyprpanel/default.nix
index 682ed75..390c936 100644
--- a/home/system/hyprpanel/default.nix
+++ b/home/system/hyprpanel/default.nix
@@ -100,7 +100,9 @@
           "theme.bar.buttons.workspaces.active": "#${config.lib.stylix.colors.base0D}",
           "theme.bar.buttons.workspaces.available": "#${config.lib.stylix.colors.base00}",
 
-          "theme.bar.margin_top": "1.0em",
+          "theme.bar.margin_top": "${
+            toString (config.var.theme.gaps-in * 2)
+          }px",
           "theme.bar.margin_sides": "${toString config.var.theme.gaps-out}px",
           "theme.bar.margin_bottom": "0px",
           "theme.bar.border_radius": "${toString config.var.theme.rounding}px",