commit 67675572de3ce79695b9c7dca784631133e7b78a
parent 800f08ef15a0d4b0d5f63b2ddeb005945b58976d
Author: Szymon Mikulicz <szymon.mikulicz@aptiv.com>
Date: Wed, 20 Dec 2023 09:44:14 +0100
Update configs
Diffstat:
10 files changed, 158 insertions(+), 260 deletions(-)
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
@@ -63,7 +63,7 @@ font:
style: Italic
# Point size of the font
- size: 9
+ size: 10
# Offset is the extra space around each character. offset.y can be thought of
# as modifying the linespacing, and offset.x as modifying the letter spacing.
@@ -152,7 +152,7 @@ bell:
# Background opacity
window:
- opacity: 0.9
+ opacity: 0.8
# Mouse bindings
#
diff --git a/cmus/.cmus/cmus-geeqie.sh b/cmus/.cmus/cmus-geeqie.sh
@@ -4,25 +4,4 @@
## There are several album art viewers for Cmus but this I believe is the most
## compatible with different setups as it is simpler. No weird hacks.
-STATUS=$( cmus-remote -Q | tee /tmp/cmus.status)
-
-FOLDER=$( echo "$STATUS" | grep "file" | sed "s/file //" | rev | cut -d"/" -f2- | rev )
-
-if [[ ${FOLDER:0:3} == "cue" ]]; then
- FOLDER=$(echo "$FOLDER" | sed 's/cue:\/\///g' | rev | cut -d"/" -f2- | rev)
-fi
-
-FLIST=$( find "$FOLDER" -type f )
-
-if echo "$FLIST" | grep -i ".jpeg\|.png\|.jpg" &>/dev/null; then
- ART=$( echo "$FLIST" | grep -i "cover.jpg\|cover.png\|front.jpg\|front.png\
- \|folder.jpg\|folder.png" | grep -vi "backcover" | head -n1 )
-
- if [[ -z "$ART" ]]; then
- ART=$( echo "$FLIST" | grep -i ".png\|.jpg\|.jpeg" | head -n1 )
- fi
-
- #geeqie -r File:"$ART"
-else
- #geeqie -r File:"/home/shyman/.cmus/none.jpg"
-fi
+cmus-remote -Q | tee /tmp/cmus.status
diff --git a/cmus/.cmus/rc b/cmus/.cmus/rc
@@ -4,7 +4,7 @@ set mixer.alsa.device=sysdefault:CARD=CODEC
set mixer.alsa.channel=master
set mouse=true
set resume=true
-set status_display_program=/home/shyman/.cmus/cmus-geeqie.sh
+set status_display_program=/home/szymon.mikulicz/.cmus/cmus-geeqie.sh
colorscheme night
shell tmux set status off
bind -f common q shell tmux bind-key -n 'q' detach \\\; unbind-key -n 'q'; sleep 1; tmux unbind-key -n 'q'
diff --git a/feh/.fehbg b/feh/.fehbg
@@ -1,9 +1,6 @@
#!/bin/bash
-WP=$(find Pictures/Desktopography/2014/ -type f | shuf -n 1)
-convert -resize 1920x1080 $WP ~/.i3/BG.png &
-
-if type swaymsg; then
- swaymsg "output * background $WP fill"
-else
- feh --no-fehbg --bg-fill $WP
+if [[ $1 == "r" ]]; then
+ WP="$(find ~/Pictures/Wallpapers -type f | shuf -n 1)"
+ ln -fs "$WP" ~/.config/sway/BG
fi
+swaymsg "output * background ~/.config/sway/BG fill"
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
@@ -1,6 +1,6 @@
#!/bin/env fish
-fish_config theme choose "Rosé Pine"
+#fish_config theme choose "Rosé Pine"
set fish_greeting ""
@@ -9,7 +9,7 @@ alias fcd 'cd (fd -I -L -d 8 -t d . ~ | fzf)'
alias bash 'env FISH_RAMP_DISABLE=1 bash'
alias psgr 'ps aux | grep'
-set -g PATH (bash -c -i 'source ~/.bash_profile; echo $PATH') ~/.local/bin /usr/bin/core_perl/
+set -g PATH (bash -c -i 'source ~/.bash_profile; echo $PATH') ~/.local/bin /usr/bin/core_perl/ ~/.deno/bin
if test -n "$NVIM"
alias nvim 'nvr -s'
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
@@ -2,8 +2,6 @@ if &compatible
set nocompatible
endif
-autocmd BufNewFile,BufRead *.fish set filetype=fish
-
autocmd BufNewFile,BufRead Jenkinsfile,*.Jenkinsfile set filetype=groovy
autocmd BufNewFile,BufRead *.bats set filetype=sh
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
@@ -1,66 +1,83 @@
-require('packer').startup(function(use)
- use 'wbthomason/packer.nvim'
-
- use { 'nvim-treesitter/nvim-treesitter',
- run = ':TSUpdate',
- config = function()
- require'nvim-treesitter.configs'.setup({
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+ vim.fn.system({
+ "git",
+ "clone",
+ "--filter=blob:none",
+ "https://github.com/folke/lazy.nvim.git",
+ "--branch=stable", -- latest stable release
+ lazypath,
+ })
+end
+vim.opt.rtp:prepend(lazypath)
+
+vim.g.mapleader = " "
+
+require('lazy').setup({
+ { "nvim-treesitter/nvim-treesitter",
+ build = ":TSUpdate",
+ config = function ()
+ require("nvim-treesitter.configs").setup({
+ ensure_installed = { "c", "cpp", "python", "bash", "lua", "vim", "vimdoc", "fish", "yaml", "markdown", "markdown_inline" },
highlight = { enable = true },
- incremental_selection = { enable = true },
- textobjects = { enable = true },
+ indent = { enable = true },
})
end
- }
-
- use { 'dag/vim-fish', ft = {'fish'}}
-
- use { 'mboughaba/i3config.vim', ft = {'i3config'}}
+ },
- use { 'stephpy/vim-yaml', rtp = 'after', ft = {'yaml'}}
+ { 'mboughaba/i3config.vim', ft = {'i3config'}},
- use { "nvimdev/lspsaga.nvim",
+ { "nvimdev/lspsaga.nvim",
config = function()
require('lspsaga').setup({})
- vim.keymap.set("n", "gd", ":Lspsaga peek_definition<CR>")
- vim.keymap.set("n", "gt", ":Lspsaga peek_type_definition<CR>")
- vim.keymap.set("n", "ga", ":Lspsaga code_action<CR>")
- vim.keymap.set("n", "gi", ":Lspsaga incoming_calls<CR>")
- vim.keymap.set("n", "go", ":Lspsaga outgoing_calls<CR>")
- end
- }
-
- use { "nvimdev/guard.nvim",
- requires = {
+ end,
+ keys = {
+ {"gd", "<cmd>Lspsaga peek_definition<CR>"},
+ {"gt", "<cmd>Lspsaga peek_type_definition<CR>"},
+ {"ga", "<cmd>Lspsaga code_action<CR>"},
+ {"gi", "<cmd>Lspsaga incoming_calls<CR>"},
+ {"go", "<cmd>Lspsaga outgoing_calls<CR>"},
+ }
+ },
+
+ { "nvimdev/guard.nvim",
+ dependencies = {
'nvimdev/guard-collection',
},
config = function()
local ft = require('guard.filetype')
- ft('cpp'):fmt({
- cmd = '/opt/clang/latest/bin/clang-format',
- stdin = true,
- })
+ ft('cpp'):fmt('clang-format')
ft('c'):fmt('clang-format')
require('guard').setup({
- -- the only options for the setup function
fmt_on_save = true,
- -- Use lsp if no formatter was defined for this filetype
lsp_as_default_formatter = false,
})
end
- }
+ },
+
+ {
+ "NeogitOrg/neogit",
+ dependencies = {
+ "nvim-lua/plenary.nvim", -- required
+ "nvim-telescope/telescope.nvim", -- optional
+ "sindrets/diffview.nvim", -- optional
+ "ibhagwan/fzf-lua", -- optional
+ },
+ config = true
+ },
- use { 'rose-pine/neovim',
- as = 'rose-pine',
- config = function()
- vim.cmd('colorscheme rose-pine')
- end
- }
+ { 'rose-pine/neovim',
+ name = 'rose-pine',
+ config = function()
+ vim.cmd('colorscheme rose-pine')
+ end
+ },
- use { 'nvim-lualine/lualine.nvim',
- requires = {
- 'kyazdani42/nvim-web-devicons',
+ { 'nvim-lualine/lualine.nvim',
+ dependencies = {
+ 'nvim-tree/nvim-web-devicons',
'rose-pine'
},
config = function()
@@ -71,9 +88,9 @@ require('packer').startup(function(use)
extensions = {'nvim-tree'}
}
end
- }
+ },
- use { 'xiyaowong/nvim-transparent',
+ { 'xiyaowong/nvim-transparent',
config = function()
require("transparent").setup({
extra_groups = {
@@ -87,10 +104,10 @@ require('packer').startup(function(use)
exclude_groups = {}, -- table: groups you don't want to clear
})
end
- }
+ },
- use {'akinsho/bufferline.nvim',
- requires = 'nvim-tree/nvim-web-devicons',
+ {'akinsho/bufferline.nvim',
+ dependencies = 'nvim-tree/nvim-web-devicons',
config = function()
vim.opt.termguicolors = true
require("bufferline").setup({
@@ -106,11 +123,10 @@ require('packer').startup(function(use)
}
})
end
- }
+ },
- use { 'nvim-tree/nvim-tree.lua',
- requires = 'nvim-tree/nvim-web-devicons',
- tag = 'nightly',
+ { 'nvim-tree/nvim-tree.lua',
+ dependencies = 'nvim-tree/nvim-web-devicons',
config = function()
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1
@@ -127,75 +143,81 @@ require('packer').startup(function(use)
},
},
})
+ end,
+ keys = {
+ { "<C-k>", "<cmd>NvimTreeToggle<CR>" }
+ }
+ },
- vim.keymap.set("n", "<C-k>", ":NvimTreeToggle<CR>")
- end
- }
-
- use 'vimwiki/vimwiki'
-
- use 'godlygeek/tabular'
+ 'vimwiki/vimwiki',
- use { "lukas-reineke/indent-blankline.nvim",
+ { "lukas-reineke/indent-blankline.nvim",
config = function()
require("ibl").setup()
end
- }
- use 'chaoren/vim-wordmotion'
+ },
+ 'chaoren/vim-wordmotion',
- use { 'goolord/alpha-nvim',
- requires = { 'nvim-tree/nvim-web-devicons' },
+ { 'goolord/alpha-nvim',
+ dependencies = { 'nvim-tree/nvim-web-devicons' },
config = function ()
local theme = require("alpha.themes.startify") --or require("alpha.themes.startify")
theme.mru_opts.autocd = true
require'alpha'.setup(theme.config)
end
- }
+ },
- use { 'neovim/nvim-lspconfig',
- requires = { 'creativenull/efmls-configs-nvim' },
+ { 'neovim/nvim-lspconfig',
config = function()
local lspconfig = require("lspconfig");
- lspconfig.clangd.setup{
- cmd = { "/opt/clang/latest/bin/clangd" },
- }
+ lspconfig.clangd.setup{}
lspconfig.pylsp.setup{}
lspconfig.zls.setup{}
lspconfig.bashls.setup{}
end
- }
+ },
- use { 'Shougo/ddc-source-nvim-lsp',
- requires = {'Shougo/ddc.vim', 'neovim/nvim-lspconfig'}
- }
- use { 'vim-denops/denops.vim',
- config = function()
- -- vim.g.denops_server_addr = '127.0.0.1:32123'
- end
- }
-
- use { 'Shougo/ddc.vim',
- requires = {
+ { 'Shougo/ddc.vim',
+ dependencies = {
'Shougo/ddc-ui-native',
'vim-denops/denops.vim',
- 'Shougo/ddc-source-nvim-lsp',
+ 'Shougo/ddc-source-lsp',
+ 'Shougo/ddc-source-around',
+ 'LumaKernel/ddc-source-file',
'Shougo/ddc-sorter_rank',
- 'Shougo/ddc-matcher_head'
+ 'Shougo/ddc-matcher_head',
},
+ lazy = false,
config = function()
+ require("lspconfig").denols.setup({
+ capabilities = require("ddc_source_lsp").make_client_capabilities(),
+ })
vim.fn['ddc#custom#patch_global']('ui', 'native')
vim.fn['ddc#custom#patch_global']({
- sources = {'nvim-lsp'},
+ sources = {'lsp', 'around', 'file'},
sourceOptions = {
_ = {
matchers = {'matcher_head'},
sorters = {'sorter_rank'}
},
- ["nvim-lsp"] = {
+ lsp = {
mark = 'L',
- forceCompletionPattern = '\\.\\w*| =\\w*|->\\w*' },
+ forceCompletionPattern = '\\.\\w*| =\\w*|->\\w*'
+ },
+ around = {
+ mark = 'A'
+ },
+ file = {
+ mark = 'F',
+ isVolatile = true,
+ forceCompletionPattern = '\\S/\\S*'
}
- })
+ },
+ sourceParams = {
+ enableResolveItem = true,
+ enableAdditionalTextEdit = true,
+ }
+ })
vim.keymap.set('i', '<Tab>', function()
local col = vim.fn.col('.') - 1
if vim.fn.pumvisible() == 1 then
@@ -208,7 +230,6 @@ require('packer').startup(function(use)
end, {expr = true, silent = true})
vim.fn["ddc#enable"]()
- end
+ end,
}
-
-end)
+})
diff --git a/polybar/.config/polybar/cmus.sh b/polybar/.config/polybar/cmus.sh
@@ -4,9 +4,9 @@ ARTIST=$(grep 'tag artist ' /tmp/cmus.status | tail -c +12)
STATE=$(grep 'status ' /tmp/cmus.status | tail -c +8)
if [ $STATE = 'playing' ]; then
- echo " $ARTIST - $TITLE"
+ echo "▶ $ARTIST - $TITLE"
elif [ $STATE = 'paused' ]; then
- echo " $ARTIST - $TITLE"
+ echo "⏸ $ARTIST - $TITLE"
else
- echo ""
+ echo "■"
fi
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
@@ -1,88 +1,19 @@
# vim: filetype=i3config
+exec 'readlink -n /tmp/wallpaper/0 > ~/.cache/swww/eDP-1; swww init'
+
+include /etc/sway/config.d/*
+
set $mod Mod4
font pango:Tamsyn 7
floating_modifier $mod
-workspace 1 output HDMI-A-1
-workspace 2 output VGA-1
-
bindsym $mod+Return exec alacritty
bindsym $mod+Shift+q kill
-bindsym $mod+d exec wofi --show drun
-
-bindsym $mod+Shift+d mode "remote"
-mode "remote" {
- bindsym $mod+d exec ssh mikulicz@N-20L6PF16PQSK dmenu_path | dmenu | xargs ssh -X mikulicz@N-20L6PF16PQSK
- bindsym $mod+Return exec alacritty -e ssh -X mikulicz@N-20L6PF16PQSK
-
- bindsym $mod+Shift+d mode "default"
-
- bindsym $mod+Shift+q kill
-
- bindsym $mod+h focus left
- bindsym $mod+j focus down
- bindsym $mod+k focus up
- bindsym $mod+l focus right
-
- bindsym $mod+Left focus left
- bindsym $mod+Down focus down
- bindsym $mod+Up focus up
- bindsym $mod+Right focus right
-
- bindsym $mod+Shift+h move left
- bindsym $mod+Shift+j move down
- bindsym $mod+Shift+k move up
- bindsym $mod+Shift+l move right
-
- bindsym $mod+Shift+Left move left
- bindsym $mod+Shift+Down move down
- bindsym $mod+Shift+Up move up
- bindsym $mod+Shift+Right move right
-
- bindsym $mod+g split h
-
- bindsym $mod+v split v
-
- bindsym $mod+f fullscreen toggle
-
- bindsym $mod+s layout stacking
- bindsym $mod+w layout tabbed
- bindsym $mod+e layout toggle split
-
- bindsym $mod+Shift+space floating toggle
-
- bindsym $mod+space focus mode_toggle
-
- bindsym $mod+a focus parent
-
- #bindsym $mod+d focus child
-
- bindsym $mod+1 workspace 1 output HDMI-A-1
- bindsym $mod+2 workspace 2 output VGA-1
- bindsym $mod+3 workspace 3
- bindsym $mod+4 workspace 4
- bindsym $mod+5 workspace 5
- bindsym $mod+6 workspace 6
- bindsym $mod+7 workspace 7
- bindsym $mod+8 workspace 8
- bindsym $mod+9 workspace 9
- bindsym $mod+0 workspace 10
-
- bindsym $mod+Shift+1 move container to workspace 1
- bindsym $mod+Shift+2 move container to workspace 2
- bindsym $mod+Shift+3 move container to workspace 3
- bindsym $mod+Shift+4 move container to workspace 4
- bindsym $mod+Shift+5 move container to workspace 5
- bindsym $mod+Shift+6 move container to workspace 6
- bindsym $mod+Shift+7 move container to workspace 7
- bindsym $mod+Shift+8 move container to workspace 8
- bindsym $mod+Shift+9 move container to workspace 9
- bindsym $mod+Shift+0 move container to workspace 10
-}
+bindsym $mod+d exec fuzzel
bindsym $mod+h focus left
bindsym $mod+j focus down
@@ -120,8 +51,6 @@ bindsym $mod+space focus mode_toggle
bindsym $mod+a focus parent
-#bindsym $mod+d focus child
-
bindsym $mod+1 workspace 1
bindsym $mod+2 workspace 2
bindsym $mod+3 workspace 3
@@ -178,24 +107,6 @@ mode $power_control {
}
bindsym $mod+n mode $power_control
-mode "brightness" {
- bindsym grave exec ~/.i3/brightness.sh 00
- bindsym 1 exec ~/.i3/brightness.sh 10
- bindsym 2 exec ~/.i3/brightness.sh 20
- bindsym 3 exec ~/.i3/brightness.sh 30
- bindsym 4 exec ~/.i3/brightness.sh 40
- bindsym 5 exec ~/.i3/brightness.sh 50
- bindsym 6 exec ~/.i3/brightness.sh 60
- bindsym 7 exec ~/.i3/brightness.sh 70
- bindsym 8 exec ~/.i3/brightness.sh 80
- bindsym 9 exec ~/.i3/brightness.sh 90
- bindsym 0 exec ~/.i3/brightness.sh 100
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-bindsym $mod+Shift+b mode "brightness"
-
default_border pixel 2
titlebar_border_thickness 1
titlebar_padding 2 2
@@ -207,21 +118,21 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5%
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle
# C* Music Player controls
-bindsym XF86AudioPlay exec --no-startup-id cmus-remote -u
-bindsym XF86AudioStop exec --no-startup-id cmus-remote -s
-bindsym XF86AudioNext exec --no-startup-id cmus-remote -n
-bindsym XF86AudioPrev exec --no-startup-id cmus-remote -r
+bindsym XF86AudioPlay exec --no-startup-id mpc toggle
+bindsym XF86AudioStop exec --no-startup-id mpc stop
+bindsym XF86AudioNext exec --no-startup-id mpc next
+bindsym XF86AudioPrev exec --no-startup-id mpc prev
bindsym $mod+c exec alacritty --class CMUS -e fish -c cmus
# Screen brightness controls
-bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10 # increase screen brightness
-bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10 # decrease screen brightness
-bindsym $mod+F12 exec --no-startup-id xbacklight -inc 10 # increase screen brightness
-bindsym $mod+F11 exec --no-startup-id xbacklight -dec 10 # decrease screen brightness
+bindsym XF86MonBrightnessUp exec brightnessctl set +25
+bindsym XF86MonBrightnessDown exec brightnessctl set 25-
+
+bindsym Shift+XF86MonBrightnessUp exec brightnessctl --device "kbd_backlight" set +25
+bindsym Shift+XF86MonBrightnessDown exec brightnessctl --device "kbd_backlight" set 25-
-# Touchpad toggle
-bindsym XF86TouchpadToggle exec --no-startup-id ~/.i3/toggle_touchpad.sh 'SynPS/2 Synaptics TouchPad'
+bindsym Shift+XF86LaunchA input type:touchpad events toggle enabled disabled
# Input configuration
input type:keyboard {
@@ -234,7 +145,7 @@ input type:touchpad {
}
# Change wallpaper
-bindsym $mod+p exec ~/.fehbg -r
+bindsym $mod+p exec swww img "$(wallpaper-change)"
# Take screenshot
bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy
@@ -245,25 +156,23 @@ client.unfocused #282c34e6 #282c34e6 #dcdfe4 #282c34e6
client.focused_inactive #282c34e6 #282c34e6 #dcdfe4 #282c34e6
client.urgent #383a3be6 #383a3be6 #e06c75 #383a3be6
-for_window [instance="polybar"] gaps inner 0
+for_window [instance="polybar"] gaps inner
for_window [instance="mpv"] pixel 0
for_window [instance="^r_x11$"] floating enable
for_window [instance="^octave\-gui$"] floating enable
for_window [instance="^matplotlib$"] floating enable
for_window [app_id="CMUS"] floating enable
-exec redshift-gtk
exec mako
+exec nm-applet --indicator
+exec wlsunset -l 50 -L 20
+exec bt-agent -c NoInputNoOutput
-exec ~/.fehbg
exec swayidle \
timeout 300 '~/.config/sway/lock.sh' \
timeout 600 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \
+ lock '~/.config/sway/lock.sh' \
before-sleep '~/.config/sway/lock.sh'
exec_always "killall waybar; waybar"
-exec_always ~/.config/sway/import-gsettings.sh \
- gtk-theme:gtk-theme-name \
- icon-theme:gtk-icon-theme-name \
-
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
@@ -2,29 +2,23 @@
{
"layer": "top", // Waybar at top layer
"position": "top", // Waybar position (top|bottom|left|right)
- "output": "HDMI-A-1",
- //"height": 10, // Waybar height
+ // "output": "HDMI-A-1"/,
+ // "height": 5, // Wayba heigh:te
// "width": 1280, // Waybar width
// Choose the order of the modules
"modules-left": ["tray", "sway/workspaces", "sway/mode"],
- "modules-center": ["custom/cmus"],
- "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "clock"],
+ "modules-center": ["mpd"],
+ "modules-right": ["idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "battery", "clock"],
// Modules configuration
- // "sway/workspaces": {
- // "disable-scroll": true,
- // "all-outputs": true,
- // "format": "{name}: {icon}",
- // "format-icons": {
- // "1": "",
- // "2": "",
- // "3": "",
- // "4": "",
- // "5": "",
- // "urgent": "",
- // "focused": "",
- // "default": ""
- // }
- // },
+ "sway/workspaces": {
+ "disable-scroll": true,
+ "all-outputs": true,
+ "format-icons": {
+ "urgent": "",
+ "focused": "",
+ "default": ""
+ }
+ },
"sway/mode": {
"format": "<span style=\"italic\">{}</span>"
},
