diff --git a/home/common/core/nixvim/keymaps.nix b/home/common/core/nixvim/keymaps.nix index 98141a3..ae02fd7 100644 --- a/home/common/core/nixvim/keymaps.nix +++ b/home/common/core/nixvim/keymaps.nix @@ -81,5 +81,37 @@ action = "Telescope help_tags"; options = {noremap = true;}; } + # paste over selected text without yanking it + { + mode = ["v"]; + key = "p"; + action = "\"_dP"; + options = {noremap = true;}; + } + # resize window + { + mode = ["n"]; + key = ""; + action = ":vertical resize +1"; + options = {noremap = true;}; + } + { + mode = ["n"]; + key = ""; + action = ":vertical resize -1"; + options = {noremap = true;}; + } + { + mode = ["n"]; + key = ""; + action = ":resize -1"; + options = {noremap = true;}; + } + { + mode = ["n"]; + key = ""; + action = ": resize +1"; + options = {noremap = true;}; + } ]; } diff --git a/home/common/optional/desktop/dwm/xinitrc.nix b/home/common/optional/desktop/dwm/xinitrc.nix index 8242c05..a98b71e 100644 --- a/home/common/optional/desktop/dwm/xinitrc.nix +++ b/home/common/optional/desktop/dwm/xinitrc.nix @@ -1,15 +1,21 @@ -{ config, ... }: -{ +{config, ...}: { # TODO: configure x11 to look in .config/x11 home.file.".xinitrc" = { recursive = true; text = '' + ## Map Alt_L + [hjkl] to left, down, up, right + xmodmap -e "keycode 64 = Mode_switch" # set Alt_l as the "Mode_switch" + xmodmap -e "keycode 43 = h H Left H" # h + xmodmap -e "keycode 44 = j J Down J" # j + xmodmap -e "keycode 45 = k K Up K" # k + xmodmap -e "keycode 46 = l L Right L" # l + picom -b --config ~/.config/picom/picom.conf xrdb -merge ~/.Xresources autostart="clipboard-save dwmblocks feh-wallpaper-changer sxhkd" - + for program in $autostart; do pidof -sx "$program" || "$program" & done >/dev/null 2>&1 @@ -19,10 +25,10 @@ eval $(dbus-launch --exit-with-session --sh-syntax) fi systemctl --user import-environment DISPLAY XAUTHORITY - + if command -v dbus-update-activation-environment >/dev/null 2>&1; then dbus-update-activation-environment DISPLAY XAUTHORITY - fi + fi export XSESSION_PID="$$" exec dwm diff --git a/hosts/common/optional/nfs-mounts/media.nix b/hosts/common/optional/nfs-mounts/media.nix index 153d0e4..6e68f14 100644 --- a/hosts/common/optional/nfs-mounts/media.nix +++ b/hosts/common/optional/nfs-mounts/media.nix @@ -2,7 +2,6 @@ fileSystems."/media/media" = { device = "10.0.10.30:/mnt/media"; fsType = "nfs"; - options = [ "noatime" "_netdev" "ro" ]; + options = ["noatime" "_netdev"]; }; } -