From fbe77a7063c3a85450cb19a42a1a06f81911614f Mon Sep 17 00:00:00 2001 From: TriMill Date: Sun, 21 May 2023 13:45:39 -0400 Subject: [PATCH] swayfx blur, other changes --- .config/alacritty/alacritty.yml | 2 +- .config/fontconfig/fonts.conf | 32 ++++++++++++++++++++++++++++++++ .config/nvim/init.vim | 13 ++++++------- .config/sway/config | 26 ++++++++++++-------------- .config/waybar/style.css | 15 +++++++++++++++ .zshenv | 7 ++++++- .zshrc | 2 -- 7 files changed, 72 insertions(+), 25 deletions(-) create mode 100644 .config/fontconfig/fonts.conf diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index b9d854c..04a3562 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -13,7 +13,7 @@ window: font: normal: - family: Fira Mono + family: monospace style: Regular bold: style: Bold diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf new file mode 100644 index 0000000..0ba2144 --- /dev/null +++ b/.config/fontconfig/fonts.conf @@ -0,0 +1,32 @@ + + + + + serif + + Twemoji + Font Awesome 6 Pro Regular + Times New Roman + DejaVu Serif + + + + sans-serif + + Twemoji + Font Awesome 6 Pro Regular + Cantarell + Noto Sans + DejaVu Sans + + + + monospace + + Fira Mono + Font Awesome 6 Pro Regular + Twemoji + DejaVu Sans Mono + + + diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 1ff637d..7e6f32f 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -18,7 +18,6 @@ colo termcolors let g:python_highlight_all = 1 - syntax on filetype plugin indent on autocmd BufNewFile,BufRead,BufWritePost *.zsh-theme set syntax=zsh @@ -29,10 +28,10 @@ nnoremap B :call box#Draw() " settings set autoindent -set hlsearch +set noexpandtab set tabstop=4 set shiftwidth=0 -set expandtab +set hlsearch set number relativenumber set encoding=utf-8 set nofoldenable @@ -42,12 +41,12 @@ set modeline set mouse=a let g:lightline = { - \ 'colorscheme': 'termcolors', - \ } + \ 'colorscheme': 'termcolors', + \ } let g:LanguageClient_serverCommands = { - \ 'rust': ['rust-analyzer'], - \ } + \ 'rust': ['rust-analyzer'], + \ } " Custom bindings for system copy-paste nmap "+yy diff --git a/.config/sway/config b/.config/sway/config index e09a09a..b0ff191 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -21,9 +21,7 @@ exec --no-startup-id rand-wallpaper exec --no-startup-id webcord.sh exec --no-startup-id autotiling exec --no-startup-id nm-applet --indicator -exec --no-startup-id mqtt_notify.lua >/tmp/mqtt_notify.log -exec --no-startup-id element-desktop -exec --no-startup-id "sleep 1; nextcloud" +exec --no-startup-id element.sh assign [class="Element"] workspace number 8 assign [app_id="WebCord"] workspace number 9 @@ -46,10 +44,10 @@ exec_always { } # swaymsg -t get_outputs -#output eDP-1 resolution 3840x2400 position 2133,0 -#output DP-1 resolution 2560x1440 position 0,0 scale 1.2 -output eDP-1 resolution 3840x2400 position 1920,0 -output DP-1 resolution 1920x1080 position 0,0 +output eDP-1 resolution 3840x2400 position 2133,0 +output DP-1 resolution 2560x1440 position 0,0 scale 1.2 +#output eDP-1 resolution 3840x2400 position 1920,0 +#output DP-1 resolution 1920x1080 position 0,0 input "type:keyboard" { xkb_layout us @@ -63,7 +61,7 @@ exec swayidle -w \ before-sleep 'swaylock -f -c 14171d' floating_modifier $mod normal -gaps inner 12 +gaps inner 14 default_border pixel 2 default_floating_border pixel 2 @@ -171,14 +169,14 @@ client.placeholder #14171d #14171d #ffffff #14171d #14171d client.background #14171d # Status Bar: -bar { - swaybar_command waybar -} +bar swaybar_command waybar # SwayFX -corner_radius 6 shadows on -shadow_blur_radius 8 -shadow_color #14171db0 +shadow_blur_radius 15 +shadow_color #14171dff +blur enable +layer_effects "waybar" blur enable; shadows enable; + include /etc/sway/config.d/* diff --git a/.config/waybar/style.css b/.config/waybar/style.css index efdd4bc..7dd7291 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -4,10 +4,25 @@ transition: none; } +/* #waybar { background-color: rgba(20, 23, 29, 0.85); color: #c7c6c3; } +*/ + +window#waybar { + background-color: rgba(20, 23, 29, 0.85); + color: #c7c6c3; +} + +/* +window#waybar > box { + margin-bottom: 8px; + color: #c7c6c3; + box-shadow: 0px 0px 3px 2px rgba(20, 23, 29, 0.70); +} +*/ button { border: none; diff --git a/.zshenv b/.zshenv index 2586084..28fde58 100755 --- a/.zshenv +++ b/.zshenv @@ -1,6 +1,8 @@ #!/bin/zsh -export PATH="$PATH:$HOME/.local/scripts:$HOME/.local/share/gem/ruby/3.0.0/bin/:$HOME/.cargo/bin" +export PATH="$PATH:/usr/lib/rustup/bin:$HOME/.local/scripts:$HOME/.local/bin:$HOME/.local/share/gem/ruby/3.0.0/bin/:$HOME/.local/share/cargo/bin" + +export LC_ALL=en_US.UTF-8 export QT_QPA_PLATFORM=wayland-egl export MOZ_ENABLE_WAYLAND=1 @@ -9,12 +11,15 @@ export VISUAL=/bin/nvim export BROWSER=/bin/librewolf export FILE=/bin/thunar export PAGER=/bin/less +export TERMINAL=/bin/alacritty export GNUPGHOME="$HOME/.config/gnupg" export CARGO_HOME="$HOME/.local/share/cargo" export RUSTUP_HOME="$HOME/.local/share/rustup" export MIX_HOME="$HOME/.local/share/mix" +export DEBUGINFOD_URLS="https://debuginfod.archlinux.org/" + if [ "$(tty)" = "/dev/tty1" ]; then exec sway fi diff --git a/.zshrc b/.zshrc index 1ae3357..b54566f 100755 --- a/.zshrc +++ b/.zshrc @@ -71,8 +71,6 @@ alias ~="cd ~" # Confirm before copy alias cp="cp -i" -alias grep=rg - # add color alias ccat='highlight --out-format=ansi'