Skip to content

Commit

Permalink
bunch of edits 3
Browse files Browse the repository at this point in the history
  • Loading branch information
arendorff committed Jan 6, 2021
1 parent 033e63f commit 9516eb6
Show file tree
Hide file tree
Showing 10 changed files with 93 additions and 119 deletions.
24 changes: 13 additions & 11 deletions .config/fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ abbr gs 'git status'
abbr gpp 'git pull'
abbr ga 'git add'
abbr gc 'git commit -m "'
abbr cat 'bat'
abbr R 'R --quiet'
abbr df 'df -h'
abbr vpn 'nordvpn'
Expand Down Expand Up @@ -184,7 +183,7 @@ abbr bspwmrc "nvim ~/.config/bspwm/bspwmrc"
abbr brc "nvim ~/.config/bspwm/bspwmrc"
abbr swayrc "nvim ~/.config/sway/config"
abbr sxhkdrc "nvim ~/.config/sxhkd/sxhkdrc"
abbr src "nvim ~/.config/sxhkd/sxhkdrc"
abbr src "nvim ~/.spectrwm.conf"
abbr arc "nvim ~/.config/alacritty/alacritty.yml"
abbr manrc "nvim ~/.config/vimpager/init.vim"
abbr pagerrc "nvim ~/.config/vimpager/init.vim"
Expand All @@ -193,10 +192,10 @@ abbr drc 'nvim ~/.config/dunst/dunstrc'
abbr drc 'nvim ~/.config/dunst/dunstrc'

# todo files
abbr tp 'nvim ~/sync/docs/todo/personal.md'
abbr tr 'nvim ~/sync/docs/todo/ricing.md'
abbr tm 'nvim ~/sync/docs/todo/master.md'
abbr th 'nvim ~/sync/docs/todo/health.md'
abbr tep 'nvim ~/sync/docs/todo/personal.md'
abbr ter 'nvim ~/sync/docs/todo/ricing.md'
abbr tem 'nvim ~/sync/docs/todo/master.md'
abbr teh 'nvim ~/sync/docs/todo/health.md'
abbr thl 'glow ~/sync/docs/todo/health.md'
abbr tpl 'glow ~/sync/docs/todo/personal.md'
abbr trl 'glow ~/sync/docs/todo/ricing.md'
Expand Down Expand Up @@ -239,11 +238,13 @@ abbr spsyu "sudo pacman -Syu" # update repository database und packages
abbr psyu "sudo pacman -Syu" # update repository database und packages
abbr psi "pacman -Si" # info on package in repos.
abbr pqi "pacman -Qi" # info on local package
abbr listorphans "pacman -Qdt"
abbr list-orphans "pacman -Qdt"
abbr list-installed-native-packages "pacman -Qent"
abbr list-installed-foreign-packages "pacman -Qemt"
abbr pqs "pacman -Qs" # local search
abbr deleteorphans "sudo pacman -Rns (pacman -Qtdq)" # delete orphaned packages
abbr create-package-list "pacman -Qqen > pkglist.txt"
abbr create-aur-package-list "pacman -Qqem > aurpkglist.txt"
abbr delete-orphans "sudo pacman -Rns (pacman -Qtdq)" # delete orphaned packages
abbr create-package-list "pacman -Qqen > ~/sync/dots/x250/pkglist.txt"
abbr create-aur-package-list "pacman -Qqem > ~/sync/dots/x250/aurpkglist.txt"

# AUR
abbr ys "yay -S"
Expand All @@ -260,7 +261,8 @@ set -x VISUAL /usr/bin/nvim
#set -Ux VISUAL '/usr/bin/emacs -nw'
set -x PAGER /usr/bin/less
set -x IMGVIEWER /usr/bin/sxiv
set -x PDFVIEWER /usr/bin/zathura
set -x PDFVIEWER /usr/bin/evince
# set -x PDFVIEWER /usr/bin/zathura
# set -x TERM /usr/bin/alacritty
set -x BROWSER /usr/bin/firefox
# set -x WM /usr/bin/bspwm
Expand Down
20 changes: 11 additions & 9 deletions .config/lf/lfrc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ map y copy
# reload directory
map l reload

# open with
map Oz &zathura $f
map Os &sxiv $f
map Oe &evince $f


# delete cut duplicate
map d
map dd cut
Expand Down Expand Up @@ -80,21 +86,17 @@ map <c-r> :bulk-rename
# jumping
map gh cd ~/
map gc cd ~/.config/
map g. cd ~/SynologyDrive/dots
map gb cd ~/Dropbox/
map g. cd ~/sync/dots
map gd cd ~/downloads
map gD cd ~/documents
map gN cd /mnt/moritz
map gu cd /mnt/moritz
map gs cd /mnt/moritz
map gn cd ~/Dropbox/notes
map gC cd ~/Cloud
map gM cd /run/media
map gm cd ~/SynologyDrive/Documents/master
map gs cd /home/mo/sync
map gM cd /mnt/
map gm cd ~/sync/docs/master/
map gT cd ~/.local/share/Trash/files
map gv cd ~/video
map gS cd ~/scripts
map gt cd ~/todo
map gt cd ~/sync/docs/todo

map .b cd ~/.config/bspwm
map .e cd ~/.emacs.d/
Expand Down
3 changes: 2 additions & 1 deletion .config/spectrwm/autostart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pgrep -x mpd || mpd &
#pgrep -x polybar || $HOME/.config/polybar/launch.sh
#pgrep -x polybar || polybar polybar &
pgrep -x redshift || redshift &
pgrep -x nitrogen || nitrogen --restore &
# pgrep -x nitrogen || nitrogen --restore &
# pgrep -x nextcloud || nextcloud &
# pgrep -x cloud-drive-ui || synology-drive &
pgrep -x unclutter || unclutter --timeout 2 &
Expand All @@ -31,6 +31,7 @@ pgrep -x xfce4-power-manager || xfce4-power-manager &
# hsetroot -solid "#4c6054"
# hsetroot -solid "#353535"
#hsetroot -solid "#000000"
hsetroot -solid "#181818"
#autorandr -c

