save changes before deletion

This commit is contained in:
Grigory Shipunov 2023-07-24 00:01:29 +02:00
parent 9774e55719
commit 0e98db206c
16 changed files with 395 additions and 169 deletions

View file

@ -6,26 +6,21 @@ font=Ttyp0:pixelsize=13
color = 000000 ffff00
[colors]
foreground = b2b2b2
background = 080808
selection-foreground = 080808
selection-background = b2ceee
regular0 = 323437
regular1 = ff5454
regular2 = 8cc85f
regular3 = e3c78a
regular4 = 80a0ff
regular5 = d183e8
regular6 = 79dac8
regular7 = c6c6c6
bright0 = 949494
bright1 = ff5189
bright2 = 36c692
bright3 = c2c292
bright4 = 74b2ff
bright5 = ae81ff
bright6 = 85dc85
bright7 = e4e4e4
foreground=dcdccc
background=111111
regular0=222222
regular1=cc9393
regular2=7f9f7f
regular3=d0bf8f
regular4=6ca0a3
regular5=dc8cc3
regular6=93e0e3
regular7=dcdccc
bright0=666666
bright1=dca3a3
bright2=bfebbf
bright3=f0dfaf
bright4=8cd0d3
bright5=fcace3
bright6=b3ffff
bright7=ffffff

View file

