Merge branch 'main' of ssh://git.zacke.dev:222/wholteza/dotfiles
This commit is contained in:
3
.bashrc
3
.bashrc
@@ -216,3 +216,6 @@ fi
|
|||||||
export PATH="$HOME/.local/bin:$PATH"
|
export PATH="$HOME/.local/bin:$PATH"
|
||||||
export PATH=/home/$USER/.fnm:$PATH
|
export PATH=/home/$USER/.fnm:$PATH
|
||||||
eval "$(fnm env --use-on-cd --version-file-strategy=recursive)"
|
eval "$(fnm env --use-on-cd --version-file-strategy=recursive)"
|
||||||
|
|
||||||
|
alias qwerty='swaymsg input "*" xkb_layout "se"'
|
||||||
|
alias colemak='swaymsg input "*" xkb_layout "colemak-se"'
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ vim.o.cursorline = true -- Highlight current line
|
|||||||
vim.o.winborder = "single" -- Borders around popups like when you press leader for keybinds
|
vim.o.winborder = "single" -- Borders around popups like when you press leader for keybinds
|
||||||
vim.opt.signcolumn =
|
vim.opt.signcolumn =
|
||||||
'yes' -- TEST: Prohibit layout shifting by always showing the sign column (left of line numbers), you should see an icon there on this row.
|
'yes' -- TEST: Prohibit layout shifting by always showing the sign column (left of line numbers), you should see an icon there on this row.
|
||||||
vim.o.updatetime = 250
|
vim.o.updatetime = 250 -- Speed up the CursorHold autocmd event
|
||||||
vim.o.timeoutlen = 300
|
vim.o.timeoutlen = 300 -- Speed up completion of key event
|
||||||
-- SECTION: Globals
|
-- SECTION: Globals
|
||||||
vim.g.mapleader = ' ' -- Mapping leader to space.
|
vim.g.mapleader = ' ' -- Mapping leader to space.
|
||||||
vim.g.maplocalleader = ' ' -- Mapping leader to space.
|
vim.g.maplocalleader = ' ' -- Mapping leader to space.
|
||||||
@@ -66,9 +66,9 @@ vim.pack.add({
|
|||||||
'https://github.com/nvim-mini/mini.completion', -- Autocomplete, needs snippets and icons
|
'https://github.com/nvim-mini/mini.completion', -- Autocomplete, needs snippets and icons
|
||||||
'https://github.com/nvim-mini/mini.snippets', -- Snippets
|
'https://github.com/nvim-mini/mini.snippets', -- Snippets
|
||||||
'https://github.com/nvim-mini/mini.icons', -- Icons
|
'https://github.com/nvim-mini/mini.icons', -- Icons
|
||||||
'https://github.com/nvim-mini/mini.cursorword',
|
'https://github.com/nvim-mini/mini.cursorword', -- Highlight word under cursor
|
||||||
'https://github.com/nvim-mini/mini.hipatterns',
|
'https://github.com/nvim-mini/mini.hipatterns', -- Highlight todos and rgb colors
|
||||||
'https://github.com/nvim-mini/mini.statusline',
|
'https://github.com/nvim-mini/mini.statusline', -- Statusline at the bottom
|
||||||
'https://github.com/neovim/nvim-lspconfig', -- Language servers
|
'https://github.com/neovim/nvim-lspconfig', -- Language servers
|
||||||
'https://github.com/mason-org/mason.nvim', -- LSP deps installer
|
'https://github.com/mason-org/mason.nvim', -- LSP deps installer
|
||||||
'https://github.com/mason-org/mason-lspconfig.nvim', -- Lets you install mason tooling using lsp names
|
'https://github.com/mason-org/mason-lspconfig.nvim', -- Lets you install mason tooling using lsp names
|
||||||
@@ -76,7 +76,6 @@ vim.pack.add({
|
|||||||
'https://github.com/folke/lazydev.nvim', -- Automatically resolve vim api paths.
|
'https://github.com/folke/lazydev.nvim', -- Automatically resolve vim api paths.
|
||||||
'https://github.com/folke/which-key.nvim', -- Shortcut hints (bar at the bottom when pressing space)
|
'https://github.com/folke/which-key.nvim', -- Shortcut hints (bar at the bottom when pressing space)
|
||||||
'https://github.com/nvim-lua/plenary.nvim', -- Helper lua functions, dep of todo-comments.
|
'https://github.com/nvim-lua/plenary.nvim', -- Helper lua functions, dep of todo-comments.
|
||||||
-- 'https://github.com/folke/todo-comments.nvim', -- Helper lua functions, dep of todo-comments.
|
|
||||||
'https://github.com/nvim-treesitter/nvim-treesitter', -- Syntax highlighting
|
'https://github.com/nvim-treesitter/nvim-treesitter', -- Syntax highlighting
|
||||||
'https://github.com/stevearc/oil.nvim', -- File explorer
|
'https://github.com/stevearc/oil.nvim', -- File explorer
|
||||||
})
|
})
|
||||||
@@ -139,7 +138,12 @@ require('nvim-treesitter').setup({
|
|||||||
require("mason").setup()
|
require("mason").setup()
|
||||||
require("mason-lspconfig").setup({
|
require("mason-lspconfig").setup({
|
||||||
-- Install lsp deps here
|
-- Install lsp deps here
|
||||||
ensure_installed = { 'lua_ls', 'ts_ls', 'ansiblels', 'eslint' },
|
ensure_installed = {
|
||||||
|
'lua_ls',
|
||||||
|
'ts_ls',
|
||||||
|
'ansiblels',
|
||||||
|
'eslint'
|
||||||
|
},
|
||||||
automatic_enable = true
|
automatic_enable = true
|
||||||
})
|
})
|
||||||
require("mason-tool-installer").setup({
|
require("mason-tool-installer").setup({
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ input "*" xkb_options caps:backspace
|
|||||||
## Set colemak layout on surface laptop
|
## Set colemak layout on surface laptop
|
||||||
input 1118:2478:Microsoft_Surface_045E:09AE_Keyboard xkb_layout colemak-se
|
input 1118:2478:Microsoft_Surface_045E:09AE_Keyboard xkb_layout colemak-se
|
||||||
## Set colemak layout on printer desktop
|
## Set colemak layout on printer desktop
|
||||||
#input 9494:26:CM_Storm_Keyboard_--_QuickFire_XT xkb_layout colemak-se
|
input 9494:26:CM_Storm_Keyboard_--_QuickFire_XT xkb_layout colemak-se
|
||||||
## Remove pointer acceleration
|
## Remove pointer acceleration
|
||||||
input "type:pointer" {
|
input "type:pointer" {
|
||||||
accel_profile "flat"
|
accel_profile "flat"
|
||||||
|
|||||||
@@ -19,3 +19,5 @@
|
|||||||
s = status
|
s = status
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = false
|
||||||
|
[core]
|
||||||
|
editor = vim
|
||||||
|
|||||||
Reference in New Issue
Block a user