commit fac952fc69eb0232c0cb6ddcc371a4744e9f6288
parent 8409f9be4bd1221160288698b221bd296c543f87
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date: Sat, 15 Feb 2025 17:25:13 +0100
FreeBSD try
Diffstat:
10 files changed, 42 insertions(+), 81 deletions(-)
diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
@@ -1,4 +1,3 @@
-live_config_reload = true
[bell]
animation = "EaseOutExpo"
@@ -607,3 +606,6 @@ semantic_escape_chars = ",│`|:\"' ()[]{}<>"
[window]
opacity = 0.8
+
+[general]
+live_config_reload = true
diff --git a/feh/.fehbg b/feh/.fehbg
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
if [[ $1 == "r" ]]; then
WP="$(find ~/Pictures/Wallpapers -type f | shuf -n 1)"
ln -fs "$WP" ~/.config/sway/BG
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
@@ -1,45 +1,28 @@
#!/bin/env fish
-alias docker "env DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus podman"
-
#fish_config theme choose "Rosé Pine"
set fish_greeting ""
-alias ec "emacsclient -a \"\""
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/ ~/.deno/bin
-
if test -n "$NVIM"
alias nvim 'nvr -s'
end
-alias vim nvim
-
-alias wine64 'env WINEPREFIX=/home/shyman/.wine64 WINEARCH=win64 wine'
-alias wine64cfg 'env WINEPREFIX=/home/shyman/.wine64 WINEARCH=win64 winecfg'
-alias wine64tricks 'env WINEPREFIX=/home/shyman/.wine64 WINEARCH=win64 winetricks'
-
-alias wine32 'env WINEPREFIX=/home/shyman/.wine32 WINEARCH=win32 wine'
-alias wine32cfg 'env WINEPREFIX=/home/shyman/.wine32 WINEARCH=win32 winecfg'
-alias wine32tricks 'env WINEPREFIX=/home/shyman/.wine32 WINEARCH=win32 winetricks'
-
alias cmus='tmux attach-session -t cmus || tmux new-session -A -D -s cmus /usr/bin/cmus'
alias :q exit
alias :e 'nvr -s'
-if test "$XDG_SESSION_TYPE" = "x11"
- alias :split 'i3-msg split v\; exec alacritty > /dev/null'
- alias :vsplit 'i3-msg split h\; exec alacritty > /dev/null'
-else
- alias :split 'swaymsg split v\; exec alacritty'
- alias :vsplit 'swaymsg split h\; exec alacritty'
-end
-alias noproxy 'env http_proxy="" https_proxy="" ftp_proxy=""'
+alias :split 'swaymsg split v\; exec alacritty'
+alias :vsplit 'swaymsg split h\; exec alacritty'
-source /usr/share/autojump/autojump.fish
direnv hook fish | source
+
+fish_add_path -P /usr/local/libexec/ccache
+set -g CCACHE_PATH /usr/bin:/usr/local/bin
+
+source "$HOME/.cargo/env.fish"
+source /usr/local/share/autojump/autojump.fish
diff --git a/mpv/.config/mpv/mpv.conf b/mpv/.config/mpv/mpv.conf
@@ -1,9 +1,6 @@
-interpolation
-tscale=catmull_rom
-video-sync=display-resample-vdrop
-
vo=gpu
ao=pulse
+gpu-context=wayland
screenshot-directory=~/Pictures/screenshots/
fullscreen
diff --git a/nvim/.config/nvim/ginit.vim b/nvim/.config/nvim/ginit.vim
@@ -11,8 +11,8 @@ elseif exists('g:fvim_loaded')
nnoremap <A-CR> :FVimToggleFullScreen<CR>
endif
-let s:font = "CodeNewRoman\\ Nerd\\ Font"
-let s:fontsize = 11
+let s:font = "Fira\\ Code"
+let s:fontsize = 9
:execute "set guifont=" . s:font . ":h" . s:fontsize
function! AdjustFontSize(amount)
@@ -25,4 +25,4 @@ noremap <C-ScrollWheelDown> :call AdjustFontSize(-1)<CR>
inoremap <C-ScrollWheelUp> <Esc>:call AdjustFontSize(1)<CR>a
inoremap <C-ScrollWheelDown> <Esc>:call AdjustFontSize(-1)<CR>a
-let g:neovide_transparency=0.6
+let g:neovide_transparency=0.9
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
@@ -1,12 +1,14 @@
+if &shell =~# 'fish$'
+ set shell=bash
+endif
+
if &compatible
set nocompatible
endif
-autocmd BufNewFile,BufRead Jenkinsfile,*.Jenkinsfile set filetype=groovy
+autocmd BufNewFile,BufRead *.fish set filetype=fish
-autocmd BufNewFile,BufRead *.zig set shell=bash
-
-autocmd BufNewFile,BufRead *.bats set filetype=sh
+autocmd BufNewFile,BufRead Jenkinsfile,*.Jenkinsfile set filetype=groovy
autocmd CompleteDone * silent! pclose
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
@@ -25,18 +25,6 @@ require('lazy').setup({
end
},
- { "m00qek/baleia.nvim",
- config = function()
- vim.g.baleia = require("baleia").setup()
- vim.api.nvim_create_user_command("BaleiaColorize", function()
- vim.g.baleia.once(vim.api.nvim_get_current_buf())
- end, { bang = true })
- end,
- keys = {
- {"<C-h>", "<cmd>BaleiaColorize<CR>"},
- }
- },
-
{ 'mboughaba/i3config.vim', ft = {'i3config'}},
{ "nvimdev/lspsaga.nvim",
@@ -62,10 +50,10 @@ require('lazy').setup({
ft('cpp'):fmt('clang-format')
ft('c'):fmt('clang-format')
- require('guard').setup({
+ vim.g.guard_config = {
fmt_on_save = true,
lsp_as_default_formatter = false,
- })
+ }
end
},
@@ -78,7 +66,6 @@ require('lazy').setup({
},
{ "NeogitOrg/neogit",
- branch = 'nightly',
dependencies = {
"nvim-lua/plenary.nvim", -- required
"nvim-telescope/telescope.nvim", -- optional
@@ -190,10 +177,10 @@ require('lazy').setup({
{ 'neovim/nvim-lspconfig',
config = function()
local lspconfig = require("lspconfig");
- lspconfig.clangd.setup{}
- lspconfig.pylsp.setup{}
- lspconfig.zls.setup{}
- lspconfig.bashls.setup{}
+ if 1 == vim.fn.executable('clangd') then lspconfig.clangd.setup{} end
+ if 1 == vim.fn.executable('pylsp') then lspconfig.pylsp.setup{} end
+ if 1 == vim.fn.executable('zls') then lspconfig.zls.setup{} end
+ if 1 == vim.fn.executable('bashls') then lspconfig.bashls.setup{} end
end
},
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
@@ -1,6 +1,4 @@
# vim: filetype=i3config
-exec 'readlink -n /tmp/wallpaper/0 > ~/.cache/swww/eDP-1; swww init'
-
include /etc/sway/config.d/*
set $mod Mod4
@@ -93,14 +91,13 @@ mode "resize" {
}
bindsym $mod+r mode "resize"
-set $power_control "[l]ock log[o]ut [s]uspend [h]ibernate [r]eboot [p]oweroff"
+set $power_control "[l]ock log[o]ut [s]uspend [r]eboot [p]oweroff"
mode $power_control {
bindsym l exec ~/.config/sway/lock.sh; mode "default"
bindsym o exec swaymsg exit; mode "default"
- bindsym s exec systemctl suspend; mode "default"
- bindsym h exec systemctl hibernate; mode "default"
- bindsym r exec systemctl reboot; mode "default"
- bindsym p exec systemctl poweroff; mode "default"
+ bindsym s exec sudo /usr/sbin/acpiconf -s 3; exec ~/.config/sway/lock.sh; mode "default"
+ bindsym r exec sudo /sbin/reboot; mode "default"
+ bindsym p exec sudo /sbin/poweroff; mode "default"
bindsym Return mode "default"
bindsym Escape mode "default"
@@ -113,9 +110,9 @@ titlebar_padding 2 2
gaps inner 10
# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5%
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5%
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
# C* Music Player controls
bindsym XF86AudioPlay exec --no-startup-id mpc toggle
@@ -126,14 +123,11 @@ 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 brightnessctl set +25
-bindsym XF86MonBrightnessDown exec brightnessctl set 25-
-
-bindsym Ctrl+XF86MonBrightnessUp exec brightnessctl set +5
-bindsym Ctrl+XF86MonBrightnessDown exec brightnessctl set 5-
+bindsym Ctrl+F8 exec backlight - 10
+bindsym Ctrl+F9 exec backlight + 10
-bindsym Shift+XF86MonBrightnessUp exec brightnessctl --device "kbd_backlight" set +25
-bindsym Shift+XF86MonBrightnessDown exec brightnessctl --device "kbd_backlight" set 25-
+bindsym Ctrl+Shift+F8 exec backlight - 5
+bindsym Ctrl+Shift+F9 exec backlight + 5
bindsym Shift+XF86LaunchA input type:touchpad events toggle enabled disabled
@@ -148,7 +142,7 @@ input type:touchpad {
}
# Change wallpaper
-bindsym $mod+p exec swww img "$(wallpaper-change)"
+bindsym $mod+p exec ~/.fehbg r
# Take screenshot
bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy
@@ -166,10 +160,9 @@ for_window [instance="^octave\-gui$"] floating enable
for_window [instance="^matplotlib$"] floating enable
for_window [app_id="CMUS"] floating enable
+exec ~/.fehbg
exec mako
-exec nm-applet --indicator
exec wlsunset -l 50 -L 20
-exec bt-agent -c NoInputNoOutput
exec swayidle \
timeout 300 '~/.config/sway/lock.sh' \
diff --git a/sway/.config/sway/lock.sh b/sway/.config/sway/lock.sh
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
-swaylock -i /tmp/wallpaper/0 -s fill
+swaylock -i ~/.config/sway/BG -s fill
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
@@ -66,9 +66,6 @@
// "format-full": "",
"format-icons": ["", "", "", "", ""]
},
- "battery#bat2": {
- "bat": "BAT2"
- },
"network": {
// "interface": "wlp2s0", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
