Skip to content

Commit

Permalink
hyprland: Fix v0.37.1
Browse files Browse the repository at this point in the history
  • Loading branch information
yutkat committed Mar 20, 2024
1 parent 9b962fe commit 7b6975d
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 34 deletions.
8 changes: 4 additions & 4 deletions .config/hypr/config.d/bind.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bind=SUPER,o,exec,xdg-open "$(find ~/Downloads -type f -not -name ".*" -printf "
bind=SUPER+SHIFT,e,exec,ulauncher-toggle -q "sys "
bind=SUPER+SHIFT,space,togglefloating,

## Group
# Group
bind=SUPER,g,togglegroup,
bind=SUPER,p,changegroupactive,f
bind=SUPER,n,changegroupactive,b
Expand All @@ -15,11 +15,11 @@ bind=SUPER+ALT,l,movewindoworgroup,r
bind=SUPER+ALT,k,movewindoworgroup,u
bind=SUPER+ALT,j,movewindoworgroup,d

## Mouse
# Mouse
bindm=SUPER,mouse:272,movewindow
bindm=SUPER,mouse:273,resizewindow

## Window
# Window
bind=SUPER+SHIFT,q,killactive
bind=ALT,F4,killactive
bind=SUPER,f,fullscreen,1
Expand Down Expand Up @@ -48,7 +48,7 @@ bind=SUPER+CTRL,l,movewindow,mon:r
bind=SUPER+CTRL,k,movewindow,mon:u
bind=SUPER+CTRL,j,movewindow,mon:d

## Workspace
# Workspace
bind=SUPER,1,workspace,1
bind=SUPER,2,workspace,2
bind=SUPER,3,workspace,3
Expand Down
18 changes: 9 additions & 9 deletions .config/hypr/config.d/startup.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Startup
exec-once=hyprpaper
exec-once=hyprctl setcursor ComixCursors-Black 24
#exec-once=hyprctl setcursor ComixCursors-Black 24
exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once=systemctl --user start espanso
Expand All @@ -11,47 +11,47 @@ exec-once=waybar
exec-once=~/.config/hypr/scripts/hyprland_portal.sh

# Apps
## Sound
# Sound
exec-once=pasystray
exec-once=systemctl --user start pipewire pipewire-pulse wireplumber

## Waybar
# Waybar
bind=SUPER,r,exec,killall -SIGUSR2 waybar

## pypr
# pypr
exec-once=pypr
bind=SUPER,semicolon,exec,pypr toggle term
# windowrulev2=float,class:(wezterm.scratchpad)
# windowrulev2=workspace special:scratch_term silent,class:(wezterm.scratchpad)
# windowrulev2=size 90% 90%,class:(wezterm.scratchpad)
# windowrulev2=center,class:(wezterm.scratchpad)

## Lock
# Lock
exec-once = hypridle
bind=SUPER,comma,exec,hyprlock

## Notification
# Notification
exec-once=dunst
bind=SUPER,BackSpace,exec,dunstctl close
bind=SUPER+SHIFT,BackSpace,exec,dunstctl close_all
bind=SUPER,grave,exec,dunstctl history-pop
bind=SUPER+SHIFT,grave,exec,dunstctl context
bind=SUPER+CTRL,grave,exec,dunstctl action

## Ulauncher
# Ulauncher
exec-once=systemctl --user import-environment PATH; systemctl --user start ulauncher
bind=SUPER,d,exec,ulauncher-toggle
bind=ALT,F2,exec,ulauncher-toggle
bind=SUPER,space,exec,ulauncher-toggle

## CopyQ
# CopyQ
exec-once=copyq
bind=SUPER+CTRL,v,exec,copyq show
windowrulev2=float,class:(com.github.hluk.copyq)
windowrulev2=size 50% 50%,class:(com.github.hluk.copyq)
windowrulev2=center,class:(com.github.hluk.copyq)

