From f0b4d53f54a137460e1248ec717fbe146fa70a5f Mon Sep 17 00:00:00 2001 From: Gregor Feierabend <23300469@sun.ac.za> Date: Sun, 16 Jan 2022 15:23:31 +0200 Subject: [PATCH] update --- .compton.conf | 2 +- .config/awesome/rc.lua | 29 +++++++++++++++++++++---- .config/cmus/autosave | 6 ++--- .config/keepassxc/keepassxc.ini | 4 ++-- .config/qpdfview/pdf-plugin.conf | 2 +- .config/qpdfview/qpdfview.conf | 18 +++++++-------- .local/share/applications/mimeapps.list | 1 + .muttrc | 5 +++++ .newsboat/config | 1 + .ratpoisonrc | 2 +- .sage/init.sage | 2 +- .tmux.conf | 2 +- .vimrc | 18 ++++++++++++--- 13 files changed, 66 insertions(+), 26 deletions(-) diff --git a/.compton.conf b/.compton.conf index ead1929..fbfbad4 100644 --- a/.compton.conf +++ b/.compton.conf @@ -1,4 +1,4 @@ -shadow-opacity = 0.8; +shadow-opacity = 0.9; shadow = true; shadow-radius = 0; diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index d3a3fff..1499406 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -322,7 +322,7 @@ globalkeys = gears.table.join( end, {description = "open a terminal", group = "launcher"}), awful.key({ modkey, "Control" }, "r", awesome.restart, {description = "reload awesome", group = "awesome"}), - awful.key({ modkey, "Shift" }, "q", awesome.quit, + awful.key({ modkey, "Control" }, "q", awesome.quit, {description = "quit awesome", group = "awesome"}), awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, @@ -355,9 +355,15 @@ globalkeys = gears.table.join( awful.key({ modkey, "Shift" }, "g", function () awful.spawn({"/home/x/.scripts/grabscreen.sh"}) end, {description = "lock screen", group = "user"}), + awful.key({ modkey, "Shift" }, "q", + function () awful.spawn({"killall", "ffmpeg"}) end, + {description = "lock screen", group = "user"}), awful.key({ modkey, "Shift" }, "r", function () awful.spawn({"/home/x/.scripts/screenrec.sh"}) end, {description = "lock screen", group = "user"}), + awful.key({ modkey, "Shift" }, "e", + function () awful.spawn({"/home/x/.scripts/screenrecHQ.sh"}) end, + {description = "lock screen", group = "user"}), awful.key({ modkey, "Shift" }, "w", function () awful.spawn({"/usr/bin/killall", "ffmpeg"}) end, {description = "lock screen", group = "user"}), @@ -608,10 +614,16 @@ awful.rules.rules = { properties = { screen = 1, tag = "9" } }, { rule = { class = "wbar" }, properties = {border_width = 0} }, + { rule = { class = "ffplay" }, + properties = {border_width = 0, floating = true, ontop = true} }, { rule = { class = "URxvt" }, properties = {maximized_horizontal = true, floating = false, ontop = true} }, { rule = { class = "Pqiv" }, properties = {border_width = 0, floating = true, ontop = true} }, + { rule = { class = "Client_gui" }, + properties = {floating = true, focus=false, ontop = true} }, + { rule = { class = "Server_gui" }, + properties = {floating = true, focus=false, ontop = true} }, } -- }}} @@ -724,13 +736,22 @@ local function bat_notification() local bat_capacity = tonumber(f_capacity:read("*all")) local bat_status = trim(f_status:read("*all")) - - if (bat_capacity <= 30 and bat_status == "Discharging") then + + if (bat_status == "Discharging") then + -- awful.spawn({"/home/x/.scripts/alarm.sh"}) + naughty.notify({ title = "Battery Warning" + , text = "Discharging! " .. bat_capacity .."%" .. " left!" + , bg="#0000ff" + , fg="#000000" + , timeout = 120 + , position = "top_right" + }) + elseif (bat_capacity <= 30 and bat_status == "Discharging") then naughty.notify({ title = "Battery Warning" , text = "Battery low! " .. bat_capacity .."%" .. " left!" , bg="#ff0000" , fg="#000000" - , timeout = 15 + , timeout = 120 , position = "top_right" }) end diff --git a/.config/cmus/autosave b/.config/cmus/autosave index 4437b60..199e7c7 100644 --- a/.config/cmus/autosave +++ b/.config/cmus/autosave @@ -46,7 +46,7 @@ set color_win_title_attr=default set color_win_title_bg=default set color_win_title_fg=white set confirm_run=true -set continue=true +set continue=false set continue_album=true set device=/dev/cdrom set display_artist_sort_name=false @@ -94,7 +94,7 @@ set passwd= set pl_sort= set play_library=true set play_sorted=false -set repeat=false +set repeat=true set repeat_current=false set replaygain=disabled set replaygain_limit=true @@ -107,7 +107,7 @@ set show_all_tracks=true set show_current_bitrate=false set show_hidden=false set show_playback_position=true -set show_remaining_time=false +set show_remaining_time=true set shuffle=false set skip_track_info=false set smart_artist_sort=true diff --git a/.config/keepassxc/keepassxc.ini b/.config/keepassxc/keepassxc.ini index 3ebc493..bac6ee7 100644 --- a/.config/keepassxc/keepassxc.ini +++ b/.config/keepassxc/keepassxc.ini @@ -64,8 +64,8 @@ TrayIconAppearance=monochrome-light [PasswordGenerator] AdditionalChars= ExcludedChars= -Length=30 -SpecialChars=false +Length=20 +SpecialChars=true WordCase=1 [SSHAgent] diff --git a/.config/qpdfview/pdf-plugin.conf b/.config/qpdfview/pdf-plugin.conf index 0d87683..948a66a 100644 --- a/.config/qpdfview/pdf-plugin.conf +++ b/.config/qpdfview/pdf-plugin.conf @@ -5,4 +5,4 @@ ignorePaperColor=false overprintPreview=false textAntialiasing=true textHinting=1 -thinLineMode=0 +thinLineMode=1 diff --git a/.config/qpdfview/qpdfview.conf b/.config/qpdfview/qpdfview.conf index 9f0af6d..82b5170 100644 --- a/.config/qpdfview/qpdfview.conf +++ b/.config/qpdfview/qpdfview.conf @@ -7,7 +7,7 @@ highlightAll=true highlightCurrentThumbnail=true highlightDuration=5000 invertColors=false -layoutMode=0 +layoutMode=1 limitThumbnailsToResults=true matchCase=false minimalScrolling=true @@ -19,7 +19,7 @@ prefetch=true prefetchDistance=10 rotateModifiers=33554432 rotation=0 -scaleFactor=0.5800653594771242 +scaleFactor=3.0428571428571427 scaleMode=1 scrollModifiers=134217728 sourceEditor= @@ -40,24 +40,24 @@ exitAfterLastTab=false extendedSearchDock=true fileToolBar=openInNewTab, refresh fontsDialogSize=@Size(278 244) -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x12\0\0\x5\x9f\0\0\x3\x83\0\0\0\x2\0\0\0\x14\0\0\x5\x9d\0\0\x3\x81\0\0\0\0\0\0\0\0\x5\xa0\0\0\0\x2\0\0\0\x14\0\0\x5\x9d\0\0\x3\x81) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x2\xd0\0\0\0\x12\0\0\x5\x9f\0\0\x3\x83\0\0\x2\xd2\0\0\0\x14\0\0\x5\x9d\0\0\x3\x81\0\0\0\0\0\0\0\0\x5\xa0\0\0\x2\xd2\0\0\0\x14\0\0\x5\x9d\0\0\x3\x81) instanceNameInWindowTitle=true keepRecentlyClosed=false newTabNextToCurrentTab=true -openPath=/SHARED/academics/2021/pdf +openPath=/SHARED/academics/books/originals recentlyClosedCount=5 recentlyUsed=@Invalid() recentlyUsedCount=10 restoreBookmarks=true restorePerFileSettings=true restoreTabs=false -saveDatabaseInterval=300000 +saveDatabaseInterval=60000 savePath=/SHARED/academics/2021/M325/endofsemester scrollableMenus=false searchableMenus=false settingsDialogSize=@Size(430 663) spreadTabs=true -state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\xb3\0\0\x2\xea\xfc\x2\0\0\0\x3\xfb\0\0\0\x16\0o\0u\0t\0l\0i\0n\0\x65\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3n\0\0\0\x8f\0\xff\xff\xff\xfb\0\0\0\x1c\0p\0r\0o\0p\0\x65\0r\0t\0i\0\x65\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3n\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0t\0h\0u\0m\0\x62\0n\0\x61\0i\0l\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x2\xea\0\0\0\x91\0\xff\xff\xff\0\0\0\x3\0\0\x3\n\0\0\0\xc3\xfc\x1\0\0\0\x2\xfb\0\0\0\x14\0s\0\x65\0\x61\0r\0\x63\0h\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\n\0\0\x1\x92\0\xff\xff\xff\xfb\0\0\0\x1a\0\x62\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x5\x9c\0\0\0\x91\0\xff\xff\xff\0\0\x5\x9c\0\0\x3n\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0v\0i\0\x65\0w\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0) +state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\xb3\0\0\x3[\xfc\x2\0\0\0\x3\xfb\0\0\0\x16\0o\0u\0t\0l\0i\0n\0\x65\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3n\0\0\0\x8f\0\xff\xff\xff\xfb\0\0\0\x1c\0p\0r\0o\0p\0\x65\0r\0t\0i\0\x65\0s\0\x44\0o\0\x63\0k\0\0\0\0\x13\0\0\x3[\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0t\0h\0u\0m\0\x62\0n\0\x61\0i\0l\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3n\0\0\0\x91\0\xff\xff\xff\0\0\0\x3\0\0\x2\xcc\0\0\0\xc3\xfc\x1\0\0\0\x2\xfb\0\0\0\x14\0s\0\x65\0\x61\0r\0\x63\0h\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x2\xcc\0\0\x1\x92\0\xff\xff\xff\xfb\0\0\0\x1a\0\x62\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x5\x9c\0\0\0\x91\0\xff\xff\xff\0\0\x2\xcc\0\0\x2\xa5\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0v\0i\0\x65\0w\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0) styleSheet="\n\n/*-----QWidget-----*/\nQWidget\n{\n\tbackground-color: #232430;\n\tcolor: #EEEEEE;\n\tborder-color: #000000;\n\n}\n\n\n/*-----QLabel-----*/\nQLabel\n{\n\tbackground-color: #232430;\n\tcolor: #c1c1c1;\n\tborder-color: #000000;\n\n}\n\n/*-----QLineEdit-----*/\nQLineEdit\n{\n\tbackground-color: #38394e;\n\tcolor: #c1c1c1;\n\tborder-style: solid;\n\tborder-width: 1px;\n\tborder-color: #4a4c68;\n\n}\n\n\n/*-----QTableView-----*/\nQTableView, \nQHeaderView, \nQTableView::item \n{\n\tbackground-color: #232430;\n\tcolor: #c1c1c1;\n\tborder: none;\n\n}\n\n\nQTableView::item:selected \n{ \n background-color: #41424e;\n color: #c1c1c1;\n\n}\n\n\nQHeaderView::section:horizontal \n{\n background-color: #232430;\n\tborder: 1px solid #37384d;\n\tpadding: 5px;\n\n}\n\n\nQTableView::indicator{\n\tbackground-color: #1d1d28;\n\tborder: 1px solid #37384d;\n\n}\n\n\nQTableView::indicator:checked{\n\timage:url(./ressources/check.png); /*To replace*/\n\tbackground-color: #1d1d28;\n\n}\n\n/*-----QTreeWidget-----*/\nQTreeView\n{\n\tshow-decoration-selected: 0;\n\talternate-background-color: transparent;\n\tbackground-color: transparent;\n \tborder: none;\n\tcolor: #fff;\n\tfont: 8pt;\n\n}\n\n\nQTreeView::item:selected\n{\n\tcolor:#fff;\n\tbackground-color: #1d1d28;\n\tborder-radius: 0px;\n\n}\n\n\nQTreeView::item:!selected:hover\n{\n background-color: #56576c;\n border: none;\n color: white;\n\n}\n\n/*-----QTabWidget-----*/\nQTabWidget::pane \n{ \n border: none;\n\n}\n\nQTabWidget::tab-bar \n{\n left: 5px; \n\n}\n\nQTabBar::tab \n{\n color: #c1c1c1;\n min-width: 1px;\n\tpadding-left: 25px;\n\tmargin-left:-22px;\n height: 28px;\n\tborder: none;\n\n}\n\nQTabBar::tab:selected \n{\n color: #ffffff;\n height: 28px;\n}\n\nQTabBar::tab:!first \n{\n margin-left: -20px;\n\n}\n\nQTabBar::tab:hover \n{\n color: #DDD;\n\n}\n\nQMenu::item\n{\n padding: 2px 10px 2px 10px;\n\n}\n\nQMenu::item:selected\n{\n background-color: #56576c;\n\tcolor: #fff;\n\n}\n\nQMenu::item:disabled\n{\n color: #555;\n background-color: transparent;\n padding: 2px 20px 2px 20px;\n\n}\n\n/*-----QTableView & QTableWidget-----*/\nQTableView\n{\n background-color: #202030;\n border: 1px solid #32414B;\n color: #f0f0f0;\n gridline-color: #8faaff;\n outline : 0;\n\n}\n\n\n/*-----QScrollBar-----*/\nQScrollBar:horizontal \n{\n background-color: transparent;\n height: 8px;\n margin: 0px;\n padding: 0px;\n\n}\n\n\nQScrollBar::handle:horizontal \n{\n border: none;\n\tmin-width: 100px;\n background-color: #56576c;\n\n}\n\n\nQScrollBar::add-line:horizontal, \nQScrollBar::sub-line:horizontal,\nQScrollBar::add-page:horizontal, \nQScrollBar::sub-page:horizontal \n{\n width: 0px;\n background-color: transparent;\n\n}\n\n\nQScrollBar:vertical \n{\n background-color: transparent;\n width: 8px;\n margin: 0;\n\n}\n\n\nQScrollBar::handle:vertical \n{\n border: none;\n\tmin-height: 100px;\n background-color: #56576c;\n\n}\n\n\nQScrollBar::add-line:vertical, \nQScrollBar::sub-line:vertical,\nQScrollBar::add-page:vertical, \nQScrollBar::sub-page:vertical \n{\n height: 0px;\n background-color: transparent;\n\n}\n" synchronizeOutlineView=false synchronizeSplitViews=false @@ -71,20 +71,20 @@ viewToolBar=scaleFactor, zoomIn, zoomOut [pageItem] addAnnotationModifiers=67108864 -annotationColor=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\0\0\0\0) +annotationColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\xff\xff\0\0\0\0) annotationOverlay=false backgroundColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\0\0\0\0) cacheSize=262144K copyToClipboardModifiers=33554432 decorateFormFields=false decorateLinks=false -decoratePages=true +decoratePages=false formFieldOverlay=true highlightColor=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\0\0\0\0\0\0) keepObsoletePixmaps=false openInSourceEditorModifiers=0 paperColor=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\xf0\xf0\0\0) -useDevicePixelRatio=true +useDevicePixelRatio=false useTiling=false zoomToSelectionModifiers=100663296 diff --git a/.local/share/applications/mimeapps.list b/.local/share/applications/mimeapps.list index bf14f67..f114eb0 100644 --- a/.local/share/applications/mimeapps.list +++ b/.local/share/applications/mimeapps.list @@ -1,2 +1,3 @@ [Default Applications] text/plain=vi.desktop +text/markdown=typora.desktop diff --git a/.muttrc b/.muttrc index 645fd26..3ef0205 100644 --- a/.muttrc +++ b/.muttrc @@ -92,3 +92,8 @@ set header_cache="~/MAIL/mutthcache/" source ~/local_muttrc.mailboxes source ~/MAIL/muttrc.aliases +alias zurab \"Janelidze, Z, Prof [zurab@sun.ac.za]\" +alias 21680809 \"Rey, JM, Mej [21680809@sun.ac.za]\" <21680809@sun.ac.za> +alias mwild \"Wild, Marcel, Prof [mwild@sun.ac.za]\" +alias smo \"Mouton, S, Prof [smo@sun.ac.za]\" +alias bfischer Bernd Fischer diff --git a/.newsboat/config b/.newsboat/config index 29f6fea..74a57db 100644 --- a/.newsboat/config +++ b/.newsboat/config @@ -6,6 +6,7 @@ macro y set browser "~/.newsboat/scripts/enq.sh %u"; open-in-browser ; set brows # general settings auto-reload yes max-items 100 +download-timeout 120 # unbind keys unbind-key ENTER diff --git a/.ratpoisonrc b/.ratpoisonrc index c0ce944..e703af1 100644 --- a/.ratpoisonrc +++ b/.ratpoisonrc @@ -10,7 +10,7 @@ exec fbsetroot -solid black exec xrdb ~/.Xresources #exec /usr/lib64/xfce4/notifyd/xfce4-notifyd exec dunst -exec redshift -l -18:33 +#exec redshift -l -18:33 exec unclutter -idle 5 -jitter 20 #exec /usr/bin/xbattbar -a -c -t 2 -I "#333333" -O white -i white -o "#333333" diff --git a/.sage/init.sage b/.sage/init.sage index 96d78b0..6f20bba 100644 --- a/.sage/init.sage +++ b/.sage/init.sage @@ -1,4 +1,4 @@ -%colors Linux +#%colors Linux def division(dividend, divisor): return (dividend._maxima_().divide(divisor).sage()) diff --git a/.tmux.conf b/.tmux.conf index 54681d5..15f7545 100755 --- a/.tmux.conf +++ b/.tmux.conf @@ -181,7 +181,7 @@ set -g @resurrect-strategy-vim 'session' # pane movement bind-key j command-prompt -p "join pane from:" "join-pane -s '%%'" -#bind-key s command-prompt -p "send pane to:" "join-pane -t '%%'" +bind-key s command-prompt -p "send pane to:" "join-pane -t '%%'" #bind-key m switchc -t 'mail' #bind-key M switchc -t 'cmus' diff --git a/.vimrc b/.vimrc index 47f03b4..be8ed0e 100644 --- a/.vimrc +++ b/.vimrc @@ -36,6 +36,10 @@ set tags=./tags,./TAGS,tags,TAGS set nojoinspaces +autocmd FileType haskell set expandtab +autocmd FileType haskell set nospell +"autocmd FileType haskell set formatprg=brittany + "escape codes for italics set t_ZH= set t_ZR= @@ -56,9 +60,9 @@ set foldtext=FoldText() set fillchars=fold:\ "check files for changes frequently -set autoread -set ut=1000 -au CursorHold * checktime +"set autoread +"set ut=1000 +"au CursorHold * checktime "highlight own types: au BufRead,BufNewFile *.[ch] let fname = expand(':p:h') . '/types.vim' @@ -172,6 +176,9 @@ let g:syntastic_tex_chktex_args = "-l ~/.chktexrc" let g:syntastic_tex_lacheck_quiet_messages = {"regex": ['.*unmatched.*', \ 'bad character in label.*']} +let g:syntastic_tex_chktex_quiet_messages = + \ {"regex": ["`)' expected, found `}'", + \ "`}' expected, found `)'"]} map :lprev map :lnext @@ -224,6 +231,7 @@ autocmd BufNewFile,BufRead *.tex call TexNewMathZone("M", "align", 1) autocmd BufNewFile,BufRead *.tex set foldtext=FoldText() autocmd BufNewFile,BufRead *.tex set textwidth=80 autocmd BufNewFile,BufRead *.tex let g:syntastic_auto_jump = 0 +autocmd BufNewFile,BufRead *.tex set expandtab imap :let b:Imap_FreezeImap = 1 imap :let b:Imap_FreezeImap = 0 @@ -318,3 +326,7 @@ autocmd FileType dart set shiftwidth=2 autocmd FileType dart set tabstop=2 autocmd FileType dart set softtabstop=2 autocmd FileType dart set expandtab + +"""""""""""""""""""""""""""""""""""" VIM2HS """""""""""""""""""""""""""""""""""" +"https://github.com/dag/vim2hs +let g:haskell_conceal = 1