From 7fe4f324b9c90c5383965b51aaccdd0322b4fef9 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Fri, 16 Jul 2021 20:36:05 -0400 Subject: brought up to date with Debian config --- .aliases | 7 ++- .bashrc | 2 +- .config/gammastep/config.ini | 68 ++++++++++++++++++++++ .config/mpd/mpd.conf | 1 - .config/openbox/autostart | 2 +- .config/openbox/rc.xml | 30 +++++----- .config/ranger/bookmarks | 3 +- .config/ranger/tagged | 4 +- .config/tint2/tint2rc | 40 ++++++------- .mbsyncrc | 22 +++++++ .msmtprc | 9 +-- .mutt/muttrc | 10 ++-- .mutt/personal | 2 +- .../mutt-maya-1000-464906-17309954408692460733 | 0 .../mutt-maya-1000-523614-10762961364526530727 | 0 .mutt/work | 19 ++++++ .offlineimaprc | 23 +------- .photocopyrc | 2 +- .rsync-exclude-weekly | 3 +- .ssh/config | 29 +-------- .tmux.conf | 4 +- .tmux/write-wire | 2 +- .vimrc | 1 + apps.txt | 4 +- debian-notes.txt | 3 +- 25 files changed, 179 insertions(+), 111 deletions(-) create mode 100644 .config/gammastep/config.ini create mode 100644 .mbsyncrc create mode 100644 .mutt/temp/mutt-maya-1000-464906-17309954408692460733 create mode 100644 .mutt/temp/mutt-maya-1000-523614-10762961364526530727 create mode 100644 .mutt/work diff --git a/.aliases b/.aliases index 26c3cf1..3f3b505 100644 --- a/.aliases +++ b/.aliases @@ -6,7 +6,7 @@ alias v="vim " alias dmenu="dmenu_run " #alias thunar="pcmanfm-qt" alias mpv="mpv --hwdec=vaapi -v " - +alias python="python3" # I like feedback alias cp='cp -v' alias mv='mv -v' @@ -98,3 +98,8 @@ alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT1 | egrep "time alias gpphoto="~/./bin/download-photos-gopro.py /mnt/card/DCIM/100GOPRO/" alias gpvid="~/./bin/download-videos-gopro.py /mnt/card/DCIM/100GOPRO/" + +# plain text accounting: +alias ebean="vim documents/_fin.beancount" +alias bean-school='bean-report documents/_fin.beancount journal -a Assets:SchoolsFirst:Checking --balance' +alias bean-schwab='bean-report documents/_fin.beancount journal -a Assets:Schwab:Checking --balance' diff --git a/.bashrc b/.bashrc index 084d91b..c354d92 100644 --- a/.bashrc +++ b/.bashrc @@ -13,7 +13,7 @@ export CM_HISTLENGTH=50 export PATH=/usr/local/bin:$PATH export PATH=$PATH:$HOME/bin export PATH=$PATH:$HOME/bin/bash-scripts -export PATH=$PATH:$HOME/.gem/ruby/2.6.0/bin +export PATH=$PATH:$HOME/.local/bin # Alias definitions if [ -f ~/.aliases ]; then diff --git a/.config/gammastep/config.ini b/.config/gammastep/config.ini new file mode 100644 index 0000000..a00f36d --- /dev/null +++ b/.config/gammastep/config.ini @@ -0,0 +1,68 @@ +; Global settings +[general] +; Set the day and night screen temperatures +temp-day=5700 +temp-night=5500 + +; Disable the smooth fade between temperatures when Redshift starts and stops. +; 0 will cause an immediate change between screen temperatures. +; 1 will gradually apply the new screen temperature over a couple of seconds. +fade=0 + +; Solar elevation thresholds. +; By default, Redshift will use the current elevation of the sun to determine +; whether it is daytime, night or in transition (dawn/dusk). When the sun is +; above the degrees specified with elevation-high it is considered daytime and +; below elevation-low it is considered night. +;elevation-high=3 +;elevation-low=-6 + +; Custom dawn/dusk intervals. +; Instead of using the solar elevation, the time intervals of dawn and dusk +; can be specified manually. The times must be specified as HH:MM in 24-hour +; format. +;dawn-time=6:00-7:45 +;dusk-time=18:35-20:15 + +; Set the screen brightness. Default is 1.0. +;brightness=0.9 +; It is also possible to use different settings for day and night +; since version 1.8. +;brightness-day=0.7 +;brightness-night=0.4 +; Set the screen gamma (for all colors, or each color channel +; individually) +gamma=0.8 +;gamma=0.8:0.7:0.8 +; This can also be set individually for day and night since +; version 1.10. +;gamma-day=0.8:0.7:0.8 +;gamma-night=0.6 + +; Set the location-provider: 'geoclue2', 'manual'. +; The location provider settings are in a different section. +location-provider=manual + +; Set the adjustment-method: 'randr', 'vidmode', 'drm', 'wayland'. +; 'randr' is the preferred X11 method, 'vidmode' is an older API +; that works in some cases when 'randr' does not. +; The adjustment method settings are in a different section. +adjustment-method=randr + +; Configuration of the location-provider: +; type 'gammastep -l PROVIDER:help' to see the settings. +; ex: 'gammastep -l manual:help' +; Keep in mind that longitudes west of Greenwich (e.g. the Americas) +; are negative numbers. +[manual] +lat=34.3 +lon=-82.6 + +; Configuration of the adjustment-method +; type 'gammastep -m METHOD:help' to see the settings. +; ex: 'gammastep -m randr:help' +; In this example, randr is configured to adjust only screen 0. +; Note that the numbering starts from 0, so this is actually the first screen. +; If this option is not specified, Redshift will try to adjust _all_ screens. +[randr] +screen=0 diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 1081004..fbdfbc5 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,6 +1,5 @@ db_file "~/.mpd/database" music_directory "/home/lxf/music/library" -playlist_directory "/home/lxf/music/playlists" log_file "/home/lxf/.mpd/mpd.log" pid_file "/home/lxf/.mpd/mpd.pid" state_file "/home/lxf/.mpd/mpdstate" diff --git a/.config/openbox/autostart b/.config/openbox/autostart index f37cc55..773f936 100644 --- a/.config/openbox/autostart +++ b/.config/openbox/autostart @@ -8,5 +8,5 @@ nextcloud & xset r rate 251 25 & xset -b xcape -e 'Control_L=Escape' -xinput set-prop 11 "libinput Natural Scrolling Enabled" 1 +xinput set-prop 13 "libinput Natural Scrolling Enabled" 1 feh --bg-fill ~/pictures/desktops/Untitled_0535_by_Mike_Sinko.jpg diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml index 08c6411..49a7c45 100644 --- a/.config/openbox/rc.xml +++ b/.config/openbox/rc.xml @@ -211,9 +211,21 @@ no - + - left + 2 + no + + + + + 3 + no + + + + + 4 no @@ -258,15 +270,6 @@ - - - - - - - - - dmenu_run @@ -309,12 +312,12 @@ - brightnessctl set 100- + brightnessctl set 10- - brightnessctl set 100+ + brightnessctl set 10+ @@ -839,7 +842,6 @@ --> no - 1 no diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks index b5c890f..b2fb743 100644 --- a/.config/ranger/bookmarks +++ b/.config/ranger/bookmarks @@ -9,4 +9,5 @@ s:/home/lxf/sites/luxagraf.net c:/home/lxf/pictures/nextcloud-ccg-phone t:/home/lxf/temp p:/home/lxf/temp/wired -':/home/lxf +':/mnt/backup/week.6 +k:/home/lxf/pictures/2021/05_bus diff --git a/.config/ranger/tagged b/.config/ranger/tagged index 1aa7043..67f7d46 100644 --- a/.config/ranger/tagged +++ b/.config/ranger/tagged @@ -2,6 +2,8 @@ /home/lxf/sites/usedbarcode.net/usedbarcode/app/contracts/models.py /home/lxf/sites/vanlife.tools/app/accounts/migrations /home/lxf/writing/opera/opera-for-android-best-features.txt -/home/lxf/writing/conde/wired/docs r:/home/lxf/sites/corrinne-site/app/clients_ /home/lxf/temp/Backwoods Home magazine pack - RePack +/home/lxf/writing/wired/docs +/home/lxf/Options Trading for Beginners.mp4 +/home/lxf/sites/luxagraf.net/app/trading/templates/trading/luxtrademodel_form.html diff --git a/.config/tint2/tint2rc b/.config/tint2/tint2rc index 716830f..a5e1f9f 100644 --- a/.config/tint2/tint2rc +++ b/.config/tint2/tint2rc @@ -80,7 +80,7 @@ autohide_hide_timeout = 0.5 autohide_height = 2 strut_policy = follow_size panel_window_name = tint2 -disable_transparency = 0 +disable_transparency = 1 mouse_effects = 1 font_shadow = 0 mouse_hover_icon_asb = 100 0 10 @@ -96,15 +96,15 @@ taskbar_active_background_id = 0 taskbar_name = 1 taskbar_hide_inactive_tasks = 0 taskbar_hide_different_monitor = 0 -taskbar_hide_different_desktop = 0 +taskbar_hide_different_desktop = 1 taskbar_always_show_all_desktop_tasks = 0 taskbar_name_padding = 4 2 taskbar_name_background_id = 0 taskbar_name_active_background_id = 0 taskbar_name_font_color = #e3e3e3 100 -taskbar_name_font = Roboto 13 +taskbar_name_font = Roboto 12 taskbar_name_active_font_color = #ffffff 100 -taskbar_distribute_size = 0 +taskbar_distribute_size = 1 taskbar_sort_order = none task_align = left @@ -133,7 +133,7 @@ mouse_scroll_down = iconify #------------------------------------- # System tray (notification area) -systray_padding = 0 4 2 +systray_padding = 5 4 2 systray_background_id = 0 systray_sort = ascending systray_icon_size = 40 @@ -151,10 +151,10 @@ launcher_icon_asb = 100 0 0 launcher_icon_theme_override = 0 startup_notifications = 1 launcher_tooltip = 1 -launcher_item_app = urxvt.desktop -launcher_item_app = vivaldi-snapshot.desktop -launcher_item_app = darktable.desktop -launcher_item_app = thunar.desktop +#launcher_item_app = urxvt.desktop +#launcher_item_app = vivaldi.desktop +#launcher_item_app = darktable.desktop +#launcher_item_app = thunar.desktop #------------------------------------- # Clock @@ -177,14 +177,14 @@ clock_dwheel_command = # Battery battery = 0 battery_tooltip = 1 -bat1_font = Roboto 13 +bat1_font = Roboto 12 bat2_font = Roboto 13 bat1_format = %p - %h:%m battery_low_status = 10 battery_low_cmd = xmessage 'tint2: Battery low!' battery_full_cmd = battery_font_color = #ffffff 100 -battery_padding = 40 0 +battery_padding = 15 0 battery_background_id = 0 battery_hide = 101 @@ -201,12 +201,12 @@ button = new button_icon = ~/bin/launcher.png #button_text = Menu button_tooltip = -button_font = Roboto Regular 13 +button_font = Roboto Regular 12 button_font_color = #888888 100 button_background_id = 0 button_centered = 0 button_padding = 10 1 1 -button_max_icon_size = 20 +button_max_icon_size = 18 button_lclick_command = jgmenu_run # button_mclick_command = button_rclick_command = jgmenu_run @@ -225,7 +225,7 @@ execp_markup = 1 execp_tooltip = execp_lclick_command = mpc toggle execp_rclick_command = mpc next -execp_font = Roboto Regular 13 +execp_font = Roboto Regular 11 execp_font_color = #ffffff 100 execp_padding = 8 0 execp_background_id = 2 @@ -248,9 +248,9 @@ execp_rclick_command = execp_mclick_command = execp_uwheel_command = execp_dwheel_command = -execp_font = Roboto 13 +execp_font = Roboto 12 execp_font_color = #ffffff 100 -execp_padding = 20 0 +execp_padding = 10 0 execp_background_id = 0 execp_centered = 0 execp_icon_w = 24 @@ -272,9 +272,9 @@ execp_rclick_command = execp_mclick_command = execp_uwheel_command = execp_dwheel_command = -execp_font = Roboto 13 +execp_font = Roboto 12 execp_font_color = #ffffff 100 -execp_padding = 20 0 +execp_padding = 10 0 execp_background_id = 0 execp_centered = 0 execp_icon_w = 0 @@ -295,9 +295,9 @@ execp_rclick_command = execp_mclick_command = execp_uwheel_command = execp_dwheel_command = -execp_font = Roboto 13 +execp_font = Roboto 12 execp_font_color = #ffffff 100 -execp_padding = 10 0 +execp_padding = 5 0 execp_background_id = 0 execp_centered = 0 execp_icon_w = 0 diff --git a/.mbsyncrc b/.mbsyncrc new file mode 100644 index 0000000..9a91817 --- /dev/null +++ b/.mbsyncrc @@ -0,0 +1,22 @@ +IMAPAccount personal +# Address to connect to +Host echo.mxrouting.net +Port 993 +User sng@luxagraf.net +Pass LAv['q_N:|Mn collapse-thread macro index \Cr "T~UN." "mark all messages as read" # Sync email -macro index O "offlineimap" "run offlineimap to sync all mail" -macro index i "offlineimap -qf INBOX" "run offlineimap to sync inbox" +macro index O "mbsync personal" "run mbsync to sync all mail" +macro index o "mbsync personal:INBOX" "run mbsync to sync inbox" # Saner copy/move dialogs # macro index C "?" "copy a message to a mailbox" @@ -157,8 +157,8 @@ macro index "unset wait_keynotmuch-mutt #macro generic,index,pager \ca "abook" "launch abook" macro index,pager A "abook --add-email" "add the sender address to abook" -set spoolfile = "+personal/INBOX" +set spoolfile = "+INBOX" source ~/.mutt/personal -folder-hook personal/* source ~/.mutt/personal +#folder-hook personal/* source ~/.mutt/personal #folder-hook wired/* source ~/.mutt/work diff --git a/.mutt/personal b/.mutt/personal index 748b1bf..d349c2b 100644 --- a/.mutt/personal +++ b/.mutt/personal @@ -1,5 +1,5 @@ set from = "sng@luxagraf.net" -set folder = ~/mail/personal +set folder = ~/.mail set sendmail = "/usr/bin/msmtp -a personal" set sendmail_wait = 0 set trash = "+Trash" diff --git a/.mutt/temp/mutt-maya-1000-464906-17309954408692460733 b/.mutt/temp/mutt-maya-1000-464906-17309954408692460733 new file mode 100644 index 0000000..e69de29 diff --git a/.mutt/temp/mutt-maya-1000-523614-10762961364526530727 b/.mutt/temp/mutt-maya-1000-523614-10762961364526530727 new file mode 100644 index 0000000..e69de29 diff --git a/.mutt/work b/.mutt/work new file mode 100644 index 0000000..e0578cd --- /dev/null +++ b/.mutt/work @@ -0,0 +1,19 @@ +set from = "wired@scottgilbertson.net" +set folder = ~/mail/wired +set sendmail = "/usr/bin/msmtp -a work" +set trash = "+Trash" +set mbox = "+Archive" +set postponed = "+Drafts" +set record="+Sent" +# Alternate email addresses. +alternates "scott_gilbertson@wired.com" + +# Mailboxes to show +mailboxes =INBOX \ + +Archive \ + +Trash \ + +Sent \ + +Drafts \ + +temporary/search \ + + diff --git a/.offlineimaprc b/.offlineimaprc index af8f702..15d0d24 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -24,25 +24,4 @@ folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Bookmarks', [Repository Personal-Local] type = Maildir -localfolders = ~/mail/personal - -#[Account Wired] -#localrepository = Wired-Local -#remoterepository = Wired-Remote -#postsynchook = notmuch new -# -#[Repository Wired-Remote] -#maxconnections = 1 -#sslcacertfile = /etc/ssl/certs/ca-certificates.crt -#ssl_versions = tls1_2 -#type = IMAP -#remotehost = echo.mxrouting.net -#remoteport = 993 -#remoteuser = wired@scottgilbertson.net -#ssl = yes -#remotepasseval = get_password("wired@scottgilbertson.net") -#folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Archive', 'Drafts'] -# -#[Repository Wired-Local] -#type = Maildir -#localfolders = ~/mail/wired +localfolders = ~/.mail diff --git a/.photocopyrc b/.photocopyrc index 1f4e931..e1e30e5 100644 --- a/.photocopyrc +++ b/.photocopyrc @@ -1 +1 @@ -DSC04454.ARW +DSC04825.ARW \ No newline at end of file diff --git a/.rsync-exclude-weekly b/.rsync-exclude-weekly index 7599fc2..0e02055 100644 --- a/.rsync-exclude-weekly +++ b/.rsync-exclude-weekly @@ -1,4 +1,3 @@ - .cache/ venv/ .DS_Store @@ -11,6 +10,8 @@ temp/ .config/vivaldi-snapshot/SingletonCookie .config/vivaldi-snapshot/SingletonLock .config/vivaldi/SingletonSocket +.config/vivaldi/Profile\ 2/Service\ Worker/ +.config/vivaldi/Profile\ 1/Service\ Worker/ .config/vivaldi/SingletonCookie .config/vivaldi/SingletonLock .config/Slack diff --git a/.ssh/config b/.ssh/config index 557c69b..1698e4d 100755 --- a/.ssh/config +++ b/.ssh/config @@ -1,40 +1,15 @@ -Host lxfold - Hostname 108.61.156.57 - user lxf - Port 25978 - CheckHostIP yes - TCPKeepAlive yes - IdentityFile ~/.ssh/id_ed25519 - Host lxf - Hostname 45.32.1.95 + Hostname 205.185.114.103 user lxf Port 25978 CheckHostIP yes TCPKeepAlive yes IdentityFile ~/.ssh/id_ed25519 -Host lxfolder - Hostname 149.28.44.132 - user lxf - Port 24598 - CheckHostIP yes - TCPKeepAlive yes - ForwardX11 yes - IdentityFile ~/.ssh/id_ed25519 - Host luxgit - Hostname 45.32.1.95 + Hostname 205.185.114.103 user git Port 25978 CheckHostIP yes TCPKeepAlive yes IdentityFile ~/.ssh/id_ed25519 - -Host dis - Hostname 155.138.214.118 - User lxf - Port 24597 - CheckHostIP yes - TCPKeepAlive yes - IdentityFile ~/.ssh/id_ed25519 diff --git a/.tmux.conf b/.tmux.conf index 045f701..24e0947 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -43,8 +43,8 @@ bind ^A select-pane -t :.+ # smart pane switching with awareness of vim splits bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L" -bind -n C-n run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D" -bind -n C-p run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U" +bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D" +bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U" bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R" #alternative for ctrl-l diff --git a/.tmux/write-wire b/.tmux/write-wire index da7c7bd..723a556 100644 --- a/.tmux/write-wire +++ b/.tmux/write-wire @@ -3,4 +3,4 @@ rename-window "wir" splitw -h -p 22 selectp -t 1 # select the original pane splitw -h -p 69 -send "cd ~/writing/conde/wired/ && v wired.txt" enter #open vim +send "cd ~/writing/wired/ && v wired.txt" enter #open vim diff --git a/.vimrc b/.vimrc index d119ace..b03d55c 100644 --- a/.vimrc +++ b/.vimrc @@ -26,6 +26,7 @@ Bundle 'junegunn/fzf' Bundle 'junegunn/fzf.vim' Bundle 'chengzeyi/fzf-preview.vim' Bundle 'alok/notational-fzf-vim' +Bundle 'nathangrigg/vim-beancount' call vundle#end() filetype plugin indent on "}}} diff --git a/apps.txt b/apps.txt index 9865550..36b4e02 100644 --- a/apps.txt +++ b/apps.txt @@ -1,3 +1,5 @@ firmware-iwlwifi acpi-call-dkms acpi alsa-utils brightnessctl build-essential x11-apps x11-common x11-session-utils x11-utils x11-xkb-utils x11-xserver-utils xcompmgr xinit xinput xsel xserver-xorg openbox tint2 make rxvt-unicode tlp network-manager network-manager-gnome fonts-droid-fallback fonts-hack fonts-inconsolata fonts-noto fonts-roboto -1password calc calibre clipman espeak feh flatpak fzf gedit gimp gimp-plugin-registry git gnumeric grim gsimplecal htop mpc mpd mpv msmtp mutt ncdu ncmpcpp newsboat nextcloud-desktop notmuch-mutt notmuch obconf offlineimap pandoc pass pulseaudio-utils ranger rclone sassc scrot sdcv sudo tmux transmission-gtk vim-gtk vivaldi-stable vnstat w3m xcape youtube-dl zoom +1password + +calc calibre clipman espeak feh flatpak fzf gedit gimp gimp-plugin-registry git gnumeric grim gsimplecal htop mpc mpd mpv msmtp mutt ncdu ncmpcpp newsboat nextcloud-desktop notmuch-mutt notmuch obconf offlineimap pandoc pass pulseaudio-utils ranger rclone sassc scrot sdcv sudo tmux transmission-gtk vim-gtk vivaldi-stable vnstat w3m xcape youtube-dl zoom diff --git a/debian-notes.txt b/debian-notes.txt index ea46a84..0d54f79 100644 --- a/debian-notes.txt +++ b/debian-notes.txt @@ -27,8 +27,7 @@ sudo make install ## build clipmenu: sudo apt install xsel -git clone https://github.com/cdown/clipnotify.git -cd clipnotify +git clone https://github.com/cdown/clipnotify.git cd clipnotify sudo make install git clone https://github.com/cdown/clipmenu.git cd clipmenu -- cgit v1.2.3-70-g09d2