Skip to content

Commit

Permalink
feat: add back frecency
Browse files Browse the repository at this point in the history
  • Loading branch information
willruggiano committed Jan 8, 2025
1 parent 0bbccec commit 03baa7d
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 86 deletions.
6 changes: 0 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@
git-hooks.follows = "";
hercules-ci-effects.follows = "";
nixpkgs.follows = "nixpkgs";
# neovim-src.follows = "neovim-src";
};
};
# neovim-src = {
# url = "github:neovim/neovim";
# flake = false;
# };

blink = {
url = "github:Saghen/blink.cmp";
Expand Down Expand Up @@ -157,7 +152,6 @@
nvim-dbee = pkgs.callPackage ./pkgs/nvim-dbee.nix {};
nvim-treesitter = pkgs.callPackage ./pkgs/nvim-treesitter {};
sqruff = pkgs.callPackage ./pkgs/sqruff.nix {inherit inputs;};
# vtsls = pkgs.callPackage ./pkgs/vtsls {};
};
};
};
Expand Down
1 change: 1 addition & 0 deletions plugins/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ return function()
},
},
graphql = {},
-- harper_ls = {},
hls = {},
jsonls = {
cmd = { "vscode-json-languageserver", "--stdio" },
Expand Down
105 changes: 27 additions & 78 deletions plugins/spec.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ in rec {
bqf = {
src = sources.nvim-bqf;
config = true;
# dependencies = {
# fzf = {
# src = sources.fzf;
# };
# };
};

# haven't written c++ in awhile... :sad sigh:
Expand All @@ -58,29 +53,6 @@ in rec {
ft = ["c" "cpp"];
};

# cmp = {
# src = sources.nvim-cmp;
# config = ./cmp.lua;
# dependencies = {
# inherit tailwind-tools;
# cmp-buffer.src = sources.cmp-buffer;
# cmp-cmdline.src = sources.cmp-cmdline;
# cmp-git = {
# src = sources.cmp-git;
# config = true;
# };
# cmp-nvim-lsp = {
# src = sources.cmp-nvim-lsp;
# dependencies = {
# inherit lspkind;
# };
# };
# cmp-nvim-lsp-document-symbol.src = sources.cmp-nvim-lsp-document-symbol;
# cmp-nvim-lsp-signature-help.src = sources.cmp-nvim-lsp-signature-help;
# cmp-path.src = sources.cmp-path;
# };
# };

Comment = {
src = sources."Comment.nvim";
config = ./comment.lua;
Expand All @@ -98,10 +70,7 @@ in rec {
shellcheck
shellharden
shfmt
# sql formatting is such ass :/
# sleek # really fucks up plpgsql
# sqlfluff # can be really slow
python3.pkgs.sqlfmt # maybe?
python3.pkgs.sqlfmt
stylua
];
};
Expand All @@ -117,10 +86,8 @@ in rec {
dapui.package = buildVimPlugin {
name = "dapui";
src = sources.nvim-dap-ui;
doInstallCheck = true;
doCheck = false;
# nvimRequireCheck = "dapui";
# dependencies = [dap.package];
doInstallCheck = true;
};
nio.package = buildVimPlugin {
name = "nio";
Expand Down Expand Up @@ -207,11 +174,6 @@ in rec {
priority = 1001;
};

# focus = {
# src = sources."focus.nvim";
# config = true;
# };

fugitive = {
src = sources.vim-fugitive;
config = ./fugitive.lua;
Expand All @@ -221,12 +183,6 @@ in rec {
package = config.packages.luafun;
};

# ivy = {
# package = config.packages.ivy.vimPlugin;
# config = ./ivy.lua;
# cpath = "${config.packages.ivy}/lib/?.so";
# };

gitsigns = {
src = sources."gitsigns.nvim";
config = ./gitsigns.lua;
Expand Down Expand Up @@ -335,6 +291,7 @@ in rec {
cmake-language-server
cppcheck
efm-langserver
harper
haskellPackages.cabal-fmt
haskellPackages.haskell-language-server
haskellPackages.ormolu
Expand All @@ -350,7 +307,6 @@ in rec {
rust-analyzer
tailwindcss-language-server
sqlfluff
# sqruff
squawk
statix
sumneko-lua-language-server
Expand Down Expand Up @@ -486,6 +442,20 @@ in rec {
cpath = "${package}/lib/lua/5.1/?.so";
};

sqlite = {
package = buildVimPlugin {
name = "sqlite.lua";
src = sources."sqlite.lua";
nvimRequireCheck = "sqlite";
};
cpath = "${pkgs.sqlite.out}/lib/?.so";
init = ''
function()
vim.g.sqlite_clib_path = package.searchpath("libsqlite3", package.cpath)
end
'';
};

statuscol = {
src = sources."statuscol.nvim";
config = {
Expand All @@ -506,10 +476,6 @@ in rec {
config = ./telescope.lua;
dependencies = {
inherit nvim-web-devicons;
# telescope-docsets = {
# src = sources."telescope-docsets.nvim";
# paths = with pkgs; [dasht elinks];
# };
telescope-fzf-native = {
package = buildVimPlugin {
name = "telescope-fzf-native";
Expand All @@ -518,14 +484,16 @@ in rec {
src = sources."telescope-fzf-native.nvim";
};
};
# telescope-manix = {
# package = mkVimPlugin {
# name = "telescope-manix";
# src = sources.telescope-manix;
# doCheck = false;
# };
# paths = with pkgs; [manix];
# };
telescope-smart-open = {
package = buildVimPlugin {
name = "smart-open.nvim";
src = sources."smart-open.nvim";
doCheck = false;
doInstallCheck = true;
};
dependencies = {inherit sqlite;};
paths = with pkgs; [ripgrep];
};
telescope-symbols = {
src = sources."telescope-symbols.nvim";
};
Expand All @@ -551,7 +519,6 @@ in rec {

toggleterm = {
src = sources."toggleterm.nvim";
# config = ./toggleterm.lua;
config = true;
};

Expand All @@ -572,24 +539,6 @@ in rec {
};
};

# wilder = {
# src = sources."wilder.nvim";
# config = ./wilder.lua;
# dependencies = {
# cpsm.package = pkgs.vimPlugins.cpsm;
# fzy-lua-native = let
# package = pkgs.vimUtils.buildVimPlugin {
# name = "fzy-lua-native";
# version = sources.fzy-lua-native.rev;
# src = sources.fzy-lua-native;
# };
# in {
# inherit package;
# cpath = "${package}/static/?.so";
# };
# };
# };

zen-mode = {
src = sources."zen-mode.nvim";
config = {
Expand Down
10 changes: 8 additions & 2 deletions plugins/telescope.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ return function()
case_mode = "smart_case",
},
smart_open = {
mappings = {
i = {
["<C-w>"] = false,
},
},
match_algorithm = "fzf",
},
undo = {
Expand All @@ -66,6 +71,7 @@ return function()
}

telescope.load_extension "fzf"
telescope.load_extension "smart_open"
telescope.load_extension "ui-select"
telescope.load_extension "undo"

Expand All @@ -91,9 +97,9 @@ return function()
},
["<space>o"] = {
function()
require("telescope.builtin").git_files { previewer = false }
require("telescope").extensions.smart_open.smart_open { cwd_only = true }
end,
{ desc = "[telescope] git files" },
{ desc = "[telescope] files" },
},
["<space>u"] = {
function()
Expand Down

0 comments on commit 03baa7d

Please sign in to comment.