servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] Added back the mappings

Browse Source
This commit is contained in:
Uttarayan Mondal
2024-03-22 12:46:55 +05:30
parent 2c0b08230d
commit 9bcfde4bdd
3 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/home.nix
View File

@@ -61,9 +61,9 @@
lua-language-server lua-language-server
(nerdfonts.override {fonts = ["Hasklig"];}) (nerdfonts.override {fonts = ["Hasklig"];})
pfetch-rs pfetch-rs
psst
] ]
++ lib.optionals device.isLinux [ ++ lib.optionals device.isLinux [
psst
sony-headphones-client sony-headphones-client
abaddon abaddon
rr rr

103
common/nvim.nix
View File

@@ -5,6 +5,20 @@
device, device,
... ...
}: let }: let
mkMappings = mappings:
[]
++ (pkgs.lib.optionals (builtins.hasAttr "normal" mappings) (mkMode mappings.normal "n"))
++ (pkgs.lib.optionals (builtins.hasAttr "terminal" mappings) (mkMode mappings.terminal "t"))
++ (pkgs.lib.optionals (builtins.hasAttr "insert" mappings) (mkMode mappings.insert "i"));
mkMode = mappings: mode:
pkgs.lib.mapAttrsToList
(key: value: {
key = key;
action = value;
mode = mode;
lua = true;
})
mappings;
in { in {
imports = [inputs.nixvim.homeManagerModules.nixvim]; imports = [inputs.nixvim.homeManagerModules.nixvim];
programs.nixvim = { programs.nixvim = {
@@ -46,10 +60,8 @@ in {
cmp-treesitter cmp-treesitter
cmp-git cmp-git
luasnip luasnip
fidget-nvim
copilot-lua copilot-lua
lsp-zero-nvim lsp-zero-nvim
trouble-nvim
crates-nvim crates-nvim
sqls-nvim sqls-nvim
rustaceanvim rustaceanvim
@@ -95,6 +107,10 @@ in {
mapleader = " "; mapleader = " ";
}; };
plugins = { plugins = {
fidget.enable = true;
rustaceanvim = {
enable = true;
};
# lspconfig = { # lspconfig = {
# enable = true; # enable = true;
# servers = { # servers = {
@@ -185,6 +201,12 @@ in {
enable = true; enable = true;
indent = true; indent = true;
folding = true; folding = true;
grammarPackages =
pkgs.vimPlugins.nvim-treesitter.allGrammars
++ (with pkgs.tree-sitter-grammars; [
tree-sitter-just
tree-sitter-norg-meta
]);
# refactor = { # refactor = {
# smartRename = { # smartRename = {
# enable = true; # enable = true;
@@ -213,44 +235,43 @@ in {
flavour = "mocha"; flavour = "mocha";
}; };
}; };
# mappings = { keymaps = mkMappings {
# normal = { normal = {
# "<leader>ff" = "require'telescope.builtin'.find_files"; "<leader>c" = "[[<cmd>ChatGPT<cr>]]";
# "<leader>c" = "[[<cmd>ChatGPT<cr>]]"; "<leader>o" = "[[<cmd>TroubleToggle<cr>]]";
# "<leader>fb" = "require'telescope'.extensions.file_browser.file_browser"; "<leader>ee" = "[[<cmd>Rest run<cr>]]";
# "<leader>gg" = "require'telescope.builtin'.live_grep"; "<leader>el" = "[[<cmd>Rest run last<cr>]]";
# "<leader>;" = "require'telescope.builtin'.buffers"; "vff" = "[[<cmd>vertical Gdiffsplit<cr>]]";
# "<leader>o" = "[[<cmd>TroubleToggle<cr>]]"; "<leader>\\\"" = ''[["+]]'';
# "<leader>ee" = "[[<cmd>Rest run<cr>]]"; "gh" = "[[<cmd>Octo actions<cr>]]";
# "<leader>el" = "[[<cmd>Rest run last<cr>]]"; "<leader><leader>" = "'<c-^>'";
# "<leader>\\\"" = ''[["+]]''; "<leader>q" = "[[<cmd>bw<cr>]]";
# "vff" = "[[<cmd>vertical Gdiffsplit<cr>]]"; "<leader>n" = "[[<cmd>bnext<cr>]]";
# "<C-k>" = "vim.lsp.buf.definition"; "<leader>p" = "[[<cmd>bprev<cr>]]";
# "gi" = "require'telescope.builtin'.lsp_implementations"; "<C-w>\\\"" = "[[<cmd>split<cr>]]";
# "gh" = "[[<cmd>Octo actions<cr>]]"; "<C-w>%" = "[[<cmd>vsplit<cr>]]";
# "<leader>a" = "vim.lsp.buf.code_action"; "<leader>dr" = "[[<cmd>RustLsp debuggables<cr>]]";
# "F" = "function() vim.lsp.buf.format({ async = true }) end"; "<C-l>" = "[[<cmd>Outline<cr>]]";
# "<leader><leader>" = "'<c-^>'";
# "<leader>q" = "[[<cmd>bw<cr>]]"; "<leader>ff" = "require'telescope.builtin'.find_files";
# "<leader>n" = "[[<cmd>bnext<cr>]]"; "<leader>fb" = "require'telescope'.extensions.file_browser.file_browser";
# "<leader>p" = "[[<cmd>bprev<cr>]]"; "<leader>gg" = "require'telescope.builtin'.live_grep";
# "<C-w>\\\"" = "[[<cmd>split<cr>]]"; "<leader>;" = "require'telescope.builtin'.buffers";
# "<C-w>%" = "[[<cmd>vsplit<cr>]]"; "<C-k>" = "vim.lsp.buf.definition";
# "gi" = "require'telescope.builtin'.lsp_implementations";
# "<leader>bb" = "require'dap'.toggle_breakpoint"; "<leader>a" = "vim.lsp.buf.code_action";
# "<leader>du" = "require'dapui'.toggle"; "F" = "function() vim.lsp.buf.format({ async = true }) end";
# "<leader>dr" = "[[<cmd>RustLsp debuggables<cr>]]"; "<leader>bb" = "require'dap'.toggle_breakpoint";
# "<leader>du" = "require'dapui'.toggle";
# "<C-l>" = "[[<cmd>Outline<cr>]]"; "<C-\\\\>" = "require('FTerm').toggle";
# "<C-\\\\>" = "require('FTerm').toggle"; };
# }; terminal = {
# terminal = { "<C-\\\\>" = "require('FTerm').toggle";
# "<C-\\\\>" = "require('FTerm').toggle"; };
# }; insert = {
# insert = { "<C-\\\\>" = "require('FTerm').toggle";
# "<C-\\\\>" = "require('FTerm').toggle"; };
# }; };
# };
extraConfigLua = let extraConfigLua = let
codelldb = codelldb =
@@ -346,7 +367,7 @@ in {
panel = { enabled = true }, panel = { enabled = true },
}) })
require 'fidget'.setup() -- require 'fidget'.setup()
-- ======================================================================= -- =======================================================================
-- nvim-cmp -- nvim-cmp
-- ======================================================================= -- =======================================================================

4
justfile
View File

@@ -8,5 +8,9 @@ install:
install: install:
sudo nixos-rebuild switch --flake . sudo nixos-rebuild switch --flake .
build:
nix run nix-darwin -- build --flake . --show-trace
home: home:
nix --extra-experimental-features "nix-command flakes" run home-manager/master -- switch --flake . nix --extra-experimental-features "nix-command flakes" run home-manager/master -- switch --flake .