Merge branch 'main' of ssh://git.zacke.dev:222/wholteza/dotfiles

.bashrc

@@ -216,3 +216,6 @@ fi
 export PATH="$HOME/.local/bin:$PATH"
 export PATH=/home/$USER/.fnm:$PATH
 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"'

.config/nvim/init.lua

@@ -1,23 +1,23 @@
 -- SECTION: Options
-vim.o.number = true        -- Show line numbers
-vim.o.wrap = true          -- Soft-wrap lines
-vim.o.tabstop = 2          -- 2 space tab width
-vim.o.shiftwidth = 2       -- 2 space tab width
-vim.o.swapfile = false     -- Disable swap files (annoying)
-vim.o.undofile = true      -- Enable undo between sessions
-vim.o.mouse = 'a'          -- Enable mouse support
-vim.o.showmode = false     -- Don't show mode in status bar
-vim.o.inccommand = 'split' -- Preview replace commands inline
-vim.o.scrolloff = 20       -- Scroll if cursor is X lines to edge
-vim.o.confirm = true       -- Add confirmation on some destructive actions
-vim.o.ignorecase = true    -- Case insensitive search
-vim.o.smartcase = true     -- Case sensitive when caps is used
-vim.o.cursorline = true    -- Highlight current line
-vim.o.winborder = "single" -- Borders around popups like when you press leader for keybinds
+vim.o.number = true         -- Show line numbers
+vim.o.wrap = true           -- Soft-wrap lines
+vim.o.tabstop = 2           -- 2 space tab width
+vim.o.shiftwidth = 2        -- 2 space tab width
+vim.o.swapfile = false      -- Disable swap files (annoying)
+vim.o.undofile = true       -- Enable undo between sessions
+vim.o.mouse = 'a'           -- Enable mouse support
+vim.o.showmode = false      -- Don't show mode in status bar
+vim.o.inccommand = 'split'  -- Preview replace commands inline
+vim.o.scrolloff = 20        -- Scroll if cursor is X lines to edge
+vim.o.confirm = true        -- Add confirmation on some destructive actions
+vim.o.ignorecase = true     -- Case insensitive search
+vim.o.smartcase = true      -- Case sensitive when caps is used
+vim.o.cursorline = true     -- Highlight current line
+vim.o.winborder = "single"  -- Borders around popups like when you press leader for keybinds
 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.
-vim.o.updatetime = 250
-vim.o.timeoutlen = 300
+'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      -- Speed up the CursorHold autocmd event
+vim.o.timeoutlen = 300      -- Speed up completion of key event
 -- SECTION: Globals
 vim.g.mapleader = ' '       -- Mapping leader to space.
 vim.g.maplocalleader = ' '  -- Mapping leader to space.
@@ -59,16 +59,16 @@ vim.keymap.set('n', '\\', ":Oil --float<CR>", { desc = "File explorer" })
 
 -- SECTION: Install packages
 vim.pack.add({
-	'https://github.com/catppuccin/nvim',          -- color scheme
-	'https://github.com/nvim-mini/mini.pick',      -- File picker, grep
-	'https://github.com/nvim-mini/mini.pairs',     -- Auto create {}, (), [] - pairs etc.
-	'https://github.com/nvim-mini/mini.notify',    -- Popup notifications
-	'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.icons',     -- Icons
-	'https://github.com/nvim-mini/mini.cursorword',
-	'https://github.com/nvim-mini/mini.hipatterns',
-	'https://github.com/nvim-mini/mini.statusline',
+	'https://github.com/catppuccin/nvim',                          -- color scheme
+	'https://github.com/nvim-mini/mini.pick',                      -- File picker, grep
+	'https://github.com/nvim-mini/mini.pairs',                     -- Auto create {}, (), [] - pairs etc.
+	'https://github.com/nvim-mini/mini.notify',                    -- Popup notifications
+	'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.icons',                     -- Icons
+	'https://github.com/nvim-mini/mini.cursorword',                -- Highlight word under cursor
+	'https://github.com/nvim-mini/mini.hipatterns',                -- Highlight todos and rgb colors
+	'https://github.com/nvim-mini/mini.statusline',                -- Statusline at the bottom
 	'https://github.com/neovim/nvim-lspconfig',                    -- Language servers
 	'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
@@ -76,7 +76,6 @@ vim.pack.add({
 	'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/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/stevearc/oil.nvim',                        -- File explorer
 })
@@ -139,7 +138,12 @@ require('nvim-treesitter').setup({
 require("mason").setup()
 require("mason-lspconfig").setup({
 	-- Install lsp deps here
-	ensure_installed = { 'lua_ls', 'ts_ls', 'ansiblels', 'eslint' },
+	ensure_installed = {
+		'lua_ls',
+		'ts_ls',
+		'ansiblels',
+		'eslint'
+	},
 	automatic_enable = true
 })
 require("mason-tool-installer").setup({

.config/sway/input

@@ -8,7 +8,7 @@ input "*" xkb_options caps:backspace
 ## Set colemak layout on surface laptop
 input 1118:2478:Microsoft_Surface_045E:09AE_Keyboard xkb_layout colemak-se
 ## 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
 input "type:pointer" {
     accel_profile "flat"

.gitconfig

@@ -19,3 +19,5 @@
   s = status
 [pull]
 	rebase = false
+[core]
+	editor = vim