jpm
/
.dotfiles
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Xdefaults, bash_aliases, and 12 more files...

This commit is contained in:
John Mertz 2022-11-04 11:12:23 -04:00
parent 640785e016
commit 37b0e30d03
14 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xdefaults
View File

@ -12,7 +12,7 @@ XTerm*saveLines: 50000
! soft XTerm*background: #32302f ! soft XTerm*background: #32302f
! medium XTerm*background: #282828 ! medium XTerm*background: #282828
! hard ! hard
XTerm*background: #010101 XTerm*background: #1d2021
XTerm*foreground: #ebdbb2 XTerm*foreground: #ebdbb2
XTerm*color0: #282828 XTerm*color0: #282828
XTerm*color1: #cc241d XTerm*color1: #cc241d
@ -44,7 +44,7 @@ UXTerm*saveLines: 50000
! soft UXTerm*background: #32302f ! soft UXTerm*background: #32302f
! medium UXTerm*background: #282828 ! medium UXTerm*background: #282828
! hard ! hard
UXTerm*background: #010101 UXTerm*background: #1d2021
UXTerm*foreground: #ebdbb2 UXTerm*foreground: #ebdbb2
UXTerm*color0: #282828 UXTerm*color0: #282828
UXTerm*color1: #cc241d UXTerm*color1: #cc241d
@ -74,7 +74,7 @@ URxvt.saveLines: 50000
! soft URxvt.background: #32302f ! soft URxvt.background: #32302f
! medium URxvt.background: #282828 ! medium URxvt.background: #282828
! hard ! hard
URxvt.background: #010101 URxvt.background: #1d2021
URxvt.foreground: #ebdbb2 URxvt.foreground: #ebdbb2
URxvt.color0: #282828 URxvt.color0: #282828
URxvt.color1: #cc241d URxvt.color1: #cc241d

5
bash/bash_aliases
View File

@ -48,5 +48,10 @@ alias blc="${HOME}/scripts/thinkpad/blc.pl --notify"
# Flatpaks # Flatpaks
alias mpv="flatpak run io.mpv.Mpv" alias mpv="flatpak run io.mpv.Mpv"
<<<<<<< Updated upstream
# Detect if I'm in a toolbox # Detect if I'm in a toolbox
alias istoolbox='[ -f "/run/.toolboxenv" ] && grep -oP "(?<=name=\")[^\";]+" /run/.containerenv' alias istoolbox='[ -f "/run/.toolboxenv" ] && grep -oP "(?<=name=\")[^\";]+" /run/.containerenv'
=======
# Script to restore toolbox after it was replaced with distrobox and removed the default 'toolbox' name
alias toolbox="$HOME/scripts/toolbox.sh"
>>>>>>> Stashed changes

3
bash/bash_login
View File

@ -25,10 +25,11 @@ export LC_ALL="en_US.UTF-8"
export XDG_DATA_HOME="${HOME}/.config" export XDG_DATA_HOME="${HOME}/.config"
# GUI themes # GUI themes
export GTK_THEME="Flat-Remix-GTK-Blue-Darkest-Solid-NoBorder" export GTK_THEME="Gruvbox-Dark-BL"
export PROFILE_NAME="Oled" export PROFILE_NAME="Oled"
export QT_QPA_PLATFORMTHEME="qt5ct" export QT_QPA_PLATFORMTHEME="qt5ct"
export QT_QPA_PLATFORM="wayland-egl;wayland;xcb" export QT_QPA_PLATFORM="wayland-egl;wayland;xcb"
export GDK_BACKEND="wayland"
export DCONF=".config/dconf/user" export DCONF=".config/dconf/user"
# Suggest session start command if last session is not known # Suggest session start command if last session is not known

2
bash/bash_logout
View File

@ -1,6 +1,6 @@
# vim: ft=sh # vim: ft=sh
if [ $SSH_TTY ]; then if [ ! $SSH_TTY ]; then
# Remove socket files # Remove socket files
rm SSH_AUTH_SOCK rm SSH_AUTH_SOCK
rm SWAYSOCK rm SWAYSOCK

25
bash/bashrc
View File

