From f124110e6f3112f5c24c2ec5a1570bcb3f6199a5 Mon Sep 17 00:00:00 2001 From: surtur Date: Tue, 11 Jul 2023 17:56:04 +0200 Subject: [PATCH] add various changes --- .cargo/.crates.toml | 25 +++++----- .config/aerc/aerc.conf | 5 +- .config/electron-flags.conf | 2 + .config/fusuma/config-wl.yml | 7 ++- .config/gtk-4.0/gtk.css | 2 +- .config/gtk-4.0/settings.ini | 4 ++ .config/nix/nix.conf | 10 +++- .config/vifm/vifmrc | 89 +++++++++++++++++++++++++++--------- .nix-channels | 2 + .vim/vimrc | 15 +++--- chromium-flags | 1 + 11 files changed, 119 insertions(+), 43 deletions(-) create mode 100644 .config/electron-flags.conf create mode 100644 chromium-flags diff --git a/.cargo/.crates.toml b/.cargo/.crates.toml index c0ee69f..b99f086 100644 --- a/.cargo/.crates.toml +++ b/.cargo/.crates.toml @@ -1,24 +1,27 @@ [v1] -"b3sum 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = ["b3sum"] +"b3sum 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["b3sum"] "bandwhich 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["bandwhich"] -"cargo-outdated 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = ["cargo-outdated"] -"cargo-update 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = [ +"cargo-outdated 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = ["cargo-outdated"] +"cargo-update 13.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = [ "cargo-install-update", "cargo-install-update-config", ] -"cargo-watch 8.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = ["cargo-watch"] +"cargo-watch 8.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["cargo-watch"] +"cloak 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["cloak"] "crowbook 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = ["crowbook"] -"du-dust 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = ["dust"] -"eva 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = ["eva"] +"du-dust 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = ["dust"] +"eva 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = ["eva"] "rustlings 3.0.0 (path+file:///home/vis/utils/rustlings)" = ["rustlings"] -"sccache 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["sccache"] -"sheldon 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = ["sheldon"] -"starship 1.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = ["starship"] +"sccache 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = ["sccache"] +"sheldon 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = ["sheldon"] +"starship 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["starship"] "sway-alttab 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = ["sway-alttab"] -"swayr 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = [ +"swayr 0.27.0 (registry+https://github.com/rust-lang/crates.io-index)" = [ "swayr", "swayrd", ] -"taskwarrior-tui 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = ["taskwarrior-tui"] +"taplo-cli 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["taplo"] +"taskwarrior-tui 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)" = ["taskwarrior-tui"] "vtebench 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = ["vtebench"] +"zellij 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)" = ["zellij"] "zenith 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = ["zenith"] diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf index 13b8ee4..a597a54 100644 --- a/.config/aerc/aerc.conf +++ b/.config/aerc/aerc.conf @@ -1,5 +1,7 @@ # # aerc main configuration +# msglist_unread.fg=cornflowerblue + [ui] # @@ -76,7 +78,8 @@ stylesets-dirs=/usr/local/share/aerc/stylesets/ # Sets the styleset to use for the aerc ui elements. # # Default: default -styleset-name=default +# styleset-name=default +styleset-name=dracula [viewer] # diff --git a/.config/electron-flags.conf b/.config/electron-flags.conf new file mode 100644 index 0000000..51bdd86 --- /dev/null +++ b/.config/electron-flags.conf @@ -0,0 +1,2 @@ +--enable-features=UseOzonePlatform +--ozone-platform=wayland diff --git a/.config/fusuma/config-wl.yml b/.config/fusuma/config-wl.yml index 42bc138..ab5349e 100644 --- a/.config/fusuma/config-wl.yml +++ b/.config/fusuma/config-wl.yml @@ -1,3 +1,4 @@ +--- threshold: swipe: 1 pinch: 1 @@ -10,10 +11,14 @@ swipe: 3: left: sendkey: "LEFTMETA+LEFTSHIFT+DOT" + # sway-specific: get a separate config + # command: "swaymsg 'workspace next'" threshold: 0.2 interval: 0.5 right: sendkey: "LEFTMETA+LEFTSHIFT+COMMA" + # sway-specific: get a separate config + # command: "swaymsg 'workspace prev'" threshold: 0.2 interval: 0.5 4: @@ -47,4 +52,4 @@ plugin: inputs: libinput_command_input: # show-keycode: true - verbose: true + # verbose: true diff --git a/.config/gtk-4.0/gtk.css b/.config/gtk-4.0/gtk.css index 32d3796..4a5ed32 100644 --- a/.config/gtk-4.0/gtk.css +++ b/.config/gtk-4.0/gtk.css @@ -7,7 +7,7 @@ headerbar separator { } headerbar { - min-height: 24px; + min-height: 16px; padding-left: 2px; /* same as childrens vertical margins for nicer proportions */ padding-right: 2px; margin: 0px; /* same as headerbar side padding for nicer proportions */ diff --git a/.config/gtk-4.0/settings.ini b/.config/gtk-4.0/settings.ini index 51f0c97..7f93429 100644 --- a/.config/gtk-4.0/settings.ini +++ b/.config/gtk-4.0/settings.ini @@ -1,8 +1,12 @@ [Settings] gtk-application-prefer-dark-theme=1 +gtk-theme-name=Dracula +gtk-icon-theme-name=Yaru-blue-dark +gtk-cursor-theme-name=Yaru gtk-primary-button-warps-slider=true gtk-xft-antialias=1 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb gtk-decoration-layout=menu: +gtk-font-name=CascadiaCodePL ExtraLight, 10.4 diff --git a/.config/nix/nix.conf b/.config/nix/nix.conf index cb091c8..f26a6d1 100644 --- a/.config/nix/nix.conf +++ b/.config/nix/nix.conf @@ -1,8 +1,16 @@ # enable nix-search, which is experimental as of 2022-04-02 -experimental-features = nix-command flakes +experimental-features = nix-command flakes recursive-nix max-jobs = auto # Allow building multiple derivations in parallel keep-outputs = true # Do not garbage-collect build time-only dependencies (e.g. clang) keep-derivations = true +auto-optimise-store = true sandbox = true +# sandbox = false +extra-sandbox-paths = /nix/var/cache/ccache # https://nixos.org/manual/nix/unstable/advanced-topics/distributed-builds.html builders = ssh://nixbldr-vela x86_64-linux; ssh://nixbldr-loki x86_64-linux +builders = +trusted-substituters = https://cache.nixos.org https://nix-community.cachix.org +substituters = https://cache.nixos.org https://da-cache.cachix.org https://go-xkcdreader.cachix.org https://math-optim.cachix.org https://shajra.cachix.org https://diwt.cachix.org +trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= da-cache.cachix.org-1:LkkznyhDZaFQ/96wNR7ZVuYKOrcgibetEzC2sttDAOc= go-xkcdreader.cachix.org-1:XpmDNw54uMyt6IuBsW8YCHyJbyHOJT7Q9qlLW+CrRh8= math-optim.cachix.org-1:UvLCAwr+6o90QFjBsEKzmWyGiupqTpdRzANH98cr2+o= shajra.cachix.org-1:V0x7Wjgd/mHGk2KQwzXv8iydfIgLupbnZKLSQt5hh9o= diwt.cachix.org-1:a10SKVn8hzntdyarMTr2Kwh1XSvZPuQ5ca3/nwKN8TY= +trusted-users = root @wheel diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index aa2bc48..eda0b42 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -133,6 +133,11 @@ command! make !!make %a command! mkcd :mkdir %a | cd %a command! vgrep vim "+grep %a" command! reload :write | restart +" a link of the selected file is made in the other directory (if you are in +" split view). it even works with multiple files selected with visual (v) or +" tag (t). source: archwiki +" +command link ln -s %d/%f %D " ------------------------------------------------------------------------------ @@ -163,13 +168,15 @@ command! reload :write | restart " program. " Pdf -filextype *.pdf zathura %c %i & +" filextype *.pdf zathura %c %i & +filetype *.pdf zathura %c %i & fileviewer *.pdf \ vifmimg pdf %px %py %pw %ph %c \ %pc \ vifmimg clear " ePUBs -filextype *.epub zathura %c %i & +" filextype *.epub zathura %c %i & +filetype *.epub zathura %c %i & fileviewer *.epub \ vifmimg epub %px %py %pw %ph %c \ %pc @@ -182,14 +189,16 @@ fileviewer *.otf,*.ttf,*.woff \ vifmimg clear " PostScript -filextype *.ps,*.eps,*.ps.gz +" filextype *.ps,*.eps,*.ps.gz +filetype *.ps,*.eps,*.ps.gz \ {View in zathura} \ zathura %f, \ {View in gv} \ gv %c %i &, " Djvu -filextype *.djvu +" filextype *.djvu +filetype *.djvu \ {View in zathura} \ zathura %f, \ {View in apvlv} @@ -197,6 +206,8 @@ filextype *.djvu " Audio filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus + \ {Play using mpv} + \ mpv -nodisp %c, \ {Play using ffplay} \ ffplay -nodisp %c, \ {Play using MPlayer} @@ -235,15 +246,21 @@ filetype *.[1-8] man ./%c fileviewer *.[1-8] man ./%c | col -b " Images -filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm - \ {View in sxiv} - \ sxiv, - \ {View in gpicview} - \ gpicview %c, - \ {View in shotwell} - \ shotwell, +" filextype *.jpg,*.jpeg,*.png,*.gif +filetype *.jpg,*.jpeg,*.png,*.gif + \ {View in feh} + \ feh -FZ %d --start-at %d/%c 2>/dev/null +""""""filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm +"""""" \ {View in sxiv} +"""""" \ sxiv, +"""""" \ {View in gpicview} +"""""" \ gpicview %c, +"""""" \ {View in shotwell} +"""""" \ shotwell, ""fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm "" \ convert -identify %f -verbose /dev/null +fileviewer *.png,*.jpeg,*.jpg + \ img2txt %c ""filextype mpv %c %i /dev/null & */ fileviewer \ vifmimg draw %px %py %pw %ph %c @@ -280,6 +297,16 @@ filetype *.sha512 \ {Check SHA512 hash sum} \ sha512sum -c %f %S, +" blake2 +filetype *.b2 + \ {Check blake2 hash sum} + \ b2sum -c %f %S, + +" blake3 +filetype *.b3 + \ {Check blake3 hash sum} + \ b3sum -c %f %S, + " GPG signature filetype *.asc \ {Check signature} @@ -303,10 +330,10 @@ fileviewer *.zip,*.jar,*.war,*.ear,*.oxt zip -sf %c filetype *.tar,*.tar.bz2,*.tbz2,*.tgz,*.tar.gz,*.tar.xz,*.txz \ {Mount with archivemount} \ FUSE_MOUNT|archivemount %SOURCE_FILE %DESTINATION_DIR, -fileviewer *.tgz,*.tar.gz tar -tzf %c -fileviewer *.tar.bz2,*.tbz2 tar -tjf %c +fileviewer *.tgz,*.tar.gz tar -tvzf %c +fileviewer *.tar.bz2,*.tbz2 tar -tvjf %c fileviewer *.tar.txz,*.txz xz --list %c -fileviewer *.tar tar -tf %c +fileviewer *.tar tar -tvf %c " Rar2FsMount and rar archives filetype *.rar @@ -336,7 +363,8 @@ filetype *.7z fileviewer *.7z 7z l %c " Office files -filextype *.odt,*.doc,*.docx,*.xls,*.xlsx,*.odp,*.pptx libreoffice %f & +" filextype *.odt,*.doc,*.docx,*.xls,*.xlsx,*.odp,*.pptx libreoffice %f & +filetype *.odt,*.doc,*.docx,*.xls,*.xlsx,*.odp,*.pptx libreoffice %f & filetype *.csv,*.xlsx libreoffice %c %i fileviewer *.csv sed "s/,,,,/,,-,,/g;s/,,/ /g" %c | column -t | sed "s/ - / /g" | cut -c -%pw fileviewer *.doc catdoc %c @@ -346,7 +374,8 @@ fileviewer *.docx, docx2txt.pl %f - filetype *.tudu tudu -f %c " Qt projects -filextype *.pro qtcreator %f & +" filextype *.pro qtcreator %f & +filetype *.pro qtcreator %f & " Directories "filextype */ @@ -357,6 +386,10 @@ filextype *.pro qtcreator %f & fileviewer */ ls --color --group-directories-first fileviewer .*/ ls --color --group-directories-first +highlight /^.*\.(mp3|ogg|oga|flac|m4a)$/ ctermfg=magenta +highlight /^.*\.(jpg|jpeg|png|gif|tiff|webp|bmp|svg|svgz)$/ ctermfg=yellow +highlight /^.*\.(zip|gz|bz2|xz|tar|tgz|tbz2|7z|rar|iso|rpm|deb)$/ ctermfg=red + " Syntax highlighting in preview " " Explicitly set highlight type for some extensions @@ -376,13 +409,17 @@ fileviewer .*/ ls --color --group-directories-first " " fileviewer *.jpg,*.png shellpic %c + +fileviewer * test -x && ldd %c + " Open all other files with default system programs (you can also remove all " :file[x]type commands above to ensure they don't interfere with system-wide " settings). By default all unknown files are opened with 'vi[x]cmd' " uncommenting one of lines below will result in ignoring 'vi[x]cmd' option " for unknown file types. " For *nix: -filetype * xdg-open %c +" only open non-executable files +filetype * test ! -x && xdg-open %c " For OS X: " filetype * open " For Windows: @@ -462,12 +499,22 @@ nnoremap :move nnoremap :mkdir nnoremap :delete +" Hold shift to jump 5 files +" +nnoremap J 5j +nnoremap K 5k + +" Type - or _ to resize the panes +" +nnoremap - 5< +nnoremap _ 5> + " ------------------------------------------------------------------------------ "{{{ Icons " file types -set classify=' :dir:/, :exe:, :reg:, :link:' +set classify=' :dir:/, :exe:, :reg:, :link:' " various file names -set classify+=' ::../::, ::*.sh::, ::*.[hc]pp::, ::*.[hc]::, ::/^copying|license$/::, ::.git/,,*.git/::, ::*.epub,,*.fb2,,*.djvu::, ::*.pdf::, ::*.htm,,*.html,,**.[sx]html,,*.xml::' +set classify+=' ::../::, ::*.sh::,🐚 ::*.zsh::,🐚 ::*.[hc]pp::, ::*.[hc]::, ::/^copying|license$/::, ::.git/,,*.git/::, ::*.epub,,*.fb2,,*.djvu::, ::*.pdf::, ::*.htm,,*.html,,**.[sx]html,,*.xml::, ::*.nix::, ::*.go,,*.mod,,*.sum::' " archives set classify+=' ::*.7z,,*.ace,,*.arj,,*.bz2,,*.cpio,,*.deb,,*.dz,,*.gz,,*.jar,,*.lzh,,*.lzma,,*.rar,,*.rpm,,*.rz,,*.tar,,*.taz,,*.tb2,,*.tbz,,*.tbz2,,*.tgz,,*.tlz,,*.trz,,*.txz,,*.tz,,*.tz2,,*.xz,,*.z,,*.zip,,*.zoo::' " images @@ -475,7 +522,7 @@ set classify+=' ::*.bmp,,*.gif,,*.jpeg,,*.jpg,,*.ico,,*.png,,*.ppm,,*.svg,,* " audio set classify+=' ::*.aac,,*.anx,,*.asf,,*.au,,*.axa,,*.flac,,*.m2a,,*.m4a,,*.mid,,*.midi,,*.mp3,,*.mpc,,*.oga,,*.ogg,,*.ogx,,*.ra,,*.ram,,*.rm,,*.spx,,*.wav,,*.wma,,*.ac3::' " media -set classify+=' ::*.avi,,*.ts,,*.axv,,*.divx,,*.m2v,,*.m4p,,*.m4v,,.mka,,*.mkv,,*.mov,,*.mp4,,*.flv,,*.mp4v,,*.mpeg,,*.mpg,,*.nuv,,*.ogv,,*.pbm,,*.pgm,,*.qt,,*.vob,,*.wmv,,*.xvid::' +set classify+=' ::*.avi,,*.ts,,*.axv,,*.divx,,*.m2v,,*.m4p,,*.m4v,,.mka,,*.mkv,,*.mov,,*.mp4,,*.flv,,*.mp4v,,*.mpeg,,*.mpg,,*.nuv,,*.ogv,,*.pbm,,*.pgm,,*.qt,,*.vob,,*.wmv,,*.xvid::' " office files set classify+=' ::*.doc,,*.docx::, ::*.xls,,*.xls[mx]::, ::*.pptx,,*.ppt::' "}}} @@ -485,7 +532,7 @@ set classify+=' ::*.doc,,*.docx::, ::*.xls,,*.xls[mx]::, ::*.pptx,,* " Use ag (the silver searcher) instead of grep " -" set grepprg=ag\ --line-numbers\ %i\ %a\ %s +set grepprg=ag\ --line-numbers\ %i\ %a\ %s " Add additional place to look for executables " diff --git a/.nix-channels b/.nix-channels index 577d2de..fdf0b4b 100644 --- a/.nix-channels +++ b/.nix-channels @@ -1,3 +1,5 @@ https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager +https://github.com/guibou/nixGL/archive/main.tar.gz nixgl https://nixos.org/channels/nixpkgs-unstable nixpkgs https://git.dotya.ml/wanderer/nix-channel/archive/development.tar.gz personal +https://git.dotya.ml/wanderer/nix-channel/archive/stable.tar.gz personal-stable diff --git a/.vim/vimrc b/.vim/vimrc index 9226529..73fba86 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -491,12 +491,12 @@ let g:vim_json_conceal = 0 let g:markdown_syntax_conceal = 0 -""" ultisnips -" If you want :UltiSnipsEdit to split your window. -" let g:UltiSnipsEditSplit="vertical" -let g:UltiSnipsExpandTrigger='' -" let g:UltiSnipsJumpForwardTrigger="" -" let g:UltiSnipsJumpBackwardTrigger="" +""""" ultisnips +""" If you want :UltiSnipsEdit to split your window. +""" let g:UltiSnipsEditSplit="vertical" +""let g:UltiSnipsExpandTrigger='' +""" let g:UltiSnipsJumpForwardTrigger="" +""" let g:UltiSnipsJumpBackwardTrigger="" """ gitmessenger @@ -1034,7 +1034,8 @@ augroup async_plug_load " used to use CursorHold,CursorHoldI but I'm not sure if that didn't go " off on *every* CursorHold, so this is the solution (perhaps not as async " anymore)... - autocmd BufWinEnter * call plug#load('vim-speeddating', 'ultisnips', 'vim-snippets') + " autocmd BufWinEnter * call plug#load('vim-speeddating', 'ultisnips', 'vim-snippets') + autocmd BufWinEnter * call plug#load('vim-speeddating', 'vim-snippets') \| autocmd! async_plug_load augroup END diff --git a/chromium-flags b/chromium-flags new file mode 100644 index 0000000..3ef4c87 --- /dev/null +++ b/chromium-flags @@ -0,0 +1 @@ +/usr/lib64/chromium-freeworld/chromium-freeworld --type=renderer --enable-accelerated-video-decode --enable-experimental-web-platform-features --enable-webgl-draft-extensions --field-trial-handle=15675769495041768696,15147321762324362287,131072 --enable-features=CSSColorSchemeUARendering,CastMediaRouteProvider,CookieDeprecationMessages,CriticalClientHint,CrossOriginEmbedderPolicy,CrossOriginIsolated,CrossOriginOpenerPolicyAccessReporting,CrossOriginOpenerPolicyReporting,DecodeJpeg420ImagesToYUV,DecodeLossyWebPImagesToYUV,DesktopPWAsLocalUpdating,DesktopPWAsTabStripLinkCapturing,DocumentPolicyNegotiation,EnableNewBadgeOnMenuItems,EnableNewCanvas2DAPI,EnableTLS13EarlyData,ExperimentalFlingAnimation,FeaturePolicyForClientHints,FtpProtocol,GlobalMediaControlsCastStartStop,GlobalMediaControlsPictureInPicture,GlobalMediaControlsSeamlessTransfer,LangClientHintHeader,OriginIsolationHeader,OriginPolicy,PDFViewerUpdate,ParallelDownloading,ReadLater,ResourceLoadingHints,SchemefulSameSite,SharedClipboardUI,SharingQRCodeGenerator,TabGroupsCollapse,TabGroupsCollapseFreezing,TabHoverCardImages,UserAgentClientHint,Vulkan,WebAssemblySimd,WebAssemblyThreads,WebOTPCrossDevice,WebRTCPipeWireCapturer,WebUITabStrip --disable-features=AutofillUpstream --disable-databases --lang=en-GB --disable-client-side-phishing-detection --origin-trial-disabled-features=SecurePaymentConfirmation --num-raster-threads=2 --enable-zero-copy --enable-main-frame-before-activation --renderer-client-id=24 --no-v8-untrusted-code-mitigations --shared-files=v8_context_snapshot_data:100