Compare commits
4 Commits
273941e2d7
...
dfcdcec184
| Author | SHA1 | Date | |
|---|---|---|---|
| dfcdcec184 | |||
| ab7ec26b22 | |||
| f601c02cad | |||
| c15f2b2dae |
@ -117,7 +117,7 @@
|
|||||||
#slang=en
|
#slang=en
|
||||||
|
|
||||||
# Play Finnish audio if available, fall back to English otherwise.
|
# Play Finnish audio if available, fall back to English otherwise.
|
||||||
#alang=fi,en
|
alang=en
|
||||||
|
|
||||||
# Change subtitle encoding. For Arabic subtitles use 'cp1256'.
|
# Change subtitle encoding. For Arabic subtitles use 'cp1256'.
|
||||||
# If the file seems to be valid UTF-8, prefer UTF-8.
|
# If the file seems to be valid UTF-8, prefer UTF-8.
|
||||||
@ -142,3 +142,5 @@
|
|||||||
--sub-auto=all
|
--sub-auto=all
|
||||||
|
|
||||||
--sub-file-paths=sub:subtitles
|
--sub-file-paths=sub:subtitles
|
||||||
|
|
||||||
|
sub-scale=1.5
|
||||||
|
|||||||
@ -3,9 +3,11 @@ return {
|
|||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
build = ":TSUpdate",
|
build = ":TSUpdate",
|
||||||
lazy = false,
|
lazy = false,
|
||||||
|
branch = 'main',
|
||||||
-- init = function(plugin)
|
-- init = function(plugin)
|
||||||
-- require("nvim-treesitter")
|
-- require("nvim-treesitter")
|
||||||
-- end,
|
-- end,
|
||||||
|
-- TODO: old options format, need to reconfigure
|
||||||
opts = {
|
opts = {
|
||||||
ensure_installed = { "python", "rust", "javascript" }, -- one of "all" or a list of languages
|
ensure_installed = { "python", "rust", "javascript" }, -- one of "all" or a list of languages
|
||||||
ignore_install = { "phpdoc", "comment", "rst" }, -- List of parsers to ignore installing
|
ignore_install = { "phpdoc", "comment", "rst" }, -- List of parsers to ignore installing
|
||||||
@ -34,8 +36,13 @@ return {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
config = function (_, opts)
|
config = function(_, opts)
|
||||||
require("nvim-treesitter.configs").setup(opts)
|
-- enable treesitter highlighting
|
||||||
|
vim.api.nvim_create_autocmd("FileType", {
|
||||||
|
callback = function(args)
|
||||||
|
pcall(vim.treesitter.start, args.buf)
|
||||||
|
end,
|
||||||
|
})
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,7 +2,8 @@
|
|||||||
set $mod Mod4
|
set $mod Mod4
|
||||||
set $term alacritty
|
set $term alacritty
|
||||||
# set $menu tofi-drun | xargs swaymsg exec --
|
# set $menu tofi-drun | xargs swaymsg exec --
|
||||||
set $menu tofi_prefix_hack && tofi-drun | xargs swaymsg exec --
|
# set $menu tofi_prefix_hack && tofi-drun | xargs swaymsg exec --
|
||||||
|
set $menu j4-dmenu-desktop --i3-ipc --dmenu=bemenu
|
||||||
|
|
||||||
set $left h
|
set $left h
|
||||||
set $down j
|
set $down j
|
||||||
@ -28,10 +29,12 @@ exec xrandr --output DP-2 --primary
|
|||||||
|
|
||||||
# set swaysock env to make swaymsg commands accessible for systemd
|
# set swaysock env to make swaymsg commands accessible for systemd
|
||||||
exec --no-startup-id systemctl --user set-environment SWAYSOCK=$SWAYSOCK
|
exec --no-startup-id systemctl --user set-environment SWAYSOCK=$SWAYSOCK
|
||||||
|
exec --no-startup-id systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS
|
||||||
|
|
||||||
bar {
|
bar {
|
||||||
id 1
|
id 1
|
||||||
mode hide
|
# TODO enable after bemenu focus bug fix
|
||||||
|
# mode hide
|
||||||
tray_output none
|
tray_output none
|
||||||
font Hack Nerd Font 9
|
font Hack Nerd Font 9
|
||||||
status_command "~/Scripts/sway/bar.sh"
|
status_command "~/Scripts/sway/bar.sh"
|
||||||
@ -53,7 +56,7 @@ output HDMI-A-2 position 4480 360 mode 1920x1080@60Hz disable
|
|||||||
# input configuration
|
# input configuration
|
||||||
# you can get the names of your inputs by running: swaymsg -t get_inputs
|
# you can get the names of your inputs by running: swaymsg -t get_inputs
|
||||||
# read `man 5 sway-input` for more information about this section.
|
# read `man 5 sway-input` for more information about this section.
|
||||||
input type:pointer {
|
input "1133:16505:Logitech_G_Pro" {
|
||||||
pointer_accel 0
|
pointer_accel 0
|
||||||
accel_profile "flat"
|
accel_profile "flat"
|
||||||
}
|
}
|
||||||
@ -169,6 +172,14 @@ workspace 28 output HDMI-A-1
|
|||||||
workspace 29 output HDMI-A-1
|
workspace 29 output HDMI-A-1
|
||||||
|
|
||||||
workspace 31 output HDMI-A-2
|
workspace 31 output HDMI-A-2
|
||||||
|
workspace 32 output HDMI-A-2
|
||||||
|
workspace 33 output HDMI-A-2
|
||||||
|
workspace 34 output HDMI-A-2
|
||||||
|
workspace 35 output HDMI-A-2
|
||||||
|
workspace 36 output HDMI-A-2
|
||||||
|
workspace 37 output HDMI-A-2
|
||||||
|
workspace 38 output HDMI-A-2
|
||||||
|
workspace 39 output HDMI-A-2
|
||||||
|
|
||||||
# move mouse to focused window/workspace
|
# move mouse to focused window/workspace
|
||||||
mouse_warping output
|
mouse_warping output
|
||||||
@ -225,6 +236,17 @@ bindsym --to-code --no-warn $mod+Alt+7 workspace 27
|
|||||||
bindsym --to-code --no-warn $mod+Alt+8 workspace 28
|
bindsym --to-code --no-warn $mod+Alt+8 workspace 28
|
||||||
bindsym --to-code --no-warn $mod+Alt+9 workspace 29
|
bindsym --to-code --no-warn $mod+Alt+9 workspace 29
|
||||||
|
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+1 workspace 31
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+2 workspace 32
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+3 workspace 33
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+4 workspace 34
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+5 workspace 35
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+6 workspace 36
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+7 workspace 37
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+8 workspace 38
|
||||||
|
bindsym --to-code --no-warn $mod+Ctrl+9 workspace 39
|
||||||
|
|
||||||
|
|
||||||
# does not work,
|
# does not work,
|
||||||
# bindsym --to-code --no-warn $mod+Shift_R+1 workspace 21
|
# bindsym --to-code --no-warn $mod+Shift_R+1 workspace 21
|
||||||
# bindsym --to-code --no-warn $mod+Shift_R+2 workspace 22
|
# bindsym --to-code --no-warn $mod+Shift_R+2 workspace 22
|
||||||
@ -273,13 +295,22 @@ bindsym --to-code $mod+Shift+bracketleft exec playerctl -p mpd volume 0.05-
|
|||||||
bindsym --to-code $mod+Shift+bracketright exec playerctl -p mpd volume 0.05+
|
bindsym --to-code $mod+Shift+bracketright exec playerctl -p mpd volume 0.05+
|
||||||
bindsym --to-code $mod+Shift+y exec playerctl -p mpd shuffle Toggle
|
bindsym --to-code $mod+Shift+y exec playerctl -p mpd shuffle Toggle
|
||||||
|
|
||||||
set $sink "alsa_output.pci-0000_29_00.0.analog-stereo"
|
set $sink_pc "alsa_output.pci-0000_29_00.0.analog-stereo"
|
||||||
|
set $sink_tv "alsa_output.pci-0000_2f_00.1.hdmi-stereo-extra3"
|
||||||
|
set $sink_combined "combined_output"
|
||||||
|
|
||||||
# special keys to adjust volume via pulseaudio
|
# special keys to adjust volume via pulseaudio
|
||||||
bindsym --to-code --locked XF86AudioMute exec pactl set-sink-mute $sink toggle
|
bindsym --to-code --locked XF86AudioMute exec pactl set-sink-mute $sink_pc toggle
|
||||||
bindsym --to-code --locked XF86AudioLowerVolume exec pactl set-sink-volume $sink -5%
|
|
||||||
bindsym --to-code --locked XF86AudioRaiseVolume exec pactl set-sink-volume $sink +5%
|
bindsym --to-code --locked XF86AudioLowerVolume exec pactl set-sink-volume $sink_pc -5%
|
||||||
bindsym --to-code --locked XF86AudioMicMute exec pactl set-source-mute $sink toggle
|
bindsym --to-code --locked XF86AudioRaiseVolume exec pactl set-sink-volume $sink_pc +5%
|
||||||
|
|
||||||
|
bindsym --to-code --locked $mod+XF86AudioLowerVolume exec pactl set-sink-volume $sink_tv -2.5%
|
||||||
|
bindsym --to-code --locked $mod+XF86AudioRaiseVolume exec pactl set-sink-volume $sink_tv +2.5%
|
||||||
|
|
||||||
|
bindsym --to-code --locked $mod+XF86AudioMute exec pactl set-sink-mute $sink_tv toggle
|
||||||
|
|
||||||
|
bindsym --to-code --locked XF86AudioMicMute exec pactl set-source-mute $sink_pc toggle
|
||||||
bindsym --to-code --locked XF86AudioPlay exec playerctl play-pause
|
bindsym --to-code --locked XF86AudioPlay exec playerctl play-pause
|
||||||
bindsym --to-code --locked XF86AudioPause exec playerctl play-pause
|
bindsym --to-code --locked XF86AudioPause exec playerctl play-pause
|
||||||
bindsym --to-code --locked XF86AudioNext exec playerctl next
|
bindsym --to-code --locked XF86AudioNext exec playerctl next
|
||||||
|
|||||||
@ -8,6 +8,9 @@ export XDG_SESSION_TYPE=wayland
|
|||||||
export HOMEBREW_NO_AUTO_UPDATE=true
|
export HOMEBREW_NO_AUTO_UPDATE=true
|
||||||
export ELECTRON_OZONE_PLATFORM_HINT=auto
|
export ELECTRON_OZONE_PLATFORM_HINT=auto
|
||||||
|
|
||||||
|
export BEMENU_SCALE='1.1'
|
||||||
|
export BEMENU_OPTS='--tf #7bc6e2 --hf #7bc6e2 --fn "Input Mono" 12 --hp 8 --ignorecase --single-instance --wrap'
|
||||||
|
|
||||||
if command -v dbus-update-activation-environment >/dev/null; then
|
if command -v dbus-update-activation-environment >/dev/null; then
|
||||||
dbus-update-activation-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE
|
dbus-update-activation-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user