diff --git a/private_dot_config/hypr/hyprland.conf b/private_dot_config/hypr/hyprland.conf index 05e7127..4748a16 100644 --- a/private_dot_config/hypr/hyprland.conf +++ b/private_dot_config/hypr/hyprland.conf @@ -8,13 +8,11 @@ env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 env = XDG_CURRENT_DESKTOP,Hyprland -# TO BE MOVED -bind = $mainMod, M, exit, - misc { force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :( + middle_click_paste = false } gestures { @@ -33,4 +31,6 @@ source = ./hyprland/layouts.conf source = ./hyprland/workspaces.conf source = ./hyprland/exec.conf source = ./hyprland/monitors.conf +source = ./hyprland/plugins.conf exec-once = hyprlock +exec-once = hyprpm reload -n diff --git a/private_dot_config/hypr/hyprland/binds/open_apps.conf b/private_dot_config/hypr/hyprland/binds/open_apps.conf index 60dadac..d3ef591 100644 --- a/private_dot_config/hypr/hyprland/binds/open_apps.conf +++ b/private_dot_config/hypr/hyprland/binds/open_apps.conf @@ -1,13 +1,15 @@ # general -bind = $mainMod, RETURN, exec, $terminal +bind = $mainMod, RETURN, exec, [workspace 4] $terminal bind = $mainMod L_SHIFT, P, exec, $menu + # Workspace binded apps bind = $mainMod Control_L, 1, exec, uwsm app -- vesktop bind = $mainMod Control_L, 2, exec, uwsm app -- zen-browser bind = $mainMod Control_L, 3, exec, uwsm app -- mangohud steam +bind = $mainMod Control_L, 5, exec, [float; center 1; pin; size 60% 40%] uwsm app -- kitty ~/.local/bin/start_coding.sh bind = $mainMod Control_L, 8, exec, uwsm app -- gimp -bind = $mainMod Control_L, 9, exec, uwsm app -- spotify-launcher +bind = $mainMod Control_L, 9, exec, uwsm app -- flatpak run com.spotify.Client bind = $mainMod Control_L, 0, exec, uwsm app -- obs diff --git a/private_dot_config/hypr/hyprland/binds/power.conf b/private_dot_config/hypr/hyprland/binds/power.conf index 898987c..40886cd 100644 --- a/private_dot_config/hypr/hyprland/binds/power.conf +++ b/private_dot_config/hypr/hyprland/binds/power.conf @@ -2,3 +2,4 @@ bind = $mainMod L_SHIFT ctrl, l, exec, hyprlock # lock bind = $mainMod L_SHIFT ctrl, r, exec, systemctl reboot bind = $mainMod L_SHIFT ctrl, p, exec, systemctl poweroff bind = $mainMod L_SHIFT ctrl, s, exec, pidof hyprlock || sleep 1 && systemctl sleep +bind = $mainMod L_SHIFT ctrl, m, exec, uwsm stop diff --git a/private_dot_config/hypr/hyprland/binds/windows.conf b/private_dot_config/hypr/hyprland/binds/windows.conf index 9ac5ab9..9aaf667 100644 --- a/private_dot_config/hypr/hyprland/binds/windows.conf +++ b/private_dot_config/hypr/hyprland/binds/windows.conf @@ -34,18 +34,6 @@ bind = $mainMod, 8, workspace, 8 bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 -# Switch workspaces with mainMod + alt [10-19] -bind = $mainMod L_ALT, 1, workspace, 11 -bind = $mainMod L_ALT, 2, workspace, 12 -bind = $mainMod L_ALT, 3, workspace, 13 -bind = $mainMod L_ALT, 4, workspace, 14 -bind = $mainMod L_ALT, 5, workspace, 15 -bind = $mainMod L_ALT, 6, workspace, 16 -bind = $mainMod L_ALT, 7, workspace, 17 -bind = $mainMod L_ALT, 8, workspace, 18 -bind = $mainMod L_ALT, 9, workspace, 19 -bind = $mainMod L_ALT, 0, workspace, 20 - # Move active window to a workspace with mainMod + SHIFT + [0-9] bind = $mainMod SHIFT, 1, movetoworkspace, 1 bind = $mainMod SHIFT, 2, movetoworkspace, 2 @@ -58,17 +46,6 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 -bind = $mainMod SHIFT L_ALT, 1, movetoworkspace, 11 -bind = $mainMod SHIFT L_ALT, 2, movetoworkspace, 12 -bind = $mainMod SHIFT L_ALT, 3, movetoworkspace, 13 -bind = $mainMod SHIFT L_ALT, 4, movetoworkspace, 14 -bind = $mainMod SHIFT L_ALT, 5, movetoworkspace, 15 -bind = $mainMod SHIFT L_ALT, 6, movetoworkspace, 16 -bind = $mainMod SHIFT L_ALT, 7, movetoworkspace, 17 -bind = $mainMod SHIFT L_ALT, 8, movetoworkspace, 18 -bind = $mainMod SHIFT L_ALT, 9, movetoworkspace, 19 -bind = $mainMod SHIFT L_ALT, 0, movetoworkspace, 20 - # Change display settings bindd = $mainMod, F, Make app fullscreen, fullscreen bindd = $mainMod, T, Toggle floating, togglefloating diff --git a/private_dot_config/hypr/hyprland/workspaces.conf b/private_dot_config/hypr/hyprland/workspaces.conf index 052a289..e9be0d1 100644 --- a/private_dot_config/hypr/hyprland/workspaces.conf +++ b/private_dot_config/hypr/hyprland/workspaces.conf @@ -7,3 +7,11 @@ workspace = 6, monitor:DP-1 workspace = 7, monitor:HDMI-A-2 workspace = 9, monitor:DP-2 workspace = 10, monitor:DP-2 + +# smart gaps or smt +workspace = w[tv1], gapsout:3, gapsin:3 +workspace = f[1], gapsout:3, gapsin:3 +windowrule = bordersize 1, floating:1, onworkspace:w[tv1] +windowrule = rounding 2, floating:2, onworkspace:w[tv1] +windowrule = bordersize 0, floating:0, onworkspace:f[1] +windowrule = rounding 2, floating:0, onworkspace:f[1] diff --git a/private_dot_config/nvim/lazy-lock.json b/private_dot_config/nvim/lazy-lock.json index 48af0a7..34745ca 100644 --- a/private_dot_config/nvim/lazy-lock.json +++ b/private_dot_config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" }, + "LuaSnip": { "branch": "master", "commit": "5271933f7cea9f6b1c7de953379469010ed4553a" }, "autoclose.nvim": { "branch": "main", "commit": "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, @@ -9,22 +9,22 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" }, - "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, + "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3856bbb0da214d1f2f3d5a2dd3fea26591f930f9" }, - "mason.nvim": { "branch": "main", "commit": "9eaedb864cdadc29c6eb7d761a6c0d8aee26c91b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "bef29b653ba71d442816bf56286c2a686210be04" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, "minimal.nvim": { "branch": "main", "commit": "22d837b814d3bd22625640ef63cc73b8507f291d" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "f610208989e9c03561f9f601db3133f6ae398fcd" }, - "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, - "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, + "nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" }, + "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "phpactor.nvim": { "branch": "main", "commit": "f4aba0b309f74b015f4a19a07e2befd6f1a0e6ca" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" }, - "vim-illuminate": { "branch": "master", "commit": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf" }, + "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/private_dot_local/bin/executable_start_coding.sh b/private_dot_local/bin/executable_start_coding.sh index 8bbaef8..942fdb9 100644 --- a/private_dot_local/bin/executable_start_coding.sh +++ b/private_dot_local/bin/executable_start_coding.sh @@ -4,9 +4,9 @@ dir=$(find ~/Dokumenty/kodowanie/ -maxdepth 2 -type d ! -path '.*' | fzf) if [[ -n $dir ]]; then echo "You choose $dir" - hyprctl dispatch exec [workspace 5] kitty $dir - hyprctl dispatch exec [workspace 5] kitty $dir hyprctl dispatch exec [workspace 5] kitty yazi $dir + hyprctl dispatch exec [workspace 5] kitty $dir + hyprctl dispatch exec [workspace 5] kitty $dir else echo "No reasonable directory selected, bye bye :P" fi