@ -4,6 +4,6 @@ text/html; links -html-numbered-links 1 -html-images 1 -dump 'file://%s'; copiou
image/*; imv %s ;
video/*; setsid mpv --quiet %s &; copiousoutput
audio/*; mpv %s ;
application/pdf; zathura %s ;
application/pdf; evince %s ;
application/pgp-encrypted; gpg -d '%s'; copiousoutput;
application/pgp-keys; gpg --import '%s'; copiousoutput;

View file

@ -79,6 +79,5 @@ augroup highlight_yank
autocmd!
au TextYankPost * silent! lua vim.highlight.on_yank { higroup='IncSearch', timeout=200 }
augroup END
]])

View file

@ -62,7 +62,7 @@ vim.diagnostic.config({ float = { border = "single" } })
-- Setting up servers per language
-- Default nvim-lsp setup: nil, clangd
local servers = { 'nil_ls', 'clangd' }
local servers = { 'nil_ls', 'clangd', 'texlab' }
for _, serv in ipairs(servers) do
nvim_lsp[serv].setup{

View file

@ -4,7 +4,7 @@ vim.cmd([[set noshowmode]])
return require('lualine').setup {
options = {
icons_enabled = true,
theme = 'moonfly',
--theme = 'everforest',
-- section_separators = '',
-- component_seaparators = '',
}

View file

@ -41,7 +41,10 @@ return require('packer').startup(function(use)
'lervag/vimtex',
ft = { 'tex' },
-- do not conceal stuff
config = function() vim.cmd([[ let g:tex_conceal = '' ]]) end,
config = function() vim.cmd([[
let g:tex_conceal = ''
autocmd FileType tex nnoremap <localleader>= :VimtexTocToggle<CR>
]]) end,
}
use 'lepture/vim-jinja'
use 'neomutt/neomutt.vim'
@ -60,11 +63,30 @@ return require('packer').startup(function(use)
}
-- pretty bits
-- use {
-- '/home/grue/projects/zen-footburn.nvim',
-- config = function()
-- vim.cmd([[
-- set termguicolors
-- colorscheme zenburn
-- ]])
-- end,
-- }
-- use {
-- 'sainnhe/everforest',
-- config = function()
-- vim.cmd([[
-- set termguicolors
-- let g:everforest_transparent_background = 2
-- colorscheme everforest
-- ]])
-- end,
-- }
use {
'bluz71/vim-moonfly-colors',
'jeffkreeftmeijer/vim-dim',
config = function()
vim.cmd([[ set termguicolors
colorscheme moonfly
vim.cmd([[
colorscheme dim
]])
end,
}
@ -79,97 +101,104 @@ return require('packer').startup(function(use)
vim.keymap.set('n', '<Leader>t', require('whitespace-nvim').trim)
end
}
use {
'nvim-lualine/lualine.nvim',
requires = { 'kyazdani42/nvim-web-devicons', opt = true },
after = { 'vim-moonfly-colors' },
config = function()
require('lualine_setup')
end,
}
-- use {
-- 'nvim-lualine/lualine.nvim',
-- requires = { 'kyazdani42/nvim-web-devicons', opt = true },
-- after = { 'zen-footburn.nvim' },
-- config = function()
-- -- this now handled by the lualine
-- vim.cmd([[set noshowmode]])
-- return require('lualine').setup {
-- options = {
-- icons_enabled = true,
-- theme = 'zenburn',
-- -- section_separators = '',
-- -- component_seaparators = '',
-- }
-- }
-- end,
-- }
-- Git
use 'tpope/vim-fugitive'
use {
'lewis6991/gitsigns.nvim',
config = function()
vim.cmd([[set signcolumn=yes]])
require('gitsigns').setup()
end,
}
-- Nifty stuff
use 'tpope/vim-surround'
use 'airblade/vim-rooter'
-- use 'airblade/vim-rooter'
-- use {
-- 'ibhagwan/fzf-lua',
-- config = setup_fzf(),
-- 'nvim-telescope/telescope.nvim',
-- branch = '0.1.x',
-- requires = { { 'nvim-lua/plenary.nvim' } },
-- config = function()
-- require('telescope').setup{
-- pickers = {
-- find_files = {
-- theme = "dropdown",
-- }
-- }
-- }
-- local builtin = require('telescope.builtin')
-- vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-- vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-- vim.keymap.set('n', '<leader>b', builtin.buffers, {})
-- vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
-- end,
-- }
use {
'nvim-telescope/telescope.nvim',
branch = '0.1.x',
requires = { { 'nvim-lua/plenary.nvim' } },
config = function()
require('telescope').setup{
pickers = {
find_files = {
theme = "dropdown",
}
}
}
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
vim.keymap.set('n', '<leader>b', builtin.buffers, {})
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
end,
}
-- completion
use {
'hrsh7th/nvim-cmp',
requires = {
-- completion sources
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-buffer',
'hrsh7th/cmp-path',
'hrsh7th/cmp-nvim-lua',
'dcampos/nvim-snippy',
'dcampos/cmp-snippy'
},
config = function()
require('completion')
end,
}
-- use {
-- 'hrsh7th/nvim-cmp',
-- requires = {
-- -- completion sources
-- 'hrsh7th/cmp-nvim-lsp',
-- 'hrsh7th/cmp-buffer',
-- 'hrsh7th/cmp-path',
-- 'hrsh7th/cmp-nvim-lua',
-- 'dcampos/nvim-snippy',
-- 'dcampos/cmp-snippy'
-- },
-- config = function()
-- require('completion')
-- end,
-- }
use {
'dcampos/nvim-snippy',
config = function()
require'snippy'.setup({
mappings = {
is = {
['<Tab>'] = 'expand_or_advance',
['<S-Tab>'] = 'previous',
},
nx = {
['<leader>x'] = 'cut_text',
},
},
})
end,
}
use 'dcampos/cmp-snippy'
use 'honza/vim-snippets'
-- use {
-- 'dcampos/nvim-snippy',
-- config = function()
-- require'snippy'.setup({
-- mappings = {
-- is = {
-- ['<Tab>'] = 'expand_or_advance',
-- ['<S-Tab>'] = 'previous',
-- },
-- nx = {
-- ['<leader>x'] = 'cut_text',
-- },
-- },
-- })
-- end,
-- }
-- use 'dcampos/cmp-snippy'
-- use 'honza/vim-snippets'
-- neovim VSCode edition
use {
'neovim/nvim-lspconfig',
after = { 'nvim-cmp' },
requires = { 'simrat39/rust-tools.nvim' },
config = function()
require'lsp_setup'
end,
}
-- use {
-- 'neovim/nvim-lspconfig',
-- after = { 'nvim-cmp' },
-- requires = { 'simrat39/rust-tools.nvim' },
-- config = function()
-- require'lsp_setup'
-- end,
-- }
use {
'jamessan/vim-gnupg',

View file

@ -1,7 +1,7 @@
local ts_conf = require('nvim-treesitter.configs')
ts_conf.setup {
ensure_installed = "all",
ensure_installed = { "vim", "vimdoc", "rust", "nix", "latex" },
highlight = {
enable = true,
},

View file

@ -8,46 +8,182 @@ font:
family: Iosevka
bold_italic:
family: Iosevka
#draw_bold_text_with_bright_colors: true
# Colors
colors:
# Default colors
primary:
background: '#080808'
foreground: '#b2b2b2'
bright_foreground: '#eeeeee'
schemes:
moonfly: &moonfly
# Default colors
primary:
background: '#080808'
foreground: '#b2b2b2'
bright_foreground: '#eeeeee'
# Cursor colors
cursor:
text: '#000000'
cursor: '#ffff00'
# Cursor colors
cursor:
text: '#000000'
cursor: '#ffff00'
# Selection colors
selection:
text: '#080808'
background: '#b2ceee'
# Selection colors
selection:
text: '#080808'
background: '#b2ceee'
# Normal colors
normal:
black: '#323437'
red: '#ff5454'
green: '#8cc85f'
yellow: '#e3c78a'
blue: '#80a0ff'
magenta: '#cf87e8'
cyan: '#79dac8'
white: '#c6c6c6'
# Normal colors
normal:
black: '#323437'
red: '#ff5454'
green: '#8cc85f'
yellow: '#e3c78a'
blue: '#80a0ff'
magenta: '#cf87e8'
cyan: '#79dac8'
white: '#c6c6c6'
# Bright colors
bright:
black: '#949494'
red: '#ff5189'
green: '#36c692'
yellow: '#c2c292'
blue: '#74b2ff'
magenta: '#ae81ff'
cyan: '#85dc85'
white: '#e4e4e4'
# Bright colors
bright:
black: '#949494'
red: '#ff5189'
green: '#36c692'
yellow: '#c2c292'
blue: '#74b2ff'
magenta: '#ae81ff'
cyan: '#85dc85'
white: '#e4e4e4'
everforest_dark_hard: &everforest_dark_hard
primary:
background: '#272e33'
foreground: '#d3c6aa'
normal:
black: '#414b50'
red: '#e67e80'
green: '#a7c080'
yellow: '#dbbc7f'
blue: '#7fbbb3'
magenta: '#d699b6'
cyan: '#83c092'
white: '#d3c6aa'
bright:
black: '#475258'
red: '#e67e80'
green: '#a7c080'
yellow: '#dbbc7f'
blue: '#7fbbb3'
magenta: '#d699b6'
cyan: '#83c092'
white: '#d3c6aa'
everforest_dark_medium: &everforest_dark_medium
primary:
background: '#2d353b'
foreground: '#d3c6aa'
normal:
black: '#475258'
red: '#e67e80'
green: '#a7c080'
yellow: '#dbbc7f'
blue: '#7fbbb3'
magenta: '#d699b6'
cyan: '#83c092'
white: '#d3c6aa'
bright:
black: '#475258'
red: '#e67e80'
green: '#a7c080'
yellow: '#dbbc7f'
blue: '#7fbbb3'
magenta: '#d699b6'
cyan: '#83c092'
white: '#d3c6aa'
everforest_dark_soft: &everforest_dark_soft
primary:
background: '#333c43'
foreground: '#d3c6aa'
normal:
black: '#4d5960'
red: '#e67e80'
green: '#a7c080'
yellow: '#dbbc7f'
blue: '#7fbbb3'
magenta: '#d699b6'
cyan: '#83c092'
white: '#d3c6aa'
bright:
black: '#4d5960'
red: '#e67e80'
green: '#a7c080'
yellow: '#dbbc7f'
blue: '#7fbbb3'
magenta: '#d699b6'
cyan: '#83c092'
white: '#d3c6aa'
everforest_light_hard: &everforest_light_hard
primary:
background: '#fffbef'
foreground: '#5c6a72'
normal:
black: '#5c6a72'
red: '#f85552'
green: '#8da101'
yellow: '#dfa000'
blue: '#3a94c5'
magenta: '#df69ba'
cyan: '#35a77c'
white: '#e8e5d5'
bright:
black: '#5c6a72'
red: '#f85552'
green: '#8da101'
yellow: '#dfa000'
blue: '#3a94c5'
magenta: '#df69ba'
cyan: '#35a77c'
white: '#e8e5d5'
everforest_light_medium: &everforest_light_medium
primary:
background: '#fdf6e3'
foreground: '#5c6a72'
normal:
black: '#5c6a72'
red: '#f85552'
green: '#8da101'
yellow: '#dfa000'
blue: '#3a94c5'
magenta: '#df69ba'
cyan: '#35a77c'
white: '#e0dcc7'
bright:
black: '#5c6a72'
red: '#f85552'
green: '#8da101'
yellow: '#dfa000'
blue: '#3a94c5'
magenta: '#df69ba'
cyan: '#35a77c'
white: '#e0dcc7'
everforest_light_soft: &everforest_light_soft
primary:
background: '#f3ead3'
foreground: '#5c6a72'
normal:
black: '#5c6a72'
red: '#f85552'
green: '#8da101'
yellow: '#dfa000'
blue: '#3a94c5'
magenta: '#df69ba'
cyan: '#35a77c'
white: '#d8d3ba'
bright:
black: '#5c6a72'
red: '#f85552'
green: '#8da101'
yellow: '#dfa000'
blue: '#3a94c5'
magenta: '#df69ba'
cyan: '#35a77c'
white: '#d8d3ba'
# Apply
colors: *everforest_dark_hard

View file

@ -1,9 +1,16 @@
[theme]
theme = "moonfly"
theme = "foot"
[icons]
icons = "awesome6"
[[block]]
block = "time"
format = " $icon $timestamp.datetime(f:'%a %F %R', l:nl_NL) "
[block.theme_overrides]
idle_bg = { link = "idle_fg" }
idle_fg = { link = "idle_bg" }
[[block]]
block = "maildir"
interval = 60
@ -12,7 +19,7 @@ threshold_critical = 1
display_type = "new"
[[block.click]]
button = "left"
cmd = "alacritty --class floating-foot -o \"window.dimensions.columns=150\" -o \"window.dimensions.lines=50\" -e zsh -c neomutt"
cmd = "foot --app-id floating-foot --window-size-chars=150x50 -- zsh -c neomutt"
[[block]]
block = "maildir"
@ -23,7 +30,7 @@ threshold_critical = 10
display_type = "new"
[[block.click]]
button = "left"
cmd = "alacritty --class floating-foot -o \"window.dimensions.columns=150\" -o \"window.dimensions.lines=50\" -e zsh -c neomutt"
cmd = "foot --app-id floating-foot --window-size-chars=150x50 -- zsh -c neomutt"
[[block]]
block = "backlight"
@ -60,12 +67,22 @@ format = " $icon $frequency $barchart $utilization "
block = "load"
format = " $1m.eng(w:4) $5m.eng(w:4) $15m.eng(w:4) "
[[block]]
block = "bluetooth"
mac = "88:C9:E8:CE:69:9F"
[[block.click]]
button = "left"
cmd = "bluetoothctl connect 88:C9:E8:CE:69:9F"
[[block.click]]
button = "right"
cmd = "bluetoothctl disconnect 88:C9:E8:CE:69:9F"
[[block]]
block = "sound"
headphones_indicator = true
[[block.click]]
button = "left"
cmd = "alacritty --class floating-foot -e zsh -c pulsemixer"
cmd = "foot --app-id floating-foot --window-size-chars=150x50 -- zsh -c pulsemixer"
[[block]]
block = "keyboard_layout"
@ -76,7 +93,3 @@ block = "battery"
driver = "upower"
format = " $icon $percentage $time "
if_command = "test -e /sys/class/power_supply/BAT0"
[[block]]
block = "time"
format = " $icon $timestamp.datetime(f:'%a %F %R', l:nl_NL) "

View file

@ -0,0 +1,15 @@
idle_bg = "#2d353b"
idle_fg = "#d3c6aa"
good_fg = "#a7c080"
info_fg = "#dbbc7f"
warning_fg = "#e69875"
critical_bg = "#e67e80"
critical_fg = "#d3c6aa"
separator = "/"
separator_fg = "#d3c6aa"
separator_bg = "#2d353b"

View file

@ -13,6 +13,7 @@ warning_fg = "#111111"
critical_bg = "#fcace3"
critical_fg = "#111111"
separator = "/"
separator = "░"
# separator = "█"
separator_fg = "#ffffff"
separator_bg = "#111111"

View file

@ -1,7 +1,14 @@
# Default
profile {
output eDP-1 enable
}
# Home
profile {
output eDP-1 disable
output DP-9 enable
output eDP-1 enable enable position -1920,960
output "LG Electronics LG HDR 4K 0x00000CA7" enable mode 3840x2160 position 0,0
}
# Work
profile {
output eDP-1 enable position 0,1200
output "Samsung Electric Company LF24T450G HNMTA01726" enable mode 1920x1200 position 0,0
}

View file

@ -0,0 +1 @@
hwdec=auto

View file

@ -14,8 +14,8 @@ set $down j
set $up k
set $right l
# Your preferred terminal emulator
set $term alacritty
set $floatterm alacritty --class floating-foot -e
set $term foot
set $floatterm foot --app-id floating-foot
set $lock $HOME/.config/sway/lock.sh
# Your preferred application launcher
@ -27,7 +27,9 @@ set $menu rofi -show combi | xargs swaymsg exec --
#
# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)
# output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
output * bg ./wall.jpg fill
output * bg /home/grue/Pictures/tiles/23.png tile
# output * bg /home/grue/Pictures/paper.jpg fill
#
# Example configuration:
#
@ -105,12 +107,12 @@ seat * hide_cursor 5000
bindsym --to-code $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
# Brightness
bindsym --to-code XF86MonBrightnessDown exec "brightnessctl set 5%-"
bindsym --to-code XF86MonBrightnessUp exec "brightnessctl set +5%"
bindsym --to-code --locked XF86MonBrightnessDown exec "brightnessctl set 5%-"
bindsym --to-code --locked XF86MonBrightnessUp exec "brightnessctl set +5%"
# Volume
bindsym --to-code XF86AudioRaiseVolume exec 'pamixer -i 1'
bindsym --to-code XF86AudioLowerVolume exec 'pamixer -d 1'
bindsym --to-code XF86AudioMute exec 'pamixer -t'
bindsym --to-code --locked XF86AudioRaiseVolume exec 'pamixer -i 1'
bindsym --to-code --locked XF86AudioLowerVolume exec 'pamixer -d 1'
bindsym --to-code --locked XF86AudioMute exec 'pamixer -t'
# Screen locking
bindsym --to-code $mod+Delete exec $lock
# Screenshots
@ -152,6 +154,31 @@ seat * hide_cursor 5000
#
# Workspaces:
#
# define outputs
set $builtin_out eDP-1
set $home_out DP-8
# bind workspaces to inputs
workspace 1 output $home_out $builtin_out
workspace 2 output $home_out $builtin_out
workspace 3 output $home_out $builtin_out
workspace 4 output $home_out $builtin_out
workspace 5 output $home_out $builtin_out
workspace 6 output $home_out $builtin_out
workspace 7 output $home_out $builtin_out
workspace 8 output $home_out $builtin_out
workspace 9 output $home_out $builtin_out
workspace 10 output $home_out $builtin_out
workspace 11 output $builtin_out
workspace 12 output $builtin_out
workspace 13 output $builtin_out
workspace 14 output $builtin_out
workspace 15 output $builtin_out
workspace 16 output $builtin_out
workspace 17 output $builtin_out
workspace 18 output $builtin_out
workspace 19 output $builtin_out
workspace 20 output $builtin_out
# move workspace between inputs
bindsym $mod+Mod1+Left move workspace to output left
bindsym $mod+Mod1+Right move workspace to output right
@ -267,8 +294,7 @@ mode "resize" {
bindsym --to-code $mod+r mode "resize"
## Styling: colors
#include colors
include moonfly
include colors
## Window styling
# Border BG Text Indicator Child Border
@ -281,7 +307,7 @@ client.focused $color06 $color06 $color00 $color07 $color06
# Read `man 5 sway-bar` for more information about this section.
bar {
position top
font pango:Iosevka Regular 9
font pango:Ttyp0 8
icon_theme "Adwaita"
status_command /run/current-system/sw/bin/i3status-rs
colors {
@ -297,7 +323,7 @@ bar {
# default border
default_border pixel 2
# Set font
font pango:Iosevka Regular 9
font pango:Ttyp0 8
# bindsym --to-code $mod+t input type:touchpad toggle
@ -305,8 +331,10 @@ font pango:Iosevka Regular 9
exec nextcloud --background
exec iwgtk -i
exec blueman-applet
exec wlsunset -l 52 -L 5
# exec wlsunset -l 52 -L 5
exec gammastep-indicator
exec kanshi
# exec udiskie --tray --no-automount
# window rules
# floating

BIN
sway/.config/sway/ibm.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 503 KiB

View file

@ -1,11 +1,13 @@
#!/usr/bin/env bash
img="$HOME/.cache/swaylock.png"
#img="$HOME/.files/sway/.config/sway/lock-fullhd.png"
img="$HOME/Pictures/paper.jpg"
grim $img
gm convert $img -scale 5% -scale 2000% $img
#grim $img
#gm convert $img -scale 5% -scale 2000% $img
#gm convert $img -blur 0x10 $img
swaylock -Ffk -i $img -s fill
# swaylock -Ffk -i $img -s fill
# swaylock -Ffk -i $HOME/Pictures/tiles/156.png -s tile
swaylock -Ffk -i $HOME/Pictures/tiles/23.png -s tile
# swaylock -Ffk -i $HOME/Pictures/tiles/10.png -s tile
rm -f $img
#rm -f $img