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

tabs->spaces

This commit is contained in:
John Mertz 2023-01-06 13:57:26 -05:00
parent e4d53db488
commit 6e11fe0b7e
5 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bash/bash_logout.host
View File

@ -1,8 +1,8 @@
if [ ! $SSH_TTY ]; then if [ ! $SSH_TTY ]; then
# Remove socket files # Remove socket files
rm $SSH_AUTH_SOCK rm $SSH_AUTH_SOCK
rm $HOME/.spool/ssh-agent.env rm $HOME/.spool/ssh-agent.env
rm $SWAYSOCK rm $SWAYSOCK
fi fi
# when leaving the console clear the screen to increase privacy # when leaving the console clear the screen to increase privacy

22
vim/generic
View File

@ -1,12 +1,12 @@
set nocompatible " iMproved only, no vi compatibility set nocompatible " iMproved only, no vi compatibility
set sessionoptions-=options " stop sessions from messing with 'runtimepath' set sessionoptions-=options " stop sessions from messing with 'runtimepath'
syntax on syntax on
filetype plugin indent on filetype plugin indent on
set backspace=indent,eol,start set backspace=indent,eol,start
set incsearch set incsearch
set scrolloff=1000 " Center cursor, unless near edge set scrolloff=1000 " Center cursor, unless near edge
" Colorize and theme " Colorize and theme
set t_Co=16 set t_Co=16
@ -37,9 +37,9 @@ set noswapfile
set title set title
syn on se title syn on se title
set ts=8 set ts=4
set softtabstop=8 set softtabstop=4
set shiftwidth=8 set shiftwidth=4
set expandtab set expandtab
" Show tabs and trailing spaces " Show tabs and trailing spaces
set list listchars=tab:»\ ,trail:· set list listchars=tab:»\ ,trail:·
@ -78,7 +78,7 @@ if has("autocmd")
au BufNewFile,BufRead COMMIT_EDITMSG set spell nonumber nolist wrap linebreak au BufNewFile,BufRead COMMIT_EDITMSG set spell nonumber nolist wrap linebreak
" Set filetype tab settings " Set filetype tab settings
autocmd FileType python,doctest set ai ts=8 sw=8 sts=8 et autocmd FileType python,doctest set ai ts=4 sw=4 sts=4 et
autocmd BufReadPost * autocmd BufReadPost *
\ if line("'\"") > 1 && line("'\"") <= line("$") | \ if line("'\"") > 1 && line("'\"") <= line("$") |
@ -86,9 +86,9 @@ if has("autocmd")
\ endif \ endif
endif endif
" 80 characters line " 100 characters line
set colorcolumn=81 set colorcolumn=101
"execute "set colorcolumn=" . join(range(81,335), ',') "execute "set colorcolumn=" . join(range(101,335), ',')
highlight ColorColumn ctermbg=Black ctermfg=DarkRed highlight ColorColumn ctermbg=Black ctermfg=DarkRed
" Highlight trailing spaces " Highlight trailing spaces
@ -106,7 +106,7 @@ let g:tablabel =
\ "%N%{flagship#tabmodified()} %{flagship#tabcwds('shorten',',')}" \ "%N%{flagship#tabmodified()} %{flagship#tabcwds('shorten',',')}"
" Python " Python
au FileType python set ts=8 sts=4 et sw=4 smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class au FileType python set ts=4 sts=4 et sw=4 smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
source ${HOME}/.dotfiles/vim/abbreviations/personalAbbreviations.vim source ${HOME}/.dotfiles/vim/abbreviations/personalAbbreviations.vim
source ${HOME}/.dotfiles/vim/abbreviations/codingAbbreviations.vim source ${HOME}/.dotfiles/vim/abbreviations/codingAbbreviations.vim

20
vim/vimrc
View File

