mirror of
https://github.com/Nickiel12/nicks-nix-config.git
synced 2024-11-22 12:49:32 -08:00
tweaks to nvim, removed emacs
This commit is contained in:
parent
71a013b18b
commit
b02ddd772e
4 changed files with 27 additions and 9 deletions
12
flake.lock
12
flake.lock
|
@ -136,11 +136,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1690476848,
|
"lastModified": 1691225770,
|
||||||
"narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=",
|
"narHash": "sha256-O5slH8nW8msTAqVAS5rkvdHSkjmrO+JauuSDzZCmv2M=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da",
|
"rev": "0a014a729cdd54d9919ff36b714d047909d7a4c8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -233,11 +233,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1690272529,
|
"lastModified": 1691186842,
|
||||||
"narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
|
"narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
|
"rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -22,13 +22,26 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/pupbrained/nix-config/blob/29af4835f21940af51b86313c451fb572a29874a/pkgs/nixvim.nix#L8
|
# https://github.com/pupbrained/nix-config/blob/29af4835f21940af51b86313c451fb572a29874a/pkgs/nixvim.nix#L8
|
||||||
# maps.
|
maps.normal = {
|
||||||
|
"<leader>ot" = "<cmd>vs | te<cr>";
|
||||||
|
"<leader>o." = "<cmd>Telescope file_browser<cr>";
|
||||||
|
"<leader>op" = "<cmd>NvimTreeToggle<cr>";
|
||||||
|
};
|
||||||
|
|
||||||
plugins = {
|
plugins = {
|
||||||
telescope = {
|
telescope = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nvim-tree = {
|
||||||
|
enable = true;
|
||||||
|
openOnSetup = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
presence-nvim = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
treesitter = {
|
treesitter = {
|
||||||
enable = true;
|
enable = true;
|
||||||
folding = true;
|
folding = true;
|
||||||
|
@ -88,6 +101,7 @@ in
|
||||||
extraConfigLua = builtins.readFile ./../rsrcs/nvim.lua;
|
extraConfigLua = builtins.readFile ./../rsrcs/nvim.lua;
|
||||||
extraPlugins = with pkgs.vimPlugins;
|
extraPlugins = with pkgs.vimPlugins;
|
||||||
[
|
[
|
||||||
|
telescope-file-browser-nvim
|
||||||
monokai-pro-nvim
|
monokai-pro-nvim
|
||||||
nvim-lspconfig
|
nvim-lspconfig
|
||||||
hop-nvim
|
hop-nvim
|
||||||
|
|
|
@ -125,7 +125,7 @@ hop.setup {
|
||||||
keys = 'etovxqpdygfblzhckisuran',
|
keys = 'etovxqpdygfblzhckisuran',
|
||||||
}
|
}
|
||||||
local directions = require('hop.hint').HintDirection
|
local directions = require('hop.hint').HintDirection
|
||||||
vim.keymap.set('', '<C-f>', function()
|
vim.keymap.set('', '<leader>ff', function()
|
||||||
hop.hint_patterns({ multi_windows = true, current_line_only = false })
|
hop.hint_patterns({ multi_windows = true, current_line_only = false })
|
||||||
end, {remap=true})
|
end, {remap=true})
|
||||||
|
|
||||||
|
@ -178,3 +178,6 @@ require("monokai-pro").setup({
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.cmd.colorscheme "monokai-pro-spectrum"
|
vim.cmd.colorscheme "monokai-pro-spectrum"
|
||||||
|
|
||||||
|
require("telescope").load_extension "file_browser"
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ in
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../modules/discord.nix
|
../modules/discord.nix
|
||||||
../modules/emacs.nix
|
#../modules/emacs.nix
|
||||||
../modules/fusuma.nix
|
../modules/fusuma.nix
|
||||||
../modules/git.nix
|
../modules/git.nix
|
||||||
../modules/rofi.nix
|
../modules/rofi.nix
|
||||||
|
@ -81,6 +81,7 @@ in
|
||||||
flameshot # screenshot utility
|
flameshot # screenshot utility
|
||||||
fontpreview # utility to preview fonts
|
fontpreview # utility to preview fonts
|
||||||
gitui # command line git tui
|
gitui # command line git tui
|
||||||
|
helvum # audio sink gui control
|
||||||
pandoc # utility for converting between document types
|
pandoc # utility for converting between document types
|
||||||
qmk # QMK utility for compiling qmk firmware
|
qmk # QMK utility for compiling qmk firmware
|
||||||
nextcloud-client # Nextcloud private syncing
|
nextcloud-client # Nextcloud private syncing
|
||||||
|
|
Loading…
Reference in a new issue