diff --git a/.Xresources b/.Xresources index 7e39859..cb17102 100644 --- a/.Xresources +++ b/.Xresources @@ -1,4 +1,4 @@ -Xft.dpi: 210 +Xft.dpi: 96 Xft.antialias: 1 Xft.rgba: rgb Xft.hinting: 1 diff --git a/.config/alacritty/alacritty-dark.yml b/.config/alacritty/alacritty-dark.yml index b204caa..0c1af77 100644 --- a/.config/alacritty/alacritty-dark.yml +++ b/.config/alacritty/alacritty-dark.yml @@ -37,7 +37,7 @@ window: # Values for `decorations`: # - full: Borders and title bar # - none: Neither borders nor title bar - decorations: full + decorations: none scrolling: # Maximum number of lines in the scrollback buffer. @@ -48,15 +48,6 @@ scrolling: # scrollback is enabled (history > 0). multiplier: 3 -# Spaces per Tab (changes require restart) -# -# This setting defines the width of a tab in cells. -# -# Some applications, like Emacs, rely on knowing about the width of a tab. -# To prevent unexpected behavior in these applications, it's also required to -# change the `it` value in terminfo when altering this setting. -tabspaces: 8 - # Font configuration (changes require restart) # # Important font attributes like antialiasing, subpixel aa, and hinting can be @@ -75,7 +66,7 @@ tabspaces: 8 # - https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration # - file:///usr/share/doc/fontconfig/fontconfig-user.html font: - size: 20.0 + size: 13.0 normal: family: IBM Plex Mono # family: Source Code Pro @@ -109,8 +100,8 @@ colors: # Default colors primary: #background: '0x000000' - #background: '0x121212' - background: '0x202020' + background: '0x121212' + #background: '0x202020' foreground: '0xa1b0b8' #foreground: '0xb8b0a1' @@ -227,7 +218,7 @@ colors: # # Window opacity as a floating point number from `0.0` to `1.0`. # The value `0.0` is completely transparent and `1.0` is opaque. -background_opacity: 0.25 +background_opacity: 1.0 # Mouse bindings # @@ -280,8 +271,6 @@ selection: # clipboard. save_to_clipboard: false -dynamic_title: true - cursor: # Cursor style # diff --git a/.config/environment.d/env.conf b/.config/environment.d/env.conf new file mode 100644 index 0000000..8094b2f --- /dev/null +++ b/.config/environment.d/env.conf @@ -0,0 +1 @@ +PATH=$HOME/bin:$HOME/.local/bin:$HOME/go/bin:$PATH:/bin:/sbin:/usr/sbin:/usr/local/sbin diff --git a/.config/environment.d/wayland.conf b/.config/environment.d/wayland.conf new file mode 100644 index 0000000..6f67ac2 --- /dev/null +++ b/.config/environment.d/wayland.conf @@ -0,0 +1,14 @@ +VDPAU_DRIVER=va_gl + +#GDK_BACKEND=wayland + +MOZ_ENABLE_WAYLAND=1 +MOZ_WEBRENDER=1 + +_JAVA_AWT_WM_NONREPARENTING=1 + +QT_QPA_PLATFORM=wayland +QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +QT_SCALE_FACTOR=1 + +XDG_SESSION_TYPE=wayland diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 3e58ded..2d1e7a4 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -14,5 +14,4 @@ gtk-xft-antialias=1 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb -# gtk-decoration-layout=menu:close -# gtk-application-prefer-dark-theme=1 +gtk-application-prefer-dark-theme=0 diff --git a/.config/i3blocks/config b/.config/i3blocks/config index 6159730..2cf422c 100644 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -1,12 +1,6 @@ separator=true separator_block_width=40 -[window] -align=left -command=~/.config/i3blocks/win-title -interval=persist -background=#000000cc - [battery] background=#000000cc command=~/.config/i3blocks/battery-plus diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index ce18228..fa246f1 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -2,9 +2,11 @@ font_family IBM Plex Mono bold_font IBM Plex Mono SemiBold italic_font IBM Plex Mono Light Italic bold_italic_font IBM Plex Mono SemiBold Italic -font_size 20.0 +font_size 13.0 adjust_line_height 3 +linux_display_server wayland + scrollback_lines 2000 touch_scroll_multiplier 6.0 @@ -16,7 +18,7 @@ enable_audio_bell no map alt+shift+c copy_to_clipboard map alt+shift+v paste_from_clipboard -window_padding_width 2 +window_padding_width 0 update_check_interval 0 cursor_shape block url_color #29B6F6 @@ -24,7 +26,7 @@ url_style curly background_opacity 1.0 dynamic_background_opacity no -background #000000 +background #121212 foreground #a1b0b8 color0 #252525 color1 #ff443e diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 92556c9..7d0e4a3 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -21,6 +21,9 @@ Plug 'junegunn/fzf', { 'do': './install --bin' } Plug 'junegunn/fzf.vim' +" Ansible +Plug 'pearofducks/ansible-vim' + " Markdown Plug 'jtratner/vim-flavored-markdown' Plug 'tpope/vim-markdown' diff --git a/.local/share/applications/tmux-local.desktop b/.local/share/applications/tmux-local.desktop new file mode 100644 index 0000000..ebe18bd --- /dev/null +++ b/.local/share/applications/tmux-local.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +TryExec=alacritty +Icon=Alacritty +Terminal=false +Categories=System;TerminalEmulator; + +Name=tmux local +GenericName=tmux-local +StartupWMClass=tmux-local + +Exec=alacritty --class tmux-local -e tmux new-session -A -D -s 0 diff --git a/.local/share/applications/tmux-porky.desktop b/.local/share/applications/tmux-porky.desktop new file mode 100644 index 0000000..8fe13e8 --- /dev/null +++ b/.local/share/applications/tmux-porky.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +TryExec=/home/dln/bin/term-porky +Icon=Alacritty +Terminal=false +Categories=System;TerminalEmulator; + +Name=tmux porky +GenericName=tmux-porky +StartupWMClass=tmux-porky + +Exec=/home/dln/bin/term-porky diff --git a/.xinitrc b/.xinitrc deleted file mode 100755 index 22e3f98..0000000 --- a/.xinitrc +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -xsetroot -solid \#99aab0 -cursor_name left_ptr -xmodmap $HOME/.Xmodmap -#compton --daemon -c -t -25 -l -25 --shadow-radius=25 --inactive-opacity 0.99 --inactive-dim 0.2 -e 0.7 -setxkbmap -option ctrl:nocaps,grp:switch,grp_led:scroll us,se -xcalib $HOME/.config/B140QAN02_0.icm -alacritty -e tmux attach -t0 & -xrdb $HOME/.Xresources -hsetroot -solid \#99aab0 -#exec $HOME/bin/2bwm -exec $HOME/bin/dwm diff --git a/.zshrc b/.zshrc index 028ffaa..347aa37 100644 --- a/.zshrc +++ b/.zshrc @@ -277,13 +277,6 @@ alias xc='xclip -selection clipboard' export PATH="./node_modules/.bin:$PATH" -## Wayland -export MOZ_ENABLE_WAYLAND=1 -export QT_QPA_PLATFORM=wayland -export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" -export QT_SCALE_FACTOR=2 -export _JAVA_AWT_WM_NONREPARENTING=1 - ## Golang #export GOPATH=$HOME GOPROXY=https://proxy.golang.org/ @@ -294,22 +287,18 @@ export ANSIBLE_NOCOWS=1 ## Rust export PATH=$HOME/.cargo/bin:$PATH -## GTK -export GDK_SCALE=1 -export GDK_DPI_SCALE=1.5 -export GTK_THEME=Arc-Dark - -## Video acceleration -export VDPAU_DRIVER=va_gl -export MOZ_WEBRENDER=1 -export MOZ_ENABLE_WAYLAND=1 - [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -# export SWAYSOCK=$HOME/.local/sway.sock -# export XDG_SESSION_TYPE=wayland -# -# if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then -# rm -f $SWAYSOCK -# XKB_DEFAULT_LAYOUT=us exec sway +ENVIRONMENTD="$HOME/.config/environment.d" +set -a +if [ -d "$ENVIRONMENTD" ]; then + for conf in $(ls "$ENVIRONMENTD"/*.conf) + do + . "$conf" + done +fi +set +a + +# if [[ -z $DISPLAY && $(tty) == /dev/tty1 && $XDG_SESSION_TYPE == tty ]]; then +# MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session # fi