diff --git a/builds/utils/sh/mousehelper b/builds/utils/sh/mousehelper new file mode 100755 index 0000000..38b4e03 --- /dev/null +++ b/builds/utils/sh/mousehelper @@ -0,0 +1,28 @@ +PADDING=50 + +eval $( + xdotool getwindowgeometry --shell $( + xdotool getactivewindow + ) | \ + xargs printf "export %s\n" +) + +eval $( + xdotool getmouselocation --shell | \ + xargs printf "export MOUSE%s\n" +) + +case "$1" in + "top") + xdotool mousemove $MOUSEX $(($Y + $PADDING)) + ;; + "bottom") + xdotool mousemove $MOUSEX $(($Y + $HEIGHT - $PADDING)) + ;; + "left") + xdotool mousemove $(($X + $PADDING)) $MOUSEY + ;; + "right") + xdotool mousemove $(($X + $WIDTH - $PADDING)) $MOUSEY + ;; +esac diff --git a/common/desktop.nix b/common/desktop.nix index ebbd7b8..cf752e4 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -2,8 +2,8 @@ let home-manager = builtins.fetchTarball { - url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"; - sha256 = "1q7wnf4ffvzgxsn828gl6hgfqbpynk9b77grsqzfxpki86nfk4mz"; + url = "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"; + sha256 = "16078fwcmqq41dqfnm124xxm8l6zykvqlj1kzgi0fvfil4y86slm"; }; customPolybar = pkgs.polybar.override { alsaSupport = true; @@ -29,6 +29,9 @@ in { nixpkgs.config = { allowUnfree = true; + permittedInsecurePackages = [ + "libxls-1.6.2" + ]; }; environment.systemPackages = with pkgs; [ @@ -82,7 +85,7 @@ in { (pkgs.callPackage ../builds/pash.nix {}) ]; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ fantasque-sans-mono ]; @@ -135,7 +138,9 @@ in { PasswordManagerEnabled = false; SearchSuggestEnabled = false; }; - nativeMessagingHosts.tridactyl = true; + nativeMessagingHosts.packages = [ + pkgs.tridactyl-native + ]; }; services.mpd = { diff --git a/config/ssh/config b/config/ssh/config index aa11ec0..90fcda3 100644 --- a/config/ssh/config +++ b/config/ssh/config @@ -1,6 +1,4 @@ -IdentityFile ~/.local/share/ssh/id_rsa -IdentityFile ~/.local/share/ssh/id_dsa -IdentityFile ~/.local/share/ssh/id_ecdsa -IdentityFile ~/.local/share/ssh/id_ed25519 - -UserKnownHostsFile ~/.local/share/ssh/known_hosts.d/%k +Host main + HostName beepboop.systems + User useracc + Port 55555 diff --git a/config/sxhkd/mouse b/config/sxhkd/mouse index 535b5d6..0304776 100644 --- a/config/sxhkd/mouse +++ b/config/sxhkd/mouse @@ -1,5 +1,5 @@ # exit mouse mode -q +Escape mode sxhkdrc # move left @@ -23,5 +23,21 @@ q xdotool {mousedown,click} {1,2,3} # let go of clicked button -g +q xdotool mouseup 1; xdotool mouseup 2; xdotool mouseup 3 + +# move the mouse to the top of the window +g ; g + mousehelper top + +# ditto for bottom +G + mousehelper bottom + +# ditto for left +0 + mousehelper left + +# ditto for right +dollar + mousehelper right