Compare commits

...

9 Commits

Author SHA1 Message Date
joelchrono12 4f61b7ff76
commented out non-working echo 2022-01-17 14:10:30 -06:00
joelchrono12 d5cb645dfc
pipewire added to spectrwm 2022-01-17 14:10:02 -06:00
joelchrono12 7bbab84ff8
neovim changes, mail config 2022-01-17 14:09:10 -06:00
joelchrono12 2342364b7c
update qpost 2022-01-17 14:08:25 -06:00
joelchrono12 e85ec216d3
newsboat 2022-01-17 14:07:38 -06:00
joelchrono12 76e73a6b96
awesomewm 2022-01-17 14:06:36 -06:00
joelchrono12 38b7970214
using mononoki font for alacritty 2022-01-17 14:05:35 -06:00
joelchrono12 9c2794ce3c
remove endeavour os functions 2022-01-17 14:04:49 -06:00
joelchrono12 99e26b7ecf
bashrc, spectrwm 2021-12-21 23:19:21 -06:00
13 changed files with 103 additions and 234 deletions

View File

@ -4,29 +4,13 @@
[[ -f ~/.welcome_screen ]] && . ~/.welcome_screen
_set_my_PS1() {
PS1='[\u@\h \W]\$ '
if [ "$(whoami)" = "liveuser" ] ; then
local iso_version="$(grep ^VERSION= /usr/lib/endeavouros-release 2>/dev/null | cut -d '=' -f 2)"
if [ -n "$iso_version" ] ; then
local prefix="eos-"
local iso_info="$prefix$iso_version"
PS1="[\u@$iso_info \W]\$ "
fi
fi
}
_set_my_PS1
unset -f _set_my_PS1
ShowInstallerIsoInfo() {
local file=/usr/lib/endeavouros-release
if [ -r $file ] ; then
cat $file
else
echo "Sorry, installer ISO info is not available." >&2
fi
}
if ! shopt -oq posix; then
if [ -f /usr/share/bash-completion/bash_completion ]; then
. /usr/share/bash-completion/bash_completion
elif [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
fi
[[ "$(whoami)" = "root" ]] && return
@ -40,131 +24,6 @@ bind '"\e[B":history-search-forward'
################################################################################
## Some generally useful functions.
## Consider uncommenting aliases below to start using these functions.
_GeneralCmdCheck() {
# A helper for functions UpdateArchPackages and UpdateAURPackages.
echo "$@" >&2
"$@" || {
echo "Error: '$*' failed." >&2
exit 1
}
}
_CheckInternetConnection() {
# curl --silent --connect-timeout 8 https://8.8.8.8 >/dev/null
eos-connection-checker
local result=$?
test $result -eq 0 || echo "No internet connection!" >&2
return $result
}
_CheckArchNews() {
local conf=/etc/eos-update-notifier.conf
if [ -z "$CheckArchNewsForYou" ] && [ -r $conf ] ; then
source $conf
fi
if [ "$CheckArchNewsForYou" = "yes" ] ; then
local news="$(yay -Pw)"
if [ -n "$news" ] ; then
echo "Arch news:" >&2
echo "$news" >&2
echo "" >&2
# read -p "Press ENTER to continue (or Ctrl-C to stop): "
else
echo "No Arch news." >&2
fi
fi
}
UpdateArchPackages() {
# Updates Arch packages.
_CheckInternetConnection || return 1
_CheckArchNews
#local updates="$(yay -Qu --repo)"
local updates="$(checkupdates)"
if [ -n "$updates" ] ; then
echo "Updates from upstream:" >&2
echo "$updates" | sed 's|^| |' >&2
_GeneralCmdCheck sudo pacman -Syu "$@"
return 0
else
echo "No upstream updates." >&2
return 1
fi
}
UpdateAURPackages() {
# Updates AUR packages.
_CheckInternetConnection || return 1
local updates
if [ -x /usr/bin/yay ] ; then
updates="$(yay -Qua)"
if [ -n "$updates" ] ; then
echo "Updates from AUR:" >&2
echo "$updates" | sed 's|^| |' >&2
_GeneralCmdCheck yay -Syua "$@"
else
echo "No AUR updates." >&2
fi
else
echo "Warning: /usr/bin/yay does not exist." >&2
fi
}
UpdateAllPackages() {
# Updates all packages in the system.
# Upstream (i.e. Arch) packages are updated first.
# If there are Arch updates, you should run
# this function a second time to update
# the AUR packages too.
UpdateArchPackages || UpdateAURPackages
}
_open_files_for_editing() {
# Open any given document file(s) for editing (or just viewing).
# Note1: Do not use for executable files!
# Note2: uses mime bindings, so you may need to use
# e.g. a file manager to make some file bindings.
if [ -x /usr/bin/exo-open ] ; then
echo "exo-open $*" >&2
/usr/bin/exo-open "$@" >& /dev/null &
return
fi
if [ -x /usr/bin/xdg-open ] ; then
for file in "$@" ; do
echo "xdg-open $file" >&2
/usr/bin/xdg-open "$file" >& /dev/null &
done
return
fi
echo "Sorry, none of programs [$progs] is found." >&2
echo "Tip: install one of packages" >&2
for prog in $progs ; do
echo " $(pacman -Qqo "$prog")" >&2
done
}
_Pacdiff() {
local differ pacdiff=/usr/bin/pacdiff
if [ -n "$(echo q | DIFFPROG=diff $pacdiff)" ] ; then
for differ in kdiff3 meld diffuse ; do
if [ -x /usr/bin/$differ ] ; then
DIFFPROG=$differ su-c_wrapper $pacdiff
break
fi
done
fi
}
#------------------------------------------------------------
## Aliases for the functions above.
@ -174,12 +33,11 @@ _Pacdiff() {
#alias ef='_open_files_for_editing' # 'ef' opens given file(s) for editing
# alias pacdiff=_Pacdiff
alias checkin='_CheckInternetConnection'
alias ls='exa -al --color=always --group-directories-first --icons'
alias vb='cd ~/git/joelchrono12.ml/_posts/ && nvim $(/usr/bin/ls *.md | sort -r | head -n 1)'
alias la='exa -a --color=always --group-directories-first --icons'
alias lt='exa -aT --color=always --group-directories-first --icons'
alias ls='exa -al --color=always --group-directories-first --icons'
alias la='exa -a --color=always'
alias l.='exa -a | grep "^\."'
alias ll='exa -l --color=always --group-directories-first --icons'
alias ll='exa -l --color=always --icons'
alias bashrc='v ~/.bashrc & exit'
alias rclua='v ~/.config/awesome/rc.lua & exit'
alias spectrwmconf='v ~/.spectrwm.conf & exit'
@ -187,11 +45,10 @@ alias ..='cd ..'
alias .2='cd ../..'
alias .3='cd ../../..'
alias .4='cd ../../../..'
alias xin='sudo pacman -S'
alias xup='paru'
alias xun='sudo pacman -Rs'
alias xs='pacman -Ss'
alias xme='sudo xbps-query -m'
alias xin='sudo apt install'
alias xup='sudo apt update && sudo apt upgrade'
alias xun='sudo apt remove'
alias xs='apt search'
alias sysinfo='inxi -Frxz'
alias cp='cp -i'
alias rm='rm -i'
@ -217,10 +74,11 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
#source $HOME/.config/bash-config/bashrc.bash
eval "$(starship init bash)"
pfetch
neofetch
################################################################################
# Install Ruby Gems to ~/gems
export PATH="$HOME/.local/share/gem/ruby/3.0.0/bin:$PATH"
export EDITOR='nvim'
export GOBIN="$HOME/go/bin"
export GOPATH="$HOME/go"
export PATH="$PATH:$GOBIN"

View File

@ -3,14 +3,14 @@
# Any items in the `env` entry below will be added as
# environment variables. Some entries may override variables
# set by alacritty itself.
env:
#env:
# TERM variable
#
# This value is used to set the `$TERM` environment variable for
# each instance of Alacritty. If it is not present, alacritty will
# check the local terminfo database and use `alacritty` if it is
# available, otherwise `xterm-256color` is used.
TERM: alacritty
#TERM: alacritty
window:
@ -102,14 +102,14 @@ scrolling:
# Font configuration
font:
normal:
family: BlexMono Nerd Font
family: mononoki Nerd Font
bold:
family: BlexMono Nerd Font
family: mononoki Nerd Font
italic:
family: BlexMono Nerd Font
family: mononoki Nerd Font
bold_italic:
family: BlexMono Nerd Font
size: 8.0
family: mononoki Nerd Font
size: 9.0
offset:
x: 0
@ -218,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: 1.0
background_opacity: 0.9
background_opacity: 1
#selection:

View File

@ -370,10 +370,10 @@ globalkeys = gears.table.join(
-- User programs
awful.key({ modkey, altkey }, "b", function () awful.spawn("qutebrowser") end,
{description = "run browser", group = "launcher"}),
awful.key({ modkey, altkey }, "v", function () awful.spawn("alacritty -e pulsemixer") end,
{description = "run volume control", group = "user programs"}),
awful.key({ modkey }, "a", function () awful.spawn(gui_editor) end,
{description = "run gui editor", group = "launcher"}),
{description = "run gui editor", group = "user programs"}),
awful.key({ modkey, altkey }, "d", function () awful.spawn("Discord") end,
{description = "run discord messaging client", group = "launcher"}),
awful.key({ modkey, altkey }, "f", function () awful.spawn("pcmanfm") end,

View File

@ -1,4 +0,0 @@
# Netscape HTTP Cookie File
# https://curl.se/docs/http-cookies.html
# This file was generated by libcurl! Edit at your own risk.

View File

@ -6,12 +6,17 @@
#urls-source "inoreader"
# miniflux
urls-source "miniflux"
miniflux-url "https://rss.airikr.me"
miniflux-login "joel"
miniflux-passwordeval "pass blog/miniflux-rss"
cookie-cache "~/.config/newsboat/.rss/cookies.txt"
#urls-source "miniflux"
#miniflux-url "https://rss.airikr.me"
#miniflux-login "joel"
#miniflux-passwordeval "pass blog/miniflux-rss"
#cookie-cache "~/.config/newsboat/.rss/cookies.txt"
#FreshRSS
urls-source "freshrss"
freshrss-login "dietpi"
freshrss-passwordeval "pass personal/freshrss"
freshrss-url "http://100.114.188.127/freshrss/api/greader.php"
#NextCloud News
#ocnews-url "https://cloud.xpenguin.club"
@ -25,11 +30,6 @@ cookie-cache "~/.config/newsboat/.rss/cookies.txt"
#urls-source "newsblur"
#cookie-cache "~/.config/newsboat/.rss/cookies.txt"
#FreshRSS
#freshrss-login "hexdsl"
#freshrss-passwordeval "pass rss.hexdsl.co.uk"
#freshrss-url "https://rss.hexdsl.co.uk/api/greader.php"
#urls-source "freshrss"
#TinyTinyRSS
#urls-source "ttrss"
@ -39,50 +39,45 @@ cookie-cache "~/.config/newsboat/.rss/cookies.txt"
#ttrss-flag-publish "p"
#cookie-cache "~/Documents/.rss/cookies.txt"
# general
auto-reload yes
reload-time 120
show-read-articles no
show-read-feeds no
delete-read-articles-on-quit yes
#auto-reload yes
#reload-time 120
#show-read-articles yes
#show-read-feeds yes
#max-items 4000
#text-width 80
#reload-threads 8
#show-title-bar yes
#confirm-exit yes
#cleanup-on-quit yes
#delete-read-articles-on-quit no
#browser "firefox %u"
#external-url-viewer "urlscan"
#player "mpv"
#download-retries 4
#pager internal
#article-sort-order date-asc
#datetime-format "%y-%m-%d"
#html-renderer "w3m -t text/html"
save-path ~/downloads/news/
cache-file "~/.config/newsboat/.rss/cache.db"
max-items 4000
delete-read-articles-on-quit yes
text-width 80
reload-threads 8
show-title-bar yes
confirm-exit yes
cleanup-on-quit no
# define
browser "firefox %u"
external-url-viewer "urlscan"
#html-renderer "w3m -T text/html"
player "mpv"
download-retries 4
pager internal
article-sort-order date-asc
datetime-format "%Y-%m-%d"
# The path where articles shall be saved to.
save-path ~/Downloads/news/
# Disable keymap hints on the bottom of screen.
# disable keymap hints on the bottom of screen.
show-keymap-hint yes
notify-always yes
notify-program "notify-send"
# Set format string that is used for formatting notifications.
# set format string that is used for formatting notifications.
notify-format "%n unread articles"
#Keys
#keys
bind-key j down
bind-key k up
bind-key j next articlelist
bind-key k prev articlelist
bind-key J next-feed articlelist
bind-key K prev-feed articlelist
bind-key G end
bind-key j next-feed articlelist
bind-key k prev-feed articlelist
bind-key g end
bind-key g home
bind-key d pagedown
bind-key u pageup
@ -90,9 +85,9 @@ bind-key l open
bind-key h quit
bind-key a toggle-article-read
bind-key n next-unread
bind-key N prev-unread
bind-key D pb-download
bind-key U show-urls
bind-key n prev-unread
bind-key d pb-download
bind-key u show-urls
bind-key x pb-delete
bind-key r reload
bind-key R reload-all
@ -136,8 +131,8 @@ highlight article ":.*\\(embedded flash\\)$" magenta default
#bookmark-cmd ~/.newsboat/bookmark.sh
#bookmark-interactive no
#bookmark-autopilot yes
#Macros
macro o open-in-browser ; toggle-article-read "read"
#Macros
# vim:ft=config:

View File

@ -0,0 +1,13 @@
" ftplugin/mail.vim
setl tw=72
setl nojs
setl nosmartindent
setl noautoindent
" Flowed format
setl fo=watqj
set comments-=fb:-
setl list
set listchars=trail:•
highlight Comment ctermfg=green cterm=italic

View File

@ -18,6 +18,7 @@ set smartcase
set incsearch
colorscheme nord
highlight ColorColumn ctermbg=0 guibg=lightgrey
highlight Comment cterm=italic gui=italic
highlight htmlBold gui=bold guifg=#af0000 ctermfg=green

View File

@ -29,7 +29,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'kien/ctrlp.vim'
Plug 'dhruvasagar/vim-table-mode'
"Plug 'ycm-core/YouCompleteMe'
Plug 'neoclide/coc.nvim', {'branch': 'release'}
"Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'gruvbox-community/gruvbox'
Plug 'sickill/vim-monokai'

View File

@ -2,7 +2,7 @@ configuration {
/*columns: 1;*/
terminal: "alacritty";
/*theme: "/home/joelchrono12/.config/rofi/themes/centered-nord.rasi";*/
modi: "drun,calc:qalc,window,run,emoji";
modi: "drun,calc:qalc,window,run";
show-icons: false;
icon-theme: "Flatery-Blue-Dark";
}

View File

@ -15,7 +15,7 @@ while [ $num = 0 ]; do
if [[ $choice = "Edit file" ]]; then
touch $path/$filename.md
echo -e "---\ntitle: $title\nheader: $title\ndescription: $description\ntags: $tags\npermalink: /blog/$filen/\nlayout: post\ndate: $today $(date +"%T") -0500\nhost: fosstodon.org\nusername: joeligj12\ncom_id: idcomments\n---">> $path/$filename.md
echo -e "---\ntitle: $title\nheader: $title\ndescription: $description\ntags: $tags\npermalink: /blog/$filen/\nlayout: post\ndate: $today $(date +"%T") -0600\nhost: fosstodon.org\nusername: joel\ncom_id: idcomments\n---">> $path/$filename.md
num=1
alacritty -e nvim $path/$filename.md & disown
#cp $path/$filename.md ~/Documents

View File

@ -40,13 +40,13 @@ vol() {
volstat=$(pamixer --get-volume-human)
vol=$(echo "$volstat")
volicon="墳"
echo -e "$volicon $vol"
echo "$volicon $vol"
}
# used storage
hdd() {
hdd="$(df -h /home | grep /dev | awk '{print $3 " / " $2}')"
echo -e " $hdd"
echo "$hdd"
}
# available ram
@ -71,12 +71,12 @@ cpu() {
# Loop to update bar output
update(){
echo " $(mpd) $(cpu)+@fg=3; +@bg=1;+@fg=1;  $(mem) +@fg=4;+@bg=2;+@fg=1;  $(hdd) +@fg=5;+@bg=3;+@fg=1; $(vol) +@fg=7;+@bg=5;+@fg=1; $(bat) +@fg=8;+@bg=6;+@fg=1; $(network) +@fg=1;+@bg=0;"
echo " $(cpu)+@fg=3; +@bg=1;+@fg=1;  $(mem) +@fg=4;+@bg=2;+@fg=1;  $(hdd) +@fg=5;+@bg=3;+@fg=1; $(vol) +@fg=7;+@bg=5;+@fg=1; $(bat) +@fg=8;+@bg=6;+@fg=1; $(network) +@fg=1;+@bg=0;"
wait
}
while :; do
update
~/.config/spectrwm/scripts/trayer_follows_ws.sh
#~/.config/spectrwm/scripts/trayer_follows_ws.sh
sleep 2 &
wait
done

View File

@ -13,8 +13,8 @@ warp_pointer = 0
border_width = 3
color_focus = rgb:b4/8e/ad
color_unfocus = rgb:2e/34/40
region_padding = 0
tile_gap = 0
region_padding = 5
tile_gap = 5
boundary_width = 50
# Bar configuration
@ -45,15 +45,17 @@ urgent_enabled = 1
urgent_collapse = 0
# Autorunning applications
autorun = ws[1]:nitrogen --set-auto ~/Pictures/walls/paranoid.jpg &
autorun = ws[1]:setxkbmap -layout latam &
autorun = ws[1]:nitrogen --restore
autorun = ws[1]:alacritty
autorun = ws[1]:pipewire
autorun = ws[1]:pipewire-pulse
autorun = ws[1]:volumeicon
autorun = ws[1]:xfce4-power-manager
autorun = ws[1]:syncthing
autorun = ws[1]:nm-applet &
autorun = ws[1]:lxpolkit &
autorun = ws[1]:picom --experimental-backends --backend glx --blur-method 'dual_kawase' --blur-strength 6
autorun = ws[1]:setxkbmap -layout latam
autorun = ws[1]:picom &
# Workspace names and modkey
layout = ws[1]:4:0:0:0:vertical
@ -75,6 +77,7 @@ quirk[Image Lounge] = FLOAT
quirk[firefox] = IGNOREPID + TRANSSZ + ANYWHERE
quirk[Thunderbird] = ANYWHERE + IGNORESPAWNWS + IGNOREPID + TRANSSZ
quirk[Claws-mail] = ANYWHERE + IGNORESPAWNWS + IGNOREPID + TRANSSZ
quirk[file-roller] = ANYWHERE + IGNORESPAWNWS + IGNOREPID + TRANSSZ
quirk[Xarchiver] = ANYWHERE + IGNORESPAWNWS + IGNOREPID + TRANSSZ
quirk[Lxappearance] = FLOAT
quirk[Pavucontrol] = FLOAT
@ -87,6 +90,7 @@ quirk[Xfce4-power-manager-settings] = FLOAT + ANYWHERE
quirk[Nm-connection-editor] = ANYWHERE + IGNORESPAWNWS + FLOAT
quirk[Pcmanfm] = ANYWHERE + IGNORESPAWNWS
quirk[Thunar] = ANYWHERE + IGNORESPAWNWS
quirk[Mousepad] = ANYWHERE + IGNORESPAWNWS
# General keybindings
bind[] = MOD+x
@ -106,7 +110,7 @@ bind[height_grow] = MOD+Shift+equal
bind[height_shrink] = MOD+Shift+minus
bind[iconify] = MOD+w
bind[initscr] = MOD+Shift+i
bind[lock] = MOD+Shift+Delete
#bind[lock] = MOD+Shift+Delete
bind[master_add] = MOD+Shift+comma
bind[master_del] = MOD+Shift+period
bind[master_grow] = MOD+l
@ -208,7 +212,7 @@ bind[ws_prev_move] = MOD+Shift+Left
bind[ws_prior] = MOD+a
# Custom program keybindings
program[Discord] = discord
program[Discord] = firefox https://discord.com/
bind[Discord] = MOD+mod1+d
program[term] = alacritty
bind[term] = MOD+Return
@ -228,7 +232,7 @@ program[screenshot] = flameshot gui
bind[screenshot] = MOD+Shift+s
program[firefox] = firefox
bind[firefox] = MOD+Mod1+b
program[pcmanfm] = pcmanfm
program[pcmanfm] = thunar
bind[pcmanfm] = MOD+Mod1+f
program[pulsemixer] = alacritty -e pulsemixer
bind[pulsemixer] = MOD+mod1+v
@ -236,3 +240,5 @@ program[brightup] = brightnessctl set +15
bind[brightup] = XF86MonBrightnessUp
program[brightdown] = brightnessctl set 15-
bind[brightdown] = XF86MonBrightnessDown
program[lock] = slock
bind[lock] = MOD+Shift+l