@ -1,5 +1,5 @@
set nocompatible " iMproved only, no vi compatibility set nocompatible " iMproved only, no vi compatibility
set sessionoptions-=options " stop sessions from messing with 'runtimepath' set sessionoptions-=options " stop sessions from messing with 'runtimepath'
" Load plugins with Pathogen " Load plugins with Pathogen
execute pathogen#infect('bundle/{}', '~/.config/vim/bundle/{}') execute pathogen#infect('bundle/{}', '~/.config/vim/bundle/{}')
@ -11,7 +11,7 @@ filetype plugin indent on
set backspace=indent,eol,start set backspace=indent,eol,start
set incsearch set incsearch
set scrolloff=1000 " Center cursor, unless near edge set scrolloff=1000 " Center cursor, unless near edge
" other usability enhancements " other usability enhancements
set backupdir=~/.config/vim/backup/,. set backupdir=~/.config/vim/backup/,.
@ -49,9 +49,9 @@ set noswapfile
set title set title
syn on se title syn on se title
set ts=8 set ts=4
set softtabstop=8 set softtabstop=4
set shiftwidth=8 set shiftwidth=4
set expandtab set expandtab
" Show tabs and trailing spaces " Show tabs and trailing spaces
set list listchars=tab:»\ ,trail:· set list listchars=tab:»\ ,trail:·
@ -90,7 +90,7 @@ if has("autocmd")
au BufNewFile,BufRead COMMIT_EDITMSG set spell nonumber nolist wrap linebreak au BufNewFile,BufRead COMMIT_EDITMSG set spell nonumber nolist wrap linebreak
" Set filetype tab settings " Set filetype tab settings
autocmd FileType python,doctest set ai ts=8 sw=8 sts=8 et autocmd FileType python,doctest set ai ts=4 sw=4 sts=4 et
autocmd BufReadPost * autocmd BufReadPost *
\ if line("'\"") > 1 && line("'\"") <= line("$") | \ if line("'\"") > 1 && line("'\"") <= line("$") |
@ -98,9 +98,9 @@ if has("autocmd")
\ endif \ endif
endif endif
" 80 characters line " 100 characters line
set colorcolumn=101 set colorcolumn=101
"execute "set colorcolumn=" . join(range(81,335), ',') "execute "set colorcolumn=" . join(range(101,335), ',')
highlight ColorColumn ctermbg=Black ctermfg=DarkRed highlight ColorColumn ctermbg=Black ctermfg=DarkRed
" Highlight trailing spaces " Highlight trailing spaces
@ -118,7 +118,7 @@ let g:tablabel =
\ "%N%{flagship#tabmodified()} %{flagship#tabcwds('shorten',',')}" \ "%N%{flagship#tabmodified()} %{flagship#tabcwds('shorten',',')}"
" Python " Python
au FileType python set ts=8 sts=4 et sw=4 smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class au FileType python set ts=4 sts=4 et sw=4 smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
source ${HOME}/.dotfiles/vim/abbreviations/personalAbbreviations.vim source ${HOME}/.dotfiles/vim/abbreviations/personalAbbreviations.vim
source ${HOME}/.dotfiles/vim/abbreviations/codingAbbreviations.vim source ${HOME}/.dotfiles/vim/abbreviations/codingAbbreviations.vim

52
waybar/config.template
View File

