diff options
Diffstat (limited to '.config')
23 files changed, 342 insertions, 306 deletions
diff --git a/.config/BetterDiscord/plugins/NotificationSounds.config.json b/.config/BetterDiscord/plugins/NotificationSounds.config.json index 23be4d7..88b73e0 100644 --- a/.config/BetterDiscord/plugins/NotificationSounds.config.json +++ b/.config/BetterDiscord/plugins/NotificationSounds.config.json @@ -53,7 +53,7 @@ } }, "changelog": { - "currentversion": "3.4.7" + "currentversion": "3.4.9" }, "choices": { "message1": { diff --git a/.config/BetterDiscord/plugins/NotificationSounds.plugin.js b/.config/BetterDiscord/plugins/NotificationSounds.plugin.js index 0cdbc55..e40a415 100644 --- a/.config/BetterDiscord/plugins/NotificationSounds.plugin.js +++ b/.config/BetterDiscord/plugins/NotificationSounds.plugin.js @@ -69,7 +69,7 @@ var NotificationSounds = (_ => { return class NotificationSounds { getName () {return "NotificationSounds";} - getVersion () {return "3.4.7";} + getVersion () {return "3.4.9";} getAuthor () {return "DevilBro";} @@ -77,7 +77,7 @@ var NotificationSounds = (_ => { constructor () { this.changelog = { - "improved":[["Incoming","Works again"]] + "improved":[["Start Over","When someone calls you again the call sound now starts over instead of continuing from the last time"]] }; this.patchedModules = { @@ -292,9 +292,9 @@ var NotificationSounds = (_ => { children: Object.keys(BDFDB.ObjectUtils.filter(types, typedata => !typedata.implemented)).map(type => createSoundCard(type)).flat(10).filter(n => n) })); - let removeableAudios = [{value:removeAllKey, label:BDFDB.LanguageUtils.LanguageStrings.FORM_LABEL_ALL}].concat(Object.keys(audios).filter(name => !defaultAudios[name]).map(name => ({value:name, label:name}))); + let removeableCategories = [{value:removeAllKey, label:BDFDB.LanguageUtils.LanguageStrings.FORM_LABEL_ALL}].concat(Object.keys(audios).filter(category => !(defaultAudios[category] && !Object.keys(audios[category] || {}).filter(song => defaultAudios[category][song] === undefined).length)).map(name => ({value:name, label:name}))); let removeableSongs = {}; - for (let audio of removeableAudios) removeableSongs[audio.value] = [{value:removeAllKey, label:BDFDB.LanguageUtils.LanguageStrings.FORM_LABEL_ALL}].concat(Object.keys(audios[audio.value] || {}).map(name => ({value:name, label:name}))); + for (let category of removeableCategories) removeableSongs[category.value] = [{value:removeAllKey, label:BDFDB.LanguageUtils.LanguageStrings.FORM_LABEL_ALL}].concat(Object.keys(audios[category.value] || {}).filter(song => !(defaultAudios[category.value] && defaultAudios[category.value][song] !== undefined)).map(name => ({value:name, label:name}))); settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.CollapseContainer, { title: "Remove Songs", collapseStates: collapseStates, @@ -311,12 +311,13 @@ var NotificationSounds = (_ => { children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Select, { key: "REMOVE_CATEGORY", value: removeAllKey, - options: removeableAudios, + options: removeableCategories, searchable: true, onChange: (category, instance) => { let songSelectIns = BDFDB.ReactUtils.findOwner(BDFDB.ReactUtils.findOwner(instance, {name:["BDFDB_Modal", "BDFDB_SettingsPanel"], up:true}), {key:"REMOVE_SONG"}); if (songSelectIns && removeableSongs[category.value]) { songSelectIns.props.options = removeableSongs[category.value]; + songSelectIns.props.value = removeAllKey; BDFDB.ReactUtils.forceUpdate(songSelectIns); } } @@ -352,8 +353,8 @@ var NotificationSounds = (_ => { let songAmount = 0; let catAll = categorySelectIns.props.value == removeAllKey; let songAll = songSelectIns.props.value == removeAllKey; - if (catAll) songAmount = BDFDB.ArrayUtils.sum(Object.keys(audios).filter(name => !defaultAudios[name]).map(category => Object.keys(audios[category] || {}).length)); - else if (songAll) songAmount = Object.keys(audios[categorySelectIns.props.value] || {}).length; + if (catAll) songAmount = BDFDB.ArrayUtils.sum(Object.keys(audios).map(category => Object.keys(audios[category] || {}).filter(song => !(defaultAudios[category] && defaultAudios[category][song] !== undefined)).length)); + else if (songAll) songAmount = Object.keys(audios[categorySelectIns.props.value] || {}).filter(song => !(defaultAudios[categorySelectIns.props.value] && defaultAudios[categorySelectIns.props.value][song] !== undefined)).length; else if (audios[categorySelectIns.props.value][songSelectIns.props.value]) songAmount = 1; if (songAmount) BDFDB.ModalUtils.confirm(this, `Are you sure you want to delete ${songAmount} added song${songAmount == 1 ? "" : "s"}?`, _ => { @@ -382,7 +383,9 @@ var NotificationSounds = (_ => { } // Legacy - load () {} + load () { + if (window.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) BDFDB.PluginUtils.load(this); + } start () { if (!window.BDFDB) window.BDFDB = {myPlugins:{}}; @@ -473,11 +476,13 @@ var NotificationSounds = (_ => { audio.volume = choices[type].volume/100; e.returnValue.play = _ => { if (!audio.paused || this.dontPlayAudio(type)) return; + audio.currentTime = 0; audio.loop = false; audio.play(); }; e.returnValue.loop = _ => { if (!audio.paused || this.dontPlayAudio(type)) return; + audio.currentTime = 0; audio.loop = true; audio.play(); }; diff --git a/.config/BetterDiscord/plugins/PinDMs.config.json b/.config/BetterDiscord/plugins/PinDMs.config.json index ef732e3..0d43d13 100644 --- a/.config/BetterDiscord/plugins/PinDMs.config.json +++ b/.config/BetterDiscord/plugins/PinDMs.config.json @@ -1,12 +1,13 @@ { "changelog": { - "currentversion": "1.7.4" + "currentversion": "1.7.5" }, "dmCategories": { "3516090637537661": { "collapsed": false, "color": null, "dms": [ + "703197442098855997", "642833698315698232", "456428001463369729", "390601823523962892", diff --git a/.config/BetterDiscord/plugins/PinDMs.plugin.js b/.config/BetterDiscord/plugins/PinDMs.plugin.js index 4fc8b3d..17fe404 100644 --- a/.config/BetterDiscord/plugins/PinDMs.plugin.js +++ b/.config/BetterDiscord/plugins/PinDMs.plugin.js @@ -9,7 +9,7 @@ var PinDMs = (_ => { return class PinDMs { getName () {return "PinDMs";} - getVersion () {return "1.7.4";} + getVersion () {return "1.7.5";} getAuthor () {return "DevilBro";} @@ -17,7 +17,7 @@ var PinDMs = (_ => { constructor () { this.changelog = { - "fixed":[["Sort by recent","Works again"]] + "fixed":[["All pinned","No longer acts weird if all DMs are pinned in a category"]] }; this.patchedModules = { @@ -145,7 +145,9 @@ var PinDMs = (_ => { } // Legacy - load () {} + load () { + if (window.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) BDFDB.PluginUtils.load(this); + } start () { if (!window.BDFDB) window.BDFDB = {myPlugins:{}}; @@ -355,6 +357,12 @@ var PinDMs = (_ => { return rowHeightFunc(...args); }; + let renderRow = e.returnvalue.props.renderRow; + e.returnvalue.props.renderRow = (...args) => { + let row = renderRow(...args); + return row && row.key == "no-private-channels" ? null : row; + }; + let renderSection = e.returnvalue.props.renderSection; e.returnvalue.props.renderSection = (...args) => { if (args[0].section != 0 && args[0].section != e.returnvalue.props.sections.length - 1) { diff --git a/.config/BetterDiscord/themes/pywal.theme.css b/.config/BetterDiscord/themes/pywal.theme.css index f64c0bf..ca71102 100644 --- a/.config/BetterDiscord/themes/pywal.theme.css +++ b/.config/BetterDiscord/themes/pywal.theme.css @@ -6,70 +6,70 @@ */ :root { - --pywal-shade0: #2C2D2F; - --pywal-shade1: #353638; - --pywal-shade2: #3A3B3D; - --pywal-shade3: #3E4041; - --pywal-shade4: #3C3F43; + --pywal-shade0: #4E3E3D; + --pywal-shade1: #5E4B49; + --pywal-shade2: #665150; + --pywal-shade3: #6D5756; + --pywal-shade4: #7B4C49; - --accent: 209, 196, 148; + --accent: 190, 213, 251; - --pywal-serverside: #1B1B1C; - --pywal-serverfolder-transparent: hsla(240, 1.6%, 10.8%, 0.75); + --pywal-serverside: #2C1F1F; + --pywal-serverfolder-transparent: hsla(4, 18.1%, 14.6%, 0.75); - --pywal-bg0: #1E1E1F; - --pywal-bg1: #242425; - --pywal-bg2: #2A2A2B; - --pywal-bg3: #303032; + --pywal-bg0: #312322; + --pywal-bg1: #3B2A29; + --pywal-bg2: #453130; + --pywal-bg3: #4E3836; - --pywal-color0: #1e1e1f; - --pywal-color1: #666b6d; - --pywal-color2: #8a8c8d; - --pywal-color3: #c59683; - --pywal-color4: #a7aeb0; - --pywal-color5: #aabbbe; - --pywal-color6: #d1c494; - --pywal-color7: #c6c6c7; - --pywal-color8: #565657; - --pywal-color9: #666b6d; - --pywal-color10: #8a8c8d; - --pywal-color11: #c59683; - --pywal-color12: #a7aeb0; - --pywal-color13: #aabbbe; - --pywal-color14: #d1c494; - --pywal-color15: #c6c6c7; + --pywal-color0: #312322; + --pywal-color1: #c3acaa; + --pywal-color2: #8eb8fb; + --pywal-color3: #f4b3aa; + --pywal-color4: #c0c3ef; + --pywal-color5: #e9bce1; + --pywal-color6: #bed5fb; + --pywal-color7: #cbc8c7; + --pywal-color8: #645a59; + --pywal-color9: #c3acaa; + --pywal-color10: #8eb8fb; + --pywal-color11: #f4b3aa; + --pywal-color12: #c0c3ef; + --pywal-color13: #e9bce1; + --pywal-color14: #bed5fb; + --pywal-color15: #cbc8c7; - --pywal-readable-color0: #69696B; - --pywal-readable-color1: #666B6D; - --pywal-readable-color2: #8A8C8D; - --pywal-readable-color3: #C59683; - --pywal-readable-color4: #A7AEB0; - --pywal-readable-color5: #AABBBE; - --pywal-readable-color6: #D1C494; - --pywal-readable-color7: #C6C6C7; - --pywal-readable-color8: #565657; - --pywal-readable-color9: #666B6D; - --pywal-readable-color10: #8A8C8D; - --pywal-readable-color11: #C59683; - --pywal-readable-color12: #A7AEB0; - --pywal-readable-color13: #AABBBE; - --pywal-readable-color14: #D1C494; - --pywal-readable-color15: #C6C6C7; + --pywal-readable-color0: #775957; + --pywal-readable-color1: #C3ACAA; + --pywal-readable-color2: #8EB8FB; + --pywal-readable-color3: #F4B3AA; + --pywal-readable-color4: #C0C3EF; + --pywal-readable-color5: #E9BCE1; + --pywal-readable-color6: #BED5FB; + --pywal-readable-color7: #CBC8C7; + --pywal-readable-color8: #645A59; + --pywal-readable-color9: #C3ACAA; + --pywal-readable-color10: #8EB8FB; + --pywal-readable-color11: #F4B3AA; + --pywal-readable-color12: #C0C3EF; + --pywal-readable-color13: #E9BCE1; + --pywal-readable-color14: #BED5FB; + --pywal-readable-color15: #CBC8C7; - --pywal-readableOn-color0: #c6c6c7; - --pywal-readableOn-color1: #c6c6c7; - --pywal-readableOn-color2: #1e1e1f; - --pywal-readableOn-color3: #1e1e1f; - --pywal-readableOn-color4: #1e1e1f; - --pywal-readableOn-color5: #1e1e1f; - --pywal-readableOn-color6: #1e1e1f; - --pywal-readableOn-color7: #1e1e1f; - --pywal-readableOn-color8: #c6c6c7; - --pywal-readableOn-color9: #c6c6c7; - --pywal-readableOn-color10: #1e1e1f; - --pywal-readableOn-color11: #1e1e1f; - --pywal-readableOn-color12: #1e1e1f; - --pywal-readableOn-color13: #1e1e1f; - --pywal-readableOn-color14: #1e1e1f; - --pywal-readableOn-color15: #1e1e1f; + --pywal-readableOn-color0: #cbc8c7; + --pywal-readableOn-color1: #312322; + --pywal-readableOn-color2: #312322; + --pywal-readableOn-color3: #312322; + --pywal-readableOn-color4: #312322; + --pywal-readableOn-color5: #312322; + --pywal-readableOn-color6: #312322; + --pywal-readableOn-color7: #312322; + --pywal-readableOn-color8: #cbc8c7; + --pywal-readableOn-color9: #312322; + --pywal-readableOn-color10: #312322; + --pywal-readableOn-color11: #312322; + --pywal-readableOn-color12: #312322; + --pywal-readableOn-color13: #312322; + --pywal-readableOn-color14: #312322; + --pywal-readableOn-color15: #312322; }
\ No newline at end of file diff --git a/.config/X11/Xresources b/.config/X11/Xresources index 784f9e1..f20c79e 100644 --- a/.config/X11/Xresources +++ b/.config/X11/Xresources @@ -1,22 +1,22 @@ -*.color0: #1e1e1f -*.color1: #666B6D -*.color2: #8A8C8D -*.color3: #C59683 -*.color4: #A7AEB0 -*.color5: #AABBBE -*.color6: #D1C494 -*.color7: #C6C6C7 -*.color8: #565657 -*.color9: #666B6D -*.color10: #8A8C8D -*.color11: #C59683 -*.color12: #A7AEB0 -*.color13: #AABBBE -*.color14: #D1C494 -*.color15: #C6C6C7 -*.foreground: #c6c6c7 -*.background: #1e1e1f -*.cursorColor: #c6c6c7 +*.color0: #312322 +*.color1: #c3acaa +*.color2: #8eb8fb +*.color3: #f4b3aa +*.color4: #c0c3ef +*.color5: #e9bce1 +*.color6: #bed5fb +*.color7: #cbc8c7 +*.color8: #645a59 +*.color9: #c3acaa +*.color10: #8eb8fb +*.color11: #f4b3aa +*.color12: #c0c3ef +*.color13: #e9bce1 +*.color14: #bed5fb +*.color15: #cbc8c7 +*.foreground: #cbc8c7 +*.background: #312322 +*.cursorColor: #cbc8c7 *.font: JetBrainsMono NF:style=Medium,Regular:size=10 @@ -26,4 +26,4 @@ *.tabspaces: 4 *.borderpx: 0 -Xcursor.theme: OpenZone_Black +Xcursor.theme: OpenZone_Black_Slim diff --git a/.config/X11/Xresources-colors b/.config/X11/Xresources-colors index 208df6e..6d74ded 100644 --- a/.config/X11/Xresources-colors +++ b/.config/X11/Xresources-colors @@ -1,20 +1,20 @@ -*.color0: #1e1e1f -*.color1: #666B6D -*.color2: #8A8C8D -*.color3: #C59683 -*.color4: #A7AEB0 -*.color5: #AABBBE -*.color6: #D1C494 -*.color7: #C6C6C7 -*.color8: #565657 -*.color9: #666B6D -*.color10: #8A8C8D -*.color11: #C59683 -*.color12: #A7AEB0 -*.color13: #AABBBE -*.color14: #D1C494 -*.color15: #C6C6C7 -*.foreground: #c6c6c7 -*.background: #1e1e1f -*.cursorColor: #c6c6c7 +*.color0: #312322 +*.color1: #c3acaa +*.color2: #8eb8fb +*.color3: #f4b3aa +*.color4: #c0c3ef +*.color5: #e9bce1 +*.color6: #bed5fb +*.color7: #cbc8c7 +*.color8: #645a59 +*.color9: #c3acaa +*.color10: #8eb8fb +*.color11: #f4b3aa +*.color12: #c0c3ef +*.color13: #e9bce1 +*.color14: #bed5fb +*.color15: #cbc8c7 +*.foreground: #cbc8c7 +*.background: #312322 +*.cursorColor: #cbc8c7 diff --git a/.config/X11/Xresources-custom b/.config/X11/Xresources-custom index b4b2317..0a7a736 100644 --- a/.config/X11/Xresources-custom +++ b/.config/X11/Xresources-custom @@ -6,4 +6,4 @@ *.tabspaces: 4 *.borderpx: 0 -Xcursor.theme: OpenZone_Black +Xcursor.theme: OpenZone_Black_Slim diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index 6ec75a2..0bcc69c 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -1,6 +1,5 @@ { "dependencies": { - "coc-clangd": ">=0.4.13", "coc-css": ">=1.2.4", "coc-emmet": ">=1.1.6", "coc-html": ">=1.2.4", diff --git a/.config/coc/snippets-mru b/.config/coc/snippets-mru index e619907..ae05170 100644 --- a/.config/coc/snippets-mru +++ b/.config/coc/snippets-mru @@ -1,9 +1,10 @@ +lambda +__main__ +beg set for forof throw -beg -lambda def foreach if diff --git a/.config/i3/config b/.config/i3/config index b0cc76f..a21b250 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -9,12 +9,12 @@ gaps outer $outer_gaps # border color # pywal-start -client.focused #d1c494 #1e1e1f #c6c6c7 #d1c494 #87826F -client.focused_inactive #676768 #565657 #c6c6c7 #242425 #1e1e1f -client.unfocused #1e1e1f #181819 #9E9EA0 #1e1e1f #181819 -client.urgent #1e1e1f #e95678 #c6c6c7 #e95678 #e95678 -client.placeholder #000000 #0c0c0c #c6c6c7 #000000 #0c0c0c -client.background #c6c6c7 +client.focused #bed5fb #312322 #cbc8c7 #bed5fb #888B9A +client.focused_inactive #786C6B #645a59 #cbc8c7 #3B2A29 #312322 +client.unfocused #312322 #271C1B #A49F9D #312322 #271C1B +client.urgent #312322 #e95678 #cbc8c7 #e95678 #e95678 +client.placeholder #000000 #0c0c0c #cbc8c7 #000000 #0c0c0c +client.background #cbc8c7 # pywal-end @@ -24,7 +24,6 @@ font pango:Fira Code 9 # no idea what these do but they were in here by default exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork exec --no-startup-id nm-applet -exec --no-startup-id xset r rate 250 40 set $refresh_i3status killall -SIGUSR1 i3status # Voulme keybinds @@ -71,6 +70,8 @@ exec "node ~/.local/share/bin/pywal/wall.js &" exec "picom --experimental-backends -b" exec "node ~/.local/share/bin/pester/index.js &" exec "flameshot &" +exec --no-startup-id "xset r rate 250 40" +exec --no-startup-id "autocutsel &" # change focus bindsym $mod+h focus left diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index 1a58556..70a6f34 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -1,3 +1,14 @@ { - "clangd.path": "/home/loek/.config/coc/extensions/coc-clangd-data/install/10.0.0/clangd_10.0.0/bin/clangd" + "languageserver": { + "ccls": { + "command": "ccls", + "filetypes": ["c", "cc", "cpp", "c++", "objc", "objcpp"], + "rootPatterns": [".ccls", "compile_commands.json", ".git/", ".hg/"], + "initializationOptions": { + "cache": { + "directory": "/tmp/ccls" + } + } + } + } } diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 7092dbe..163166f 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -41,7 +41,7 @@ call plug#begin('~/.config/nvim/plugged') " quality of life Plug 'jiangmiao/auto-pairs' Plug 'tpope/vim-surround' -Plug 'Chiel92/vim-autoformat' +" Plug 'Chiel92/vim-autoformat' Plug 'itchyny/lightline.vim' Plug 'terryma/vim-multiple-cursors' Plug 'vim-scripts/colorizer' @@ -82,6 +82,7 @@ Plug 'NLKNguyen/papercolor-theme' Plug 'scheakur/vim-scheakur' Plug 'mkarmona/materialbox' Plug 'morhetz/gruvbox' +Plug 'co1ncidence/mountaineer' call plug#end() " keybinds @@ -128,10 +129,13 @@ map <leader>y "+y let g:which_key_map.p = 'x11-paste' let g:which_key_map.y = 'x11-yank' +map <leader>* y/<C-R>0<CR> +let g:which_key_map['*'] = 'search-selected' + map <leader>h :noh<cr> let g:which_key_map.h = 'no-highlighting' -map <leader>b :Autoformat<cr> +map <leader>b :norm gg=G``<cr> let g:which_key_map.b = 'format-file' map <leader>s /\s\+$<CR> @@ -173,7 +177,7 @@ let g:which_key_map['.'] = { \ 'p': 'polybar' \ } -colorscheme sonokai +colorscheme mountaineer-grey let g:lightline = { \ 'colorscheme': 'pywal', \ 'mode_map': { diff --git a/.config/nvim/pywal/colors.vim b/.config/nvim/pywal/colors.vim index 5151b35..564c54c 100644 --- a/.config/nvim/pywal/colors.vim +++ b/.config/nvim/pywal/colors.vim @@ -1,46 +1,46 @@ -hi! Normal guibg=#1e1e1f ctermbg=NONE -hi! EndOfBuffer guibg=#1e1e1f ctermbg=NONE -hi! CocInfoFloat guibg=#3C3C3E ctermbg=NONE +hi! Normal guibg=#312322 ctermbg=NONE +hi! EndOfBuffer guibg=#312322 ctermbg=NONE +hi! CocInfoFloat guibg=#624644 ctermbg=NONE -let s:bg = [ '#1e1e1f', 'NONE' ] -let s:fg = [ '#c6c6c7', 'NONE' ] -let s:bg1 = [ '#242425', 'NONE' ] -let s:bg2 = [ '#2A2A2B', 'NONE' ] -let s:bg3 = [ '#303032', 'NONE' ] -let s:bg4 = [ '#363638', 'NONE' ] -let s:bg5 = [ '#3C3C3E', 'NONE' ] -let s:color0 = [ '#1e1e1f', 'NONE' ] -let s:color1 = [ '#666b6d', 'NONE' ] -let s:color2 = [ '#8a8c8d', 'NONE' ] -let s:color3 = [ '#c59683', 'NONE' ] -let s:color4 = [ '#a7aeb0', 'NONE' ] -let s:color5 = [ '#aabbbe', 'NONE' ] -let s:color6 = [ '#d1c494', 'NONE' ] -let s:color7 = [ '#c6c6c7', 'NONE' ] -let s:color8 = [ '#565657', 'NONE' ] -let s:color9 = [ '#666b6d', 'NONE' ] -let s:color10 = [ '#8a8c8d', 'NONE' ] -let s:color11 = [ '#c59683', 'NONE' ] -let s:color12 = [ '#a7aeb0', 'NONE' ] -let s:color13 = [ '#aabbbe', 'NONE' ] -let s:color14 = [ '#d1c494', 'NONE' ] -let s:color15 = [ '#c6c6c7', 'NONE' ] -let s:color0readable = [ '#c6c6c7', 'NONE' ] -let s:color1readable = [ '#c6c6c7', 'NONE' ] -let s:color2readable = [ '#1e1e1f', 'NONE' ] -let s:color3readable = [ '#1e1e1f', 'NONE' ] -let s:color4readable = [ '#1e1e1f', 'NONE' ] -let s:color5readable = [ '#1e1e1f', 'NONE' ] -let s:color6readable = [ '#1e1e1f', 'NONE' ] -let s:color7readable = [ '#1e1e1f', 'NONE' ] -let s:color8readable = [ '#c6c6c7', 'NONE' ] -let s:color9readable = [ '#c6c6c7', 'NONE' ] -let s:color10readable = [ '#1e1e1f', 'NONE' ] -let s:color11readable = [ '#1e1e1f', 'NONE' ] -let s:color12readable = [ '#1e1e1f', 'NONE' ] -let s:color13readable = [ '#1e1e1f', 'NONE' ] -let s:color14readable = [ '#1e1e1f', 'NONE' ] -let s:color15readable = [ '#1e1e1f', 'NONE' ] +let s:bg = [ '#312322', 'NONE' ] +let s:fg = [ '#cbc8c7', 'NONE' ] +let s:bg1 = [ '#3B2A29', 'NONE' ] +let s:bg2 = [ '#453130', 'NONE' ] +let s:bg3 = [ '#4E3836', 'NONE' ] +let s:bg4 = [ '#583F3D', 'NONE' ] +let s:bg5 = [ '#624644', 'NONE' ] +let s:color0 = [ '#312322', 'NONE' ] +let s:color1 = [ '#c3acaa', 'NONE' ] +let s:color2 = [ '#8eb8fb', 'NONE' ] +let s:color3 = [ '#f4b3aa', 'NONE' ] +let s:color4 = [ '#c0c3ef', 'NONE' ] +let s:color5 = [ '#e9bce1', 'NONE' ] +let s:color6 = [ '#bed5fb', 'NONE' ] +let s:color7 = [ '#cbc8c7', 'NONE' ] +let s:color8 = [ '#645a59', 'NONE' ] +let s:color9 = [ '#c3acaa', 'NONE' ] +let s:color10 = [ '#8eb8fb', 'NONE' ] +let s:color11 = [ '#f4b3aa', 'NONE' ] +let s:color12 = [ '#c0c3ef', 'NONE' ] +let s:color13 = [ '#e9bce1', 'NONE' ] +let s:color14 = [ '#bed5fb', 'NONE' ] +let s:color15 = [ '#cbc8c7', 'NONE' ] +let s:color0readable = [ '#cbc8c7', 'NONE' ] +let s:color1readable = [ '#312322', 'NONE' ] +let s:color2readable = [ '#312322', 'NONE' ] +let s:color3readable = [ '#312322', 'NONE' ] +let s:color4readable = [ '#312322', 'NONE' ] +let s:color5readable = [ '#312322', 'NONE' ] +let s:color6readable = [ '#312322', 'NONE' ] +let s:color7readable = [ '#312322', 'NONE' ] +let s:color8readable = [ '#cbc8c7', 'NONE' ] +let s:color9readable = [ '#312322', 'NONE' ] +let s:color10readable = [ '#312322', 'NONE' ] +let s:color11readable = [ '#312322', 'NONE' ] +let s:color12readable = [ '#312322', 'NONE' ] +let s:color13readable = [ '#312322', 'NONE' ] +let s:color14readable = [ '#312322', 'NONE' ] +let s:color15readable = [ '#312322', 'NONE' ] let s:none = [ 'NONE', 'NONE' ] let s:test = [ '#ff00ff', 'NONE' ] diff --git a/.config/nvim/pywal/pywal.vim b/.config/nvim/pywal/pywal.vim index 785face..6804310 100644 --- a/.config/nvim/pywal/pywal.vim +++ b/.config/nvim/pywal/pywal.vim @@ -1,46 +1,46 @@ -hi! Normal guibg=#1e1e1f ctermbg=NONE -hi! EndOfBuffer guibg=#1e1e1f ctermbg=NONE -hi! CocInfoFloat guibg=#3C3C3E ctermbg=NONE +hi! Normal guibg=#312322 ctermbg=NONE +hi! EndOfBuffer guibg=#312322 ctermbg=NONE +hi! CocInfoFloat guibg=#624644 ctermbg=NONE -let s:bg = [ '#1e1e1f', 'NONE' ] -let s:fg = [ '#c6c6c7', 'NONE' ] -let s:bg1 = [ '#242425', 'NONE' ] -let s:bg2 = [ '#2A2A2B', 'NONE' ] -let s:bg3 = [ '#303032', 'NONE' ] -let s:bg4 = [ '#363638', 'NONE' ] -let s:bg5 = [ '#3C3C3E', 'NONE' ] -let s:color0 = [ '#1e1e1f', 'NONE' ] -let s:color1 = [ '#666b6d', 'NONE' ] -let s:color2 = [ '#8a8c8d', 'NONE' ] -let s:color3 = [ '#c59683', 'NONE' ] -let s:color4 = [ '#a7aeb0', 'NONE' ] -let s:color5 = [ '#aabbbe', 'NONE' ] -let s:color6 = [ '#d1c494', 'NONE' ] -let s:color7 = [ '#c6c6c7', 'NONE' ] -let s:color8 = [ '#565657', 'NONE' ] -let s:color9 = [ '#666b6d', 'NONE' ] -let s:color10 = [ '#8a8c8d', 'NONE' ] -let s:color11 = [ '#c59683', 'NONE' ] -let s:color12 = [ '#a7aeb0', 'NONE' ] -let s:color13 = [ '#aabbbe', 'NONE' ] -let s:color14 = [ '#d1c494', 'NONE' ] -let s:color15 = [ '#c6c6c7', 'NONE' ] -let s:color0readable = [ '#c6c6c7', 'NONE' ] -let s:color1readable = [ '#c6c6c7', 'NONE' ] -let s:color2readable = [ '#1e1e1f', 'NONE' ] -let s:color3readable = [ '#1e1e1f', 'NONE' ] -let s:color4readable = [ '#1e1e1f', 'NONE' ] -let s:color5readable = [ '#1e1e1f', 'NONE' ] -let s:color6readable = [ '#1e1e1f', 'NONE' ] -let s:color7readable = [ '#1e1e1f', 'NONE' ] -let s:color8readable = [ '#c6c6c7', 'NONE' ] -let s:color9readable = [ '#c6c6c7', 'NONE' ] -let s:color10readable = [ '#1e1e1f', 'NONE' ] -let s:color11readable = [ '#1e1e1f', 'NONE' ] -let s:color12readable = [ '#1e1e1f', 'NONE' ] -let s:color13readable = [ '#1e1e1f', 'NONE' ] -let s:color14readable = [ '#1e1e1f', 'NONE' ] -let s:color15readable = [ '#1e1e1f', 'NONE' ] +let s:bg = [ '#312322', 'NONE' ] +let s:fg = [ '#cbc8c7', 'NONE' ] +let s:bg1 = [ '#3B2A29', 'NONE' ] +let s:bg2 = [ '#453130', 'NONE' ] +let s:bg3 = [ '#4E3836', 'NONE' ] +let s:bg4 = [ '#583F3D', 'NONE' ] +let s:bg5 = [ '#624644', 'NONE' ] +let s:color0 = [ '#312322', 'NONE' ] +let s:color1 = [ '#c3acaa', 'NONE' ] +let s:color2 = [ '#8eb8fb', 'NONE' ] +let s:color3 = [ '#f4b3aa', 'NONE' ] +let s:color4 = [ '#c0c3ef', 'NONE' ] +let s:color5 = [ '#e9bce1', 'NONE' ] +let s:color6 = [ '#bed5fb', 'NONE' ] +let s:color7 = [ '#cbc8c7', 'NONE' ] +let s:color8 = [ '#645a59', 'NONE' ] +let s:color9 = [ '#c3acaa', 'NONE' ] +let s:color10 = [ '#8eb8fb', 'NONE' ] +let s:color11 = [ '#f4b3aa', 'NONE' ] +let s:color12 = [ '#c0c3ef', 'NONE' ] +let s:color13 = [ '#e9bce1', 'NONE' ] +let s:color14 = [ '#bed5fb', 'NONE' ] +let s:color15 = [ '#cbc8c7', 'NONE' ] +let s:color0readable = [ '#cbc8c7', 'NONE' ] +let s:color1readable = [ '#312322', 'NONE' ] +let s:color2readable = [ '#312322', 'NONE' ] +let s:color3readable = [ '#312322', 'NONE' ] +let s:color4readable = [ '#312322', 'NONE' ] +let s:color5readable = [ '#312322', 'NONE' ] +let s:color6readable = [ '#312322', 'NONE' ] +let s:color7readable = [ '#312322', 'NONE' ] +let s:color8readable = [ '#cbc8c7', 'NONE' ] +let s:color9readable = [ '#312322', 'NONE' ] +let s:color10readable = [ '#312322', 'NONE' ] +let s:color11readable = [ '#312322', 'NONE' ] +let s:color12readable = [ '#312322', 'NONE' ] +let s:color13readable = [ '#312322', 'NONE' ] +let s:color14readable = [ '#312322', 'NONE' ] +let s:color15readable = [ '#312322', 'NONE' ] let s:none = [ 'NONE', 'NONE' ] let s:test = [ '#ff00ff', 'NONE' ] diff --git a/.config/picom.conf b/.config/picom.conf index 1649a3f..d1061f9 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -10,12 +10,18 @@ shadow-opacity = 0.3; shadow-offset-y = -48; shadow-offset-x = -48; +detect-rounded-corners = true; +detect-client-opacity = true; +detect-transient = true; +detect-client-leader = true; + blur-kern = "3x3box"; blur-method = "kawase"; -blur-strength = 12; +blur-strength = 15; blur-background-exclude = [ "class_g = 'Polybar'", + "class_g = 'Brave'", "class_g = 'firefox' && !I3_FLOATING_WINDOW@:c" ] diff --git a/.config/polybar/config b/.config/polybar/config index aa2e9fb..5ecbcca 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -42,7 +42,7 @@ padding = 0 module-margin-left = 0 module-margin-right = 0 -font-0 = "Scientifica:weight=regular:size=4;2" +font-0 = "Scientifica-11.bdf:pixelsize=11:weight=regular:size=4;2" font-1 = "Weather Icons:antialias=false:size=6;2" font-2 = "Siji:size=8;2" font-3 = "Material Design Icons:antialias=false:size=8;2" @@ -103,18 +103,18 @@ pseudo-transparency = false [color] -bg = #1e1e1f -fg = #c6c6c7 -fg-alt = #1e1e1f +bg = #312322 +fg = #cbc8c7 +fg-alt = #312322 alpha = #00000000 -shade1 = #A7AEB0 -shade2 = #B5B5A7 -shade3 = #C3BD9E -shade4 = #D1C494 +shade1 = #C0C3EF +shade2 = #BFC9F3 +shade3 = #BFCFF7 +shade4 = #BED5FB -shade-fg = #1e1e1f +shade-fg = #312322 [module/alsa] type = internal/alsa diff --git a/.config/rofi/pywal.rasi b/.config/rofi/pywal.rasi index 3bf382a..bcbf188 100644 --- a/.config/rofi/pywal.rasi +++ b/.config/rofi/pywal.rasi @@ -1,6 +1,6 @@ * { - background-color: #1e1e1f33; - text-color: #c6c6c7; + background-color: #31232233; + text-color: #cbc8c7; spacing: 0; width: 720px; } @@ -15,8 +15,8 @@ prompt { } textbox { - background-color: #1e1e1f; - border-color: #1e1e1f; + background-color: #312322; + border-color: #312322; padding: 8px 16px; } @@ -35,6 +35,6 @@ element { } element selected { - background-color: #d1c494; - text-color: #1e1e1f; + background-color: #bed5fb; + text-color: #312322; }
\ No newline at end of file diff --git a/.config/spicetify/Themes/Loekaars/color.ini b/.config/spicetify/Themes/Loekaars/color.ini index acdae72..ad28399 100644 --- a/.config/spicetify/Themes/Loekaars/color.ini +++ b/.config/spicetify/Themes/Loekaars/color.ini @@ -1,18 +1,18 @@ [Base] Base=object Object] -main_fg=c6c6c7 -secondary_fg=B2B2B3 -main_bg=1e1e1f -sidebar_and_player_bg=1e1e1f -cover_overlay_and_shadow=1e1e1f -indicator_fg_and_button_bg=d1c494 -pressing_fg=d1c494 -slider_bg=3A3B3D -sidebar_indicator_and_hover_button_bg=d1c494 -scrollbar_fg_and_selected_row_bg=353638 -pressing_button_fg=c6c6c7 -pressing_button_bg=3E4041 -selected_button=d1c494 -miscellaneous_bg=353638 -miscellaneous_hover_bg=d1c494 -preserve_1=c6c6c7 +main_fg=cbc8c7 +secondary_fg=B8B4B2 +main_bg=312322 +sidebar_and_player_bg=312322 +cover_overlay_and_shadow=312322 +indicator_fg_and_button_bg=bed5fb +pressing_fg=bed5fb +slider_bg=665150 +sidebar_indicator_and_hover_button_bg=bed5fb +scrollbar_fg_and_selected_row_bg=5E4B49 +pressing_button_fg=cbc8c7 +pressing_button_bg=6D5756 +selected_button=bed5fb +miscellaneous_bg=5E4B49 +miscellaneous_hover_bg=bed5fb +preserve_1=cbc8c7 diff --git a/.config/spicetify/config.ini b/.config/spicetify/config.ini index ebc1963..c6b3b0a 100644 --- a/.config/spicetify/config.ini +++ b/.config/spicetify/config.ini @@ -1,7 +1,6 @@ [AdditionalOptions] made_for_you_hub = 0 song_page = 0 -extensions = fastUser_switching = 0 lyric_force_no_sync = 0 new_feedback_ui = 0 @@ -14,14 +13,15 @@ visualization_high_framerate = 0 experimental_features = 0 lyric_always_show = 0 minimal_ui = 0 +extensions = [Setting] replace_colors = 1 -overwrite_assets = 0 +overwrite_assets = 1 spotify_path = /opt/spotify prefs_path = /home/loek/.config/spotify/prefs current_theme = Loekaars -color_scheme = +color_scheme = Loekaars inject_css = 1 spotify_launch_flags = check_spicetify_upgrade = 0 diff --git a/.config/startpage/index.html b/.config/startpage/index.html index 801a664..09cb823 100644 --- a/.config/startpage/index.html +++ b/.config/startpage/index.html @@ -41,7 +41,7 @@ <div class="column"> <h3 style="color: var(--pywal-readable-color2)">school</h3> <a href="https://www.montiplaza.nl/">montiplaza</a> - <a href="https://somtoday.nl/">somtoday</a> + <a href="https://mcnijmegen.zportal.nl/app/">zermelo</a> <a href="https://client.etesync.com/pim">etesync</a> </div> </div> diff --git a/.config/startpage/pywal.css b/.config/startpage/pywal.css index cabb075..9e254ed 100644 --- a/.config/startpage/pywal.css +++ b/.config/startpage/pywal.css @@ -1,63 +1,63 @@ :root { - --pywal-shade0: #2C2D2F; - --pywal-shade1: #353638; - --pywal-shade2: #3A3B3D; - --pywal-shade3: #3E4041; - --pywal-shade4: #3C3F43; + --pywal-shade0: #4E3E3D; + --pywal-shade1: #5E4B49; + --pywal-shade2: #665150; + --pywal-shade3: #6D5756; + --pywal-shade4: #7B4C49; - --pywal-bg0: #1E1E1F; - --pywal-bg1: #242425; - --pywal-bg2: #2A2A2B; - --pywal-bg3: #303032; + --pywal-bg0: #312322; + --pywal-bg1: #3B2A29; + --pywal-bg2: #453130; + --pywal-bg3: #4E3836; - --pywal-color0: #1e1e1f; - --pywal-color1: #666b6d; - --pywal-color2: #8a8c8d; - --pywal-color3: #c59683; - --pywal-color4: #a7aeb0; - --pywal-color5: #aabbbe; - --pywal-color6: #d1c494; - --pywal-color7: #c6c6c7; - --pywal-color8: #565657; - --pywal-color9: #666b6d; - --pywal-color10: #8a8c8d; - --pywal-color11: #c59683; - --pywal-color12: #a7aeb0; - --pywal-color13: #aabbbe; - --pywal-color14: #d1c494; - --pywal-color15: #c6c6c7; + --pywal-color0: #312322; + --pywal-color1: #c3acaa; + --pywal-color2: #8eb8fb; + --pywal-color3: #f4b3aa; + --pywal-color4: #c0c3ef; + --pywal-color5: #e9bce1; + --pywal-color6: #bed5fb; + --pywal-color7: #cbc8c7; + --pywal-color8: #645a59; + --pywal-color9: #c3acaa; + --pywal-color10: #8eb8fb; + --pywal-color11: #f4b3aa; + --pywal-color12: #c0c3ef; + --pywal-color13: #e9bce1; + --pywal-color14: #bed5fb; + --pywal-color15: #cbc8c7; - --pywal-readable-color0: #69696B; - --pywal-readable-color1: #666B6D; - --pywal-readable-color2: #8A8C8D; - --pywal-readable-color3: #C59683; - --pywal-readable-color4: #A7AEB0; - --pywal-readable-color5: #AABBBE; - --pywal-readable-color6: #D1C494; - --pywal-readable-color7: #C6C6C7; - --pywal-readable-color8: #565657; - --pywal-readable-color9: #666B6D; - --pywal-readable-color10: #8A8C8D; - --pywal-readable-color11: #C59683; - --pywal-readable-color12: #A7AEB0; - --pywal-readable-color13: #AABBBE; - --pywal-readable-color14: #D1C494; - --pywal-readable-color15: #C6C6C7; + --pywal-readable-color0: #775957; + --pywal-readable-color1: #C3ACAA; + --pywal-readable-color2: #8EB8FB; + --pywal-readable-color3: #F4B3AA; + --pywal-readable-color4: #C0C3EF; + --pywal-readable-color5: #E9BCE1; + --pywal-readable-color6: #BED5FB; + --pywal-readable-color7: #CBC8C7; + --pywal-readable-color8: #645A59; + --pywal-readable-color9: #C3ACAA; + --pywal-readable-color10: #8EB8FB; + --pywal-readable-color11: #F4B3AA; + --pywal-readable-color12: #C0C3EF; + --pywal-readable-color13: #E9BCE1; + --pywal-readable-color14: #BED5FB; + --pywal-readable-color15: #CBC8C7; - --pywal-readableOn-color0: #c6c6c7; - --pywal-readableOn-color1: #c6c6c7; - --pywal-readableOn-color2: #1e1e1f; - --pywal-readableOn-color3: #1e1e1f; - --pywal-readableOn-color4: #1e1e1f; - --pywal-readableOn-color5: #1e1e1f; - --pywal-readableOn-color6: #1e1e1f; - --pywal-readableOn-color7: #1e1e1f; - --pywal-readableOn-color8: #c6c6c7; - --pywal-readableOn-color9: #c6c6c7; - --pywal-readableOn-color10: #1e1e1f; - --pywal-readableOn-color11: #1e1e1f; - --pywal-readableOn-color12: #1e1e1f; - --pywal-readableOn-color13: #1e1e1f; - --pywal-readableOn-color14: #1e1e1f; - --pywal-readableOn-color15: #1e1e1f; + --pywal-readableOn-color0: #cbc8c7; + --pywal-readableOn-color1: #312322; + --pywal-readableOn-color2: #312322; + --pywal-readableOn-color3: #312322; + --pywal-readableOn-color4: #312322; + --pywal-readableOn-color5: #312322; + --pywal-readableOn-color6: #312322; + --pywal-readableOn-color7: #312322; + --pywal-readableOn-color8: #cbc8c7; + --pywal-readableOn-color9: #312322; + --pywal-readableOn-color10: #312322; + --pywal-readableOn-color11: #312322; + --pywal-readableOn-color12: #312322; + --pywal-readableOn-color13: #312322; + --pywal-readableOn-color14: #312322; + --pywal-readableOn-color15: #312322; }
\ No newline at end of file diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 111a3e8..f8053cc 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -9,8 +9,8 @@ set selection-clipboard clipboard map <C-i> recolor set recolor "true" -set default-bg rgba(30,30,31,0.92) -set recolor-lightcolor rgba(198,198,199,0) +set default-bg rgba(49,35,34,0.92) +set recolor-lightcolor rgba(203,200,199,0) set recolor-reverse-video "true" set recolor-keephue "true" |