From c1fe7828fd0933fa52a347b1426d25b885ea891f Mon Sep 17 00:00:00 2001 From: Phantop Date: Fri, 19 Apr 2024 16:45:54 -0400 Subject: [PATCH] qute: restructure out of config.py, qt: ditch kvantum for qt5ct, mpv: update to new SoM settings --- Kvantum/kvantum.kvconfig | 2 -- archpkgs | 9 ++++++--- bin/setup | 4 ++++ fish/config.fish | 2 +- nvim/init.lua | 2 +- qt5ct/qt5ct.conf | 13 +++++++++++++ qutebrowser/config.py | 3 --- qutebrowser/redirects.py | 1 - qutebrowser/sites.py | 2 +- qutebrowser/theme.py | 5 ++++- 10 files changed, 30 insertions(+), 13 deletions(-) delete mode 100644 Kvantum/kvantum.kvconfig create mode 100644 qt5ct/qt5ct.conf diff --git a/Kvantum/kvantum.kvconfig b/Kvantum/kvantum.kvconfig deleted file mode 100644 index 48238bd..0000000 --- a/Kvantum/kvantum.kvconfig +++ /dev/null @@ -1,2 +0,0 @@ -[General] -theme=Dracula-Solid diff --git a/archpkgs b/archpkgs index 8988851..d6810bd 100644 --- a/archpkgs +++ b/archpkgs @@ -31,7 +31,6 @@ doas-sudo-shim dolphin-emu dolphin-emu-tool dracula-gtk-theme-git -dracula-kde-theme-git elvish expac fd @@ -43,6 +42,7 @@ fwupd fzf gallery-dl game-devices-udev +gamescope gdb ghostscript gifsicle @@ -50,6 +50,7 @@ git git-filter-repo git-lfs gitui +gmic gnome-disk-utility gnome-keyring gnome-power-manager @@ -73,16 +74,16 @@ keepassxc kernel-headers-musl kitty kiwix-tools -kvantum-qt5 +krita lagrange libheif libplist libpulse -libresprite-git libusbmuxd libva-intel-driver linux-firmware linux-hardened +love lrzip ly lynx @@ -144,6 +145,7 @@ qownnotes qpdf qrencode qt5-base +qt5ct qutebrowser rclone redlib @@ -187,6 +189,7 @@ xdelta3 xdg-utils xf86-input-evdev xf86-input-libinput +xf86-input-wacom xorg-server xorg-xinit xreader diff --git a/bin/setup b/bin/setup index dbf6381..40b868a 100755 --- a/bin/setup +++ b/bin/setup @@ -30,6 +30,10 @@ wget https://source.netsurf-browser.org/netsurf.git/plain/resources/adblock.css wget https://github.com/savq/paq-nvim/raw/master/lua/paq.lua -P ~/.config/nvim/lua nvim +PaqInstall +q +wget https://github.com/DonCanjas/mpv-visualizer/raw/master/visualizer.lua -P ~/.config/mpv/scripts +wget https://github.com/elhirchek/copy-paste-url/raw/master/copy-paste-url.lua -P ~/.config/mpv/scripts +wget https://gitlab.com/lvml/mpv-plugin-xrandr/-/raw/master/xrandr.lua -P ~/.config/mpv/scripts + printf bt-tracker= > ~/.config/aria2/aria2.conf curl -L https://github.com/ngosang/trackerslist/raw/master/trackers_best.txt | tr "\n" , >> ~/.config/aria2/aria2.conf diff --git a/fish/config.fish b/fish/config.fish index e57d567..8d49fb0 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,6 +1,6 @@ fish_add_path -g ~/{.dotfiles,.local{/appdwarf,},Games}/bin /usr/lib64/ccache/bin export EDITOR=nvim MANPAGER='nvim +Man!' USE_CCACHE=1 PAGER=most -export QT_STYLE_OVERRIDE=kvantum GTK_THEME=Dracula +export QT_QPA_PLATFORMTHEME=qt5ct GTK_THEME=Dracula export NNN_PLUG='f:fzcd;i:imgur;j:autojump;m:nmount;s:imgview' set fish_greeting diff --git a/nvim/init.lua b/nvim/init.lua index f3d8910..f34e216 100755 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -120,5 +120,5 @@ vim.cmd [[ colorscheme dracula command Q q! let b:ale_linters = {'c': [''], 'sh': [''], 'php': ['']} -autocmd BufReadPost,FileReadPost *.bz3 call gzip#read("bzip3 -d") +autocmd BufReadPost,FileReadPost *.bz3 call gzip#read("bzip3 -rd") ]] diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf new file mode 100644 index 0000000..ad592d2 --- /dev/null +++ b/qt5ct/qt5ct.conf @@ -0,0 +1,13 @@ +[Appearance] +color_scheme_path=/home/glados/.dotfiles/qt5ct/qt5ct.conf +custom_palette=true +icon_theme=Haiku + +[ColorScheme] +active_colors=#ffffffff, #ff282a36, #ff282a36, #ff282a36, #ff282a36, #ff282a36, #ffffffff, #ffffffff, #ffffffff, #ff282a36, #ff282a36, #ffe7e4e0, #ffbd93f9, #fff9f9f9, #ffbd93f9, #ff554371, #ff282a36, #ffffffff, #ff282a36, #ffffffff, #80ffffff +disabled_colors=#ff808080, #ff282a36, #ff282a36, #ff282a36, #ff282a36, #ff282a36, #ff808080, #ffffffff, #ff808080, #ff282a36, #ff282a36, #ffe7e4e0, #ffbd93f9, #ff808080, #ffbd93f9, #ff554371, #ff282a36, #ffffffff, #ff282a36, #ffffffff, #80ffffff +inactive_colors=#ffffffff, #ff282a36, #ff282a36, #ff282a36, #ff282a36, #ff282a36, #ffffffff, #ffffffff, #ffffffff, #ff282a36, #ff282a36, #ffe7e4e0, #ffbd93f9, #fff9f9f9, #ffbd93f9, #ff554371, #ff282a36, #ffffffff, #ff282a36, #ffffffff, #80ffffff + +[Fonts] +fixed="Source Code Pro,10,-1,5,50,0,0,0,0,0" +general="Cantarell,11,-1,5,50,0,0,0,0,0" diff --git a/qutebrowser/config.py b/qutebrowser/config.py index 38b12bd..98ff451 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -1,10 +1,7 @@ config.load_autoconfig(False) -c.content.fullscreen.window = True -c.content.user_stylesheets = ['adblock.css', 'dracula.css', 'user.css'] c.confirm_quit = ['downloads'] c.qt.workarounds.remove_service_workers = True -c.url.start_pages = c.url.default_page = 'minifocs.fly.dev' config.source('adblock.py') config.source('bindings.py') diff --git a/qutebrowser/redirects.py b/qutebrowser/redirects.py index f45e931..dbbb117 100644 --- a/qutebrowser/redirects.py +++ b/qutebrowser/redirects.py @@ -42,7 +42,6 @@ def github(url: QUrl) -> bool: return farside(url, '/gothub/') #twitter = o(s, 'unrollnow.com') -twitter = o(s, 'nitter.poast.org') m = { "reddit.com": reddit, diff --git a/qutebrowser/sites.py b/qutebrowser/sites.py index 6c26650..886f8a9 100644 --- a/qutebrowser/sites.py +++ b/qutebrowser/sites.py @@ -2,6 +2,7 @@ c.content.cookies.accept = "never" c.content.javascript.enabled = False c.content.notifications.enabled = False c.content.register_protocol_handler = False +c.url.start_pages = c.url.default_page = 'minifocs.fly.dev' sites = [ 'archiveofourown.org', 'canary.discord.com', @@ -12,7 +13,6 @@ sites = [ '*.albany.edu', 'api-3e0243bb.duosecurity.com', 'api-71fc1511.duosecurity.com', - 'www.gradescope.com', ] for site in sites: config.set('content.javascript.enabled', True, 'https://' + site) diff --git a/qutebrowser/theme.py b/qutebrowser/theme.py index 7646ebc..2368295 100644 --- a/qutebrowser/theme.py +++ b/qutebrowser/theme.py @@ -50,5 +50,8 @@ cc.webpage.darkmode.enabled = True cc.webpage.preferred_color_scheme = 'dark' cc.webpage.darkmode.policy.images = 'never' -c.tabs.show = 'multiple' c.completion.open_categories = ["bookmarks","history"] +c.content.fullscreen.window = True +c.content.prefers_reduced_motion = True +c.content.user_stylesheets = ['adblock.css', 'dracula.css', 'user.css'] +c.tabs.show = 'multiple'