@ -44,7 +44,7 @@
// "disable-scroll": true, // "disable-scroll": true,
// "all-outputs": true, // "all-outputs": true,
"format": "{icon}", "format": "{icon}",
"numeric-first": true, "numeric-first": true,
"format-icons": { "format-icons": {
"0": "0 \uf073", "0": "0 \uf073",
"1": "1 \uf27a", "1": "1 \uf27a",
@ -74,14 +74,14 @@
}, },
//"mpd": { //"mpd": {
//"server": "10.10.0.66", //"server": "10.10.0.66",
//"port": 6600, //"port": 6600,
//"interval": 10, //"interval": 10,
//"timeout": 30, //"timeout": 30,
//"unknown-tag": "⚠", //"unknown-tag": "⚠",
//"format": "▶️ {title}", //"format": "▶️ {title}",
//"format-paused": "⏸️ {title}", //"format-paused": "⏸️ {title}",
//"format-stopped": "⏹️ mpd", //"format-stopped": "⏹️ mpd",
//"format-disconnected": "⚠ mpd", //"format-disconnected": "⚠ mpd",
//"on-click": "${HOME}/scripts/waybar/waybar-mpd.sh" //"on-click": "${HOME}/scripts/waybar/waybar-mpd.sh"
//}, //},
"custom/weather": { "custom/weather": {
@ -91,17 +91,17 @@
}, },
"network": { "network": {
// "interface": "wlp58s0", // (Optional) To force the use of this interface // "interface": "wlp58s0", // (Optional) To force the use of this interface
"interval": 10, "interval": 10,
"tooltip-format": "{essid} {ipaddr}", "tooltip-format": "{essid} {ipaddr}",
"format-ethernet": "", "format-ethernet": "",
"format-wifi": "", "format-wifi": "",
"format-disconnected": "⛖", "format-disconnected": "⛖",
"on-click": "${HOME}/scripts/wofi/wofi-wifi-menu.sh" "on-click": "${HOME}/scripts/wofi/wofi-wifi-menu.sh"
}, },
"network#wireguard": { "network#wireguard": {
"interval": 10, "interval": 10,
"interface": "wg0", // (Optional) To force the use of this interface "interface": "wg0", // (Optional) To force the use of this interface
"tooltip-format": "{ifname} {ipaddr}", "tooltip-format": "{ifname} {ipaddr}",
"tooltip": "{ipaddr}", "tooltip": "{ipaddr}",
"format": "⚿", "format": "⚿",
"format-disconnected": "⚿", "format-disconnected": "⚿",
@ -129,13 +129,13 @@
// "device": "acpi_video1", // "device": "acpi_video1",
"format": "{icon}\u200a{percent}%", "format": "{icon}\u200a{percent}%",
"format-icons": [ "•", "☼", "o", "", ""], "format-icons": [ "•", "☼", "o", "", ""],
"on-click": "${HOME}/scripts/thinkpad/blc.pl --notify %", "on-click": "${HOME}/scripts/thinkpad/blc.pl --notify %",
"on-scroll-up": "${HOME}/scripts/thinkpad/blc.pl --notify ++", "on-scroll-up": "${HOME}/scripts/thinkpad/blc.pl --notify ++",
"on-scroll-down": "${HOME}/scripts/thinkpad/blc.pl --notify --" "on-scroll-down": "${HOME}/scripts/thinkpad/blc.pl --notify --"
}, },
"custom/battery": { "custom/battery": {
"format": "{}", "format": "{}",
"return-type": "json", "return-type": "json",
"exec": "${HOME}/scripts/thinkpad/pow.pl --bar", "exec": "${HOME}/scripts/thinkpad/pow.pl --bar",
"interval": 5, "interval": 5,
"on-click": "notify-send Power \"`${HOME}/scripts/thinkpad/pow.pl -p`\"" "on-click": "notify-send Power \"`${HOME}/scripts/thinkpad/pow.pl -p`\""
@ -177,15 +177,15 @@
}, },
"custom/pkg": { "custom/pkg": {
"interval": 60, "interval": 60,
"tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>", "tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>",
"on-click": "${HOME}/scripts/waybar/waybar-pkg.sh upgrade", "on-click": "${HOME}/scripts/waybar/waybar-pkg.sh upgrade",
"return-type": "json", "return-type": "json",
"exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar" "exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar"
}, },
"custom/bar": { "custom/bar": {
"interval": 86400, "interval": 86400,
"exec": "echo '\u200a\nLock bar\n'", "exec": "echo '\u200a\nLock bar\n'",
"on-click": "${HOME}/scripts/waybar/toggle.sh" "on-click": "${HOME}/scripts/waybar/toggle.sh"
}, },
"idle_inhibitor": { "idle_inhibitor": {
"format": "{icon}", "format": "{icon}",
@ -193,24 +193,24 @@
"activated": "", "activated": "",
"deactivated": "" "deactivated": ""
}, },
"on-click": "echo {status} > .config/idle_inhibitor" "on-click": "echo {status} > .config/idle_inhibitor"
}, },
"custom/hibernate_inhibitor": { "custom/hibernate_inhibitor": {
"interval": 5, "interval": 5,
"return-type": "json", "return-type": "json",
"exec": "${HOME}/scripts/waybar/waybar-hibernate.sh bar", "exec": "${HOME}/scripts/waybar/waybar-hibernate.sh bar",
"on-click": "${HOME}/scripts/waybar/waybar-hibernate.sh toggle" "on-click": "${HOME}/scripts/waybar/waybar-hibernate.sh toggle"
}, },
"custom/gammastep": { "custom/gammastep": {
"interval": 1, "interval": 1,
"return-type": "json", "return-type": "json",
"exec": "${HOME}/scripts/waybar/waybar-gammastep.sh", "exec": "${HOME}/scripts/waybar/waybar-gammastep.sh",
"on-click": "${HOME}/scripts/waybar/waybar-gammastep.sh toggle" "on-click": "${HOME}/scripts/waybar/waybar-gammastep.sh toggle"
}, },
"custom/clock": { "custom/clock": {
"interval": 60, "interval": 60,
"on-click": "${HOME}/.local/bin/firefox/firefox-bin https://papillon.john.me.tz/calendar.php", "on-click": "${HOME}/.local/bin/firefox/firefox-bin https://papillon.john.me.tz/calendar.php",
"return-type": "json", "return-type": "json",
"exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'" "exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'"
}, },
"custom/power": { "custom/power": {

48
wofi/style.css
View File

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