@ -6,9 +6,6 @@ case $- in
*) return;; *) return;;
esac esac
# Use static SSH Agent from profile
export SSH_AUTH_SOCK=~/.ssh/ssh-agent.sock
# agetty is set to automatically log me in on tty1 # agetty is set to automatically log me in on tty1
# Automatically launch GUI on tty1 after login # Automatically launch GUI on tty1 after login
if [ "$(tty)" == '/dev/tty1' ] && [ ! $SSH_TTY ]; then if [ "$(tty)" == '/dev/tty1' ] && [ ! $SSH_TTY ]; then
@ -77,6 +74,10 @@ PERL_LOCAL_LIB_ROOT="${HOME}/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}
PERL_MB_OPT="--install_base \"${HOME}/perl5\""; export PERL_MB_OPT; PERL_MB_OPT="--install_base \"${HOME}/perl5\""; export PERL_MB_OPT;
PERL_MM_OPT="INSTALL_BASE=${HOME}/perl5"; export PERL_MM_OPT; PERL_MM_OPT="INSTALL_BASE=${HOME}/perl5"; export PERL_MM_OPT;
# Android configs
JDK_HOME=/etc/java
STUDIO_JDK=/usr/lib/jvm/jre-openjdk
# Configure PATH # Configure PATH
source "$HOME/.dotfiles/bash/path" source "$HOME/.dotfiles/bash/path"
@ -89,21 +90,7 @@ export LC_CTYPE="en_US.UTF-8"
# terminal type # terminal type
export TERM="xterm" export TERM="xterm"
# GUI options. Mostly to optimize Wayland
export QT_QPA_PLATFORM="wayland-egl;wayland;xcb"
export SDL_VIDEODRIVER="wayland"
export QML_IMPORT_PATH="/usr/lib/qt/qml"
export QT_PLUGIN_PATH="/usr/lib/qt/plugins"
export QML2_IMPORT_PATH="/usr/lib/qt/qml"
export MOZ_ENABLE_WAYLAND="1"
export MOZ_WEBRENDER="1"
export XDG_SESSION_TYPE="wayland"
export XDG_CURRENT_DESKTOP="sway"
export XDG_CONFIG_HOME="${HOME}/.config"
export XDG_DATA_DIRS="$XDG_DATA_DIRS:${HOME}/.config/flatpak/exports/share"
export SWAYSOCK=`sway --get-socketpath`
export CHROME_EXECUTABLE="/usr/bin/chromium"
export FLATPAK_IDE_LOG_LEVEL="0"
# Set initial title # Set initial title
echo -e -n "\033]2;Welcome to Bash\007" echo -e -n "\033]2;Welcome to Bash\007"
SSH_AUTH_SOCK="$HOME/.ssh/ssh-agent.sock"

6
nvim/init.vim
View File

@ -28,9 +28,15 @@ Plug 'airblade/vim-gitgutter'
Plug 'itchyny/lightline.vim' Plug 'itchyny/lightline.vim'
" Nerdtree - Tree explorer " Nerdtree - Tree explorer
Plug 'preservim/nerdtree' Plug 'preservim/nerdtree'
" Conqueror of Completion
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'bmeneg/coc-perl', {'do': 'yarn install && yarn build'}
" Dart lsp
Plug 'dart-lang/dart-vim-plugin'
call plug#end() call plug#end()
let g:coc_global_extensions = ['coc-json', 'coc-html', 'coc-python', 'coc-php', 'coc-perl', 'coc-flutter', 'coc-git']
if plug_install if plug_install
PlugInstall --sync PlugInstall --sync
endif endif

3
sway/autostart
View File

@ -61,3 +61,6 @@ exec flatpak run org.mozilla.firefox &
# 9:Git (gittyup) # 9:Git (gittyup)
exec flatpak run com.github.Murmele.Gittyup & exec flatpak run com.github.Murmele.Gittyup &
# 0:Hud
exec flatpak run com.github.Eloston.UngoogledChromium --app="https://papillon.john.me.tz/hud.php?theme=dark&refresh=3600"

2
sway/behaviours
View File

@ -14,6 +14,7 @@ assign [class="Linphone"] 5
assign [class="firefox"] 7 assign [class="firefox"] 7
assign [app_id="firefox"] 7 assign [app_id="firefox"] 7
assign [app_id="com.github.gittyup.Gittyup"] 9 assign [app_id="com.github.gittyup.Gittyup"] 9
assign [app_id="chrome-papillon.john.me.tz__-Default"] 0 # Dedicated Chromium window for HUD
# Don't use VNC viewer anymore. I've defaulted to running virt-manager on this workspace because it's similar # Don't use VNC viewer anymore. I've defaulted to running virt-manager on this workspace because it's similar
#assign [class="Vncviewer"] 9 #assign [class="Vncviewer"] 9
@ -22,6 +23,7 @@ assign [app_id="com.github.gittyup.Gittyup"] 9
# Floating windows # Floating windows
################################################################################ ################################################################################
#for_window [name="SSH Passphrase"] floating enable # SSH auth dialog
for_window [title="Picture-in-Picture"] floating enable # Picture-in-picture firefox for_window [title="Picture-in-Picture"] floating enable # Picture-in-picture firefox
# Also make Picture-in-picture windows stick to active workspace # Also make Picture-in-picture windows stick to active workspace
for_window [title="Picture-in-Picture"] sticky enable for_window [title="Picture-in-Picture"] sticky enable

2
sway/bindings
View File

