From 2eac47e01279aa68a03a5cf9d2e96bc3fb1ee109 Mon Sep 17 00:00:00 2001 From: jmug Date: Tue, 20 Jan 2026 15:27:07 -0800 Subject: [PATCH] [all] Update neovin config to be qwerty compatible. --- .../explicit-configs/nvim/lua/keymappings.lua | 26 +++++++++---------- home-modules/hyprland/default.nix | 2 +- home-modules/lazygit.nix | 8 +++--- home-modules/tmux.nix | 16 ++++++------ hosts/nixbox/configuration.nix | 15 +++++++++++ hosts/nixbox/home.nix | 4 +++ 6 files changed, 45 insertions(+), 26 deletions(-) diff --git a/home-modules/explicit-configs/nvim/lua/keymappings.lua b/home-modules/explicit-configs/nvim/lua/keymappings.lua index 2c4a7af..517ccd7 100644 --- a/home-modules/explicit-configs/nvim/lua/keymappings.lua +++ b/home-modules/explicit-configs/nvim/lua/keymappings.lua @@ -8,21 +8,21 @@ vim.api.nvim_set_keymap('n', '', '', {noremap = true, silent = true} vim.g.mapleader = ' ' -- Exit insert mode with ,h. -vim.api.nvim_set_keymap('i', ',h', '', {noremap = true, silent = true}) +vim.api.nvim_set_keymap('i', ',m', '', {noremap = true, silent = true}) -- Remap for colemak-dhm. -- Left. -vim.api.nvim_set_keymap('', 'm', 'h', {noremap = true, silent = true}) -vim.api.nvim_set_keymap('', 'h', 'm', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('', 'm', 'h', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('', 'h', 'm', {noremap = true, silent = true}) -- Down. -vim.api.nvim_set_keymap('', 'j', 'n', {noremap = true, silent = true}) -vim.api.nvim_set_keymap('', 'n', 'j', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('', 'j', 'n', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('', 'n', 'j', {noremap = true, silent = true}) -- Up. -vim.api.nvim_set_keymap('', 'k', 'e', {noremap = true, silent = true}) -vim.api.nvim_set_keymap('', 'e', 'k', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('', 'k', 'e', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('', 'e', 'k', {noremap = true, silent = true}) -- Right. -vim.api.nvim_set_keymap('', 'l', 'i', {noremap = true, silent = true}) -vim.api.nvim_set_keymap('', 'i', 'l', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('', 'l', 'i', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('', 'i', 'l', {noremap = true, silent = true}) -- C-g as ESC vim.api.nvim_set_keymap('n', '', '', {silent = true}) @@ -39,10 +39,10 @@ vim.api.nvim_set_keymap('t', '', '', {silent = true}) vim.api.nvim_set_keymap("i", '', '', {noremap = true, silent = true}) -- Leader window movement. -vim.api.nvim_set_keymap("n", 'wm', 'h', {noremap = true, silent = true}) -vim.api.nvim_set_keymap("n", 'wn', 'j', {noremap = true, silent = true}) -vim.api.nvim_set_keymap("n", 'we', 'k', {noremap = true, silent = true}) -vim.api.nvim_set_keymap("n", 'wi', 'l', {noremap = true, silent = true}) +vim.api.nvim_set_keymap("n", 'wh', 'h', {noremap = true, silent = true}) +vim.api.nvim_set_keymap("n", 'wj', 'j', {noremap = true, silent = true}) +vim.api.nvim_set_keymap("n", 'wk', 'k', {noremap = true, silent = true}) +vim.api.nvim_set_keymap("n", 'wl', 'l', {noremap = true, silent = true}) -- Quick save. vim.api.nvim_set_keymap('n', 'fw', ':w', {silent = true}) diff --git a/home-modules/hyprland/default.nix b/home-modules/hyprland/default.nix index d285ef2..f551bcf 100644 --- a/home-modules/hyprland/default.nix +++ b/home-modules/hyprland/default.nix @@ -18,9 +18,9 @@ wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.settings = { monitor = [ - ",preferred,auto,auto" "HDMI-A-1,3840x2160@60.00Hz,auto,1.3333" "eDP-1,preferred,auto,1.6" + "FALLBACK,1920x1080@60,auto,1" ]; "$terminal" = "ghostty"; diff --git a/home-modules/lazygit.nix b/home-modules/lazygit.nix index d946268..24b599c 100644 --- a/home-modules/lazygit.nix +++ b/home-modules/lazygit.nix @@ -7,10 +7,10 @@ git.autoRefresh = false; keybinding = { universal = { - prevItem-alt = "e"; - nextItem-alt = "n"; - prevBlock-alt = "m"; - nextBlock-alt = "i"; + # prevItem-alt = "e"; + # nextItem-alt = "n"; + # prevBlock-alt = "m"; + # nextBlock-alt = "i"; nextMatch = "@"; prevMatch = "#"; new = "+"; diff --git a/home-modules/tmux.nix b/home-modules/tmux.nix index 445ac7b..26cc810 100644 --- a/home-modules/tmux.nix +++ b/home-modules/tmux.nix @@ -42,16 +42,16 @@ bind -r f next-window # Movement - bind -r e select-pane -U - bind -r n select-pane -D - bind -r m select-pane -L - bind -r i select-pane -R + bind -r k select-pane -U + bind -r j select-pane -D + bind -r h select-pane -L + bind -r l select-pane -R # Resizing this will not work with colemak keymaps. - bind -r C-j resize-pane -D 15 - bind -r C-k resize-pane -U 15 - bind -r C-h resize-pane -L 15 - bind -r C-l resize-pane -R 15 + # bind -r C-j resize-pane -D 15 + # bind -r C-k resize-pane -U 15 + # bind -r C-h resize-pane -L 15 + # bind -r C-l resize-pane -R 15 # Kill panes and windows bind w kill-pane diff --git a/hosts/nixbox/configuration.nix b/hosts/nixbox/configuration.nix index 9cd5835..fa26a48 100644 --- a/hosts/nixbox/configuration.nix +++ b/hosts/nixbox/configuration.nix @@ -88,11 +88,13 @@ in # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. wget curl + chromium # Misc utils ripgrep fzf unzip nautilus + keyd # Terminal ghostty.packages.x86_64-linux.default kitty @@ -192,6 +194,19 @@ in }; }; + services.keyd = { + enable = true; + keyboards.colemakdhm = { + ids = [ "320f:5088:37b39d24" ]; + settings = { + main = { + capslock = "leftcontrol"; + leftcontrol = "capslock"; + }; + }; + }; + }; + security.pam.services.hyprlock = {}; programs.hyprland = { enable = true; diff --git a/hosts/nixbox/home.nix b/hosts/nixbox/home.nix index 4fe152f..da62253 100644 --- a/hosts/nixbox/home.nix +++ b/hosts/nixbox/home.nix @@ -68,12 +68,16 @@ in { firefox # Coms discord + slack obs-studio # AWS tools # awscli2 # (callPackage ../../nixos-modules/shell-apps/aws-cli-mfa.nix {}) + # Minecraft + prismlauncher + # Misc # zig fastfetch