From 39d94bb10dc832701e367a6f12d217ec7809f602 Mon Sep 17 00:00:00 2001 From: Phantop Date: Sat, 15 Jan 2022 13:31:54 -0500 Subject: [PATCH] Reorganize everything into repo root dir --- config/bashrc => bashrc | 3 +- {local/bin => bin}/72 | 0 {local/bin => bin}/acmus | 0 {local/bin => bin}/aliases | 0 bin/appdwarf | 1 + {local/bin => bin}/awall | 0 {local/bin => bin}/clean | 0 {local/bin => bin}/drivedl | 0 {local/bin => bin}/dwarfmount | 0 {local/bin => bin}/hitolo | 0 {local/bin => bin}/optiall | 0 {local/bin => bin}/optiflac | 0 {local/bin => bin}/setup | 6 +- {local/bin => bin}/undeflate | 0 {local/bin => bin}/zzexe | 0 config/invid.yml | 33 ------- config/wine.theme | 92 ------------------ {config/fish => fish}/config.fish | 1 - {config/fish => fish}/fish_variables | 0 {config/git => git}/config | 0 {config/gtk-3.0 => gtk-3.0}/gtk.css | 0 {config => gtk-3.0}/gtkrc | 0 {config/gtk-3.0 => gtk-3.0}/settings.ini | 0 {config/kitty => kitty}/kitty.conf | 0 {config/kitty => kitty}/wall.png | Bin local/bin/appdwarf | 1 - {config/mpv => mpv}/input.conf | 0 {config/mpv => mpv}/mpv.conf | 0 {config/mpv => mpv}/scripts/mpris.so | Bin {config/nvim => nvim}/init.vim | 0 {config/qutebrowser => qutebrowser}/config.py | 26 ++--- .../conf => qutebrowser/config}/adapta.py | 0 .../conf => qutebrowser/config}/adblock.py | 0 .../conf => qutebrowser/config}/bindings.py | 0 .../conf => qutebrowser/config}/redirects.py | 0 .../greasemonkey/ao3.js | 0 .../greasemonkey/discord.js | 0 .../greasemonkey/twitch.js | 0 .../greasemonkey/white.js | 6 +- .../qutebrowser => qutebrowser}/quickmarks | 0 {config/rofi => rofi}/config.rasi | 0 setup | 2 +- config/starship.toml => starship.toml | 0 {config/sway => sway}/config | 0 wine.theme | 34 +++++++ {config/yt-dlp => yt-dlp}/config | 0 {config/zathura => zathura}/zathurarc | 0 47 files changed, 58 insertions(+), 147 deletions(-) rename config/bashrc => bashrc (96%) rename {local/bin => bin}/72 (100%) rename {local/bin => bin}/acmus (100%) rename {local/bin => bin}/aliases (100%) create mode 120000 bin/appdwarf rename {local/bin => bin}/awall (100%) rename {local/bin => bin}/clean (100%) rename {local/bin => bin}/drivedl (100%) rename {local/bin => bin}/dwarfmount (100%) rename {local/bin => bin}/hitolo (100%) rename {local/bin => bin}/optiall (100%) rename {local/bin => bin}/optiflac (100%) rename {local/bin => bin}/setup (93%) rename {local/bin => bin}/undeflate (100%) rename {local/bin => bin}/zzexe (100%) delete mode 100644 config/invid.yml delete mode 100644 config/wine.theme rename {config/fish => fish}/config.fish (99%) rename {config/fish => fish}/fish_variables (100%) rename {config/git => git}/config (100%) rename {config/gtk-3.0 => gtk-3.0}/gtk.css (100%) rename {config => gtk-3.0}/gtkrc (100%) rename {config/gtk-3.0 => gtk-3.0}/settings.ini (100%) rename {config/kitty => kitty}/kitty.conf (100%) rename {config/kitty => kitty}/wall.png (100%) delete mode 120000 local/bin/appdwarf rename {config/mpv => mpv}/input.conf (100%) rename {config/mpv => mpv}/mpv.conf (100%) rename {config/mpv => mpv}/scripts/mpris.so (100%) rename {config/nvim => nvim}/init.vim (100%) rename {config/qutebrowser => qutebrowser}/config.py (61%) rename {config/qutebrowser/conf => qutebrowser/config}/adapta.py (100%) rename {config/qutebrowser/conf => qutebrowser/config}/adblock.py (100%) rename {config/qutebrowser/conf => qutebrowser/config}/bindings.py (100%) rename {config/qutebrowser/conf => qutebrowser/config}/redirects.py (100%) rename {config/qutebrowser => qutebrowser}/greasemonkey/ao3.js (100%) rename {config/qutebrowser => qutebrowser}/greasemonkey/discord.js (100%) rename {config/qutebrowser => qutebrowser}/greasemonkey/twitch.js (100%) rename {config/qutebrowser => qutebrowser}/greasemonkey/white.js (89%) rename {config/qutebrowser => qutebrowser}/quickmarks (100%) rename {config/rofi => rofi}/config.rasi (100%) rename config/starship.toml => starship.toml (100%) rename {config/sway => sway}/config (100%) create mode 100644 wine.theme rename {config/yt-dlp => yt-dlp}/config (100%) rename {config/zathura => zathura}/zathurarc (100%) diff --git a/config/bashrc b/bashrc similarity index 96% rename from config/bashrc rename to bashrc index 87dd9ec..3d79752 100644 --- a/config/bashrc +++ b/bashrc @@ -85,4 +85,5 @@ shopt -s cdspell 2> /dev/null shopt -s cdable_vars #aliases -eval alias $(fish -c alias | cut -d' ' -f2- | sed 's/ /=/') +eval alias $(fish -c alias | cut -d' ' -f2- | sed 's/ /=/' | sed 's/(/$(/g' | sed 's/argv/@/g') +alias cd=cd diff --git a/local/bin/72 b/bin/72 similarity index 100% rename from local/bin/72 rename to bin/72 diff --git a/local/bin/acmus b/bin/acmus similarity index 100% rename from local/bin/acmus rename to bin/acmus diff --git a/local/bin/aliases b/bin/aliases similarity index 100% rename from local/bin/aliases rename to bin/aliases diff --git a/bin/appdwarf b/bin/appdwarf new file mode 120000 index 0000000..17c31cb --- /dev/null +++ b/bin/appdwarf @@ -0,0 +1 @@ +../../.appdwarf/appdwarf \ No newline at end of file diff --git a/local/bin/awall b/bin/awall similarity index 100% rename from local/bin/awall rename to bin/awall diff --git a/local/bin/clean b/bin/clean similarity index 100% rename from local/bin/clean rename to bin/clean diff --git a/local/bin/drivedl b/bin/drivedl similarity index 100% rename from local/bin/drivedl rename to bin/drivedl diff --git a/local/bin/dwarfmount b/bin/dwarfmount similarity index 100% rename from local/bin/dwarfmount rename to bin/dwarfmount diff --git a/local/bin/hitolo b/bin/hitolo similarity index 100% rename from local/bin/hitolo rename to bin/hitolo diff --git a/local/bin/optiall b/bin/optiall similarity index 100% rename from local/bin/optiall rename to bin/optiall diff --git a/local/bin/optiflac b/bin/optiflac similarity index 100% rename from local/bin/optiflac rename to bin/optiflac diff --git a/local/bin/setup b/bin/setup similarity index 93% rename from local/bin/setup rename to bin/setup index e317378..d4d28a2 100755 --- a/local/bin/setup +++ b/bin/setup @@ -16,11 +16,13 @@ se it -c system.devel $audio $dev $gui $media $rice $sys $term $web se rm $gnome firefox hexchat libreoffice-common onboard thunderbird echo source ~/.config/bashrc > ~/.bashrc -ln -s ~/.config/gtkrc ~/.gtkrc-2.0 +ln -s ~/.config/gtk-3.0/gtkrc ~/.gtkrc-2.0 install -D <(echo set -g mouse on) ~/.config/tmux/tmux.conf mkdir -p ~/.parallel/will-cite -parallel stow --no-folding -d ~/.dotfiles/{} -t ~/.{} . ::: config local +stow --no-folding -d ~/.dotfiles -t ~/.config . +stow --no-folding -d ~/.dotfiles -t ~/.local/bin bin + un(){ F=$(mktemp); mkdir -p $2; curl https://api.github.com/repos/$1/releases |\ grep -om1 http.\*zip | wget -i- -O$F; unzip $F -d $2;} diff --git a/local/bin/undeflate b/bin/undeflate similarity index 100% rename from local/bin/undeflate rename to bin/undeflate diff --git a/local/bin/zzexe b/bin/zzexe similarity index 100% rename from local/bin/zzexe rename to bin/zzexe diff --git a/config/invid.yml b/config/invid.yml deleted file mode 100644 index dc6bad7..0000000 --- a/config/invid.yml +++ /dev/null @@ -1,33 +0,0 @@ -services: - postgres: - image: postgres:10 - restart: unless-stopped - volumes: - - postgresdata:/var/lib/postgresql/data - environment: - POSTGRES_DB: invidious - POSTGRES_USER: kemal - POSTGRES_PASSWORD: kemal - healthcheck: - test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"] - invidious: - image: quay.io/invidious/invidious:latest - ports: - - "127.0.0.1:3000:3000" - environment: - INVIDIOUS_CONFIG: | - channel_threads: 4 - check_tables: true - feed_threads: 4 - db: - dbname: invidious - user: kemal - password: kemal - host: postgres - port: 5432 - full_refresh: false - https_only: false - depends_on: - - postgres -volumes: - postgresdata: diff --git a/config/wine.theme b/config/wine.theme deleted file mode 100644 index ebd633c..0000000 --- a/config/wine.theme +++ /dev/null @@ -1,92 +0,0 @@ -; Copyright © Microsoft Corp. - -[Theme] -BrandImage=tpenguinltg.png -; Windows Classic - IDS_THEME_DISPLAYNAME_CLASSIC -DisplayName=FxDev - -; Computer - SHIDI_SERVER -[CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}\DefaultIcon] -DefaultValue=%SystemRoot%\System32\imageres.dll,-109 - -; UsersFiles - SHIDI_USERFILES -[CLSID\{59031A47-3F72-44A7-89C5-5595FE6B30EE}\DefaultIcon] -DefaultValue=%SystemRoot%\System32\imageres.dll,-123 - -; Network - SHIDI_MYNETWORK -[CLSID\{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}\DefaultIcon] -DefaultValue=%SystemRoot%\System32\imageres.dll,-25 - -; Recycle Bin - SHIDI_RECYCLERFULL SHIDI_RECYCLER -[CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon] -Full=%SystemRoot%\System32\imageres.dll,-54 -Empty=%SystemRoot%\System32\imageres.dll,-55 - -[Control Panel\Cursors] -DefaultValue=Windows default - -[Control Panel\Desktop] -TileWallpaper=0 -WallpaperStyle=10 -Pattern= - -[Control Panel\Desktop\WindowMetrics] - -[Metrics] -NonclientMetrics=88 1 0 0 1 0 0 0 16 0 0 0 16 0 0 0 18 0 0 0 18 0 0 0 245 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 188 2 0 0 0 0 0 1 0 0 0 0 84 97 104 111 109 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 0 0 15 0 0 0 245 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 188 2 0 0 0 0 0 1 0 0 0 0 84 97 104 111 109 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 18 0 0 0 18 0 0 0 245 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 144 1 0 0 0 0 0 1 0 0 0 0 84 97 104 111 109 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 245 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 144 1 0 0 0 0 0 1 0 0 0 0 84 97 104 111 109 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 245 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 144 1 0 0 0 0 0 1 0 0 0 0 84 97 104 111 109 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -LangID=1033 -IconMetrics=76 0 0 0 75 0 0 0 75 0 0 0 1 0 0 0 245 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 144 1 0 0 0 0 0 1 0 0 0 0 84 97 104 111 109 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - -[VisualStyles] -Path= -ColorStyle=@themeui.dll,-854 -Size=@themeui.dll,-2019 -Transparency=0 -ColorizationColor=0XD91A4666 -Composition=0 -VisualStyleVersion=10 - -[boot] -SCRNSAVE.EXE= - -[MasterThemeSelector] -MTSM=DABJDKT - -[Sounds] -; IDS_SCHEME_DEFAULT -SchemeName=@mmres.dll,-800 -[Control Panel\Colors] -Scrollbar=148 160 175 -Background=26 58 99 -ActiveTitle=26 70 102 -InactiveTitle=28 33 38 -Menu=57 66 77 -Window=23 27 31 -WindowFrame=0 0 0 -MenuText=255 255 255 -WindowText=245 247 250 -TitleText=245 247 250 -ActiveBorder=57 66 77 -InactiveBorder=57 66 77 -AppWorkspace=28 33 38 -Hilight=7 77 117 -HilightText=255 255 255 -ButtonFace=57 66 77 -;ButtonShadow=38 44 51 -ButtonShadow=27 33 39 -GrayText=133 136 140 -ButtonText=255 255 255 -InactiveTitleText=245 247 250 -;ButtonHilight=148 160 175 -ButtonHilight=107 113 122 -;ButtonDkShadow=64 64 64 -ButtonDkShadow=7 9 10 -ButtonLight=57 66 77 -InfoText=0 0 0 -InfoWindow=243 242 219 -ButtonAlternateFace=181 181 181 -HotTrackingColor=47 138 202 -GradientActiveTitle=26 70 102 -GradientInactiveTitle=28 33 38 -MenuHilight=7 77 117 -MenuBar=57 66 77 diff --git a/config/fish/config.fish b/fish/config.fish similarity index 99% rename from config/fish/config.fish rename to fish/config.fish index 377da92..0d5b1d0 100644 --- a/config/fish/config.fish +++ b/fish/config.fish @@ -11,7 +11,6 @@ if tty -s bind \et 'tmux' bind \ef 'fzf | xclip -selection clipboard' - starship init fish --print-full-init | source source /usr/share/autojump/autojump.fish end diff --git a/config/fish/fish_variables b/fish/fish_variables similarity index 100% rename from config/fish/fish_variables rename to fish/fish_variables diff --git a/config/git/config b/git/config similarity index 100% rename from config/git/config rename to git/config diff --git a/config/gtk-3.0/gtk.css b/gtk-3.0/gtk.css similarity index 100% rename from config/gtk-3.0/gtk.css rename to gtk-3.0/gtk.css diff --git a/config/gtkrc b/gtk-3.0/gtkrc similarity index 100% rename from config/gtkrc rename to gtk-3.0/gtkrc diff --git a/config/gtk-3.0/settings.ini b/gtk-3.0/settings.ini similarity index 100% rename from config/gtk-3.0/settings.ini rename to gtk-3.0/settings.ini diff --git a/config/kitty/kitty.conf b/kitty/kitty.conf similarity index 100% rename from config/kitty/kitty.conf rename to kitty/kitty.conf diff --git a/config/kitty/wall.png b/kitty/wall.png similarity index 100% rename from config/kitty/wall.png rename to kitty/wall.png diff --git a/local/bin/appdwarf b/local/bin/appdwarf deleted file mode 120000 index 145f48c..0000000 --- a/local/bin/appdwarf +++ /dev/null @@ -1 +0,0 @@ -../../../.appdwarf/appdwarf \ No newline at end of file diff --git a/config/mpv/input.conf b/mpv/input.conf similarity index 100% rename from config/mpv/input.conf rename to mpv/input.conf diff --git a/config/mpv/mpv.conf b/mpv/mpv.conf similarity index 100% rename from config/mpv/mpv.conf rename to mpv/mpv.conf diff --git a/config/mpv/scripts/mpris.so b/mpv/scripts/mpris.so similarity index 100% rename from config/mpv/scripts/mpris.so rename to mpv/scripts/mpris.so diff --git a/config/nvim/init.vim b/nvim/init.vim similarity index 100% rename from config/nvim/init.vim rename to nvim/init.vim diff --git a/config/qutebrowser/config.py b/qutebrowser/config.py similarity index 61% rename from config/qutebrowser/config.py rename to qutebrowser/config.py index c0ff7ba..7e636e7 100644 --- a/config/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -1,21 +1,21 @@ config.load_autoconfig(False) -config.source('conf/adapta.py') -config.source('conf/adblock.py') -config.source('conf/bindings.py') -config.source('conf/redirects.py') +config.source('config/adapta.py') +config.source('config/adblock.py') +config.source('config/bindings.py') +config.source('config/redirects.py') -c.url.default_page = "feedly.com/i/my" -c.url.start_pages = "covid19.rpi.edu/dailycheckin" -c.url.searchengines['y'] = "vid.puffyan.us/search?q={}" +c.url.default_page = 'feedly.com/i/my' +c.url.start_pages = 'covid19.rpi.edu/dailycheckin' +c.url.searchengines['y'] = 'vid.puffyan.us/search?q={}' c.url.open_base_url = True c.content.fullscreen.window = True c.colors.webpage.darkmode.enabled = True -c.tabs.show = "multiple" -c.confirm_quit = ["downloads"] -c.qt.force_platformtheme = "gtk2" -c.content.cookies.accept = "no-3rdparty" +c.tabs.show = 'multiple' +c.confirm_quit = ['downloads'] +c.qt.force_platformtheme = 'gtk2' +c.content.cookies.accept = 'no-3rdparty' c.colors.webpage.preferred_color_scheme = 'dark' c.colors.webpage.darkmode.policy.images = 'never' @@ -27,9 +27,9 @@ config.set('content.notifications.enabled', True, 'https://mail.tutanota.com') config.set('content.register_protocol_handler', True, 'https://mail.tutanota.com') import socket -if socket.gethostname() == "wheatley": +if socket.gethostname() == 'wheatley': c.zoom.default = 125 - c.qt.force_software_rendering = "chromium" + c.qt.force_software_rendering = 'chromium' #import dracula.draw #dracula.draw.blood(c, {'spacing': {'vertical': 1,'horizontal': 0}}) diff --git a/config/qutebrowser/conf/adapta.py b/qutebrowser/config/adapta.py similarity index 100% rename from config/qutebrowser/conf/adapta.py rename to qutebrowser/config/adapta.py diff --git a/config/qutebrowser/conf/adblock.py b/qutebrowser/config/adblock.py similarity index 100% rename from config/qutebrowser/conf/adblock.py rename to qutebrowser/config/adblock.py diff --git a/config/qutebrowser/conf/bindings.py b/qutebrowser/config/bindings.py similarity index 100% rename from config/qutebrowser/conf/bindings.py rename to qutebrowser/config/bindings.py diff --git a/config/qutebrowser/conf/redirects.py b/qutebrowser/config/redirects.py similarity index 100% rename from config/qutebrowser/conf/redirects.py rename to qutebrowser/config/redirects.py diff --git a/config/qutebrowser/greasemonkey/ao3.js b/qutebrowser/greasemonkey/ao3.js similarity index 100% rename from config/qutebrowser/greasemonkey/ao3.js rename to qutebrowser/greasemonkey/ao3.js diff --git a/config/qutebrowser/greasemonkey/discord.js b/qutebrowser/greasemonkey/discord.js similarity index 100% rename from config/qutebrowser/greasemonkey/discord.js rename to qutebrowser/greasemonkey/discord.js diff --git a/config/qutebrowser/greasemonkey/twitch.js b/qutebrowser/greasemonkey/twitch.js similarity index 100% rename from config/qutebrowser/greasemonkey/twitch.js rename to qutebrowser/greasemonkey/twitch.js diff --git a/config/qutebrowser/greasemonkey/white.js b/qutebrowser/greasemonkey/white.js similarity index 89% rename from config/qutebrowser/greasemonkey/white.js rename to qutebrowser/greasemonkey/white.js index 3ab1fae..5a33921 100644 --- a/config/qutebrowser/greasemonkey/white.js +++ b/qutebrowser/greasemonkey/white.js @@ -1,10 +1,10 @@ // ==UserScript== // @match -// @match https://*.discord.com/* +// @match https://archiveofourown.org/* +// @match https://canary.discord.com/* +// @match https://drop.lol/* // @match https://mail.tutanota.com/* // @match https://teddit.net/* -// @match https://archiveofourown.org/* -// @match https://drop.lol/* // ==/UserScript== const meta = document.createElement('meta'); meta.name = "color-scheme"; diff --git a/config/qutebrowser/quickmarks b/qutebrowser/quickmarks similarity index 100% rename from config/qutebrowser/quickmarks rename to qutebrowser/quickmarks diff --git a/config/rofi/config.rasi b/rofi/config.rasi similarity index 100% rename from config/rofi/config.rasi rename to rofi/config.rasi diff --git a/setup b/setup index 5d11c0c..d72aea2 120000 --- a/setup +++ b/setup @@ -1 +1 @@ -local/bin/setup \ No newline at end of file +bin/setup \ No newline at end of file diff --git a/config/starship.toml b/starship.toml similarity index 100% rename from config/starship.toml rename to starship.toml diff --git a/config/sway/config b/sway/config similarity index 100% rename from config/sway/config rename to sway/config diff --git a/wine.theme b/wine.theme new file mode 100644 index 0000000..54214e8 --- /dev/null +++ b/wine.theme @@ -0,0 +1,34 @@ +[VisualStyles] +ColorizationColor=0XD91A4666 +[Control Panel\Colors] +Scrollbar=148 160 175 +Background=26 58 99 +ActiveTitle=26 70 102 +InactiveTitle=28 33 38 +Menu=57 66 77 +Window=23 27 31 +WindowFrame=0 0 0 +MenuText=255 255 255 +WindowText=245 247 250 +TitleText=245 247 250 +ActiveBorder=57 66 77 +InactiveBorder=57 66 77 +AppWorkspace=28 33 38 +Hilight=7 77 117 +HilightText=255 255 255 +ButtonFace=57 66 77 +ButtonShadow=27 33 39 +GrayText=133 136 140 +ButtonText=255 255 255 +InactiveTitleText=245 247 250 +ButtonHilight=107 113 122 +ButtonDkShadow=7 9 10 +ButtonLight=57 66 77 +InfoText=0 0 0 +InfoWindow=243 242 219 +ButtonAlternateFace=181 181 181 +HotTrackingColor=47 138 202 +GradientActiveTitle=26 70 102 +GradientInactiveTitle=28 33 38 +MenuHilight=7 77 117 +MenuBar=57 66 77 diff --git a/config/yt-dlp/config b/yt-dlp/config similarity index 100% rename from config/yt-dlp/config rename to yt-dlp/config diff --git a/config/zathura/zathurarc b/zathura/zathurarc similarity index 100% rename from config/zathura/zathurarc rename to zathura/zathurarc