Compare commits

..

No commits in common. "b67887a9d71e3ba6f18a72923fe9c280ccbfd158" and "1970352b59a2071f46237aa40fb500bd878c40ca" have entirely different histories.

8 changed files with 6 additions and 93 deletions

View File

@ -8,12 +8,7 @@
vim-fugitive vim-fugitive
undotree undotree
telescope-nvim telescope-nvim
nvim-cmp
cmp-nvim-lsp
nvim-lspconfig
lsp-zero-nvim lsp-zero-nvim
vim-floaterm
luasnip
(nvim-treesitter.withPlugins (p: [ (nvim-treesitter.withPlugins (p: [
p.tree-sitter-nix p.tree-sitter-nix
p.tree-sitter-go p.tree-sitter-go
@ -25,22 +20,14 @@
]; ];
extraLuaConfig = '' extraLuaConfig = ''
${builtins.readFile ./options.lua} ${builtins.readFile ./options.lua}
${builtins.readFile ./plugins.lua}
${builtins.readFile ./keybinds.lua}
''; '';
}; };
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
# nix stuff # nix stuff
nixpkgs-fmt nixpkgs-fmt
statix
# LSPs
gopls
nodePackages.pyright
nodePackages.typescript-language-server
nil nil
yaml-language-server statix
]; ];
home.sessionVariables.EDITOR = "nvim"; home.sessionVariables.EDITOR = "nvim";
} }

View File

@ -1,18 +0,0 @@
-- Keybinds
-- Term
vim.g.floaterm_keymap_toggle = '<leader>ft'
-- Tabs
vim.keymap.set('n', '<leader>n', ':tabnew<CR>',
{ silent = true, desc = '[N]ew tab' })
vim.keymap.set('n', '<leader>p', ':tabnext<CR>',
{ silent = true, desc = '[p]Next tab' })
vim.keymap.set('n', '<leader>P', ':tabprev<CR>',
{ silent = true, desc = '[P]Previous tab' })
-- Telescope
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles,
{ desc = '[?] FInd recently opened files' })
vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files,
{ desc = '[F]ind [F]iles' })

View File

@ -1,4 +1,3 @@
-- Options
vim.g.mapleader = ' ' vim.g.mapleader = ' '
vim.g.maplocalleader = ' ' vim.g.maplocalleader = ' '

View File

@ -1,51 +0,0 @@
-- Plugins
-- LSP stuff
local lsp_zero = require('lsp-zero')
lsp_zero.on_attach(function(client, bufnr)
lsp_zero.default_keymaps({buffer = bufnr})
end)
require('lspconfig').gopls.setup({
settings = {
gopls = {
analyses = {
unusedparams = true,
},
staticcheck = true,
gofumpt = true,
}
}
})
-- Cmp
local cmp = require('cmp')
local cmp_action = lsp_zero.cmp_action()
cmp.setup({
mapping = cmp.mapping.preset.insert({
-- Enter to confirm completion
['<CR>'] = cmp.mapping.confirm({select = false}),
-- Ctrl+Space to open completion menu
['<C-Space>'] = cmp.mapping.complete(),
-- Move between snippet placeholders
['<C-f>'] = cmp_action.luasnip_jump_forward(),
['<C-b>'] = cmp_action.luasnip_jump_backward(),
-- Scroll in completion docs
['<C-k>'] = cmp.mapping.scroll_docs(-4),
['<C-j>'] = cmp.mapping.scroll_docs(4),
})
})
-- Telescope
require('telescope').setup({
extensions = {
fzf = {
fuzzy = true,
override_generic_sorter = true,
override_file_sorter = true,
case_mode = "smart_case",
}
},
})

View File

@ -3,7 +3,7 @@
# Generic tools # Generic tools
age age
btop btop
bzip2 bzip
croc croc
file file
go-task go-task

View File

@ -31,6 +31,9 @@
PATH = [ "${XDG_BIN_HOME}" ]; PATH = [ "${XDG_BIN_HOME}" ];
}; };
# Enable sudo
security.sudo.enable = true;
# Enable flakes # Enable flakes
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];

View File

@ -1 +1 @@
{ imports = [ ./podman.nix ./fonts.nix ./users.nix ./services.nix ./security.nix ]; } { imports = [ ./podman.nix ./fonts.nix ./users.nix ./services.nix ]; }

View File

@ -1,7 +0,0 @@
{ pkgs, ... }: {
# Enable sudo
security.sudo = {
enable = true;
wheelNeedsPassword = false;
};
}