harpoon

modules/core.nix

@@ -5,15 +5,6 @@
     config = {
       allowUnfree = true;
     };
-    overlays = let
-      path = ../overlays;
-    in
-      with builtins;
-        map (n: import (path + ("/" + n))) (
-          filter (n: match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (
-            attrNames (readDir path)
-          )
-        );
   };
 
   nix = {

modules/home/neovim/default.nix

@@ -4,6 +4,7 @@
     ./mappings.nix
     ./options.nix
     ./plugins/blink-cmp.nix
+    ./plugins/harpoon.nix
     ./plugins/conform.nix
     ./plugins/grug-far.nix
     ./plugins/lsp.nix

modules/home/neovim/mappings.nix

@@ -148,5 +148,41 @@
       action = ":lua require('mini.jump2d').start(require('mini.jump2d').builtin_opts.query)<CR>";
       options.desc = "Jump to character";
     }
+    {
+      mode = "n";
+      key = "<leader>a";
+      action = ":lua require('harpoon'):list():add()<CR>";
+      options.desc = "Add harpoon";
+    }
+    {
+      mode = "n";
+      key = "<C-e>";
+      action = ":lua require('harpoon').ui:toggle_quick_menu(require('harpoon'):list())<CR>";
+      options.desc = "Toggle harpoon quick menu";
+    }
+    {
+      mode = "n";
+      key = "<leader>1";
+      action = ":lua require('harpoon'):list():select(1)<CR>";
+      options.desc = "Go to harpoon 1";
+    }
+    {
+      mode = "n";
+      key = "<leader>2";
+      action = ":lua require('harpoon'):list():select(2)<CR>";
+      options.desc = "Go to harpoon 2";
+    }
+    {
+      mode = "n";
+      key = "<leader>3";
+      action = ":lua require('harpoon'):list():select(3)<CR>";
+      options.desc = "Go to harpoon 3";
+    }
+    {
+      mode = "n";
+      key = "<leader>4";
+      action = ":lua require('harpoon'):list():select(4)<CR>";
+      options.desc = "Go to harpoon 4";
+    }
   ];
 }

modules/home/neovim/plugins/harpoon.nix

@@ -0,0 +1,7 @@
+{
+  programs.nixvim.plugins = {
+    harpoon = {
+      enable = true;
+    };
+  };
+}

modules/nixos/default.nix

@@ -8,7 +8,6 @@
 }: {
   imports = [
     ../core.nix
-    ../postgresql.nix
     ./firewall.nix
     ./ssh.nix
     ./adguard.nix

modules/packages.sync-conflict-20250904-133614-N7W6SUT.nix

@@ -0,0 +1,38 @@
+{pkgs, ...}:
+with pkgs; [
+  (callPackage ./bin/open-project.nix {})
+  age
+  alejandra
+  nodejs_24
+  pnpm
+  ast-grep
+  delta
+  devenv
+  dig
+  docker
+  docker-compose
+  fastfetch
+  fd
+  fira-code
+  gh
+  git
+  gnumake
+  gnupg
+  htop
+  hyperfine
+  jjui
+  jq
+  killall
+  lsof
+  nurl
+  openssh
+  postgresql_17
+  sd
+  sops
+  sqlite
+  tree
+  tree-sitter
+  unzip
+  vivid
+  zip
+]

modules/postgresql.nix

@@ -1,34 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  user,
-  ...
-}: {
-  config = lib.mkIf config.services.postgresql.enable {
-    services.postgresql = {
-      package = pkgs.postgresql_17;
-      enableTCPIP = true;
-      settings.port = 5432;
-      ensureDatabases = ["postgres"];
-      ensureUsers = [
-        {
-          name = "postgres";
-          ensureDBOwnership = true;
-        }
-        {
-          name = user;
-          ensureClauses = {
-            superuser = true;
-            createdb = true;
-          };
-        }
-      ];
-      authentication = ''
-        local all all trust
-        host  all all 127.0.0.1/32 trust
-        host  all all ::1/128 trust
-      '';
-    };
-  };
-}