[all] Update neovin config to be qwerty compatible.

home-modules/explicit-configs/nvim/lua/keymappings.lua

@@ -8,21 +8,21 @@ vim.api.nvim_set_keymap('n', '<Space>', '<NOP>', {noremap = true, silent = true}
 vim.g.mapleader = ' '
 
 -- Exit insert mode with ,h.
-vim.api.nvim_set_keymap('i', ',h', '<ESC>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap('i', ',m', '<ESC>', {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('', 'm', 'h', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('', 'h', 'm', {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('', 'j', 'n', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('', 'n', 'j', {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('', 'k', 'e', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('', 'e', 'k', {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('', 'l', 'i', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('', 'i', 'l', {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', '<C-g>', '<ESC>', {silent = true})
@@ -39,10 +39,10 @@ vim.api.nvim_set_keymap('t', '<C-g>', '<ESC>', {silent = true})
 vim.api.nvim_set_keymap("i", '<C-l>', '<Right>', {noremap = true, silent = true})
 
 -- Leader window movement.
-vim.api.nvim_set_keymap("n", '<Leader>wm', '<C-w>h', {noremap = true, silent = true})
+vim.api.nvim_set_keymap("n", '<Leader>wh', '<C-w>h', {noremap = true, silent = true})
-vim.api.nvim_set_keymap("n", '<Leader>wn', '<C-w>j', {noremap = true, silent = true})
+vim.api.nvim_set_keymap("n", '<Leader>wj', '<C-w>j', {noremap = true, silent = true})
-vim.api.nvim_set_keymap("n", '<Leader>we', '<C-w>k', {noremap = true, silent = true})
+vim.api.nvim_set_keymap("n", '<Leader>wk', '<C-w>k', {noremap = true, silent = true})
-vim.api.nvim_set_keymap("n", '<Leader>wi', '<C-w>l', {noremap = true, silent = true})
+vim.api.nvim_set_keymap("n", '<Leader>wl', '<C-w>l', {noremap = true, silent = true})
 
 -- Quick save.
 vim.api.nvim_set_keymap('n', '<Leader>fw', ':w<CR>', {silent = true})

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";

home-modules/lazygit.nix

@@ -7,10 +7,10 @@
       git.autoRefresh = false;
       keybinding = {
         universal = {
-          prevItem-alt = "e";
+          # prevItem-alt = "e";
-          nextItem-alt = "n";
+          # nextItem-alt = "n";
-          prevBlock-alt = "m";
+          # prevBlock-alt = "m";
-          nextBlock-alt = "i";
+          # nextBlock-alt = "i";
           nextMatch = "@";
           prevMatch = "#";
           new = "+";

home-modules/tmux.nix

@@ -42,16 +42,16 @@
       bind -r f next-window
 
       # Movement
-      bind -r e select-pane -U
+      bind -r k select-pane -U
-      bind -r n select-pane -D
+      bind -r j select-pane -D
-      bind -r m select-pane -L
+      bind -r h select-pane -L
-      bind -r i select-pane -R
+      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-j resize-pane -D 15
-      bind -r C-k resize-pane -U 15
+      # bind -r C-k resize-pane -U 15
-      bind -r C-h resize-pane -L 15
+      # bind -r C-h resize-pane -L 15
-      bind -r C-l resize-pane -R 15
+      # bind -r C-l resize-pane -R 15
 
       # Kill panes and windows
       bind w kill-pane

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;

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