## Screenshots
# Screenshots
bind=,Print,exec,grim "$(echo ~/Pictures/screenshots/$(date +'%Y%m%d_%H%M%S').png)"
bind=SHIFT,Print,exec,grim -g "$(slurp)" - | swappy -f -
bind=CTRL,Print,exec,swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"' | slurp | grim -g - - | swappy -f -
30 changes: 15 additions & 15 deletions .config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ChatGPT.nvim": { "branch": "main", "commit": "df53728e05129278d6ea26271ec086aa013bed90" },
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
"CopilotChat.nvim": { "branch": "canary", "commit": "23b92f102ca6d0f3529f11ca099bdedd9377615b" },
"CopilotChat.nvim": { "branch": "canary", "commit": "453b0d54533f6378a188a6afbc10ec087210cad8" },
"LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
"NeoComposer.nvim": { "branch": "main", "commit": "b06e8e88e289947937f241f76e86f7c46f4a5805" },
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
Expand All @@ -15,7 +15,7 @@
"cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
"cmp-emoji": { "branch": "main", "commit": "0acd702358230abeb6576769f7116e766bca28a0" },
"cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
"cmp-mocword": { "branch": "main", "commit": "165092bee5e043ff319b1d08d5ea4d4164f74f43" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
Expand All @@ -30,12 +30,12 @@
"colorful-winsep.nvim": { "branch": "main", "commit": "4ac6a8cab5866ec3de3f5e3bc202e0c682d4d806" },
"comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
"confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" },
"conform.nvim": { "branch": "master", "commit": "41586cbc81b8d344a795264989a3db79d0a27615" },
"conform.nvim": { "branch": "master", "commit": "bf109f061fc3cd75394b7823923187ae045cbf22" },
"convert-git-url.nvim": { "branch": "main", "commit": "fd97c92a627175546f8572088b2b240b92f2790d" },
"copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
"copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
"csv-tools.lua": { "branch": "master", "commit": "d537018c39dad6ac79212b1694b4637c5c0fe885" },
"debugprint.nvim": { "branch": "main", "commit": "3f9f2edf5e487383919c5bbf924dbcbb4f96541c" },
"debugprint.nvim": { "branch": "main", "commit": "2ba2dcaf6ce1a178855f5b609a70d2004b437f2c" },
"delete-word-to-chars.nvim": { "branch": "main", "commit": "3d3931c67eee7475e97d71564d09c0e6e2896582" },
"dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" },
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
Expand All @@ -60,16 +60,16 @@
"line-notes.nvim": { "branch": "master", "commit": "17e21c3410aea9e075d0b1f54c25f8723fb77415" },
"live-command.nvim": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" },
"lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lspsaga.nvim": { "branch": "main", "commit": "01dc5ea5916abbe3158d2661e21d90dcc04d7c47" },
"lspsaga.nvim": { "branch": "main", "commit": "d5aa1a02a23b5725054928426b1de6932a6d3bc3" },
"lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" },
"marks.nvim": { "branch": "master", "commit": "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" },
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
"matchparen.nvim": { "branch": "main", "commit": "190861577d83167021dcb3339dd3aa594279f2f3" },
"mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
"modicator.nvim": { "branch": "main", "commit": "780ea1e98c9bee8f3816685213b0aac42b34cd75" },
"neo-tree.nvim": { "branch": "main", "commit": "403a9c5014624dc517b850a360f345340139307c" },
"neoconf.nvim": { "branch": "main", "commit": "7eb9b339869c84494c0fdf68b96e53a764289938" },
"neo-tree.nvim": { "branch": "main", "commit": "6011391412b003ffbaf5615d6df8ade154726117" },
"neoconf.nvim": { "branch": "main", "commit": "8137a976a5eb55d8d1a4950f7afe28861affa3db" },
"neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
"neogen": { "branch": "main", "commit": "b95347a588401a755eadd17482edc1662876bd58" },
"neogit": { "branch": "master", "commit": "55eb562bf4ef7d2c370291e3185421c3333999ee" },
Expand All @@ -88,14 +88,14 @@
"nvim-config-local": { "branch": "main", "commit": "83bb6d9881653a5cf8b489ba8a6fe5a06049a10a" },
"nvim-cursorword": { "branch": "master", "commit": "c0f2958ec729b47be2dba0d79ef43d005dac9f4e" },
"nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" },
"nvim-dap-ui": { "branch": "master", "commit": "13888eb35faaba48efaf49130b83e0d12e042e1b" },
"nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" },
"nvim-gtd": { "branch": "main", "commit": "d2f34debfd8c0af3a0a81708933e33f4478fe120" },
"nvim-hlslens": { "branch": "main", "commit": "e4c811a401b06f86a7bb042b1d64a5cba21729a9" },
"nvim-hlslens": { "branch": "main", "commit": "6c615ffcbd137682affab88a7a8bf0df99dcc029" },
"nvim-insx": { "branch": "main", "commit": "438ea4168383776e76841d8472b6cb8572d14833" },
"nvim-lint": { "branch": "master", "commit": "03b1fc593638098a35de26d768d5f43b0fe57041" },
"nvim-lsp-smag": { "branch": "master", "commit": "add830cb376ebe3daac3f63b7f4349c499090918" },
"nvim-lspconfig": { "branch": "master", "commit": "8c1831817d40925d22cd8a555296c44c02fdaaf5" },
"nvim-lspconfig": { "branch": "master", "commit": "d67715d3b746a19e951b6b0a99663fa909bb9e64" },
"nvim-luadev": { "branch": "master", "commit": "3ba0c02c378503739f1fdb95cff3ea2aad48db3e" },
"nvim-luapad": { "branch": "master", "commit": "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce" },
"nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" },
Expand All @@ -104,13 +104,13 @@
"nvim-pasta": { "branch": "main", "commit": "b9fdc3f24c6cc47beb3e02069a3fae7fdaab4f77" },
"nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" },
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
"nvim-spectre": { "branch": "master", "commit": "d1db6c1d37252b5a38f199e2f590c5a1617d9254" },
"nvim-spectre": { "branch": "master", "commit": "1d23be1165c373a6026e42f3b3a5100126eaf81d" },
"nvim-spider": { "branch": "main", "commit": "bcc9fa38a62637491b75b02e364191553fd858a2" },
"nvim-surround": { "branch": "main", "commit": "84a26afce16cffa7e3322cfa80a42cddf60616eb" },
"nvim-test": { "branch": "main", "commit": "e06f3d029ee161f3ead6193cf27354d1eb8723c3" },
"nvim-tree-docs": { "branch": "master", "commit": "5db023d783da1e55339e5e25caaf72a59597e626" },
"nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" },
"nvim-treesitter": { "branch": "master", "commit": "2014f8285e306f4c8a896c7d3af53fdd599e5a4f" },
"nvim-treesitter": { "branch": "master", "commit": "36860295919fb18e57cd637b2a5f22e16f750c2f" },
"nvim-treesitter-context": { "branch": "master", "commit": "2484f58384be24da375558c88402f2998193eff6" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" },
Expand All @@ -136,7 +136,7 @@
"rainbow-delimiters.nvim": { "branch": "master", "commit": "2200900e3c1aae21dadb65c2ea2e91bcc39ca368" },
"registers.nvim": { "branch": "main", "commit": "22bb98f93a423252fffeb3531f7bc12a3e07b63f" },
"replacer.nvim": { "branch": "master", "commit": "32e1713230844fa52f7f0598c59295de3c90dc95" },
"rustaceanvim": { "branch": "master", "commit": "b0548ff58d34caa220f8806c518fedb6453fc48e" },
"rustaceanvim": { "branch": "master", "commit": "597c8d6c7b4433ec4577b73bced1df41c132b077" },
"save-clipboard-on-exit.nvim": { "branch": "main", "commit": "506d6970026e1c2e59a42ecdc7378fe908da8a0b" },
"scrap.nvim": { "branch": "main", "commit": "cc8453ed613932c744c3d1ec42f379b78bd8b92c" },
"sidebar.nvim": { "branch": "main", "commit": "5695712eef6288fff667343c4ae77c54911bdb1b" },
Expand All @@ -150,7 +150,7 @@
"telekasten.nvim": { "branch": "main", "commit": "a684d6ebe7026944b0a5323219d5f5364511e5b2" },
"telescope-changes.nvim": { "branch": "master", "commit": "7ed65f3698be4b5f7a9cdeb88a657bfa866dcb3c" },
"telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
"telescope-frecency.nvim": { "branch": "master", "commit": "8e3e5ba645b04625acb92e912fabf6d102ae6ee4" },
"telescope-frecency.nvim": { "branch": "master", "commit": "747894efd18685529a20e368a58f174cb43a3c06" },
"telescope-github.nvim": { "branch": "master", "commit": "ee95c509901c3357679e9f2f9eaac3561c811736" },
"telescope-heading.nvim": { "branch": "main", "commit": "23ce2c9ef252aecbaa37300c1209b5ef2b51e6c5" },
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" },
Expand All @@ -159,7 +159,7 @@
"telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
"telescope.nvim": { "branch": "master", "commit": "c816406bd50ade6ec754474f08974154487d417c" },
"telescope.nvim": { "branch": "master", "commit": "f06eeb79e14d5c95745558927c5b1f341c0a3a28" },
"template.nvim": { "branch": "main", "commit": "6b9a1acba0b34a31fdd8b70e7e1d7b114230b339" },
"term-gf.nvim": { "branch": "main", "commit": "be02449c0edbe24d624ae8347561f255056019ca" },
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
Expand Down
3 changes: 2 additions & 1 deletion .config/wezterm/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ local config = {
-- https://github.com/wez/wezterm/issues/4972
--enable_wayland = enable_wayland(),
-- https://github.com/wez/wezterm/issues/1772
--enable_wayland = false,
-- https://github.com/wez/wezterm/issues/5103
enable_wayland = false,
color_scheme = "nordfox",
color_scheme_dirs = { os.getenv("HOME") .. "/.config/wezterm/colors/" },
hide_tab_bar_if_only_one_tab = false,
Expand Down
7 changes: 3 additions & 4 deletions install_scripts/lib/arch-extra-setup/gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ systemctl --user enable --now ulauncher
sudo pacman -S --noconfirm --needed arc-gtk-theme kvantum kvantum-qt5
sudo pacman -S --noconfirm --needed fcitx5-nord
# flameshot on wayland https://github.com/flameshot-org/flameshot/blob/master/docs/Sway and wlroots support.md
paru -S --noconfirm --needed xdg-desktop-portal xdg-desktop-portal-wlr grim
#paru -S --noconfirm --needed xdg-desktop-portal xdg-desktop-portal-wlr grim
paru -S --noconfirm --needed grim

# hyperland
paru -S --noconfirm --needed pyprland nwg-look-bin hypridle hyprlock

#paru -S --noconfirm --needed hyprland-bin waybar-hyprland-git hyprpaper brightnessctl wlogout
paru -S --noconfirm --needed pyprland nwg-look-bin

if [ "$(lspci -k | grep -A 2 -E "(VGA|3D)" | grep AMD)" != "" ]; then
sudo pacman -S --noconfirm --needed xf86-video-amdgpu vulkan-radeon
Expand Down
4 changes: 3 additions & 1 deletion install_scripts/lib/dotsinstaller/install-hyprland.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ function install_hyprland() {
elif [[ $distro == "redhat" ]]; then
:
elif [[ $distro == "arch" ]]; then
sudo pacman -S --noconfirm --needed hyprland hyprpaper waybar
sudo pacman -S --noconfirm --needed hyprland hyprpaper waybar \
hypridle hyprlock hyprcursor hyprlang \
xdg-desktop-portal-hyprland xdg-desktop-portal-gtk
elif [[ $distro == "alpine" ]]; then
:
fi
Expand Down

0 comments on commit 7b6975d

Please sign in to comment.