# feh --bg-fill ~/images/walls/wallhaven-137ozw.png
Expand Down
6 changes: 3 additions & 3 deletions .spectrwm.conf.corsair
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ color_focus_maximized = rgb:1d/1f/21
color_unfocus = rgb:35/35/35
# color_unfocus = rgb:1d/1f/21
color_unfocus_maximized = rgb:88/88/00
region_padding = 20
tile_gap = 20
region_padding = 0
tile_gap = 0

# Region containment
# Distance window must be dragged/resized beyond the region edge before it is
Expand Down Expand Up @@ -109,7 +109,7 @@ program[term] = alacritty
# program[term2] = kitty --single-instance
program[term2] = xterm

program[menu] = dmenu_run -fn "Terminus-12"
program[menu] = dmenu_run -fn "Terminus-12" -i
bind[menu] = MOD+a

program[dmenuscript] = /home/mo/scripts/dmenuscript.fish
Expand Down
40 changes: 23 additions & 17 deletions .spectrwm.conf.x250
Original file line number Diff line number Diff line change
Expand Up @@ -134,22 +134,24 @@ program[menu] = dmenu_run -i -l 25 -fn "Roboto Mono-10"

# program bindings

program[browser1] = firefox
bind[browser1] = MOD+v
program[browser2] = chromium
bind[browser2] = MOD+Shift+v

program[pcmanfm] = pcmanfm
program[thunar] = thunar
bind[pcmanfm] = MOD+Shift+c
bind[pcmanfm] = MOD+c
program[telegram] = telegram-desktop
bind[telegram] = MOD+w
program[dmenuscript] = /home/mo/scripts/dmenuscript.fish
bind[dmenuscript] = MOD+Shift+space

program[mail] = thunderbird
bind[mail] = MOD+l
program[browser1] = firefox
bind[browser1] = MOD+v
program[browser2] = brave
bind[browser2] = MOD+Shift+v

program[pcmanfm] = pcmanfm
program[thunar] = thunar
bind[pcmanfm] = MOD+Shift+c
bind[pcmanfm] = MOD+c
program[telegram] = telegram-desktop
bind[telegram] = MOD+w
program[dmenuscript] = /home/mo/scripts/dmenuscript.fish
bind[dmenuscript] = MOD+Shift+space
program[wifinotification] = /home/mo/scripts/wifi-notification.fish
bind[wifinotification] = MOD+Shift+g

program[mail] = thunderbird
bind[mail] = MOD+l

# volume control

Expand Down Expand Up @@ -188,6 +190,10 @@ program[mpc_previous] = mpc prev
bind[mpc_previous] = XF86AudioPrev


program[wifitoggle] = nmcli device disconnect wlp3s0 || nmcli device connect wlp3s0; notify-send 'Toggling Wifi...'
bind[wifitoggle] = MOD+Shift+h
# bind[wifitoggle] = XF86WLAN

# QUIRKS
# Default quirks, remove with: quirk[class:name] = NONE
# quirk[MPlayer:xv] = FLOAT + FULLSCREEN + FOCUSPREV
Expand Down Expand Up @@ -462,7 +468,7 @@ bind[ws_prior] = MOD+Tab


program[timebattery] = /home/mo/scripts/timebattery.fish
bind[timebattery] = MOD + g
bind[timebattery] = MOD+g

# program[mpc
# XF86Tools
Expand Down
2 changes: 1 addition & 1 deletion Scripts/dmenuscript.fish
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if test -f $string
# nvim "$string"
switch $string
case '*.pdf'
$PDFVIEWER $string &
evince $string &
case '*.md' '*.org' '*.txt' '*.conf' '*.yaml' '*.yml' '*.toml' '*.json' '*.hex' '*.c' '*.R' '*.r' '*.rmd' '*.html' '*.bib' '*.fish' '*.sh'
alacritty -e $EDITOR $string
# alacritty -e $EDITOR $string
Expand Down
20 changes: 18 additions & 2 deletions Scripts/timebattery.fish
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
#!/bin/fish

nordvpn status | grep "Connected" >/dev/null; and set vpn connected; or set vpn disconnected

set name (nmcli dev | grep "^wlp3s0" | awk '{print$4}')

set date (date +"%a %H:%M %d.%m.%Y")

set bat (acpi -b | cut -d' ' -f4 | tr -d ',')
set bat (acpi -b | cut -d' ' -f3,4 | tr -d ',')
# set bat (acpi -b | cut -d' ' -f3,4 | tr -d ',')

notify-send "DATE: $date
BAT: $bat"
BAT: $bat
WIFI: $name
VPN: $vpn"




# echo $name



# nmcli dev | grep '^wlp3s0.*connected' > /dev/null && notify-send "wifi connected to $name" || notify-send "wifi disconnected"
13 changes: 12 additions & 1 deletion aurpkglist.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
bitwarden-bin
brave-bin
brother-hll2300d
dict-freedict-deu-eng
dict-freedict-eng-deu
doi2bib
easystroke-git
glow
gotop-bin
lf-bin
mangohud
nordvpn-bin
yay
oomox
pfetch-git
6 changes: 6 additions & 0 deletions neo.map
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# my notes:

# put into /usr/share/kbd/keymaps/i386/qwertz
# edit /etc/vconsole.conf


#==========================================================================
# README
#==========================================================================
Expand Down
Loading

0 comments on commit 9516eb6

Please sign in to comment.