@ -326,7 +326,7 @@ bindsym $mod+Shift+End exec $HOME/scripts/thinkpad/blc.pl --notify -= 10
# Miscellaneous # Miscellaneous
# Tab: Quick change. Shows all windows on all pages by name in wofi # Tab: Quick change. Shows all windows on all pages by name in wofi
bindsym $mod+Tab exec "~/scripts/wofi/wofi-alt-tab.sh" bindsym $mod+tab exec $HOME/scripts/wofi/alt-tab.py
# Resize Mode (you can also use the mouse for that): Entered with $mod+i # Resize Mode (you can also use the mouse for that): Entered with $mod+i
mode "resize" { mode "resize" {

2
sway/config
View File

@ -34,7 +34,7 @@ seat seat0 hide_cursor 5000
################################################################################ ################################################################################
# Gtk themes # Gtk themes
exec gsettings set org.gnome.desktop.interface gtk-theme 'Flat-Remix-GTK-Blue-Darkest-Solid-NoBorder' & exec gsettings set org.gnome.desktop.interface gtk-theme 'Gruvbox-Dark-BL' &
exec gsettings set org.gnome.desktop.interface icon-theme 'Flat-Remix-Blue-Dark' & exec gsettings set org.gnome.desktop.interface icon-theme 'Flat-Remix-Blue-Dark' &
# X11 Cursor theme # X11 Cursor theme

8
vim/generic
View File

@ -17,11 +17,9 @@ let g:gruvbox_underline=1
let g:gruvbox_undercurl=1 let g:gruvbox_undercurl=1
let g:gruvbox_termcolors=256 let g:gruvbox_termcolors=256
set background=dark set background=dark
colorscheme gruvbox-oled colorscheme gruvbox
" autocmd vimenter * colorscheme gruvbox autocmd vimenter * colorscheme gruvbox
"autocmd vimenter * colorscheme gruvbox-oled " colorscheme autoload/lightline/colorscheme/gruvbox.vim
"theme autoload/airline/themes/gruvbox-oled.vim
" colorscheme autoload/lightline/colorscheme/gruvbox-oled.vim
" colorscheme base16-gruvbox-dark-hard " colorscheme base16-gruvbox-dark-hard
set ttyfast set ttyfast

10
vim/vimrc
View File

@ -27,11 +27,11 @@ let g:gruvbox_underline=1
let g:gruvbox_undercurl=1 let g:gruvbox_undercurl=1
let g:gruvbox_termcolors=256 let g:gruvbox_termcolors=256
set background=dark set background=dark
colorscheme gruvbox-oled colorscheme gruvbox
" autocmd vimenter * colorscheme gruvbox " autocmd vimenter * colorscheme gruvbox
"autocmd vimenter * colorscheme gruvbox-oled "autocmd vimenter * colorscheme gruvbox
"theme autoload/airline/themes/gruvbox-oled.vim "theme autoload/airline/themes/gruvbox.vim
" colorscheme autoload/lightline/colorscheme/gruvbox-oled.vim " colorscheme autoload/lightline/colorscheme/gruvbox.vim
" colorscheme base16-gruvbox-dark-hard " colorscheme base16-gruvbox-dark-hard
set ttyfast set ttyfast
@ -99,7 +99,7 @@ if has("autocmd")
endif endif
" 80 characters line " 80 characters line
set colorcolumn=81 set colorcolumn=101
"execute "set colorcolumn=" . join(range(81,335), ',') "execute "set colorcolumn=" . join(range(81,335), ',')
highlight ColorColumn ctermbg=Black ctermfg=DarkRed highlight ColorColumn ctermbg=Black ctermfg=DarkRed

2
waybar/style.css
View File

@ -1,4 +1,4 @@
@import "gruvbox-oled.css"; @import "gruvbox.css";
/* /*
* Available colours * Available colours
* black * black

14
wofi/style.css
View File

@ -1,26 +1,28 @@
window { window {
margin: 0px; margin: 0px;
border: 1px solid #458588; border-left: 2px solid #458588;
background-color: #010101; background-color: #1d2021;
} }
#input { #input {
margin: 5px; margin: 5px;
border: none; border: none;
color: #010101; color: #1d2021;
background-color: #EBDBB2; background-color: #EBDBB2;
} }
#inner-box { #inner-box {
margin: 5px; margin: 5px;
margin-left: 0px;
border: none; border: none;
background-color: #010101; background-color: #1d2021;
} }
#outer-box { #outer-box {
margin: 5px; margin: 5px;
margin-left: 0px;
border: none; border: none;
background-color: #010101; background-color: #1d2021;
} }
#scroll { #scroll {
@ -36,7 +38,7 @@ window {
} }
#text:selected { #text:selected {
color: #010101; color: #1d2021;
} }
#img { #img {