Compare commits
2 Commits
fe0c7e7630
...
07de246f77
Author | SHA1 | Date | |
---|---|---|---|
07de246f77 | |||
e04c89b57a |
@ -66,32 +66,21 @@ cmp.setup{
|
|||||||
mapping = {
|
mapping = {
|
||||||
-- ["<cr>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Replace}),
|
-- ["<cr>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Replace}),
|
||||||
["<Tab>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Insert}),
|
["<Tab>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Insert}),
|
||||||
-- ["<Tab>"] = cmp.mapping(function(fallback)
|
|
||||||
-- if vim.fn.pumvisible() == 1 then
|
|
||||||
-- feedkey("<C-n>", "n")
|
|
||||||
-- elseif vim.fn["vsnip#available"]() == 1 then
|
|
||||||
-- feedkey("<Plug>(vsnip-expand-or-jump)", "")
|
|
||||||
-- elseif has_words_before() then
|
|
||||||
-- cmp.complete()
|
|
||||||
-- else
|
|
||||||
-- fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
|
|
||||||
-- end
|
|
||||||
-- end, { "i", "s" }),
|
|
||||||
|
|
||||||
-- ["<S-Tab>"] = cmp.mapping(function()
|
|
||||||
-- if vim.fn.pumvisible() == 1 then
|
|
||||||
-- feedkey("<C-p>", "n")
|
|
||||||
-- elseif vim.fn["vsnip#jumpable"](-1) == 1 then
|
|
||||||
-- feedkey("<Plug>(vsnip-jump-prev)", "")
|
|
||||||
-- end
|
|
||||||
-- end, { "i", "s" }),
|
|
||||||
},
|
},
|
||||||
sources = {
|
sources = {
|
||||||
{ name = 'vsnip' },
|
{ name = 'vsnip' },
|
||||||
{ name = 'nvim_lsp' },
|
{ name = 'nvim_lsp' },
|
||||||
{ name = 'path' },
|
{ name = 'path' },
|
||||||
{ name = 'buffer', keyword_length = 4 },
|
{
|
||||||
{ name = 'spell', keyword_length = 4 },
|
name = 'buffer',
|
||||||
|
keyword_length = 4,
|
||||||
|
keyword_pattern = [[\d\@!\k\k*]],
|
||||||
|
options = {
|
||||||
|
-- keyword_pattern = [[\k\+]]-- for non ascii caracters
|
||||||
|
keyword_pattern = [[\d\@!\k\k*]],
|
||||||
|
}
|
||||||
|
},
|
||||||
|
-- { name = 'spell', keyword_length = 4 },
|
||||||
},
|
},
|
||||||
experimental = {
|
experimental = {
|
||||||
-- I like the new menu better! Nice work hrsh7th
|
-- I like the new menu better! Nice work hrsh7th
|
||||||
|
@ -5,8 +5,8 @@ require'nvim-treesitter.configs'.setup {
|
|||||||
enable = true,
|
enable = true,
|
||||||
},
|
},
|
||||||
indent = {
|
indent = {
|
||||||
enable = true,
|
enable = false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
vim.opt.foldmethod = "expr"
|
-- vim.opt.foldmethod = "expr"
|
||||||
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
-- vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||||
|
@ -128,9 +128,9 @@ bindsym $mod+Shift+Right move right
|
|||||||
#
|
#
|
||||||
# Workspaces:
|
# Workspaces:
|
||||||
#
|
#
|
||||||
set $ws1 1:
|
set $ws1 1:
|
||||||
set $ws2 2:
|
set $ws2 2:
|
||||||
set $ws3 3:
|
set $ws3 3:
|
||||||
set $ws4 4:
|
set $ws4 4:
|
||||||
set $ws5 5:
|
set $ws5 5:
|
||||||
set $ws6 6:
|
set $ws6 6:
|
||||||
@ -155,6 +155,10 @@ bindsym $mod+6 move container to workspace $ws6
|
|||||||
bindsym $mod+7 move container to workspace $ws7
|
bindsym $mod+7 move container to workspace $ws7
|
||||||
bindsym $mod+8 move container to workspace 8
|
bindsym $mod+8 move container to workspace 8
|
||||||
bindsym $mod+9 move container to workspace 9
|
bindsym $mod+9 move container to workspace 9
|
||||||
|
|
||||||
|
|
||||||
|
bindsym $mod+Ctrl+greater move workspace to output right
|
||||||
|
bindsym $mod+Ctrl+less move workspace to output left
|
||||||
#
|
#
|
||||||
# Layout stuff:
|
# Layout stuff:
|
||||||
#
|
#
|
||||||
@ -196,10 +200,6 @@ bindsym $mod+9 move container to workspace 9
|
|||||||
# Resizing containers:
|
# Resizing containers:
|
||||||
#
|
#
|
||||||
mode "resize" {
|
mode "resize" {
|
||||||
# left will shrink the containers width
|
|
||||||
# right will grow the containers width
|
|
||||||
# up will shrink the containers height
|
|
||||||
# down will grow the containers height
|
|
||||||
bindsym $left resize shrink width 10px
|
bindsym $left resize shrink width 10px
|
||||||
bindsym $down resize grow height 10px
|
bindsym $down resize grow height 10px
|
||||||
bindsym $up resize shrink height 10px
|
bindsym $up resize shrink height 10px
|
||||||
@ -245,8 +245,8 @@ client.focused #d65d0e #be5046 #ffffff #be5046 #be5046
|
|||||||
#
|
#
|
||||||
# Read `man 5 sway-bar` for more information about this section.
|
# Read `man 5 sway-bar` for more information about this section.
|
||||||
bar {
|
bar {
|
||||||
position top
|
# position top
|
||||||
output $laptopScreen
|
# output $laptopScreen
|
||||||
swaybar_command waybar
|
swaybar_command waybar
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,9 @@ exec_always /usr/libexec/goa-daemon --replace
|
|||||||
exec gammastep-indicator
|
exec gammastep-indicator
|
||||||
exec mako
|
exec mako
|
||||||
exec "avizo-service"
|
exec "avizo-service"
|
||||||
exec_always pkill kanshi; exec_always kanshi
|
|
||||||
|
#exec_always pkill kanshi; exec_always kanshi
|
||||||
|
exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"
|
||||||
|
|
||||||
exec swaymsg "workspace $ws1; exec firefox;"
|
exec swaymsg "workspace $ws1; exec firefox;"
|
||||||
exec swaymsg "workspace $ws2; exec thunderbird;"
|
exec swaymsg "workspace $ws2; exec thunderbird;"
|
||||||
|
11
sway/.config/systemd/user/kanshi.service
Normal file
11
sway/.config/systemd/user/kanshi.service
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Dynamic output configuration for Wayland compositors
|
||||||
|
Documentation=https://sr.ht/~emersion/kanshi
|
||||||
|
BindsTo=sway-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
ExecStart=/usr/bin/kanshi
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sway-session.target
|
6
sway/.config/systemd/user/sway-session.target
Normal file
6
sway/.config/systemd/user/sway-session.target
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Sway compositor session
|
||||||
|
Documentation=man:systemd.special
|
||||||
|
BindsTo=graphical-session.target
|
||||||
|
Wants=graphical-session-pre.target
|
||||||
|
After=graphical-session-pre.target
|
@ -0,0 +1 @@
|
|||||||
|
/home/lafrite/.config/systemd/user/kanshi.service
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"layer": "top",
|
"layer": "top",
|
||||||
"output": "eDP-1",
|
"output": "eDP-1",
|
||||||
|
"height": 30,
|
||||||
"modules-left": ["sway/workspaces", "sway/mode"],
|
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||||
"modules-center": ["sway/window"],
|
"modules-center": ["sway/window"],
|
||||||
"modules-right": ["pulseaudio", "battery", "tray", "clock"],
|
"modules-right": ["pulseaudio", "battery", "tray", "clock"],
|
||||||
@ -8,7 +9,7 @@
|
|||||||
"max-length": 50
|
"max-length": 50
|
||||||
},
|
},
|
||||||
"sway/workspaces": {
|
"sway/workspaces": {
|
||||||
|
"all-outputs": true
|
||||||
},
|
},
|
||||||
"battery": {
|
"battery": {
|
||||||
"states": {
|
"states": {
|
||||||
@ -25,15 +26,8 @@
|
|||||||
"format-icons": ["", "", "", "", ""]
|
"format-icons": ["", "", "", "", ""]
|
||||||
},
|
},
|
||||||
"clock": {
|
"clock": {
|
||||||
"format": "{:%a, %d. %b %H:%M}"
|
"format": "{:%a, %d. %b %H:%M}",
|
||||||
},
|
"on-click": "gnome-calendar"
|
||||||
"network": {
|
|
||||||
"format-wifi": "{essid} ({signalStrength}%) ",
|
|
||||||
"format-ethernet": "{ipaddr}/{cidr} ",
|
|
||||||
"tooltip-format": "{ifname} via {gwaddr} ",
|
|
||||||
"format-linked": "{ifname} (No IP) ",
|
|
||||||
"format-disconnected": "Disconnected ⚠",
|
|
||||||
"format-alt": "{ifname}: {ipaddr}/{cidr}"
|
|
||||||
},
|
},
|
||||||
"pulseaudio": {
|
"pulseaudio": {
|
||||||
// "scroll-step": 1, // %, can be a float
|
// "scroll-step": 1, // %, can be a float
|
||||||
@ -54,4 +48,8 @@
|
|||||||
},
|
},
|
||||||
"on-click": "pavucontrol"
|
"on-click": "pavucontrol"
|
||||||
},
|
},
|
||||||
|
"tray": {
|
||||||
|
"icon-size": 21,
|
||||||
|
"spacing": 10,
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
font-family: Droid Nerd Font Mono;
|
font-family: Droid Nerd Font Mono;
|
||||||
font-size: 13px;
|
font-size: 14px;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user