diff options
598 files changed, 5223 insertions, 2866 deletions
@@ -1,5 +1,5 @@ files/fonts/ComicCode* -hosts/denpa/email/ -hosts/denpa/letsencrypt/ -hosts/denpa/wg-rod.conf hosts/rod/wg-rod.conf +hosts/station/email/ +hosts/station/letsencrypt/ +hosts/station/wg-rod.conf diff --git a/NOTES.txt b/NOTES.txt deleted file mode 100644 index 64edceb..0000000 --- a/NOTES.txt +++ /dev/null @@ -1,47 +0,0 @@ -== Hosts -iroha - sofue - soy - corpa - xp -moyo - denpa <-> rod ^ - the-p -yashinoki - -== Resources - * https://search.nixos.org/options?channel=unstable - * https://rycee.gitlab.io/home-manager/options.html#opt-programs.zsh.defaultKeymap - * https://nixos.wiki/wiki/Build_flags - * https://functor.tokyo/blog/2018-02-20-show-packages-installed-on-nixos - * https://github.com/NixOS/nixpkgs/blob/1e0561d78a3d3cd84bac45ab474af82e32802120/lib/systems/examples.nix - * https://gist.github.com/Kron4ek/af1bbc1353302751a0941308294ec24a - * https://wiki.cachyos.org/features/cachyos_settings/ - -== Examples - * https://nixos.wiki/wiki/Configuration_Collection - * https://github.com/yrashk/nix-home/blob/master/alacritty.yml - * https://github.com/MatthiasBenaets/nixos-config/blob/master/modules/theming/colors.nix - * https://git.daniel-siepmann.de/danielsiepmann/nixpkgs/src/branch/main/home/programs/neovim.nix#L267 - * https://github.com/sekunho/dotfiles/blob/main/flake.nix - * https://discourse.nixos.org/t/anyone-using-firefox-gnome-theme-successfully-with-nixos-home-manager/19248 - -=- Aux - * https://gist.github.com/pshchelo/6ffabbffaedc46456b39c037d16e1d8c - * https://github.com/ValveSoftware/Proton/wiki/Using-a-NTFS-disk-with-Linux-and-Windows - -== Issues - * https://github.com/ValveSoftware/gamescope/issues/107 - * https://github.com/NixOS/nixpkgs/issues/15159 - * https://github.com/NixOS/nixpkgs/issues/239515 - * https://stackoverflow.com/questions/3822604/setuid0-with-cap-setuid - * https://github.com/containers/bubblewrap/issues/380 - -== Kernel Config - * https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/blob/main/config?ref_type=heads - * https://lore.kernel.org/lkml/20250505110946.1095363-15-mingo@kernel.org/ - -== Server - * https://serverfault.com/a/211083 - -// vim: set syntax=asciidoc: diff --git a/TODO.txt b/TODO.txt deleted file mode 100644 index 3757b1c..0000000 --- a/TODO.txt +++ /dev/null @@ -1,12 +0,0 @@ -== TODO -- [x] Update moyo kernel config. -- [x] https://github.com/flightlessmango/MangoHud?tab=readme-ov-file#environment-variables - - display_server -- [x] Finally add email server config. -- [x] Sync pipewire between iroha and sofue. -- [x] Diff iroha and moyo kernel configs. - -== At Some Point -- [ ] New Gentoo desktop. - -// vim: set syntax=asciidoc: diff --git a/files/audio/asoundrc b/files/audio/asoundrc new file mode 100644 index 0000000..051a420 --- /dev/null +++ b/files/audio/asoundrc @@ -0,0 +1,12 @@ +#pcm.!spdif { +# type hw +# card 1 +# device 1 +#} +# +#pcm.!default { +# type plug +# slave { +# pcm "spdif" +# } +#} diff --git a/files/convolver/Focal_Elegia_minimum_phase_44100Hz.wav b/files/audio/convolver/Focal_Elegia_minimum_phase_44100Hz.wav Binary files differindex 6620260..6620260 100644 --- a/files/convolver/Focal_Elegia_minimum_phase_44100Hz.wav +++ b/files/audio/convolver/Focal_Elegia_minimum_phase_44100Hz.wav diff --git a/files/convolver/Focal_Elegia_minimum_phase_48000Hz.wav b/files/audio/convolver/Focal_Elegia_minimum_phase_48000Hz.wav Binary files differindex ea009c2..ea009c2 100644 --- a/files/convolver/Focal_Elegia_minimum_phase_48000Hz.wav +++ b/files/audio/convolver/Focal_Elegia_minimum_phase_48000Hz.wav diff --git a/files/audio/gentoo-pipewire-launcher.conf b/files/audio/gentoo-pipewire-launcher.conf new file mode 100644 index 0000000..c609208 --- /dev/null +++ b/files/audio/gentoo-pipewire-launcher.conf @@ -0,0 +1,3 @@ +GENTOO_PIPEWIRE_LOG="/tmp/pipewire.log" +GENTOO_PIPEWIRE_PULSE_LOG="/tmp/pipewire-pulse.log" +GENTOO_WIREPLUMBER_LOG="/tmp/wireplumber.log" diff --git a/hosts/iroha/pipewire/pipewire.conf.d/92-user.conf b/files/audio/pipewire/90-elegia-convolver.conf index 381897e..dd789ee 100644 --- a/hosts/iroha/pipewire/pipewire.conf.d/92-user.conf +++ b/files/audio/pipewire/90-elegia-convolver.conf @@ -1,16 +1,3 @@ -context.properties = { - default.clock.rate = 48000 - default.clock.allowed-rates = [ 44100 48000 88200 96000 176400 192000 352800 384000 ] - default.clock.quantum = 512 - default.clock.min-quantum = 32 - default.clock.max-quantum = 4096 - default.clock.quantum-limit = 4096 - default.video.width = 640 - default.video.height = 480 - default.video.rate.num = 25 - default.video.rate.denom = 1 -} - context.modules = [{ name = "libpipewire-module-filter-chain" args = { @@ -23,8 +10,8 @@ context.modules = [{ label = "convolver" config = { filename = [ - "/etc/convolver/Focal_Elegia_minimum_phase_44100Hz.wav" - "/etc/convolver/Focal_Elegia_minimum_phase_48000Hz.wav" + "/opt/convolver/Focal_Elegia_minimum_phase_44100Hz.wav" + "/opt/convolver/Focal_Elegia_minimum_phase_48000Hz.wav" ] resample_quality = 10 } @@ -44,8 +31,3 @@ context.modules = [{ } } }] - -stream.properties = { - resample.quality = 10 - channelmix.normalize = false -} diff --git a/files/audio/pipewire/90-x570-taichi-spdif.conf b/files/audio/pipewire/90-x570-taichi-spdif.conf new file mode 100644 index 0000000..dabfbea --- /dev/null +++ b/files/audio/pipewire/90-x570-taichi-spdif.conf @@ -0,0 +1,5 @@ +context.properties = { + # cat /proc/asound/card1/codec#0 + # cat /proc/asound/card1/stream0 + default.clock.allowed-rates = [ 32000 44100 48000 88200 96000 192000 ] +} diff --git a/hosts/iroha/pipewire/client.conf.d/92-client-user.conf b/files/audio/pipewire/92-client-user.conf index c956a7e..c956a7e 100644 --- a/hosts/iroha/pipewire/client.conf.d/92-client-user.conf +++ b/files/audio/pipewire/92-client-user.conf diff --git a/hosts/iroha/pipewire/pipewire-pulse.conf.d/92-pulse-user.conf b/files/audio/pipewire/92-pulse-user.conf index 96dab58..96dab58 100644 --- a/hosts/iroha/pipewire/pipewire-pulse.conf.d/92-pulse-user.conf +++ b/files/audio/pipewire/92-pulse-user.conf diff --git a/files/audio/pipewire/92-user.conf b/files/audio/pipewire/92-user.conf new file mode 100644 index 0000000..329f9ad --- /dev/null +++ b/files/audio/pipewire/92-user.conf @@ -0,0 +1,20 @@ +context.properties = { + default.clock.rate = 48000 + default.clock.quantum = 1024 + default.clock.min-quantum = 16 + default.clock.max-quantum = 4096 + # https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-PipeWire#setting-buffer-size-quantum + # quantum settings above are scaled when rate is different than clock.rate. + # -limit and -floor apply to the scaled values. + default.clock.quantum-limit = 8192 + default.clock.quantum-floor = 16 + default.video.width = 640 + default.video.height = 480 + default.video.rate.num = 25 + default.video.rate.denom = 1 +} + +stream.properties = { + resample.quality = 10 + channelmix.normalize = false +} diff --git a/files/email/muttrc b/files/email/muttrc new file mode 100644 index 0000000..2f2efea --- /dev/null +++ b/files/email/muttrc @@ -0,0 +1,112 @@ +set send_charset = "utf-8" +set assumed_charset = "iso-8859-1" + +set sort = reverse-date + +set editor = "vi -c 'set syntax=mail ft=mail enc=utf-8'" + +set menu_scroll = yes + +set simple_search = "~f %s | ~C %s | ~s %s" + +set mail_check_stats = yes +set delete = ask-yes + +set rfc2047_parameters = yes +set sleep_time = 0 +set markers = no +set wait_key = no +set reverse_name +set fast_reply +set fcc_attach +set mime_forward = no +set forward_attachments = yes +set forward_format = "Fwd: %s" +set forward_quote + +set index_format = "%2C (%Z) %[%D %I:%M %p] %-15.15F %s (%c)" + +set sidebar_visible = yes +set sidebar_short_path = yes +set sidebar_width = 18 +set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S' + +auto_view text/html +auto_view application/pgp-encrypted +alternative_order text/plain text/enriched text/html + +set realname = "Andrew Opalach" +set from = "andrew@akon.city" + +set mail_check = 60 +set imap_keepalive = 300 + +set imap_user = "andrew@akon.city" +set imap_pass = "`pass andrew@akon.city`" +set folder = imaps://mail.akon.city/ +set spoolfile = "=INBOX" +set record = "=INBOX/Sent" +set postponed = "=INBOX/Drafts" +set trash = "=INBOX/Trash" +mailboxes =INBOX +mailboxes =INBOX/Sent +mailboxes =INBOX/Drafts +mailboxes =INBOX/Trash +mailboxes =INBOX/Junk +mailboxes =INBOX/Archive + +set smtp_pass = "`pass andrew@akon.city`" +set smtp_url = smtp://andrew@akon.city@mail.akon.city/ + +set header_cache = /var/tmp/mutt + +bind index i imap-fetch-mail +bind index,pager g noop +bind index gg first-entry +bind index j next-entry +bind index k previous-entry +bind index G last-entry +bind attach <Return> view-mailcap +bind attach l view-mailcap +bind editor <space> noop +bind pager j next-line +bind pager k previous-line +bind pager gg top +bind pager G bottom +bind pager l view-attachments +bind index h noop +bind pager,attach h exit +bind index,pager \Ck sidebar-prev +bind index,pager \Cj sidebar-next +bind index,pager \Co sidebar-open +bind editor <Tab> complete-query +bind browser l select-entry +bind browser gg top-page +bind browser G bottom-page +#bind index,pager H "view-raw-message" + +# https://superuser.com/a/695154 +macro index,pager \cB ": unset wait_key; set pipe_decode\n|w3m\n: set wait_key; unset pipe_decode\n" "call w3m to extract URLs out of a message" + +color normal white black +color attachment brightyellow black +color hdrdefault green black +color indicator black brightgreen +color markers brightyellow black +color quoted green black +color signature blue black +color status black green +color tilde blue black +color tree yellow black + +color index green black ~D +color index magenta black ~T + +color header brightyellow black ^From: +color header brightgreen black ^To: +color header brightgreen black ^Reply-To: +color header brightgreen black ^Cc: +color header brightgreen black ^Subject: + +#color body brightyellow black [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+ +#color body brightgreen black (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+ diff --git a/files/firefox/user-overrides.js b/files/firefox/user-overrides.js index 3a73f4f..5535de3 100644 --- a/files/firefox/user-overrides.js +++ b/files/firefox/user-overrides.js @@ -93,6 +93,9 @@ user_pref("browser.tabs.drawInTitlebar", true); // Gnome theme user_pref("gnomeTheme.normalWidthTabs", true); +// adw3-gtk +user_pref("widget.gtk.libadwaita-colors.enabled", false); + // Hide bookmarks user_pref("browser.toolbars.bookmarks.visibility", "never"); diff --git a/files/gaming/MangoHud.conf b/files/gaming/MangoHud.conf new file mode 100644 index 0000000..1b2a7bd --- /dev/null +++ b/files/gaming/MangoHud.conf @@ -0,0 +1,31 @@ +gamemode +cpu_temp +cpu_mhz +vulkan_driver +gpu_name +gpu_power +gpu_temp +gpu_junction_temp +gpu_core_clock +gpu_voltage +throttling_status +vram +gpu_mem_temp +gpu_mem_clock +engine_version +wine +winesync +display_server +resolution +present_mode +table_columns=4 +cellpadding_y=-0.100 +font_size=22 +round_corners +toggle_preset= +toggle_hud_position= +toggle_fps_limit= +toggle_logging= +reload_cfg= +upload_log= +toggle_hud=Shift_R+F10 diff --git a/files/gaming/gamemode.ini b/files/gaming/gamemode.ini new file mode 100644 index 0000000..72a72f4 --- /dev/null +++ b/files/gaming/gamemode.ini @@ -0,0 +1,13 @@ +[general] +inhibit_screensaver=0 +#softrealtime=on +#renice=11 + +# 'high' is too aggressive for my system. +#[gpu] +#apply_gpu_optimisations=accept-responsibility +#gpu_device=0 +#amd_performance_level=high + +[cpu] +pin_cores=no diff --git a/files/gaming/scripts/run_egs.sh b/files/gaming/scripts/run_egs.sh new file mode 100755 index 0000000..88e4864 --- /dev/null +++ b/files/gaming/scripts/run_egs.sh @@ -0,0 +1,5 @@ +#! /usr/bin/env sh + +#gamescope -W 1920 -H 1080 -w 1920 -h 1080 -r 60 -- env WINEPREFIX=/mnt/hdd/Games/epic_games_store \ +env WINEPREFIX=/mnt/hdd/Games/epic_games_store \ + umu-run /mnt/hdd/Games/epic_games_store/drive_c/Program\ Files\ \(x86\)/Epic\ Games/Launcher/Portal/Binaries/Win64/EpicGamesLauncher.exe -opengl -SkipBuildPatchPrereq diff --git a/files/gaming/scripts/run_in_proton.sh b/files/gaming/scripts/run_in_proton.sh new file mode 100755 index 0000000..6a2cc2a --- /dev/null +++ b/files/gaming/scripts/run_in_proton.sh @@ -0,0 +1,85 @@ +#! /usr/bin/env sh +# https://github.com/Matoking/protontricks/issues/238 +# https://github.com/cheat-engine/cheat-engine/issues/2789 +# +# CC_Studio: +# Rotate -> 5 + 4 +# Move -> 5 + 6 +# +#EXE="Z:\mnt\hdd\Tools\cheat_engines\Cheat Engine 6.8.1\cheatengine-i386.exe" +#EXE="Z:\mnt\hdd\Tools\cheat_engines\Cheat Engine 7.5\Cheat Engine.exe" +#EXE="Z:\mnt\hdd\Tools\cheat_engines\CheatEngine752P.exe" +#EXE="regedit" +#EXE="Z:\mnt\hdd\Tools\mhw\CC_Studio/MHW CC Studio.exe" +#EXE="Z:\mnt\hdd\Tools\mhw\photo_mode\IGCSClient.exe" +#EXE="Z:\mnt\ssd\SteamLibrary\steamapps\common\Baldurs Gate 3\bin\bg3_dx11.exe" +#EXE="Z:\mnt\hdd\Tools\baldurs_gate3/modmanager/BG3ModManager.exe" +#EXE="Z:\home\andrew\dl\windowsdesktop-runtime-7.0.13-win-x64.exe" +#EXE="Z:\home\andrew\dl\ndp472-kb4054531-web.exe" +#EXE="Z:\mnt\hdd\Tools\elden_ring\injector\IGCSInjectorUI.exe" +#EXE="Z:\mnt\hdd\Tools\elden_ring\camera_tools\IGCSClient.exe" +#EXE="Z:\mnt\hdd\Tools\x360ce\x360ce.exe" +#EXE="Z:\mnt\hdd\Tools\fluffy_modmanager\Modmanager.exe" + +EXE="Z:\mnt\hdd\Tools\cheat_engines\Cheat Engine 7.5.2\Cheat Engine.exe" +#EXE="Z:\mnt\hdd\Tools\cheat_engines\Cheat Engine 7.5.2\cheatengine-i386.exe" + +#EXE="IGCSInjector.exe" + +#EXE="Z:\mnt\hdd\Tools\inject.exe" +#ARG0="MonsterHunterWorld.exe" + +#EXE="Z:\mnt\hdd\Tools\injector.exe" +#ARG0="-n" + +#ARG1="eldenring.exe" +#ARG2="Z:\mnt\hdd\Tools\elden_ring\camera_tools\EldenRingCameraTools.dll" + +#ARG1="TombRaider.exe" +#ARG2="TombRaiderCameraTools.dll" + +#ARG1="MonsterHunterWorld" +#ARG2="Z:\mnt\hdd\Tools\reshade\ReShade64.dll" + +#APP_ID=367500 # Dragon's Dogma +APP_ID=582010 # Monster Hunter World +#APP_ID=1086940 +#APP_ID=3737539014 +#APP_ID=1245620 +#APP_ID=2054970 +#APP_ID=203160 # Tomb Raider +#APP_ID=357190 # UMVC3 +BUS_NAME=com.steampowered.App$APP_ID +#BUS_NAME=com.steampowered.App0 + +#export WINEARCH=win64 +#export WINEARCH=win32 +export WINE="$HOME/.local/share/Steam/steamapps/common/Proton - Experimental/files/bin/wine" +#export WINE="/mnt/ssd/SteamLibrary/steamapps/common/Proton 10.0/files/bin/wine" + +export PROTON_NO_USERSETTINGS=1 +#export WINEDLLOVERRIDES="*mscoree=n;*fusion=n" +#export WINEDEBUG=+tid,err+all,fixme-all,-loaddll + +#STEAMAPPS=$HOME/.steam/steam/steamapps +#STEAMAPPS="/mnt/hdd/SteamLibrary/steamapps" +STEAMAPPS="/mnt/ssd/SteamLibrary/steamapps" + +WINEPREFIX=$STEAMAPPS/compatdata/$APP_ID/pfx +export WINEPREFIX + +#steam-run "$WINE" uninstaller +#steam-run "$WINE" winecfg -v win7 +#steam-run "$WINE" "Z:\home\andrew\.cache\winetricks\dotnet452\NDP452-KB2901907-x86-x64-AllOS-ENU.exe" +#steam-run "$WINE" "Z:\home\andrew\.cache\winetricks\dotnet48\ndp48-x86-x64-allos-enu.exe" + +#steam-run winetricks -q dotnet48 +#steam-run "$WINE" control + +#steam-run "$WINE" $EXE +#steam-run $HOME/.local/share/Steam/steamapps/common/SteamLinuxRuntime_sniper/pressure-vessel/bin/steam-runtime-launch-client --list + +$HOME/.local/share/Steam/steamapps/common/SteamLinuxRuntime_soldier/pressure-vessel/bin/steam-runtime-launch-client \ + --bus-name=$BUS_NAME -- \ + env STEAM_COMPAT_MOUNTS=/mnt/hdd/SteamLibrary:/mnt/hdd/Tools WINEPREFIX=$WINEPREFIX \ + "$WINE" "$EXE" $ARG0 $ARG1 $ARG2 diff --git a/files/gitconfig b/files/gitconfig new file mode 100644 index 0000000..3e31de7 --- /dev/null +++ b/files/gitconfig @@ -0,0 +1,16 @@ +[user] + email = andrew@akon.city + name = Andrew Opalach + signingKey = 99659CB58598BDDB + +[init] + defaultBranch = master + +[format] + signOff = true + +[commit] + gpgSign = true + +[tag] + gpgSign = true diff --git a/files/gtk/Xresources b/files/gtk/Xresources new file mode 100644 index 0000000..fbe97bc --- /dev/null +++ b/files/gtk/Xresources @@ -0,0 +1 @@ +Xcursor.theme: Mocu-White-Right diff --git a/files/gtk/gtk3_config.ini b/files/gtk/gtk3_config.ini new file mode 100644 index 0000000..f88b4f0 --- /dev/null +++ b/files/gtk/gtk3_config.ini @@ -0,0 +1,4 @@ +[Settings] +gtk-theme-name = adw-gtk3-dark +gtk-application-prefer-dark-theme = true +gtk-cursor-theme-name = Mocu-White-Right diff --git a/files/gtk/gtkrc-2.0 b/files/gtk/gtkrc-2.0 new file mode 100644 index 0000000..9d216a0 --- /dev/null +++ b/files/gtk/gtkrc-2.0 @@ -0,0 +1,2 @@ +gtk-theme-name = "adw-gtk3-dark" +gtk-icon-theme-name = "Mocu-White-Right" diff --git a/files/gtk/sway_gtk b/files/gtk/sway_gtk new file mode 100644 index 0000000..01c0660 --- /dev/null +++ b/files/gtk/sway_gtk @@ -0,0 +1,10 @@ +set $gnome-schema org.gnome.desktop.interface +exec_always { + gsettings set $gnome-schema gtk-theme 'adw-gtk3-dark' + gsettings set $gnome-schema color-scheme 'prefer-dark' + gsettings set $gnome-schema icon-theme 'Adwaita' + gsettings set $gnome-schema cursor-theme 'Mocu-White-Right' + gsettings set $gnome-schema font-name 'Sans 10' +} +seat seat0 xcursor_theme Mocu-White-Right +exec_always test -f ~/.Xresources && xrdb -merge ~/.Xresources diff --git a/files/kitty/kitty.conf b/files/kitty/kitty.conf new file mode 100644 index 0000000..4728717 --- /dev/null +++ b/files/kitty/kitty.conf @@ -0,0 +1,89 @@ +font_size 11.0 +font_family Liberation Mono +bold_font auto +italic_font auto +bold_italic_font auto +disable_ligatures always +#modify_font baseline +#modify_font cell_height + +window_padding_width 1 +placement_strategy top-left + +shell /bin/bash +shell_integration enabled + +clear_all_shortcuts yes +map kitty_mod+c copy_to_clipboard +map kitty_mod+v paste_from_clipboard +map ctrl+shift+u kitten unicode_input +map ctrl+shift+f5 load_config_file + +update_check_interval 0 +confirm_os_window_close 0 +initial_window_width 720 +initial_window_height 480 +scrollback_lines 3000 +remember_window_size no +linux_display_server wayland +allow_remote_control no +enabled_layouts splits,stack +paste_actions confirm,confirm-if-large + +sync_to_monitor no +# My understanding is that if repaint_delay equates to a refresh rate +# of just under my monitor's that VRR can avoid all tearing. +# --------------------------------------------------------- +# This probably doesn't work out. According to the man page +# repaint_delay is ignored if there is pending input. +# Tearing is still easily observable. +repaint_delay 7 +input_delay 1 +resize_debounce_time 0.025 0.5 + +cursor_shape block +#cursor_blink_interval -1 linear ease-out +#cursor_stop_blinking_after 20.0 +cursor_trail 3 +cursor_trail_decay 0.075 0.425 +cursor_trail_start_threshold 3 +#cursor #${colo.foreground} +#cursor none +#cursor_text_color background + +foreground #eeeeee +background #000000 +color0 #000000 +color1 #d75f00 +color2 #af5f00 +color3 #ffd75f +color4 #005f5f +color5 #ff5f87 +color6 #ffaf00 +color7 #eeeeee +color8 #808080 +color9 #d78700 +color10 #af8700 +color11 #ffff5f +color12 #00875f +color13 #ff8787 +color14 #ffd700 +color15 #ffffff +#selection_foreground #${colo.background} +#selection_background #${colo.color6} +#mark1_foreground #${colo.background} +#mark1_background #${colo.color5} +#mark2_foreground #${colo.background} +#mark2_background #${colo.color6} +#mark3_foreground #${colo.background} +#mark3_background #${colo.color4} +#background_opacity ${toString colo.alpha} +#active_border_color #${colo.color4} +#bell_border_color #${colo.color1} +#inactive_border_color #${colo.color3} +#active_tab_foreground #${colo.background} +#active_tab_background #${colo.color5} +#active_tab_font_style bold-italic +#inactive_tab_foreground #${colo.background} +#inactive_tab_background #${colo.color4} +#url_color #${colo.color5} diff --git a/files/nixpkgs-patches/425312.diff b/files/nixpkgs-patches/425312.diff deleted file mode 100644 index f895dae..0000000 --- a/files/nixpkgs-patches/425312.diff +++ /dev/null @@ -1,143 +0,0 @@ -diff --git a/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch b/pkgs/by-name/ms/msmtp/msmtpq-remove-binary-check.patch -similarity index 100% -rename from pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch -rename to pkgs/by-name/ms/msmtp/msmtpq-remove-binary-check.patch -diff --git a/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch b/pkgs/by-name/ms/msmtp/msmtpq-systemd-logging.patch -similarity index 70% -rename from pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch -rename to pkgs/by-name/ms/msmtp/msmtpq-systemd-logging.patch -index a9db3e64580827..55f386bb31906a 100644 ---- a/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch -+++ b/pkgs/by-name/ms/msmtp/msmtpq-systemd-logging.patch -@@ -1,17 +1,17 @@ - diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq --index bcb384e..dbaf1b5 100755 -+index 28d0754..3eaac58 100755 - --- a/scripts/msmtpq/msmtpq - +++ b/scripts/msmtpq/msmtpq --@@ -92,6 +92,8 @@ if [ ! -v MSMTPQ_LOG ] ; then -- fi -+@@ -182,6 +182,8 @@ if [ -n "$MSMTPQ_LOG" ] ; then -+ unset msmptq_log_dir - fi -- [ -d "$(dirname "$MSMTPQ_LOG")" ] || mkdir -p "$(dirname "$MSMTPQ_LOG")" --+ -+ - +JOURNAL=@journal@ -- ## ====================================================================================== -++ -+ umask 077 # set secure permissions on created directories and files - -- ## msmtpq can use the following environment variables : --@@ -144,6 +146,7 @@ on_exit() { # unlock the queue on exit if the lock was -+ declare -i CNT # a count of mail(s) currently in the queue -+@@ -214,6 +216,7 @@ on_exit() { # unlock the queue on exit if the lock was - ## display msg to user, as well - ## - log() { -@@ -19,7 +19,7 @@ index bcb384e..dbaf1b5 100755 - local ARG RC PFX - PFX="$('date' +'%Y %d %b %H:%M:%S')" - # time stamp prefix - "2008 13 Mar 03:59:45 " --@@ -161,10 +164,19 @@ log() { -+@@ -233,10 +236,19 @@ log() { - done - fi - -diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/by-name/ms/msmtp/package.nix -similarity index 84% -rename from pkgs/applications/networking/msmtp/default.nix -rename to pkgs/by-name/ms/msmtp/package.nix -index 60946106d0ddf1..c801fa83ee9b98 100644 ---- a/pkgs/applications/networking/msmtp/default.nix -+++ b/pkgs/by-name/ms/msmtp/package.nix -@@ -9,6 +9,7 @@ - bash, - coreutils, - gnugrep, -+ gnused, - gnutls, - gsasl, - libidn2, -@@ -20,6 +21,8 @@ - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, - systemd, - withScripts ? true, -+ withLibnotify ? true, -+ libnotify, - gitUpdater, - binlore, - msmtp, -@@ -28,13 +31,13 @@ - let - inherit (lib) getBin getExe optionals; - -- version = "1.8.26"; -+ version = "1.8.30"; - - src = fetchFromGitHub { - owner = "marlam"; - repo = "msmtp"; - rev = "msmtp-${version}"; -- hash = "sha256-MV3fzjjyr7qZw/BbKgsSObX+cxDDivI+0ZlulrPFiWM="; -+ hash = "sha256-aM2qId08zvT9LbncCQYHsklbvHVtcZJgr91JTjwpQ/0="; - }; - - meta = with lib; { -@@ -112,13 +115,17 @@ let - msmtpq = { - scripts = [ "bin/msmtpq" ]; - interpreter = getExe bash; -- inputs = [ -- binaries -- coreutils -- gnugrep -- netcat-gnu -- which -- ] ++ optionals withSystemd [ systemd ]; -+ inputs = -+ [ -+ binaries -+ coreutils -+ gnugrep -+ gnused -+ netcat-gnu -+ which -+ ] -+ ++ optionals withSystemd [ systemd ] -+ ++ optionals withLibnotify [ libnotify ]; - execer = - [ - "cannot:${getBin binaries}/bin/msmtp" -@@ -126,9 +133,15 @@ let - ] - ++ optionals withSystemd [ - "cannot:${getBin systemd}/bin/systemd-cat" -+ ] -+ ++ optionals withLibnotify [ -+ "cannot:${getBin libnotify}/bin/notify-send" - ]; - fix."$MSMTP" = [ "msmtp" ]; -- fake.external = [ "ping" ] ++ optionals (!withSystemd) [ "systemd-cat" ]; -+ fake.external = -+ [ "ping" ] -+ ++ optionals (!withSystemd) [ "systemd-cat" ] -+ ++ optionals (!withLibnotify) [ "notify-send" ]; - keep.source = [ "~/.msmtpqrc" ]; - }; - -diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix -index 1f6cde48853370..2d89e07134d294 100644 ---- a/pkgs/top-level/all-packages.nix -+++ b/pkgs/top-level/all-packages.nix -@@ -13308,10 +13308,6 @@ with pkgs; - - taxi-cli = with python3Packages; toPythonApplication taxi; - -- msmtp = callPackage ../applications/networking/msmtp { -- autoreconfHook = buildPackages.autoreconfHook269; -- }; -- - imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { - lua = lua5; - }; diff --git a/files/nixpkgs-patches/425843.diff b/files/nixpkgs-patches/425843.diff deleted file mode 100644 index ded8544..0000000 --- a/files/nixpkgs-patches/425843.diff +++ /dev/null @@ -1,504 +0,0 @@ -diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix -index 18f999dd83599c..8242549b63007b 100644 ---- a/pkgs/development/libraries/mesa/common.nix -+++ b/pkgs/development/libraries/mesa/common.nix -@@ -5,14 +5,14 @@ - # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa - rec { - pname = "mesa"; -- version = "25.1.6"; -+ version = "25.2.0-rc1"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "mesa"; - rev = "mesa-${version}"; -- hash = "sha256-SHYYezt2ez9awvIATEC6wVMZMuJUsOYXxlugs1Q6q7U="; -+ hash = "sha256-iVDnJ0MoLQbpEpjfRUy3MV6pjhMTqUMxR4yf9jkuXKw="; - }; - - meta = { -diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix -index db9ec527358508..ee10017b9d5aa0 100644 ---- a/pkgs/development/libraries/mesa/default.nix -+++ b/pkgs/development/libraries/mesa/default.nix -@@ -44,62 +44,53 @@ - enablePatentEncumberedCodecs ? true, - withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, - -- galliumDrivers ? -- [ -- "asahi" # Apple AGX, built on non-aarch64 for cross tools -- "d3d12" # WSL emulated GPU (aka Dozen) -- "iris" # new Intel (Broadwell+) -- "llvmpipe" # software renderer -- "nouveau" # Nvidia -- "panfrost" # ARM Mali Midgard and up (T/G series), built on non-ARM for cross tools -- "r300" # very old AMD -- "r600" # less old AMD -- "radeonsi" # new AMD (GCN+) -- "softpipe" # older software renderer -- "svga" # VMWare virtualized GPU -- "virgl" # QEMU virtualized GPU (aka VirGL) -- "zink" # generic OpenGL over Vulkan, experimental -- ] -- ++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) [ -- "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) -- "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) -- "lima" # ARM Mali 4xx -- "vc4" # Broadcom VC4 (Raspberry Pi 0-3) -- ] -- ++ lib.optionals stdenv.hostPlatform.isAarch64 [ -- "tegra" # Nvidia Tegra SoCs -- "v3d" # Broadcom VC5 (Raspberry Pi 4) -- ] -- ++ lib.optionals stdenv.hostPlatform.isx86 [ -- "crocus" # Intel legacy, x86 only -- "i915" # Intel extra legacy, x86 only -- ], -+ # We enable as many drivers as possible here, to build cross tools -+ # and support emulation use cases (emulated x86_64 on aarch64, etc) -+ galliumDrivers ? [ -+ "asahi" # Apple AGX -+ "crocus" # Intel legacy -+ "d3d12" # WSL emulated GPU (aka Dozen) -+ "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) -+ "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) -+ "i915" # Intel extra legacy -+ "iris" # new Intel (Broadwell+) -+ "lima" # ARM Mali 4xx -+ "llvmpipe" # software renderer -+ "nouveau" # Nvidia -+ "panfrost" # ARM Mali Midgard and up (T/G series) -+ "r300" # very old AMD -+ "r600" # less old AMD -+ "radeonsi" # new AMD (GCN+) -+ "softpipe" # older software renderer -+ "svga" # VMWare virtualized GPU -+ "tegra" # Nvidia Tegra SoCs -+ "v3d" # Broadcom VC5 (Raspberry Pi 4) -+ "vc4" # Broadcom VC4 (Raspberry Pi 0-3) -+ "virgl" # QEMU virtualized GPU (aka VirGL) -+ "zink" # generic OpenGL over Vulkan, experimental -+ ], - vulkanDrivers ? - [ - "amd" # AMD (aka RADV) -- "asahi" # Apple AGX, built on non-aarch64 for cross tools -- "intel" # new Intel (aka ANV) -- "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) -- "nouveau" # Nouveau (aka NVK) -- "swrast" # software renderer (aka Lavapipe) -- ] -- ++ -- lib.optionals -- (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") -- [ -- # QEMU virtualized GPU (aka VirGL) -- # Requires ATOMIC_INT_LOCK_FREE == 2. -- "virtio" -- ] -- ++ lib.optionals stdenv.hostPlatform.isAarch64 [ -+ "asahi" # Apple AGX - "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) - "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) -+ # "gfxstream" # Android virtualized GPU, breaks on some targets, doesn't seem useful? - "imagination-experimental" # PowerVR Rogue (currently N/A) -+ "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) -+ "intel" # new Intel (aka ANV) -+ "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) -+ "nouveau" # Nouveau (aka NVK) - "panfrost" # ARM Mali Midgard and up (T/G series) -+ "swrast" # software renderer (aka Lavapipe) - ] -- ++ lib.optionals stdenv.hostPlatform.isx86 [ -- "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) -- ], -+ ++ lib.optionals -+ (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") -+ [ -+ # QEMU virtualized GPU (aka VirGL) -+ # Requires ATOMIC_INT_LOCK_FREE == 2. -+ "virtio" -+ ], - eglPlatforms ? [ - "x11" - "wayland" -@@ -117,40 +108,26 @@ - }: - - let -- rustDeps = [ -- { -- pname = "paste"; -- version = "1.0.14"; -- hash = "sha256-+J1h7New5MEclUBvwDQtTYJCHKKqAEOeQkuKy+g0vEc="; -- } -- { -- pname = "proc-macro2"; -- version = "1.0.86"; -- hash = "sha256-9fYAlWRGVIwPp8OKX7Id84Kjt8OoN2cANJ/D9ZOUUZE="; -- } -- { -- pname = "quote"; -- version = "1.0.33"; -- hash = "sha256-VWRCZJO0/DJbNu0/V9TLaqlwMot65YjInWT9VWg57DY="; -- } -- { -- pname = "syn"; -- version = "2.0.68"; -- hash = "sha256-nGLBbxR0DFBpsXMngXdegTm/o13FBS6QsM7TwxHXbgQ="; -- } -- { -- pname = "unicode-ident"; -- version = "1.0.12"; -- hash = "sha256-KX8NqYYw6+rGsoR9mdZx8eT1HIPEUUyxErdk2H/Rlj8="; -- } -- ]; -+ rustDeps = lib.importJSON ./wraps.json; -+ -+ handleRustDep = dep: '' -+ ( -+ echo "Preparing Rust dependency wrap ${dep.pname}-${dep.version}..." -+ -+ wrapDir=subprojects/packagefiles/${dep.pname} -+ outDir=subprojects/${dep.pname}-${dep.version} -+ -+ mkdir -p $outDir -+ tar -C $outDir -xf ${fetchCrate (dep // { unpack = false; })} --strip-components=1 -+ cp $wrapDir/meson.build $outDir - -- copyRustDep = dep: '' -- cp -R --no-preserve=mode,ownership ${fetchCrate dep} subprojects/${dep.pname}-${dep.version} -- cp -R subprojects/packagefiles/${dep.pname}/* subprojects/${dep.pname}-${dep.version}/ -+ for patch in $wrapDir/*.patch; do -+ patch -d $outDir -i $(readlink -f $patch) -p1 -+ done -+ ) - ''; - -- copyRustDeps = lib.concatStringsSep "\n" (builtins.map copyRustDep rustDeps); -+ copyRustDeps = lib.concatStringsSep "\n" (builtins.map handleRustDep rustDeps); - - needNativeCLC = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; - -@@ -227,13 +204,6 @@ stdenv.mkDerivation { - (lib.mesonEnable "gbm" true) - (lib.mesonBool "libgbm-external" true) - -- (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK -- -- # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver, -- # so we're keeping it for now. Should be removed when that's no longer the case. -- # See: https://github.com/NixOS/nixpkgs/pull/392492 -- (lib.mesonEnable "gallium-xa" true) -- - (lib.mesonBool "teflon" true) # TensorFlow frontend - - # Enable all freedreno kernel mode drivers. (For example, virtio can be -@@ -241,9 +211,6 @@ stdenv.mkDerivation { - # is ignored when freedreno is not being built. - (lib.mesonOption "freedreno-kmds" "msm,kgsl,virtio,wsl") - -- # Enable Intel RT stuff when available -- (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64) -- - # Required for OpenCL - (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib") - -@@ -251,15 +218,16 @@ stdenv.mkDerivation { - (lib.mesonBool "gallium-rusticl" true) - (lib.mesonOption "gallium-rusticl-enable-drivers" "auto") - -- # meson auto_features enables this, but we do not want it -- (lib.mesonEnable "android-libbacktrace" false) -- (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) -- - # Enable more sensors in gallium-hud - (lib.mesonBool "gallium-extra-hud" true) - - # Disable valgrind on targets where it's not available - (lib.mesonEnable "valgrind" withValgrind) -+ -+ # meson auto_features enables these, but we do not want them -+ (lib.mesonEnable "gallium-mediafoundation" false) # Windows only -+ (lib.mesonEnable "android-libbacktrace" false) # Android only -+ (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) - ] - ++ lib.optionals enablePatentEncumberedCodecs [ - (lib.mesonOption "video-codecs" "all") -diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch -index 9d40da82f85649..d71f168d83cf12 100644 ---- a/pkgs/development/libraries/mesa/opencl.patch -+++ b/pkgs/development/libraries/mesa/opencl.patch -@@ -1,23 +1,23 @@ - diff --git a/meson.build b/meson.build --index c150bff74ff..37fa7f0531b 100644 -+index 393f3ac1b93..fbc90b5645e 100644 - --- a/meson.build - +++ b/meson.build --@@ -1850,7 +1850,7 @@ endif -+@@ -1836,7 +1836,7 @@ endif - - dep_clang = null_dep -- if with_clc or with_gallium_clover -+ if with_clc - - llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') - + llvm_libdir = get_option('clang-libdir') - - dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) - --diff --git a/meson_options.txt b/meson_options.txt --index 82324617884..4bde97a8568 100644 -+diff --git a/meson.options b/meson.options -+index b1cdb06fcc9..3e8861979ae 100644 - --- a/meson.options - +++ b/meson.options --@@ -738,3 +738,10 @@ option( -- 'none', 'dri2' -- ], -+@@ -856,3 +856,10 @@ option( -+ value : false, -+ description : 'Build virtgpu_kumquat (only useful with gfxstream currently)' - ) - + - +option( -@@ -26,24 +26,11 @@ index 82324617884..4bde97a8568 100644 - + value : '', - + description : 'Locations to search for clang libraries.' - +) --diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build --index ab2c83556a8..a59e88e122f 100644 ----- a/src/gallium/targets/opencl/meson.build --+++ b/src/gallium/targets/opencl/meson.build --@@ -56,7 +56,7 @@ if with_opencl_icd -- configuration : _config, -- input : 'mesa.icd.in', -- output : 'mesa.icd', --- install : true, --+ install : false, -- install_tag : 'runtime', -- install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), -- ) - diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build --index 35833dc7423..41a95927cab 100644 -+index 2b214adbbf5..7f919397ad5 100644 - --- a/src/gallium/targets/rusticl/meson.build - +++ b/src/gallium/targets/rusticl/meson.build --@@ -63,7 +63,7 @@ configure_file( -+@@ -64,7 +64,7 @@ configure_file( - configuration : _config, - input : 'rusticl.icd.in', - output : 'rusticl.icd', -diff --git a/pkgs/development/libraries/mesa/update-wraps.py b/pkgs/development/libraries/mesa/update-wraps.py -new file mode 100644 -index 00000000000000..037dfc0397b24b ---- /dev/null -+++ b/pkgs/development/libraries/mesa/update-wraps.py -@@ -0,0 +1,50 @@ -+import base64 -+import binascii -+import configparser -+import json -+import pathlib -+import sys -+import urllib.parse -+ -+ -+def to_sri(hash: str): -+ raw = binascii.unhexlify(hash) -+ b64 = base64.b64encode(raw).decode() -+ return f"sha256-{b64}" -+ -+ -+def main(dir: str): -+ result = [] -+ for file in (pathlib.Path(dir) / "subprojects").glob("*.wrap"): -+ name = file.stem -+ parser = configparser.ConfigParser() -+ _ = parser.read(file) -+ sections = parser.sections() -+ if "wrap-file" not in sections: -+ continue -+ -+ url = parser.get("wrap-file", "source_url") -+ if "crates.io" not in url: -+ continue -+ -+ parsed = urllib.parse.urlparse(url) -+ path = parsed.path.split("/") -+ assert path[4] == name -+ version = path[5] -+ -+ hash = to_sri(parser.get("wrap-file", "source_hash")) -+ -+ result.append({ -+ "pname": name, -+ "version": version, -+ "hash": hash, -+ }) -+ -+ here = pathlib.Path(__file__).parent -+ with (here / "wraps.json").open("w") as fd: -+ json.dump(result, fd, indent=4) -+ _ = fd.write("\n") -+ -+ -+if __name__ == '__main__': -+ main(*sys.argv[1:]) -diff --git a/pkgs/development/libraries/mesa/wraps.json b/pkgs/development/libraries/mesa/wraps.json -new file mode 100644 -index 00000000000000..5b185c2d56239b ---- /dev/null -+++ b/pkgs/development/libraries/mesa/wraps.json -@@ -0,0 +1,137 @@ -+[ -+ { -+ "pname": "errno", -+ "version": "0.3.12", -+ "hash": "sha256-zqFO+TVeO+qwY3A6qdqxWv0l8GZ8NBMQweUnS7HQ2hg=" -+ }, -+ { -+ "pname": "quote", -+ "version": "1.0.35", -+ "hash": "sha256-KR7Jq179k0qvUDpkZsXVJRU10QjudHRyw5d8xazIaO8=" -+ }, -+ { -+ "pname": "pest", -+ "version": "2.8.0", -+ "hash": "sha256-GY23RTHVjHCjYcQiAe/efiWR6XbVGMr3ZipH3Fcg57Y=" -+ }, -+ { -+ "pname": "equivalent", -+ "version": "1.0.1", -+ "hash": "sha256-VEOAfW3/aTc9Qzq571N4rY31DKYpjK8V3m5S4kqvVNU=" -+ }, -+ { -+ "pname": "syn", -+ "version": "2.0.87", -+ "hash": "sha256-JapM40bQOm3NaN2LQBC8t05U5iyQxXPzlMRurpmroy0=" -+ }, -+ { -+ "pname": "remain", -+ "version": "0.2.12", -+ "hash": "sha256-GtXgESMMrSdNBTJGDFq2mCjqR651aBtCqEFmPv/695Q=" -+ }, -+ { -+ "pname": "unicode-ident", -+ "version": "1.0.12", -+ "hash": "sha256-M1S5rD+uH/Z1XLbbU2g622YWNPZ1V5Qt6k+s6+wP7ks=" -+ }, -+ { -+ "pname": "cfg-if", -+ "version": "1.0.0", -+ "hash": "sha256-uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0=" -+ }, -+ { -+ "pname": "bitflags", -+ "version": "2.9.1", -+ "hash": "sha256-G45WmF7GLRfpwQAdyJyI7NfcCOR+ul7Hwpx7Xu7N6Wc=" -+ }, -+ { -+ "pname": "pest_derive", -+ "version": "2.8.0", -+ "hash": "sha256-1yXZz9eeh9zMk0Gi7znRtvY1PWjEszwXf+u+GkAsl8U=" -+ }, -+ { -+ "pname": "rustc-hash", -+ "version": "2.1.1", -+ "hash": "sha256-NXcD1BNltLJ8WQ4+2R6rsbZj8HxMCECV5gy+1DYt/w0=" -+ }, -+ { -+ "pname": "ucd-trie", -+ "version": "0.1.6", -+ "hash": "sha256-7WRikv/IGI746k0eDgFQ+xWlwuEq2bj8GRrnqKfzxLk=" -+ }, -+ { -+ "pname": "indexmap", -+ "version": "2.2.6", -+ "hash": "sha256-Fo+3Fd2kchXjYJEsCWZJ0j1Yvzkqxi9zkZ6DF0XkDyY=" -+ }, -+ { -+ "pname": "paste", -+ "version": "1.0.14", -+ "hash": "sha256-3jFFrwgCTeqfqZFPOBoXuPxgNN+wDzqEAT9/9D8p7Uw=" -+ }, -+ { -+ "pname": "hashbrown", -+ "version": "0.14.1", -+ "hash": "sha256-ff2mKhL1Xa6uUBX4GwuuoUU5HLRSD4bCSPxhXXJkDRI=" -+ }, -+ { -+ "pname": "libc", -+ "version": "0.2.168", -+ "hash": "sha256-Wq6ymB4GBsoR15cY+LsBFk8dbtdQgBgtOr8Bfm0kS20=" -+ }, -+ { -+ "pname": "thiserror-impl", -+ "version": "2.0.11", -+ "hash": "sha256-Jq/BuuqKmJM37rUrbnKgOXgM5Fw+38ycW50RL+6xc8I=" -+ }, -+ { -+ "pname": "once_cell", -+ "version": "1.8.0", -+ "hash": "sha256-aS/LY7ZLF1gCngqW7mPgSc6MWUhYfy9yCN8EYl5fa1Y=" -+ }, -+ { -+ "pname": "rustix", -+ "version": "1.0.7", -+ "hash": "sha256-xx6D1q/n/2SJDsa3HWppu4phCreM42SzNSh2u0yAEmY=" -+ }, -+ { -+ "pname": "pest_generator", -+ "version": "2.8.0", -+ "hash": "sha256-230Bcmvoq2arMvnfRnrosRSJBmhbvnXILR5l1/Wz+EE=" -+ }, -+ { -+ "pname": "thiserror", -+ "version": "2.0.11", -+ "hash": "sha256-1FLyhLc+bXbdNnWKDIaEsdW+MfkridB/1YIhdXMiBvw=" -+ }, -+ { -+ "pname": "proc-macro2", -+ "version": "1.0.86", -+ "hash": "sha256-XnGejfZl3w0cj7/SOAFXRHNhUdREXsCDa45iiq4QO3c=" -+ }, -+ { -+ "pname": "zerocopy", -+ "version": "0.8.13", -+ "hash": "sha256-Z5FKtFHzv9Lmnl6dLvOFhITnB01j8gT9Fm7DkbVN4h0=" -+ }, -+ { -+ "pname": "roxmltree", -+ "version": "0.20.0", -+ "hash": "sha256-bCC2eTtcL6ZVOyUBVLeNbQ2zfnJwCuNfrZOHpG9IfJc=" -+ }, -+ { -+ "pname": "zerocopy-derive", -+ "version": "0.8.13", -+ "hash": "sha256-eYjXOkMDyiid8DMWvEkOk0rM83Gva8dFOTzzwsXE8l0=" -+ }, -+ { -+ "pname": "pest_meta", -+ "version": "2.8.0", -+ "hash": "sha256-f5+DJHBJSQbR/KUyn4q1eRzGC+sjDHSBXf9UHL0rXKA=" -+ }, -+ { -+ "pname": "log", -+ "version": "0.4.27", -+ "hash": "sha256-E9wt81HjICeDof4NRDdfcpX/tASSZ7DzAYNG3BIqHZQ=" -+ } -+] -diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix -index 49f4838a058bda..6e14ad71a2b48c 100644 ---- a/pkgs/servers/x11/xorg/overrides.nix -+++ b/pkgs/servers/x11/xorg/overrides.nix -@@ -829,7 +829,6 @@ self: super: - }); - - xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { -- buildInputs = attrs.buildInputs ++ [ mesa ]; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12 - meta = attrs.meta // { - platforms = [ diff --git a/files/nixpkgs-patches/4c3870b23dded4e75292be48bdb03cd870fb1719.diff b/files/nixpkgs-patches/4c3870b23dded4e75292be48bdb03cd870fb1719.diff deleted file mode 100644 index 950ee0e..0000000 --- a/files/nixpkgs-patches/4c3870b23dded4e75292be48bdb03cd870fb1719.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix -index d6377d6de7dabd..18f999dd83599c 100644 ---- a/pkgs/development/libraries/mesa/common.nix -+++ b/pkgs/development/libraries/mesa/common.nix -@@ -5,14 +5,14 @@ - # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa - rec { - pname = "mesa"; -- version = "25.1.5"; -+ version = "25.1.6"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "mesa"; - rev = "mesa-${version}"; -- hash = "sha256-AZAd1/wiz8d0lXpim9obp6/K7ySP12rGFe8jZrc9Gl0="; -+ hash = "sha256-SHYYezt2ez9awvIATEC6wVMZMuJUsOYXxlugs1Q6q7U="; - }; - - meta = { diff --git a/files/adw-gtk3-non-blue-accent.diff b/files/patches/adw-gtk3-non-blue-accent.diff index 90ab11c..90ab11c 100644 --- a/files/adw-gtk3-non-blue-accent.diff +++ b/files/patches/adw-gtk3-non-blue-accent.diff diff --git a/files/gamescope_1826.diff b/files/patches/gamescope_1826.diff index 69c85e8..69c85e8 100644 --- a/files/gamescope_1826.diff +++ b/files/patches/gamescope_1826.diff diff --git a/files/sway_background_covered.diff b/files/patches/sway_background_covered.diff index 3ba8ef4..3ba8ef4 100644 --- a/files/sway_background_covered.diff +++ b/files/patches/sway_background_covered.diff diff --git a/files/shell/bashrc b/files/shell/bashrc new file mode 100644 index 0000000..443501d --- /dev/null +++ b/files/shell/bashrc @@ -0,0 +1,69 @@ +source ~/.profile + +gpgconf --launch gpg-agent + +if [ -v $NIX_SHELL ]; then + complete -cf doas +else + complete -F _root_command doas +fi + +export HISTCONTROL=erasedups +export HISTFILE=$HOME/.bash_history +export HISTFILESIZE=100000 +export HISTSIZE=1000 + +bind 'set completion-query-items 0' +bind 'set show-all-if-ambiguous on' +bind 'set show-all-if-unmodified on' +bind 'set menu-complete-display-prefix on' +bind '"\t": menu-complete' +bind '"\e[Z": menu-complete-backward' +# Clear screen and set return code to 0. +# Caveat: The text 'clear' will flash in the command line as +# if it was pasted and sent extremely fast. +bind '"\C-l":"\C-a\C-kclear\n"' + +alias ls='ls --ignore=lost+found --color=auto' +alias cp='rsync -av' +alias gdb='gdb -q' +alias top='htop' +alias pgrep='pgrep -f' +alias python='python -q' +alias bc='bc -l' +alias make='make -j6' +alias diff='diff -u' +alias mail='mutt' +alias iroha='ssh andrew@iroha' +alias moyo='ssh andrew@moyo' +alias station='ssh moyo -t "ssh 192.168.122.89"' +alias rod='ssh -p 1738 rod' +alias bmrg='ssh boomerang' +alias cmv-add='$HOME/c/camu/scripts/cmv_add.sh' +alias cmv-pause='cmv-add PAUSE' +alias cmv-next='cmv-add NEXT' +alias cmv-prev='cmv-add PREV' +alias cmv-shuffle='cmv-add SHUFFLE' +alias cmv-sort='cmv-add SORT' +alias cmv-reverse='cmv-add REVERSE' +alias cmv-clear='cmv-add CLEAR' + +RESET="\001\017\002" +NORMAL="\001\033[0m\002" +GREEN="\001\033[0;32m\002" +RED="\001\033[0;31m\002" +IROHA="\001\033[38;5;214m\002" +export HOSTCOLOR=$IROHA +exit_code_guy() +{ + retcode=$? + if [ $retcode -eq 0 ]; then + printf "(・_・) >$RED" + else + printf "(″ãƒã‚›) >$RED *$retcode" + fi +} +export PS1="$RESET$GREEN\u@$HOSTCOLOR\H$GREEN:\w\$(exit_code_guy)$NORMAL " + +# Nix-specific. +LOCALE_ARCHIVE=$HOME/.nix-profile/lib/locale/locale-archive diff --git a/files/shell/profile b/files/shell/profile new file mode 100644 index 0000000..fc677a7 --- /dev/null +++ b/files/shell/profile @@ -0,0 +1,7 @@ +export PATH="$PATH:$HOME/.local/bin" +#export GPG_TTY=$(tty) +unset SSH_AGENT_PID +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +fi +export MAIN_MONITOR=DP-1 diff --git a/files/sway/config b/files/sway/config new file mode 100644 index 0000000..3ec0052 --- /dev/null +++ b/files/sway/config @@ -0,0 +1,108 @@ +set $mod1 Mod1 +set $mod4 Mod4 + +set $left h +set $down j +set $up k +set $right l + +set $term kitty -1 +set $menu dmenu-path | bemenu-colored | xargs swaymsg exec -- + +font pango:monospace 10 + +default_border normal 1 +titlebar_border_thickness 1 +titlebar_padding 4 3 + +floating_modifier $mod1 normal + +bindsym $mod1+Shift+q kill +bindsym $mod1+Return exec $term +bindsym $mod1+d exec $menu +bindsym $mod1+Shift+c reload + +bindsym $mod1+Shift+e exec swaynag -t warning -m 'Do you really want to exit?' -B 'Yes' 'swaymsg exit' + +bindsym $mod1+$left focus left +bindsym $mod1+$down focus down +bindsym $mod1+$up focus up +bindsym $mod1+$right focus right + +bindsym $mod1+Shift+$left move left +bindsym $mod1+Shift+$down move down +bindsym $mod1+Shift+$up move up +bindsym $mod1+Shift+$right move right + +workspace 1 output DP-1 +workspace 2 output DP-1 +workspace 3 output DP-1 +workspace 4 output DP-1 +workspace 5 output DP-2 +workspace 6 output DP-2 +workspace 7 output DP-2 +workspace 8 output DP-2 +workspace 9 output HDMI-A-1 + +bindsym $mod1+1 workspace number 1 +bindsym $mod1+2 workspace number 2 +bindsym $mod1+3 workspace number 3 +bindsym $mod1+4 workspace number 4 +bindsym $mod4+1 workspace number 5 +bindsym $mod4+2 workspace number 6 +bindsym $mod4+3 workspace number 7 +bindsym $mod4+4 workspace number 8 +bindsym $mod4+5 workspace number 9 + +bindsym $mod1+Shift+1 move container to workspace number 1 +bindsym $mod1+Shift+2 move container to workspace number 2 +bindsym $mod1+Shift+3 move container to workspace number 3 +bindsym $mod1+Shift+4 move container to workspace number 4 +bindsym $mod4+Shift+1 move container to workspace number 5 +bindsym $mod4+Shift+2 move container to workspace number 6 +bindsym $mod4+Shift+3 move container to workspace number 7 +bindsym $mod4+Shift+4 move container to workspace number 8 +bindsym $mod4+Shift+5 move container to workspace number 9 + +bindsym $mod1+b splith +bindsym $mod1+v splitv + +bindsym $mod1+f fullscreen +bindsym $mod1+space floating toggle + +bindsym $mod1+r mode "resize" +mode "resize" { + bindsym $left resize shrink width 1px + bindsym $down resize grow height 1px + bindsym $up resize shrink height 1px + bindsym $right resize grow width 1px + bindsym Escape mode "default" +} + +bindsym $mod1+Shift+s exec screenshot +bindsym Print exec screenshot main +bindsym Shift+Print exec screenshot full +bindsym $mod1+q exec screenshot qrcode +bindsym $mod1+c exec screenshot color + +bindsym button4 nop +bindsym button5 nop + +xwayland force + +include config.d/* + +# class border bground text indicator child_border +client.focused $c1_light $c1 $fg $c1 $c1 +client.focused_inactive $c1 $c2 $fg $c1 $c1 +client.unfocused $c2 $c2 $fg $bg $bg +client.urgent $urgent $urgent $fg $urgent $urgent +client.placeholder $bg $bg $fg $bg $bg +client.background $bg + +exec dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK +exec_always swaymsg 'seat * hide_cursor 4000' +exec swayidle -w \ + timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' +exec mako +exec gentoo-pipewire-launcher restart diff --git a/files/sway/window_rules b/files/sway/window_rules new file mode 100644 index 0000000..f6ee9ee --- /dev/null +++ b/files/sway/window_rules @@ -0,0 +1,25 @@ +for_window [shell="xwayland"] title_format "(Xwayland) %title" +for_window [app_id=kitty] allow_tearing yes +for_window [app_id=gamescope] inhibit_idle fullscreen, allow_tearing yes, floating enable +for_window [app_id=cmv] inhibit_idle fullscreen, floating enable +for_window [class=cmv] floating enable +for_window [class=cmv.exe] floating enable +for_window [app_id=mauri] floating enable +for_window [app_id=imv] floating enable +for_window [app_id=Waydroid] floating enable +for_window [title=Parsec] inhibit_idle fullscreen +for_window [class=streaming_client] inhibit_idle fullscreen +for_window [class=steam_app_.*] inhibit_idle fullscreen, allow_tearing yes +for_window [app_id=gamescope] inhibit_idle fullscreen, allow_tearing yes, floating enable +for_window [class=.gamescope-wrapped] inhibit_idle fullscreen, allow_tearing yes +for_window [app_id=osu!] inhibit_idle fullscreen, allow_tearing yes +for_window [app_id=cs2] inhibit_idle fullscreen, allow_tearing yes +for_window [class=Minecraft*] inhibit_idle fullscreen, allow_tearing yes +for_window [title=Overwatch] inhibit_idle fullscreen, allow_tearing yes +for_window [class=Ryujinx] inhibit_idle fullscreen +for_window [app_id=org.yuzu_emu.yuzu] inhibit_idle fullscreen +for_window [app_id=info.cemu.Cemu] inhibit_idle fullscreen +for_window [class=dolphin-emu] inhibit_idle fullscreen +# Ishiiruka-Dolphin +for_window [class=AppRun] inhibit_idle fullscreen +for_window [class=SuperMeatBoy] inhibit_idle fullscreen diff --git a/files/user-dirs.dirs b/files/user-dirs.dirs new file mode 100644 index 0000000..018d12a --- /dev/null +++ b/files/user-dirs.dirs @@ -0,0 +1,8 @@ +XDG_DESKTOP_DIR="$HOME/tmp" +XDG_DOCUMENTS_DIR="$HOME/docs" +XDG_DOWNLOAD_DIR="$HOME/dl" +XDG_MUSIC_DIR="$HOME/tmp" +XDG_PICTURES_DIR="$HOME/pics" +XDG_PUBLICSHARE_DIR="$HOME/tmp" +XDG_TEMPLATES_DIR="$HOME/tmp" +XDG_VIDEOS_DIR="$HOME/dl/mp4" diff --git a/files/vim/autoload/Juliana.vim b/files/vim/autoload/Juliana.vim new file mode 100644 index 0000000..4dd86db --- /dev/null +++ b/files/vim/autoload/Juliana.vim @@ -0,0 +1,56 @@ +" https://github.com/neitanod/vim-clevertab + +function! Juliana#Init() + let g:Juliana#has_selection = 0 + augroup JulianaPersistAu + autocmd ModeChanged [V\x16]*:i let g:Juliana#has_selection = 1 + autocmd InsertLeave * let g:Juliana#has_selection = 0 + augroup END +endfunction + +function! Juliana#CompleteTab(type) + if a:type == "START" + let g:Juliana#stop=0 + return "" + endif + + if !g:Juliana#stop + " Vanilla <Tab> if we are at the front of a line. + if a:type == "TAB" && col(".") >= col("$") && !pumvisible() + let g:Juliana#stop=1 + return "\<Tab>" + elseif a:type == "ALIGN" && !pumvisible() " Align if !pumvisible(). + let g:Juliana#stop=1 + if g:Juliana#has_selection + return "\<ESC>gv=i" + else + return "\<ESC>\<C-v>=i" + endif + elseif a:type == "NEXT" " If pumvisible(), goto the next result. + let g:Juliana#stop=1 + return "\<C-n>" + endif + endif + + return "" +endfunction + +function! Juliana#CompleteSTab(type) + if a:type == "PREV" + if pumvisible() " If pumvisible(), goto the previous result. + return "\<C-p>" + else + return "\<Tab>" " <S-Tab> = <Tab> + endif + endif +endfunction + +function! Juliana#CompleteNTab(type) + if a:type == "FOLD" + if foldlevel(line(".")) " Toggle fold if on fold. + return "za" + else + return "\<Tab>" + endif + endif +endfunction diff --git a/files/vim/colors/lil_pablo.vim b/files/vim/colors/lil_pablo.vim new file mode 100644 index 0000000..1ab6d2a --- /dev/null +++ b/files/vim/colors/lil_pablo.vim @@ -0,0 +1,81 @@ +" Name: lil_pablo +" Author: Ron Aaron <ron@ronware.org> +" Maintainer: Original maintainerRon Aaron <ron@ronware.org> +" Website: https://github.com/vim/colorschemes +" License: Same as Vim +" Last Change: 2025 Aug 5 + +set background=dark + +hi clear +let g:colors_name = 'lil_pablo' + +" :%s/cterm\(bg\|fg\)=\([0-9]*\|NONE\|fg\)\ /cterm\1=\2\ gui\1=##\2##\ /g + +hi Normal ctermfg=15 guifg=#ffffff ctermbg=0 guibg=#000000 cterm=NONE +hi Comment ctermfg=8 guifg=#808080 ctermbg=NONE guibg=NONE cterm=NONE +hi Constant ctermfg=9 guifg=#d78700 ctermbg=NONE guibg=NONE cterm=NONE +hi Identifier ctermfg=6 guifg=#ffaf00 ctermbg=NONE guibg=NONE cterm=NONE +hi Statement ctermfg=3 guifg=#ffd75f ctermbg=NONE guibg=NONE cterm=bold +hi PreProc ctermfg=12 guifg=#00875f ctermbg=NONE guibg=NONE cterm=NONE +hi Type ctermfg=6 guifg=#ffaf00 ctermbg=NONE guibg=NONE cterm=NONE +hi Special ctermfg=14 guifg=#ffd700 ctermbg=NONE guibg=NONE cterm=NONE +hi Underlined ctermfg=2 guifg=#af5f00 ctermbg=NONE guibg=NONE cterm=underline +hi Ignore ctermfg=0 guifg=#000000 ctermbg=0 guibg=#000000 cterm=NONE +hi Error ctermfg=15 guifg=#ffffff ctermbg=9 guibg=#d78700 cterm=NONE +hi Todo ctermfg=0 guifg=#000000 ctermbg=3 guibg=#ffd75f cterm=NONE +hi Conceal ctermfg=8 guifg=#808080 ctermbg=NONE guibg=NONE cterm=NONE +hi Cursor ctermfg=0 guifg=#000000 ctermbg=15 guibg=#ffffff cterm=NONE +hi lCursor ctermfg=0 guifg=#000000 ctermbg=15 guibg=#ffffff cterm=NONE +hi CursorIM ctermfg=NONE guifg=NONE ctermbg=fg guibg=#eeeeee cterm=NONE +hi Title ctermfg=13 guifg=#ff8787 ctermbg=NONE guibg=NONE cterm=bold +hi Directory ctermfg=2 guifg=#af5f00 ctermbg=NONE guibg=NONE cterm=NONE +hi Search ctermfg=0 guifg=#000000 ctermbg=3 guibg=#ffd75f cterm=NONE +hi IncSearch ctermfg=15 guifg=#ffffff ctermbg=NONE guibg=NONE cterm=reverse +hi NonText ctermfg=12 guifg=#00875f ctermbg=NONE guibg=NONE cterm=bold +hi EndOfBuffer ctermfg=12 guifg=#00875f ctermbg=NONE guibg=NONE cterm=bold +hi ErrorMsg ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#d75f00 cterm=NONE +hi WarningMsg ctermfg=9 guifg=#d78700 ctermbg=NONE guibg=NONE cterm=NONE +hi SignColumn ctermfg=14 guifg=#ffd700 ctermbg=0 guibg=#000000 cterm=NONE +hi ColorColumn ctermfg=15 guifg=#ffffff ctermbg=8 guibg=#808080 cterm=NONE +hi FoldColumn ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE cterm=NONE +hi Folded ctermfg=12 guifg=#00875f ctermbg=NONE guibg=NONE cterm=NONE +hi CursorColumn ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE cterm=underline +hi CursorLine ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE cterm=underline +hi CursorLineNr ctermfg=11 guifg=#ffff5f ctermbg=NONE guibg=NONE cterm=underline +hi Visual ctermfg=4 guifg=#005f5f ctermbg=7 guibg=#eeeeee cterm=NONE +hi VisualNOS ctermfg=NONE guifg=NONE ctermbg=0 guibg=#000000 cterm=underline +hi LineNr ctermfg=8 guifg=#808080 ctermbg=NONE guibg=NONE cterm=NONE +hi! link LineNrAbove LineNr +hi! link LineNrBelow LineNr +hi MatchParen ctermfg=NONE guifg=NONE ctermbg=6 guibg=#ffaf00 cterm=NONE +hi ModeMsg ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE cterm=bold +hi MoreMsg ctermfg=12 guifg=#00875f ctermbg=NONE guibg=NONE cterm=bold +hi Question ctermfg=10 guifg=#af8700 ctermbg=NONE guibg=NONE cterm=bold +hi SpecialKey ctermfg=14 guifg=#ffd700 ctermbg=NONE guibg=NONE cterm=NONE +hi WildMenu ctermfg=0 guifg=#000000 ctermbg=11 guibg=#ffff5f cterm=NONE +hi QuickFixLine ctermfg=0 guifg=#000000 ctermbg=6 guibg=#ffaf00 cterm=NONE +hi SpellBad ctermfg=9 guifg=#d78700 ctermbg=NONE guibg=NONE cterm=underline +hi SpellCap ctermfg=12 guifg=#00875f ctermbg=NONE guibg=NONE cterm=underline +hi SpellLocal ctermfg=13 guifg=#ff8787 ctermbg=NONE guibg=NONE cterm=underline +hi SpellRare ctermfg=11 guifg=#ffff5f ctermbg=NONE guibg=NONE cterm=underline +hi StatusLine ctermfg=11 guifg=#ffff5f ctermbg=4 guibg=#005f5f cterm=NONE +hi StatusLineNC ctermfg=0 guifg=#000000 ctermbg=15 guibg=#ffffff cterm=NONE +hi VertSplit ctermfg=15 guifg=#ffffff ctermbg=15 guibg=#ffffff cterm=NONE +hi TabLine ctermfg=15 guifg=#ffffff ctermbg=8 guibg=#808080 cterm=NONE +hi TabLineFill ctermfg=NONE guifg=NONE ctermbg=0 guibg=#000000 cterm=reverse +hi TabLineSel ctermfg=15 guifg=#ffffff ctermbg=0 guibg=#000000 cterm=bold +hi ToolbarLine ctermfg=NONE guifg=NONE ctermbg=0 guibg=#000000 cterm=NONE +hi ToolbarButton ctermfg=0 guifg=#000000 ctermbg=7 guibg=#eeeeee cterm=bold +hi PmenuMatch ctermfg=fg guifg=#eeeeee ctermbg=8 guibg=#808080 cterm=bold +hi PmenuMatchSel ctermfg=0 guifg=#000000 ctermbg=7 guibg=#eeeeee cterm=bold +hi Pmenu ctermfg=fg guifg=#eeeeee ctermbg=8 guibg=#808080 cterm=NONE +hi PmenuSbar ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE cterm=NONE +hi PmenuSel ctermfg=0 guifg=#000000 ctermbg=7 guibg=#eeeeee cterm=NONE +hi PmenuThumb ctermfg=NONE guifg=NONE ctermbg=15 guibg=#ffffff cterm=NONE +hi DiffAdd ctermfg=15 guifg=#ffffff ctermbg=2 guibg=#af5f00 cterm=NONE +hi DiffChange ctermfg=15 guifg=#ffffff ctermbg=12 guibg=#00875f cterm=NONE +hi DiffText ctermfg=0 guifg=#000000 ctermbg=7 guibg=#eeeeee cterm=NONE +hi DiffDelete ctermfg=15 guifg=#ffffff ctermbg=13 guibg=#ff8787 cterm=NONE + +" vim: et ts=8 sw=2 sts=2 diff --git a/files/vim/pack/downloads/create_opt.sh b/files/vim/pack/downloads/create_opt.sh new file mode 100755 index 0000000..0029440 --- /dev/null +++ b/files/vim/pack/downloads/create_opt.sh @@ -0,0 +1,38 @@ +#! /usr/bin/env sh + +if [ ! -d "./opt" ]; then + echo "'opt' dir not found, create it here and re-run $0" + exit 1 +fi + +git clone --depth=1 https://github.com/tpope/vim-fugitive.git opt/vim-fugitive +cd opt/vim-fugitive +rm .git/hooks/* +git apply ../../../../patches/vim_fugitive_tab_expand.diff +cd ../.. + +git clone --depth=1 https://github.com/itchyny/vim-gitbranch.git opt/vim-gitbranch +cd opt/vim-gitbranch +rm .git/hooks/* +cd ../.. + +git clone --depth=1 https://github.com/matcatc/vim-asciidoc-folding.git opt/vim-asciidoc-folding +cd opt/vim-asciidoc-folding +rm .git/hooks/* +cd ../.. + +git clone --depth=1 https://github.com/chrisbra/Colorizer.git opt/Colorizer +cd opt/Colorizer +rm .git/hooks/* +cd ../.. + +#git clone --depth=1 https://github.com/yegappan/lsp.git opt/lsp +#cd opt/lsp +#rm .git/hooks/* +#cd ../.. + +vim -u NONE -c "helptags opt/vim-fugitive/doc" -c q +vim -u NONE -c "helptags opt/vim-gitbranch/doc" -c q +vim -u NONE -c "helptags opt/vim-asciidoc-folding/doc" -c q +vim -u NONE -c "helptags opt/Colorizer/doc" -c q +#vim -u NONE -c "helptags opt/lsp/doc" -c q diff --git a/files/vim/patches/qname_edit.diff b/files/vim/patches/qname_edit.diff new file mode 100644 index 0000000..4ca65ff --- /dev/null +++ b/files/vim/patches/qname_edit.diff @@ -0,0 +1,178 @@ +Post- dos2unix, Tabify, and Trim. +--- a/qname.1.2.vim 2025-08-03 20:12:24.629096223 -0400 ++++ b/qname.1.2.vim 2025-08-13 22:10:15.352953531 -0400 +@@ -7,7 +7,25 @@ + " License: Vim License + " ============================================================================= + ++" https://www.vim.org/scripts/script.php?script_id=2317 ++" + " Change Log ++" EDIT: ++" 2025-06-24: ++" Remove redraw on update ++" Don't wrap around in the list ++" ls! -> ls ++" <Tab> -> <C-j/k> ++" Take out built-in hotkey ++" 2025-08-05: ++" Use path relative to current dir ++" Match against file path ++" 2025-08-13: ++" Sort buffers by most recently used ++" Add bind to "flatten" the list ++" Replace fmatch() with built-in matchfuzzy() (speedup) ++" Fix logic to not include buffers with modifiable off ++" + " 1.2 2013-01-03 + " ADD: <Tab> and <S-Tab> moves selection like <Up> and <Down> + " ADD: Use <silent> mapping to keep cmdline clear +@@ -30,12 +48,6 @@ + finish + endif + +-if !exists("g:qname_hotkey") || g:qname_hotkey == "" +- let g:qname_hotkey = "<F3>" +-endif +-exe "nmap" g:qname_hotkey ":cal QNameInit(1)<cr>:~" +-let s:qname_hotkey = eval('"\'.g:qname_hotkey.'"') +- + if exists("g:qname_loaded") && g:qname_loaded + finish + endif +@@ -70,16 +82,19 @@ + call s:swb(str2nr(matchstr(s:s[_sel], '<\zs\d\+\ze>'))) + endif + call QNameInit(0) +- elseif _key ==# "\<Up>" || _key ==# "\<S-Tab>" ++ elseif _key ==# "\<Up>" || _key ==# "\<C-k>" + call s:colPrinter.vert(-1) +- elseif _key ==# "\<Down>" || _key ==# "\<Tab>" ++ elseif _key ==# "\<Down>" || _key ==# "\<C-j>" + call s:colPrinter.vert(1) + elseif _key ==# "\<Left>" + call s:colPrinter.horz(-1) + elseif _key ==# "\<Right>" + call s:colPrinter.horz(1) +- elseif _key ==# s:qname_hotkey +- call QNameInit(0) ++ elseif _key ==# "\<C-f>" ++ let s:flat = 1 - s:flat ++ let prev_sel = s:colPrinter.sel ++ call s:build() ++ let s:colPrinter.sel = prev_sel + else + call s:build() + endif +@@ -88,7 +103,6 @@ + cal QNameInit(0) + finally + " clean up screen after dismissing search window +- redraw! + call inputrestore() + endtry + endfunc +@@ -99,6 +113,7 @@ + let s:cmdh = &cmdheight + if a:start != -1 + let s:inp = "" ++ let s:flat = 0 + endif + call s:baselist() + call s:build() +@@ -112,16 +127,27 @@ + function! s:build() + let s:s = [] + let s:n = [] ++ let s:sp = [] ++ let s:np = [] + let s:blen = 0 + let _cmp = tolower(tr(s:inp, '\', '/')) + for _line in s:ls +- let _name = matchstr(_line, '^.\{-}\ze \+<') +- if s:fmatch(tolower(_name), _cmp) ++ " Match everthing before |<xx>| Match everthing after space. ++ let _match = matchlist(_line, '^.\{-}\ze \+<.*> \+\(.*\)') ++ let _name = _match[0] ++ let _path = _match[1] ++ if strlen(_cmp) == 0 || s:fmatch(tolower(_name), _cmp) + cal add(s:s, _line) + cal add(s:n, _name) ++ elseif s:fmatch(tolower(_path), _cmp) ++ cal add(s:sp, _line) ++ cal add(s:np, _name) + endif + endfor +- if len(s:n) > s:colPrinter.trow ++ " Put filename matches before path matches. ++ let s:n = s:n + s:np ++ let s:s = s:s + s:sp ++ if !s:flat && len(s:n) > s:colPrinter.trow + cal s:colPrinter.put(s:n) + else + cal s:colPrinter.put(s:s) +@@ -137,37 +163,28 @@ + endfunc + + function! s:fmatch(src,pat) +- let _si = strlen(a:src)-1 +- let _pi = strlen(a:pat)-1 +- while _si>=0 && _pi>=0 +- if a:src[_si] == a:pat[_pi] +- let _pi -= 1 +- endif +- let _si -= 1 +- endwhile +- return _pi < 0 ++ return len(matchfuzzy([a:src], a:pat)) > 0 + endfunc + + function! s:baselist() + let s:ls = [] +- redir => l:bufs | silent ls! | redir END ++ redir => l:bufs | silent ls t | redir END + for _line in split(l:bufs, "\n") +- if _line[3]!='u' || _line[6]!='-' ++ if _line[6] != '-' + let _bno = matchstr(_line, '^ *\zs\d*')+0 + let _fname = substitute(expand("#"._bno.":p"), '\', '/', 'g') + if _fname == "" + let _fname = "|".matchstr(_line, '"\[\zs[^\]]*')."|" + endif + let _name = fnamemodify(_fname,":t") +- cal add(s:ls, _name." <"._bno."> ".fnamemodify(_fname,":h")) ++ cal add(s:ls, _name." <"._bno."> ".fnamemodify(_fname,":.")) + endif + endfor + let _align = max(map(copy(s:ls),'stridx(v:val,">")')) + call map(s:ls, 'substitute(v:val, " <", repeat(" ",_align-stridx(v:val,">"))." <", "")') +- cal sort(s:ls, 1) + endfunc + +-let s:colPrinter = {"trow": 4} ++let s:colPrinter = {"trow": 5} + function! s:colPrinter.put(its) dict + let _cols = [] + let _trow = self.trow +@@ -224,11 +241,7 @@ + function! s:colPrinter.vert(mv) dict + let _t = self.sel + a:mv + let _len = self.len +- if _t < 0 && _len > 0 +- let self.sel = _len-1 +- elseif _t >= _len +- let self.sel = 0 +- else ++ if _t >= 0 && _t < _len + let self.sel = _t + endif + endfunc +@@ -244,7 +257,7 @@ + let _t = _sel/_trow + let _cpos = self.cpos + let _lcol = self.lcol +- let _tcol = &columns ++ let _tcol = s:flat ? 1 : &columns + if _cpos[_lcol]+_tcol < _cpos[_t+1] + let _rcol = _t + let _pos = _cpos[_t+1]-_tcol-2 diff --git a/files/vim/patches/vim_fugitive_tab_expand.diff b/files/vim/patches/vim_fugitive_tab_expand.diff new file mode 100644 index 0000000..aa7b0ef --- /dev/null +++ b/files/vim/patches/vim_fugitive_tab_expand.diff @@ -0,0 +1,17 @@ +diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim +index 7f2f602..fa178c4 100644 +--- a/autoload/fugitive.vim ++++ b/autoload/fugitive.vim +@@ -2696,10 +2696,10 @@ function! s:MapStatus() abort + call s:Map('n', 'C', ":echoerr 'fugitive: C has been removed in favor of cc'<CR>", '<silent><unique>') + call s:Map('n', 'a', ":echoerr 'fugitive: a has been removed in favor of s'<CR>", '<silent><unique>') + call s:Map('n', 'i', ":<C-U>execute <SID>NextExpandedHunk(v:count1)<CR>", '<silent>') +- call s:Map('n', "=", ":<C-U>execute <SID>StageInline('toggle',line('.'),v:count)<CR>", '<silent>') ++ call s:Map('n', "<Tab>", ":<C-U>execute <SID>StageInline('toggle',line('.'),v:count)<CR>", '<silent>') + call s:Map('n', "<", ":<C-U>execute <SID>StageInline('hide', line('.'),v:count)<CR>", '<silent>') + call s:Map('n', ">", ":<C-U>execute <SID>StageInline('show', line('.'),v:count)<CR>", '<silent>') +- call s:Map('x', "=", ":<C-U>execute <SID>StageInline('toggle',line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>') ++ call s:Map('x', "<Tab>", ":<C-U>execute <SID>StageInline('toggle',line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>') + call s:Map('x', "<", ":<C-U>execute <SID>StageInline('hide', line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>') + call s:Map('x', ">", ":<C-U>execute <SID>StageInline('show', line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>') + call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent><unique>') diff --git a/files/vim/plugin/Hello.vim b/files/vim/plugin/Hello.vim new file mode 100644 index 0000000..224200e --- /dev/null +++ b/files/vim/plugin/Hello.vim @@ -0,0 +1,122 @@ +" https://github.com/arp242/startscreen.vim/blob/master/plugin/startscreen.vim + +scriptencoding utf-8 +if exists('g:Hello_Loaded') | finish | endif +let g:Hello_Loaded = 1 +let s:save_cpo = &cpo +set cpo&vim + +fun! Hello#start() + " Don't run if: + " - there are commandline arguments; + " - the buffer isn't empty (e.g. cmd | vi -); + " - we're not invoked as vim or gvim; + " - we're starting in insert mode. + if argc() || line2byte('$') != -1 || v:progname !~? '^[-gmnq]\=vim\=x\=\%[\.exe]$' || &insertmode + return + endif + + " Start a new buffer... + enew + + " ...set it's name... + keepalt file [Hello] + + " ...and set some options for it. + setlocal + \ bufhidden=wipe + \ buftype=nofile + \ nobuflisted + \ nocursorcolumn + \ nocursorline + \ nolist + \ nonumber + \ noswapfile + \ norelativenumber + + " Now we can just write to the buffer whatever you want. + + let pole = [' .', ' (` `)', ' `\./`', ' __|`|__', '/ |_| \', '|_______|', '\_______/', ' | |', ' | |', ' | |', ' `.| |.`', ' /| |\', ' / | | \', ' | |', ' .`| |`.', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |', ' | |'] + for i in reverse(range(0, len(pole) - 1)) + call append('0', ' '.pole[i]) + endfor + :1 + redraw! + + "call writefile([output], '/proc/self/fd/0', 'b') + + " No modifications to this buffer. + setlocal nomodifiable nomodified + + " When we go to insert mode start a new buffer, and start insert. + nnoremap <buffer><silent> e :enew<CR> + nnoremap <buffer><silent> i :enew <bar> startinsert<CR> + nnoremap <buffer><silent> p :enew<CR>p +endfun + +augroup Hello + autocmd! + autocmd VimEnter * call Hello#start() +augroup end + +let &cpo = s:save_cpo +unlet s:save_cpo +" +" +" +" +" +" +" +" +" Sketch +" +" +" +" +" +" +" +" +" +" +" +" https://www.asciiart.eu/buildings-and-places/fences +" . +" (` `) +" `\./` +" __|`|__ +" / |_| \ +" |_______| +" \_______/ +" | | +" | | +" | | +" `.| |.` +" /| |\ +" / | | \ +" | | +" .`| |`. +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" | | +" +" +" +" +" +" +" diff --git a/files/vim/plugin/qname.1.2.vim b/files/vim/plugin/qname.1.2.vim new file mode 100644 index 0000000..73b7dec --- /dev/null +++ b/files/vim/plugin/qname.1.2.vim @@ -0,0 +1,298 @@ +" ============================================================================= +" QuickName: The most convenient way navigating opened buffers, +" incremental search by name +" Last Change: 2013-01-03 +" Maintainer: Pal Nart <palnart@gmail.com> +" Version: 1.2 +" License: Vim License +" ============================================================================= + +" https://www.vim.org/scripts/script.php?script_id=2317 +" +" Change Log +" EDIT: +" 2025-06-24: +" Remove redraw on update +" Don't wrap around in the list +" ls! -> ls +" <Tab> -> <C-j/k> +" Take out built-in hotkey +" 2025-08-05: +" Use path relative to current dir +" Match against file path +" 2025-08-13: +" Sort buffers by most recently used +" Add bind to "flatten" the list +" Replace fmatch() with built-in matchfuzzy() (speedup) +" Fix logic to not include buffers with modifiable off +" +" 1.2 2013-01-03 +" ADD: <Tab> and <S-Tab> moves selection like <Up> and <Down> +" ADD: Use <silent> mapping to keep cmdline clear +" FIX: Catch interrupt (<C-C> or <Esc> keypress) and restore cmd line +" FIX: Use case-sensitive string comparisons to afford immunity from value +" of 'ignorecase' +" FIX: Do not clobber contents of @y register +" +" 1.1 2009-07-19 +" ADD: Key Shift+Enter open buffer in a new horizontally split window. Thanks +" to contribution by Salman Halim +" ADD: Key Ctrl+U reset input line and show all buffers +" FIX: If a buffer is already associated with a window, navigate to that +" window instead of opening in current window +" +" 1.0 2008-07-30 +" Initial upload + +if v:version < 700 + finish +endif + +if exists("g:qname_loaded") && g:qname_loaded + finish +endif +let g:qname_loaded = 1 + +function! QNameRun() + try + call s:colPrinter.print() + echo "\rMatch" len(s:n)."/".len(s:ls) "names:" s:inp + call inputsave() + let _key = getchar() + if !type(_key) + let _key = nr2char(_key) + endif + + " use case-sensitive equality operator, otherwise <BS> looks like + " <S-Tab> if 'ignorecase' is set + if _key ==# "\<BS>" + let s:inp = s:inp[:-2] + elseif _key ==# "\<C-U>" + let s:inp = "" + elseif strlen(_key) == 1 && char2nr(_key) > 31 + let s:inp = s:inp._key + endif + + if _key ==# "\<ESC>" || _key ==# "\<CR>" || _key ==# "\<S-CR>" + let _sel = s:colPrinter.sel + if _key != "\<ESC>" && _sel < len(s:n) && _sel >= 0 + if _key ==# "\<S-CR>" + :split + endif + call s:swb(str2nr(matchstr(s:s[_sel], '<\zs\d\+\ze>'))) + endif + call QNameInit(0) + elseif _key ==# "\<Up>" || _key ==# "\<C-k>" + call s:colPrinter.vert(-1) + elseif _key ==# "\<Down>" || _key ==# "\<C-j>" + call s:colPrinter.vert(1) + elseif _key ==# "\<Left>" + call s:colPrinter.horz(-1) + elseif _key ==# "\<Right>" + call s:colPrinter.horz(1) + elseif _key ==# "\<C-f>" + let s:flat = 1 - s:flat + let prev_sel = s:colPrinter.sel + call s:build() + let s:colPrinter.sel = prev_sel + else + call s:build() + endif + catch /^Vim:.*$/ + " restore cmdheight if search is interrupted + cal QNameInit(0) + finally + " clean up screen after dismissing search window + call inputrestore() + endtry +endfunc + +function! QNameInit(start) + if a:start + cmap <silent> ~ cal QNameRun()<CR>:~ + let s:cmdh = &cmdheight + if a:start != -1 + let s:inp = "" + let s:flat = 0 + endif + call s:baselist() + call s:build() + exe "set cmdheight=".(s:colPrinter.trow+1) + else + cmap <silent> ~ exe "cunmap \x7E"<CR> + exe "set cmdheight=".s:cmdh + endif +endfunc + +function! s:build() + let s:s = [] + let s:n = [] + let s:sp = [] + let s:np = [] + let s:blen = 0 + let _cmp = tolower(tr(s:inp, '\', '/')) + for _line in s:ls + " Match everthing before |<xx>| Match everthing after space. + let _match = matchlist(_line, '^.\{-}\ze \+<.*> \+\(.*\)') + let _name = _match[0] + let _path = _match[1] + if strlen(_cmp) == 0 || s:fmatch(tolower(_name), _cmp) + cal add(s:s, _line) + cal add(s:n, _name) + elseif s:fmatch(tolower(_path), _cmp) + cal add(s:sp, _line) + cal add(s:np, _name) + endif + endfor + " Put filename matches before path matches. + let s:n = s:n + s:np + let s:s = s:s + s:sp + if !s:flat && len(s:n) > s:colPrinter.trow + cal s:colPrinter.put(s:n) + else + cal s:colPrinter.put(s:s) + endif +endfunc + +function! s:swb(bno) + if bufwinnr(a:bno) == -1 + exe "hid b" a:bno + else + exe bufwinnr(a:bno) . "winc w" + endif +endfunc + +function! s:fmatch(src,pat) + return len(matchfuzzy([a:src], a:pat)) > 0 +endfunc + +function! s:baselist() + let s:ls = [] + redir => l:bufs | silent ls t | redir END + for _line in split(l:bufs, "\n") + if _line[6] != '-' + let _bno = matchstr(_line, '^ *\zs\d*')+0 + let _fname = substitute(expand("#"._bno.":p"), '\', '/', 'g') + if _fname == "" + let _fname = "|".matchstr(_line, '"\[\zs[^\]]*')."|" + endif + let _name = fnamemodify(_fname,":t") + cal add(s:ls, _name." <"._bno."> ".fnamemodify(_fname,":.")) + endif + endfor + let _align = max(map(copy(s:ls),'stridx(v:val,">")')) + call map(s:ls, 'substitute(v:val, " <", repeat(" ",_align-stridx(v:val,">"))." <", "")') +endfunc + +let s:colPrinter = {"trow": 5} +function! s:colPrinter.put(its) dict + let _cols = [] + let _trow = self.trow + + let _its = copy(a:its) + let _len = len(_its) + let _i = 0 + while _i < _len + if _i+_trow <= _len + cal add(_cols, remove(_its,0,_trow-1)) + else + cal add(_cols, _its) + endif + let _i += _trow + endwhile + + let _cpos = [0] + let _cw = [] + let _t = 0 + for _li in _cols + let _w = max(map(copy(_li),'strlen(v:val)'))+4 + let _t += _w + cal add(_cpos,_t) + cal add(_cw,_w) + endfor + + let _rows = [] + for _i in range(_trow) + let _row = [] + for _j in range(len(_cols)) + if _j*_trow+_i < _len + cal add(_row,_cols[_j][_i]) + endif + endfor + cal add(_rows, _row) + endfor + + let self.cols = _cols + let self.cw = _cw + let self.rows = _rows + let self.cpos = _cpos + let self.len = _len + let self.lcol = 0 + let self.sel = 0 +endfunc + +function! s:colPrinter.horz(mv) dict + let _t = self.sel + a:mv*self.trow + if _t >= 0 && _t < self.len + let self.sel = _t + endif +endfunc + +function! s:colPrinter.vert(mv) dict + let _t = self.sel + a:mv + let _len = self.len + if _t >= 0 && _t < _len + let self.sel = _t + endif +endfunc + +function! s:colPrinter.print() dict + let _len = self.len + let _trow = self.trow + if !_len + echo " [...NO MATCH...]" repeat("\n",_trow) + return + endif + let _sel = self.sel + let _t = _sel/_trow + let _cpos = self.cpos + let _lcol = self.lcol + let _tcol = s:flat ? 1 : &columns + if _cpos[_lcol]+_tcol < _cpos[_t+1] + let _rcol = _t + let _pos = _cpos[_t+1]-_tcol-2 + while _cpos[_lcol] < _pos + let _lcol += 1 + endwhile + let _lcol -= _lcol > _t + else + if _t < _lcol + let _lcol = _t + endif + let _rcol = len(_cpos)-1 + let _pos = _cpos[_lcol]+_tcol+2 + while _cpos[_rcol] > _pos + let _rcol -= 1 + endwhile + let _rcol -= _rcol > _lcol + endif + let _cw = self.cw + let _pos = _cpos[_lcol]+_tcol + let self.lcol = _lcol + for _i in range(_trow) + let _row = self.rows[_i] + for _j in range(_lcol,_rcol) + if _j*_trow+_i < _len + let _txt = " " . _row[_j] + let _txt .= repeat(" ", _cw[_j] - strlen(_txt)) + let _txt = _txt[:_pos-_cpos[_j]-2] + if _j*_trow + _i == _sel + echoh Search|echon _txt|echoh None + else + echon _txt + endif + endif + endfor + echon "\n" + endfor +endfunc diff --git a/files/vim/vimrc b/files/vim/vimrc new file mode 100644 index 0000000..41e30fb --- /dev/null +++ b/files/vim/vimrc @@ -0,0 +1,294 @@ +" @TODO: Map 'd' to delete no yank + +" Basic settings. +set nocompatible +set number +" showmode too often puts the cursor on the bottom line, this can make +" kitty's cursor_trail way too jumpy. +set noshowmode +"set signcolumn=yes +set updatetime=250 +set scrolloff=5 +"set lazyredraw +" Don't ask to save changes when switching buffers. +set hidden +" Use the last buffer instead of the right-most when opening from quickfix. +set switchbuf=uselast +" Show match count. +set shortmess-=S +" Old split defaults (I think). +set splitright +set splitbelow +" Stop buffers from jumping when opening buffer selection. +set splitkeep=screen + +set termguicolors +colo lil_pablo + +" Syntax and indent from filetype. +filetype plugin indent on +syntax on +" Search farther and longer to correctly highlight. +"au BufEnter * :syntax sync minlines=10 +set redrawtime=3000 +set maxmempattern=5000 + +" Highlight unwanted whitespace. +au BufEnter * match Error /\s\+$/ +au InsertEnter * match Error /\s\+\%#\@<!$/ +au InsertLeave * match Error /\s\+$/ + +" Check for SHIFT_JIS. +set fileencodings=ucs-bom,utf-8,sjis,default,latin1 + +" 4 spaces autoindent. +set tabstop=4 +set shiftwidth=4 +set expandtab +set autoindent + +" C syntax preference. +let g:c_syntax_for_h=1 +let g:c_no_curly_error=1 +let g:c_function_pointers=1 +set cinoptions=:0,=4,l1,g2,h2,(4,u4,+4,m1,j1,J1 +set cindent + +" Set different format for mail and text files. +set nowrap nolinebreak nolist formatoptions=l textwidth=0 +au FileType mail,text setlocal wrap formatoptions=l textwidth=0 + +" Ex tab complete that makes sense to me. +set wildmode=longest,list,full +set wildmenu + +" Set titlebar. +set title +au BufEnter * let &titlestring=expand("%:t") + +" https://github.com/csdvrx/CuteVim/blob/main/.vimrc + +" Allow distinguishing <C-i> from <Tab> in bindings. +" If using vim rather than neovim, this will disable the ability +" to map <C-h/j/k/l>. Apparently due to vim's lack of "CSI u" +" support, according to some issue reports. +" https://github.com/vim/vim/issues/10244 +"let &t_TI = "\<Esc>[>4;2m" +"let &t_TE = "\<Esc>[>4;m" +" Treat shift + backspace as normal backspace. +"noremap <S-BS> <BS> + +" System clipboard on linux. +set clipboard=unnamedplus + +" Session options. +set ssop=curdir,skiprtp,blank,buffers,folds,winsize,terminal +set vop-=curdir + +" Move ~/.viminfo. +set viminfo+=n~/.vim/viminfo + +" Session auto save. +" https://vim.fandom.com/wiki/Go_away_and_come_back +function! SaveSession() + if v:this_session != "" + echo "Saving." + exe "mksession! " . v:this_session + else + echo "No Session." + endif +endfunction +au VimLeave * :call SaveSession() + +if isdirectory(expand("~/c")) + " Swap file directory. + let swap_dir = expand("~/c/sessions/swaps//") + if !isdirectory(swap_dir) + call mkdir(swap_dir, "p", 0755) + endif + let &directory=swap_dir + + if has("persistent_undo") + let undo_dir = expand("~/c/sessions/undo//") + if !isdirectory(undo_dir) + call mkdir(undo_dir, "p", 0755) + endif + let &undodir=undo_dir + set undofile + endif + + " Staggered backups. + let backup_dir = "/mnt/store/backup/vim" + if !isdirectory(backup_dir) + let backup_dir = expand("~/c/sessions/backup//") + if !isdirectory(backup_dir) + call mkdir(backup_dir, "p", 0755) + endif + endif + let &backupdir=backup_dir + set backup +endif + +set autocomplete +set complete=.^5,w^5,b^5,u^5 +set completeopt=popup + +" Plugins. +let g:fugitive_no_maps = 1 +set diffopt+=vertical +packadd vim-fugitive +packadd vim-gitbranch +packadd vim-asciidoc-folding +packadd Colorizer +"if !empty($NIX_SHELL) +"packadd lsp +"call LspAddServer([#{ +"\ name: 'clangd', +"\ filetype: ['c', 'cpp'], +"\ path: 'clangd', +"\ args: ['--background-index'] +"\}]) +"endif + +" Custom statusline. +function! StatuslineGit() + let l:branchname = gitbranch#name() + return strlen(l:branchname) > 0 ? " ".l:branchname." " : " " +endfunction + +function! Statusline() abort + let focused = g:statusline_winid == win_getid(winnr()) + let status = focused ? "%#StatusLine#" : "%#StatusLineNC#" + let status .= "%{StatuslineGit()}" + let status .= " %{expand('%:~:.')}" " Explicitly expand to relative file, %f was flaky. + let status .= " vim@%{hostname()}" + let status .= "%=" + let status .= " %y" + let status .= " %{&fileencoding}" + let status .= "[%{&fileformat}]" + let status .= "%3p%%" + let status .= " %3l:%-3c" + return status +endfunction +set laststatus=2 " Always show statusline. +set statusline=%!Statusline() + +" Make shift + nav keys no-ops. +nnoremap <S-h> <nop> +nnoremap <S-j> <nop> +nnoremap <S-k> <nop> +nnoremap <S-l> <nop> +" Normal mode tab no-op. +nmap <Tab> <nop> +" ctrl + c no-op. +nnoremap <C-c> <nop> +" Disable F1 for help. +nmap <F1> <nop> +" Disable q: for histroy. +nmap q: <nop> +" Simplify split movement. +nnoremap <silent> <C-h> :wincmd h<CR> +nnoremap <silent> <C-j> :wincmd j<CR> +nnoremap <silent> <C-k> :wincmd k<CR> +nnoremap <silent> <C-l> :wincmd l<CR> +" Make ctrl + "." and "," map to previous buffer. +nmap <C-,> <C-^> +nmap <C-.> <C-^> +" Personally intuitive pop-up menu binds. +inoremap <expr> <CR> pumvisible() ? "<C-y><CR>" : "<CR>" +inoremap <expr> <Up> pumvisible() ? "<C-p>" : "<Up>" +inoremap <expr> <Down> pumvisible() ? "<C-n>" : "<Down>" +" Ctags +nnoremap <C-d> <C-]> +" Toggle colorcolumn. +nmap <silent> C :exe "set colorcolumn=" . (&colorcolumn == "" ? "101" : "")<CR> +" Toggle css color highlighting. +noremap <silent> # :ColorToggle<CR> +" Buffer select. +nmap <silent> \ :call QNameInit(1)<CR>:~ +" Git summary. +nmap <silent> Y :vertical G<CR> + +" Relative :e, :vs, and :s. +fun OpenBasedOnRelativeArgument(A, CMD) + " https://stackoverflow.com/a/14348204 + let arg = a:A + if arg != "" + let arg = (arg[0] == "/" ? arg : resolve(fnamemodify(expand("%:h")."/".arg, ":p"))) + endif + if a:CMD == "EDIT" + exe "edit" arg + elseif a:CMD == "VERTICAL_SPLIT" + exe "vsplit" arg + elseif a:CMD == "SPLIT" + exe "split" arg + endif +endfun +command -nargs=* -complete=customlist,RelativeFileComplete E :call OpenBasedOnRelativeArgument("<args>", "EDIT") +command -nargs=* -complete=customlist,RelativeFileComplete VS :call OpenBasedOnRelativeArgument("<args>", "VERTICAL_SPLIT") +command -nargs=* -complete=customlist,RelativeFileComplete S :call OpenBasedOnRelativeArgument("<args>", "SPLIT") +fun RelativeFileComplete(A,L,P) + let argpath = fnamemodify(a:A, ":h") + if argpath[0] == "~" || argpath[0] == "/" + let curpath = "" + else + let curpath = expand("%:h")."/" + endif + let argfile = fnamemodify(a:A, ":t") + let files = globpath(curpath.argpath, argfile."*", 0, 1) + for i in range(0, len(files) - 1) + if isdirectory(files[i]) + let files[i] = files[i]."/" + endif + if len(curpath) > 0 + let files[i] = substitute(files[i], curpath, "", "") + let files[i] = substitute(files[i], "^./", "", "") + endif + endfor + return files +endfun +" https://stackoverflow.com/a/20564623 +cnoreabbrev <expr> e getcmdtype() == ":" && getcmdline() == "e" ? "E" : "e" +cnoreabbrev <expr> vs getcmdtype() == ":" && getcmdline() == "vs" ? "VS" : "vs" +cnoreabbrev <expr> s getcmdtype() == ":" && getcmdline() == "s" ? "S" : "s" + +" :no -> :nohlsearch instead of :noremap. +cnoreabbrev <expr> no getcmdtype() == ":" && getcmdline() == "no" ? "nohlsearch" : "no" + +call Juliana#Init() " Custom insert mode tab behavior inherited from Emacs. +inoremap <silent> <Tab> <C-R>=Juliana#CompleteTab("START")<CR> + \<C-R>=Juliana#CompleteTab("TAB")<CR> + \<C-R>=Juliana#CompleteTab("ALIGN")<CR> + \<C-R>=Juliana#CompleteTab("NEXT")<CR> +inoremap <silent> <S-Tab> <C-R>=Juliana#CompleteSTab("PREV")<CR> +nnoremap <silent> <expr> <Tab> Juliana#CompleteNTab("FOLD") + +command Tabify set noexpandtab | %retab! | set expandtab +command Untabify set expandtab | %retab! + +command Hex :%!xxd +command Unhex :%!xxd -r + +" https://stackoverflow.com/a/27721306 +"command -nargs=+ Ggr execute 'Ggrep! -q' <q-args> +command -nargs=+ Ggr execute "silent Ggrep!" <q-args> | botright cwindow | redraw! +" I had this mapped to <C-i> for the longest time. Sadly with OG vim +" (not neovim) the fix for mapping <Tab> and <C-i> seperately doesn't work. +" Changing this bind as the only concession to be compatible with vim +" seems well worth it. +nnoremap <C-o> :Ggr + +"" https://stackoverflow.com/a/37040415 +function! SyntaxGroup() + let l:s = synID(line("."), col("."), 1) + echo synIDattr(l:s, "name") . " -> " . synIDattr(synIDtrans(l:s), "name") +endfun +command Syn :call SyntaxGroup() + +" https://vi.stackexchange.com/a/456 +function! TrimWhitespace() + let l:save = winsaveview() + keeppatterns %s/\s\+$//e + call winrestview(l:save) +endfun +command Trim :call TrimWhitespace() diff --git a/files/waydroid/waydroid.cfg b/files/waydroid/waydroid.cfg new file mode 100644 index 0000000..ef6ddc6 --- /dev/null +++ b/files/waydroid/waydroid.cfg @@ -0,0 +1,60 @@ +[waydroid] +arch = x86_64 +vendor_type = MAINLINE +system_datetime = 1754733814 +vendor_datetime = 1754691693 +suspend_action = freeze +mount_overlays = True +auto_adb = True +images_path = /var/lib/waydroid/images +binder = binder +vndbinder = vndbinder +hwbinder = hwbinder +system_ota = https://ota.waydro.id/system/lineage/waydroid_x86_64/GAPPS.json +vendor_ota = https://ota.waydro.id/vendor/waydroid_x86_64/MAINLINE.json +binder_protocol = aidl3 +service_manager_protocol = aidl3 + +[properties] +ro.product.brand = google +ro.product.manufacturer = Google +ro.product.device = komodo +ro.product.model = Pixel 9 Pro XL +ro.product.name = komodo +ro.system.build.fingerprint = google/komodo/komodo:16/BP2A.250705.008/13578956:user/release-keys +ro.build.fingerprint = google/komodo/komodo:16/BP2A.250705.008/13578956:user/release-keys +ro.vendor.build.fingerprint = google/komodo/komodo:16/BP2A.250705.008/13578956:user/release-keys +ro.bootimage.build.fingerprint = google/komodo/komodo:16/BP2A.250705.008/13578956:user/release-keys +ro.system.build.description = komodo-user 16 BP2A.250705.008 13578956 release-keys +ro.system.build.product = komodo +ro.system.build.flavor = komodo-user +ro.build.display.id = google/komodo/komodo:16/BP2A.250705.008/13578956:user/release-keys +ro.build.tags = release-keys +ro.build.description = komodo-user 16 BP2A.250705.008 13578956 release-keys +ro.vendor.build.id = BP2A.250705.008 +ro.vendor.build.tags = release-keys +ro.vendor.build.type = user +ro.odm.build.tags = release-keys +ro.boot.verifiedbootstate = green +ro.boot.flash.locked = 1 +ro.kernel.qemu = 0 +ro.secure = 1 +ro.adb.secure = 1 +ro.debuggable = 0 +ro.build.selinux = 1 +ro.secureboot.enable = 1 +ro.boot.selinux = enforcing +persist.sys.usb.config = none +persist.service.adb.enable = 0 +settings.secure.android_id = 5adea3426167354a +settings.secure.gsf_id = 127237629 +persist.graphics.vulkan.disable = false +persist.vulkan.enabled = 1 +ro.product.cpu.abilist = x86_64,x86,arm64-v8a,armeabi-v7a,armeabi +ro.product.cpu.abilist32 = x86,armeabi-v7a,armeabi +ro.product.cpu.abilist64 = x86_64,arm64-v8a +ro.dalvik.vm.native.bridge = libhoudini.so +ro.enable.native.bridge.exec = 1 +ro.dalvik.vm.isa.arm = x86 +ro.dalvik.vm.isa.arm64 = x86_64 + diff --git a/hosts/xp/iso_checksums.txt b/files/windows/iso_checksums.txt index dbb32b6..dbb32b6 100644 --- a/hosts/xp/iso_checksums.txt +++ b/files/windows/iso_checksums.txt diff --git a/hosts/xp/products.sha b/files/windows/products.sha index fce430a..2c93019 100644 --- a/hosts/xp/products.sha +++ b/files/windows/products.sha @@ -227,3 +227,6 @@ f54ea53d96e4b2558be56931a3f339649bf973c8 *en_windows_vista_media_center_software # Windows Vista Media Center Software Development Kit (SDK) Refresh [8404] d6486e9b3e8bc9be3858e78287befba1605b603e *en_windows_vista_media_center_sdk_refresh_dvd_x13-77439.iso +# Windows 11 IoT Enterprise LTSC 2024 [8870] +f8f068cdc90c894a55d8c8530db7c193234ba57bb11d33b71383839ac41246b4 *en-us_windows_11_iot_enterprise_ltsc_2024_arm64_dvd_ec517836.iso +4f59662a96fc1da48c1b415d6c369d08af55ddd64e8f1c84e0166d9e50405d7a *en-us_windows_11_iot_enterprise_ltsc_2024_x64_dvd_f6b14814.iso diff --git a/hosts/HOSTS.txt b/hosts/HOSTS.txt new file mode 100644 index 0000000..088b7eb --- /dev/null +++ b/hosts/HOSTS.txt @@ -0,0 +1,11 @@ +== Hosts +iroha + soy + corpa + xp +moyo + station <-> rod ^ + the-p +palm + +// vim: set syntax=asciidoc: diff --git a/hosts/corpa/windows_dev_setup.txt b/hosts/corpa/windows_dev_setup.txt index bdf0ef6..02424ff 100644 --- a/hosts/corpa/windows_dev_setup.txt +++ b/hosts/corpa/windows_dev_setup.txt @@ -1,4 +1,5 @@ Windows 10 LTSC IoT + - https://rentry.co/LTSC#install-windows Visual Studio Community Msys2 DirectX June 2010 @@ -12,3 +13,6 @@ Computer Configuration > Administrative Templates > Windows Components > Microso https://superuser.com/a/1256574 User Configuration > Administrative Templates > Windows Components > Attachment Manager - Inclusion list for moderate risk file types = "*.exe;" + +https://www.technipages.com/fix-we-cant-verify-who-created-this-file-error/ +Internet Options -> Sites -> Advanced -> Add samba share like "S:" -> Close -> Ok -> Ok diff --git a/hosts/denpa/git/git-config b/hosts/denpa/git/git-config deleted file mode 100644 index 00eb9e3..0000000 --- a/hosts/denpa/git/git-config +++ /dev/null @@ -1,3 +0,0 @@ -[init] - defaultBranch = master - templatedir = /mnt/git//.git-template diff --git a/hosts/denpa/scripts/mail-stats b/hosts/denpa/scripts/mail-stats deleted file mode 100755 index 4f703a1..0000000 --- a/hosts/denpa/scripts/mail-stats +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -sudo journalctl --no-tail _SYSTEMD_UNIT=postfix@-.service | sudo pflogsumm diff --git a/hosts/iroha/conf.d/dmcrypt b/hosts/iroha/conf.d/dmcrypt new file mode 100644 index 0000000..3a9e219 --- /dev/null +++ b/hosts/iroha/conf.d/dmcrypt @@ -0,0 +1,67 @@ +# /etc/conf.d/dmcrypt + +# For people who run dmcrypt on top of some other layer (like raid), +# use rc_need to specify that requirement. See the runscript(8) man +# page for more information. + +#-------------------- +# Instructions +#-------------------- + +# Note regarding the syntax of this file. This file is *almost* bash, +# but each line is evaluated separately. Separate swaps/targets can be +# specified. The init-script which reads this file assumes that a +# swap= or target= line starts a new section, similar to lilo or grub +# configuration. + +# Note when using gpg keys and /usr on a separate partition, you will +# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly +# and ensure that gpg has been compiled statically. +# See http://bugs.gentoo.org/90482 for more information. + +# Note that the init-script which reads this file detects whether your +# partition is LUKS or not. No mkfs is run unless you specify a makefs +# option. + +# Global options: +#---------------- + +# How long to wait for each timeout (in seconds). +dmcrypt_key_timeout=1 + +# Max number of checks to perform (see dmcrypt_key_timeout). +#dmcrypt_max_timeout=300 + +# Number of password retries. +dmcrypt_retries=10 + +# Arguments: +#----------- +# target=<name> == Mapping name for partition. +# swap=<name> == Mapping name for swap partition. +# source='<dev>' == Real device for partition. +# Note: You can (and should) specify a tag like UUID +# for blkid (see -t option). This is safer than using +# the full path to the device. +# key='</path/to/keyfile>[:<mode>]' == Fullpath from / or from inside removable media. +# header='</path/to/header>' == Full path to detached LUKS header file. +# remdev='<dev>' == Device that will be assigned to removable media. +# gpg_options='<opts>' == Default are --quiet --decrypt +# options='<opts>' == cryptsetup, for LUKS you can only use --readonly +# loop_file='<file>' == Loopback file. +# Note: If you omit $source, then a free loopback will +# be looked up automatically. +# pre_mount='cmds' == commands to execute before mounting partition. +# post_mount='cmds' == commands to execute after mounting partition. +# wait=5 == wait given amount of seconds for source or +# detached header file appear. +#----------- +# Supported Modes +# gpg == decrypt and pipe key into cryptsetup. +# Note: new-line character must not be part of key. +# Command to erase \n char: 'cat key | tr -d '\n' > cleanKey' + +target=home +source=UUID="8eec4eb8-b4f5-4ee4-8979-2bb83be3201e" + +# The file must be terminated by a newline. Or leave this comment last. diff --git a/hosts/iroha/conf.d/hostname b/hosts/iroha/conf.d/hostname new file mode 100644 index 0000000..9c59e78 --- /dev/null +++ b/hosts/iroha/conf.d/hostname @@ -0,0 +1,2 @@ +# Hostname fallback if /etc/hostname does not exist +hostname="iroha" diff --git a/hosts/iroha/do_stow.sh b/hosts/iroha/do_stow.sh new file mode 100755 index 0000000..d5152e6 --- /dev/null +++ b/hosts/iroha/do_stow.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env sh + +mkdir -p $HOME/.vim/pack/downloads/opt + +cd stow +stow -vRt $HOME/ . 2> ../stow.txt +cd ../ diff --git a/hosts/iroha/fstab b/hosts/iroha/fstab index 3a5a64e..5a196b3 100644 --- a/hosts/iroha/fstab +++ b/hosts/iroha/fstab @@ -1,10 +1,26 @@ -/dev/iroha-vg0/root / ext4 noatime 0 1 -UUID="0170-0D7B" /boot vfat defaults,noatime 0 2 -/dev/iroha-vg0/swap none swap sw 0 0 +# /etc/fstab: static file system information. +# +# See the manpage fstab(5) for more information. +# +# NOTE: The root filesystem should have a pass number of either 0 or 1. +# All other filesystems should have a pass number of 0 or greater than 1. +# +# NOTE: Even though we list ext4 as the type here, it will work with ext2/ext3 +# filesystems. This just tells the kernel to use the ext4 driver. +# +# NOTE: You can use full paths to devices like /dev/sda3, but it is often +# more reliable to use filesystem labels or UUIDs. See your filesystem +# documentation for details on setting a label. To obtain the UUID, use +# the blkid(8) command. -UUID="e339ba64-d4ee-44e1-856a-80812fd72960" /mnt/hdd ext4 noatime 0 2 -UUID="88a11ddb-a1ef-4953-bc27-39e358e4c1c4" /mnt/ssd ext4 noatime 0 2 +# <fs> <mountpoint> <type> <opts> <dump> <pass> -tmpfs /var/tmp/portage tmpfs size=16G,uid=portage,gid=portage,mode=775 0 0 +UUID="2FCB-DCF5" /efi vfat umask=0077,tz=UTC 0 2 +/dev/iroha-vg0/swap none swap sw 0 0 +/dev/iroha-vg0/root / ext4 defaults,noatime 0 1 +/dev/mapper/home /home/andrew ext4 defaults,noatime 0 2 + +UUID="88a11ddb-a1ef-4953-bc27-39e358e4c1c4" /mnt/ssd ext4 defaults,noatime 0 2 +UUID="e339ba64-d4ee-44e1-856a-80812fd72960" /mnt/hdd ext4 defaults,noatime 0 2 -#hugetlbfs /hugepages hugetlbfs mode=1770,gid=78 0 0 +tmpfs /var/tmp/portage tmpfs size=16G,uid=portage,gid=portage,mode=775 0 0 diff --git a/hosts/iroha/gentoo/env/eix-extra-econf.conf b/hosts/iroha/gentoo/env/eix-extra-econf.conf deleted file mode 100644 index ffd867b..0000000 --- a/hosts/iroha/gentoo/env/eix-extra-econf.conf +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_ECONF="--enable-security ---enable-new-dialect ---enable-strong-optimization" diff --git a/hosts/iroha/gentoo/env/gcc.conf b/hosts/iroha/gentoo/env/gcc.conf deleted file mode 100644 index 1c90660..0000000 --- a/hosts/iroha/gentoo/env/gcc.conf +++ /dev/null @@ -1,3 +0,0 @@ -COMMON_FLAGS="-march=native -mtune=native -O2 -fomit-frame-pointer -flto=auto -pipe" -CFLAGS="${COMMON_FLAGS}" -CXXFLAGS="${COMMON_FLAGS}" diff --git a/hosts/iroha/gentoo/env/nolto.conf b/hosts/iroha/gentoo/env/nolto.conf new file mode 100644 index 0000000..75ce5d4 --- /dev/null +++ b/hosts/iroha/gentoo/env/nolto.conf @@ -0,0 +1,6 @@ +DISABLE_LTO="-Wno-error=odr -Wno-error=lto-type-mismatch -Wno-error=strict-aliasing -fno-lto" +CFLAGS="${CFLAGS} ${DISABLE_LTO}" +CXXFLAGS="${CXXFLAGS} ${DISABLE_LTO}" +FCFLAGS="${FCFLAGS} ${DISABLE_LTO}" +FFLAGS="${FFLAGS} ${DISABLE_LTO}" +LDFLAGS="${LDFLAGS} ${DISABLE_LTO}" diff --git a/hosts/iroha/gentoo/make.conf b/hosts/iroha/gentoo/make.conf index f83b6b4..0fa679c 100644 --- a/hosts/iroha/gentoo/make.conf +++ b/hosts/iroha/gentoo/make.conf @@ -1,39 +1,44 @@ WARNING_FLAGS="-Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing" -COMMON_FLAGS="-O2 -pipe -march=znver2 -mtune=znver2 -fno-semantic-interposition -flto ${WARNING_FLAGS}" +COMMON_FLAGS="-O2 -pipe -march=znver2 -mtune=znver2 -fno-semantic-interposition -fomit-frame-pointer -fno-stack-protector -flto ${WARNING_FLAGS}" CFLAGS="${COMMON_FLAGS}" CXXFLAGS="${COMMON_FLAGS}" FCFLAGS="${COMMON_FLAGS}" FFLAGS="${COMMON_FLAGS}" +# https://wiki.gentoo.org/wiki/LTO +LDFLAGS="${COMMON_FLAGS} ${LDFLAGS} ${WARNING_FLAGS}" CGO_CFLAGS="${COMMON_FLAGS}" CGO_CXXFLAGS="${COMMON_FLAGS}" CGO_FFLAGS="${COMMON_FLAGS}" CGO_LDFLAGS="${LDFLAGS}" -RUSTFLAGS="-C opt-level=2 -C target-cpu=znver2" +RUSTFLAGS="${RUSTFLAGS} -C target-cpu=znver2" -MAKEOPTS="-j18" +MAKEOPTS="-j20 -l24" EMERGE_DEFAULT_OPTS="--jobs 3" -RUBY_TARGETS="ruby32" +RUBY_TARGETS="ruby33" PERL_FEATURES="" LUA_SINGLE_TARGET="lua5-4" LUA_TARGETS="lua5-4" -KERNEL="linux" - ACCEPT_KEYWORDS="amd64" -ACCEPT_LICENSE="-* @FREE @BINARY-REDISTRIBUTABLE MS-TOU" +ACCEPT_LICENSE="-* @FREE" -USE="lto pgo orc native-extensions dbus udev policykit acl -systemd -consolekit -X -wayland -gtk -gnome -kde -qt5 -qt6 -alsa -jack -pulseaudio -bluetooth -introspection -nls -numa -selinux -caps -filecaps -sysprof -pie -pic -unwind -ssp -hardened -sanitize -debug -cpudetection" +USE="modules-compress lto pgo policykit elogind man -X \ + -numa -selinux -sysprof -pie -pic -unwind -ssp -cet -hardened -sanitize -debug \ + -consolekit -systemd -introspection -vala -handbook -kerberos" GRUB_PLATFORMS="efi-64" -VIDEO_CARDS="radeonsi amdgpu intel virgl" -INPUT_DEVICES="keyboard" +INPUT_DEVICES="keyboard mouse" + +L10N="en en-US" +LC_MESSAGES="C.utf8" -L10N="en" -LC_MESSAGES=C.utf8 +GENTOO_MIRRORS="rsync://rsync.gtlib.gatech.edu/gentoo \ + rsync://mirrors.mit.edu/gentoo-distfiles/ \ + https://gentoo.osuosl.org/" diff --git a/hosts/iroha/gentoo/package.accept_keywords/bpftool b/hosts/iroha/gentoo/package.accept_keywords/bpftool deleted file mode 100644 index 57c1aa6..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/bpftool +++ /dev/null @@ -1 +0,0 @@ -dev-util/bpftool ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/cachyos-sources b/hosts/iroha/gentoo/package.accept_keywords/cachyos-sources deleted file mode 100644 index 8bab576..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/cachyos-sources +++ /dev/null @@ -1 +0,0 @@ -sys-kernel/cachyos-sources ** diff --git a/hosts/iroha/gentoo/package.accept_keywords/cowsql b/hosts/iroha/gentoo/package.accept_keywords/cowsql deleted file mode 100644 index 744c16e..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/cowsql +++ /dev/null @@ -1 +0,0 @@ -dev-libs/cowsql ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/foot-terminfo b/hosts/iroha/gentoo/package.accept_keywords/foot-terminfo deleted file mode 100644 index c42d2a9..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/foot-terminfo +++ /dev/null @@ -1 +0,0 @@ -gui-apps/foot-terminfo ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/gamescope b/hosts/iroha/gentoo/package.accept_keywords/gamescope new file mode 100644 index 0000000..f47c27a --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/gamescope @@ -0,0 +1 @@ +gui-wm/gamescope ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/gcc b/hosts/iroha/gentoo/package.accept_keywords/gcc deleted file mode 100644 index 87f3409..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/gcc +++ /dev/null @@ -1 +0,0 @@ -sys-devel/gcc ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/gentoo-sources b/hosts/iroha/gentoo/package.accept_keywords/gentoo-sources deleted file mode 100644 index 9932ebe..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/gentoo-sources +++ /dev/null @@ -1 +0,0 @@ -sys-kernel/gentoo-sources ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/gentoolkit b/hosts/iroha/gentoo/package.accept_keywords/gentoolkit deleted file mode 100644 index 57341a6..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/gentoolkit +++ /dev/null @@ -1 +0,0 @@ -app-portage/gentoolkit python_targets_python3_12 diff --git a/hosts/iroha/gentoo/package.accept_keywords/git-sources b/hosts/iroha/gentoo/package.accept_keywords/git-sources deleted file mode 100644 index 91ebb1b..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/git-sources +++ /dev/null @@ -1 +0,0 @@ -sys-kernel/git-sources ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/igt-gpu-tools b/hosts/iroha/gentoo/package.accept_keywords/igt-gpu-tools deleted file mode 100644 index 1cf79a0..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/igt-gpu-tools +++ /dev/null @@ -1 +0,0 @@ -x11-apps/igt-gpu-tools ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/incus b/hosts/iroha/gentoo/package.accept_keywords/incus deleted file mode 100644 index 5fae8e1..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/incus +++ /dev/null @@ -1 +0,0 @@ -app-containers/incus ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/libbpf b/hosts/iroha/gentoo/package.accept_keywords/libbpf deleted file mode 100644 index ceebff3..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/libbpf +++ /dev/null @@ -1 +0,0 @@ -dev-libs/libbpf ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/libhugetlbfs b/hosts/iroha/gentoo/package.accept_keywords/libhugetlbfs deleted file mode 100644 index 479c176..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/libhugetlbfs +++ /dev/null @@ -1 +0,0 @@ -sys-libs/libhugetlbfs ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/libvirt b/hosts/iroha/gentoo/package.accept_keywords/libvirt deleted file mode 100644 index 72756ed..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/libvirt +++ /dev/null @@ -1,2 +0,0 @@ -app-emulation/libvirt ~amd64 -dev-python/libvirt-python ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/lutris b/hosts/iroha/gentoo/package.accept_keywords/lutris new file mode 100644 index 0000000..e1a74f0 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/lutris @@ -0,0 +1,3 @@ +games-util/lutris ~amd64 +dev-python/pypresence ~amd64 +dev-python/moddb ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/mangohud b/hosts/iroha/gentoo/package.accept_keywords/mangohud new file mode 100644 index 0000000..be7927c --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/mangohud @@ -0,0 +1,3 @@ +games-util/mangohud ~amd64 +media-libs/imgui ~amd64 +media-libs/implot ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/megatools b/hosts/iroha/gentoo/package.accept_keywords/megatools index 9b81e46..9b81e46 100644 --- a/hosts/moyo/gentoo/package.accept_keywords/megatools +++ b/hosts/iroha/gentoo/package.accept_keywords/megatools diff --git a/hosts/iroha/gentoo/package.accept_keywords/mesa b/hosts/iroha/gentoo/package.accept_keywords/mesa new file mode 100644 index 0000000..400baaf --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/mesa @@ -0,0 +1 @@ +media-libs/mesa ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/nix-guix b/hosts/iroha/gentoo/package.accept_keywords/nix-guix new file mode 100644 index 0000000..64685ad --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/nix-guix @@ -0,0 +1,4 @@ +*/*::nix-guix +dev-libs/editline ~amd64 +dev-libs/libcpuid ~amd64 +dev-cpp/toml11 ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/obs-studio b/hosts/iroha/gentoo/package.accept_keywords/obs-studio new file mode 100644 index 0000000..1d64898 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/obs-studio @@ -0,0 +1 @@ +media-video/obs-studio ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/openrgb b/hosts/iroha/gentoo/package.accept_keywords/openrgb deleted file mode 100644 index 78978ff..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/openrgb +++ /dev/null @@ -1 +0,0 @@ -app-misc/openrgb ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/osu-lazer b/hosts/iroha/gentoo/package.accept_keywords/osu-lazer new file mode 100644 index 0000000..ba18a23 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/osu-lazer @@ -0,0 +1 @@ +games-arcade/osu-lazer ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/qemu b/hosts/iroha/gentoo/package.accept_keywords/qemu deleted file mode 100644 index 0d5a3eb..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/qemu +++ /dev/null @@ -1 +0,0 @@ -app-emulation/qemu ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/qpwgraph b/hosts/iroha/gentoo/package.accept_keywords/qpwgraph new file mode 100644 index 0000000..f7a171f --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/qpwgraph @@ -0,0 +1 @@ +media-sound/qpwgraph ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/raft b/hosts/iroha/gentoo/package.accept_keywords/raft deleted file mode 100644 index 88ddd9c..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/raft +++ /dev/null @@ -1 +0,0 @@ -dev-libs/raft ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/rpcs3 b/hosts/iroha/gentoo/package.accept_keywords/rpcs3 new file mode 100644 index 0000000..c35c56c --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/rpcs3 @@ -0,0 +1 @@ +games-emulation/rpcs3 ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/ryujinx b/hosts/iroha/gentoo/package.accept_keywords/ryujinx new file mode 100644 index 0000000..4121201 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/ryujinx @@ -0,0 +1 @@ +games-emulation/ryujinx ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/samba b/hosts/iroha/gentoo/package.accept_keywords/samba deleted file mode 100644 index 90d7b6d..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/samba +++ /dev/null @@ -1 +0,0 @@ -net-fs/samba ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/screen b/hosts/iroha/gentoo/package.accept_keywords/screen new file mode 100644 index 0000000..9801170 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/screen @@ -0,0 +1 @@ +app-misc/screen ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/scx b/hosts/iroha/gentoo/package.accept_keywords/scx deleted file mode 100644 index 39c9bc4..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/scx +++ /dev/null @@ -1 +0,0 @@ -sys-kernel/scx ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/seabios-bin b/hosts/iroha/gentoo/package.accept_keywords/seabios-bin deleted file mode 100644 index 02519e6..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/seabios-bin +++ /dev/null @@ -1 +0,0 @@ -sys-firmware/seabios-bin ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/shotcut b/hosts/iroha/gentoo/package.accept_keywords/shotcut new file mode 100644 index 0000000..e383b00 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/shotcut @@ -0,0 +1 @@ +media-video/shotcut ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/steam b/hosts/iroha/gentoo/package.accept_keywords/steam new file mode 100644 index 0000000..6f77faa --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/steam @@ -0,0 +1,3 @@ +*/*::steam-overlay +games-util/game-device-udev-rules +sys-libs/libudev-compat diff --git a/hosts/iroha/gentoo/package.accept_keywords/sway b/hosts/iroha/gentoo/package.accept_keywords/sway new file mode 100644 index 0000000..75868de --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/sway @@ -0,0 +1 @@ +gui-wm/sway ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/talloc b/hosts/iroha/gentoo/package.accept_keywords/talloc deleted file mode 100644 index f08e38b..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/talloc +++ /dev/null @@ -1 +0,0 @@ -sys-libs/talloc ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/tdb b/hosts/iroha/gentoo/package.accept_keywords/tdb deleted file mode 100644 index 4b53952..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/tdb +++ /dev/null @@ -1 +0,0 @@ -sys-libs/tdb ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/tevent b/hosts/iroha/gentoo/package.accept_keywords/tevent deleted file mode 100644 index 924bdcc..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/tevent +++ /dev/null @@ -1 +0,0 @@ -sys-libs/tevent ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/ufetch b/hosts/iroha/gentoo/package.accept_keywords/ufetch new file mode 100644 index 0000000..1bcb76d --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/ufetch @@ -0,0 +1 @@ +app-misc/ufetch ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/umu-launcher b/hosts/iroha/gentoo/package.accept_keywords/umu-launcher new file mode 100644 index 0000000..15c7631 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/umu-launcher @@ -0,0 +1 @@ +games-util/umu-launcher ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/vim b/hosts/iroha/gentoo/package.accept_keywords/vim new file mode 100644 index 0000000..ee0bab1 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/vim @@ -0,0 +1,2 @@ +app-editors/vim ** ~amd64 +app-editors/vim-core ** ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/virtiofsd b/hosts/iroha/gentoo/package.accept_keywords/virtiofsd deleted file mode 100644 index f7504db..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/virtiofsd +++ /dev/null @@ -1 +0,0 @@ -app-emulation/virtiofsd ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/vkroots b/hosts/iroha/gentoo/package.accept_keywords/vkroots new file mode 100644 index 0000000..f7194bc --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/vkroots @@ -0,0 +1 @@ +media-libs/vkroots ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/waydroid b/hosts/iroha/gentoo/package.accept_keywords/waydroid new file mode 100644 index 0000000..9a51183 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/waydroid @@ -0,0 +1,5 @@ +app-containers/waydroid ~amd64 +dev-python/pyclip ~amd64 +dev-python/gbinder ~amd64 +dev-libs/libglibutil ~amd64 +dev-libs/gbinder ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/wf-recorder b/hosts/iroha/gentoo/package.accept_keywords/wf-recorder new file mode 100644 index 0000000..31a9a54 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/wf-recorder @@ -0,0 +1 @@ +gui-apps/wf-recorder ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/wlrobs b/hosts/iroha/gentoo/package.accept_keywords/wlrobs new file mode 100644 index 0000000..872bbc3 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/wlrobs @@ -0,0 +1 @@ +media-video/wlrobs ** ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/wlsunset b/hosts/iroha/gentoo/package.accept_keywords/wlsunset new file mode 100644 index 0000000..88bbc99 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/wlsunset @@ -0,0 +1 @@ +gui-apps/wlsunset ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/wolfssl b/hosts/iroha/gentoo/package.accept_keywords/wolfssl new file mode 100644 index 0000000..d3ea8d3 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/wolfssl @@ -0,0 +1 @@ +dev-libs/wolfssl ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/xboxdrv b/hosts/iroha/gentoo/package.accept_keywords/xboxdrv deleted file mode 100644 index b33641f..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/xboxdrv +++ /dev/null @@ -1 +0,0 @@ -games-util/xboxdrv ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/xpad-noone b/hosts/iroha/gentoo/package.accept_keywords/xpad-noone deleted file mode 100644 index 72b7893..0000000 --- a/hosts/iroha/gentoo/package.accept_keywords/xpad-noone +++ /dev/null @@ -1 +0,0 @@ -games-util/xpad-noone ~amd64 diff --git a/hosts/iroha/gentoo/package.env/eix b/hosts/iroha/gentoo/package.env/eix deleted file mode 100644 index 6b1be34..0000000 --- a/hosts/iroha/gentoo/package.env/eix +++ /dev/null @@ -1 +0,0 @@ -app-portage/eix eix-extra-econf.conf diff --git a/hosts/iroha/gentoo/package.env/gcc b/hosts/iroha/gentoo/package.env/gcc deleted file mode 100644 index 06fdded..0000000 --- a/hosts/iroha/gentoo/package.env/gcc +++ /dev/null @@ -1 +0,0 @@ -sys-devel/gcc gcc.conf diff --git a/hosts/iroha/gentoo/package.env/libvirt-python b/hosts/iroha/gentoo/package.env/libvirt-python deleted file mode 100644 index 967a860..0000000 --- a/hosts/iroha/gentoo/package.env/libvirt-python +++ /dev/null @@ -1 +0,0 @@ -dev-python/libvirt-python single-thread.conf diff --git a/hosts/iroha/gentoo/package.env/mlt b/hosts/iroha/gentoo/package.env/mlt new file mode 100644 index 0000000..cbba588 --- /dev/null +++ b/hosts/iroha/gentoo/package.env/mlt @@ -0,0 +1 @@ +media-libs/mlt nolto.conf diff --git a/hosts/iroha/gentoo/package.env/rust b/hosts/iroha/gentoo/package.env/rust deleted file mode 100644 index 018d177..0000000 --- a/hosts/iroha/gentoo/package.env/rust +++ /dev/null @@ -1 +0,0 @@ -dev-lang/rust notmpfs.conf diff --git a/hosts/iroha/gentoo/package.license/7zip b/hosts/iroha/gentoo/package.license/7zip new file mode 100644 index 0000000..7e770e1 --- /dev/null +++ b/hosts/iroha/gentoo/package.license/7zip @@ -0,0 +1 @@ +app-arch/7zip unRAR diff --git a/hosts/iroha/gentoo/package.license/kernel b/hosts/iroha/gentoo/package.license/kernel new file mode 100644 index 0000000..348558e --- /dev/null +++ b/hosts/iroha/gentoo/package.license/kernel @@ -0,0 +1 @@ +sys-kernel/linux-firmware linux-fw-redistributable diff --git a/hosts/iroha/gentoo/package.license/osu-lazer b/hosts/iroha/gentoo/package.license/osu-lazer new file mode 100644 index 0000000..351d203 --- /dev/null +++ b/hosts/iroha/gentoo/package.license/osu-lazer @@ -0,0 +1 @@ +games-arcade/osu-lazer all-rights-reserved diff --git a/hosts/iroha/gentoo/package.license/steam b/hosts/iroha/gentoo/package.license/steam new file mode 100644 index 0000000..1e1fb7e --- /dev/null +++ b/hosts/iroha/gentoo/package.license/steam @@ -0,0 +1 @@ +games-util/steam-launcher ValveSteamLicense diff --git a/hosts/iroha/gentoo/package.license/unrar b/hosts/iroha/gentoo/package.license/unrar new file mode 100644 index 0000000..11808d6 --- /dev/null +++ b/hosts/iroha/gentoo/package.license/unrar @@ -0,0 +1 @@ +app-arch/unrar unRAR diff --git a/hosts/iroha/gentoo/package.license/xone b/hosts/iroha/gentoo/package.license/xone new file mode 100644 index 0000000..73ce083 --- /dev/null +++ b/hosts/iroha/gentoo/package.license/xone @@ -0,0 +1 @@ +games-util/xone MS-TOU diff --git a/hosts/iroha/gentoo/package.mask/chromium b/hosts/iroha/gentoo/package.mask/chromium new file mode 100644 index 0000000..e282af3 --- /dev/null +++ b/hosts/iroha/gentoo/package.mask/chromium @@ -0,0 +1 @@ +>www-client/chromium-140.0.7339.207 diff --git a/hosts/iroha/gentoo/package.mask/gcc b/hosts/iroha/gentoo/package.mask/gcc deleted file mode 100644 index 9246290..0000000 --- a/hosts/iroha/gentoo/package.mask/gcc +++ /dev/null @@ -1 +0,0 @@ -=sys-devel/gcc-14.1.1_p20240720 diff --git a/hosts/iroha/gentoo/package.mask/python b/hosts/iroha/gentoo/package.mask/python index 20d7841..af9ebaf 100644 --- a/hosts/iroha/gentoo/package.mask/python +++ b/hosts/iroha/gentoo/package.mask/python @@ -1 +1 @@ ->=dev-lang/python-3.13 +>=dev-lang/python-3.14.0 diff --git a/hosts/iroha/gentoo/package.mask/xone b/hosts/iroha/gentoo/package.mask/xone deleted file mode 100644 index 783daaa..0000000 --- a/hosts/iroha/gentoo/package.mask/xone +++ /dev/null @@ -1 +0,0 @@ -=games-util/xone-0.3_p20240425 diff --git a/hosts/iroha/gentoo/package.unmask/mesa b/hosts/iroha/gentoo/package.unmask/mesa new file mode 100644 index 0000000..3a9fb3f --- /dev/null +++ b/hosts/iroha/gentoo/package.unmask/mesa @@ -0,0 +1 @@ +=media-libs/mesa-25.2.5 diff --git a/hosts/iroha/gentoo/package.unmask/screen b/hosts/iroha/gentoo/package.unmask/screen new file mode 100644 index 0000000..0501830 --- /dev/null +++ b/hosts/iroha/gentoo/package.unmask/screen @@ -0,0 +1 @@ +=app-misc/screen-5.0.1 diff --git a/hosts/iroha/gentoo/package.use/00cpu-flags b/hosts/iroha/gentoo/package.use/00cpu-flags index 102a85d..ea302d2 100644 --- a/hosts/iroha/gentoo/package.use/00cpu-flags +++ b/hosts/iroha/gentoo/package.use/00cpu-flags @@ -1 +1 @@ -*/* CPU_FLAGS_X86: aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3 +*/* CPU_FLAGS_X86: aes avx avx2 bmi1 bmi2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3 diff --git a/hosts/iroha/gentoo/package.use/00video-cards b/hosts/iroha/gentoo/package.use/00video-cards new file mode 100644 index 0000000..320548a --- /dev/null +++ b/hosts/iroha/gentoo/package.use/00video-cards @@ -0,0 +1 @@ +*/* VIDEO_CARDS: -* amdgpu radeonsi radeon diff --git a/hosts/iroha/gentoo/package.use/7zip b/hosts/iroha/gentoo/package.use/7zip new file mode 100644 index 0000000..8bda43d --- /dev/null +++ b/hosts/iroha/gentoo/package.use/7zip @@ -0,0 +1 @@ +app-arch/7zip rar diff --git a/hosts/iroha/gentoo/package.use/Alien-Build b/hosts/iroha/gentoo/package.use/Alien-Build new file mode 100644 index 0000000..5f4675c --- /dev/null +++ b/hosts/iroha/gentoo/package.use/Alien-Build @@ -0,0 +1 @@ +dev-perl/Alien-Build minimal diff --git a/hosts/iroha/gentoo/package.use/Path-Tiny b/hosts/iroha/gentoo/package.use/Path-Tiny new file mode 100644 index 0000000..3901a7b --- /dev/null +++ b/hosts/iroha/gentoo/package.use/Path-Tiny @@ -0,0 +1 @@ +dev-perl/Path-Tiny minimal diff --git a/hosts/iroha/gentoo/package.use/XML-LibXML b/hosts/iroha/gentoo/package.use/XML-LibXML new file mode 100644 index 0000000..cf021e1 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/XML-LibXML @@ -0,0 +1 @@ +dev-perl/XML-LibXML minimal diff --git a/hosts/iroha/gentoo/package.use/ardour b/hosts/iroha/gentoo/package.use/ardour new file mode 100644 index 0000000..8a493a4 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/ardour @@ -0,0 +1 @@ +media-sound/ardour jack diff --git a/hosts/iroha/gentoo/package.use/audacity b/hosts/iroha/gentoo/package.use/audacity new file mode 100644 index 0000000..3a01bf6 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/audacity @@ -0,0 +1,5 @@ +media-sound/audacity alsa +media-libs/portaudio alsa +media-libs/flac cxx +x11-libs/wxGTK X +x11-libs/gtk+ X diff --git a/hosts/iroha/gentoo/package.use/bemenu b/hosts/iroha/gentoo/package.use/bemenu new file mode 100644 index 0000000..dc6da75 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/bemenu @@ -0,0 +1 @@ +dev-libs/bemenu wayland -ncurses diff --git a/hosts/iroha/gentoo/package.use/binutils b/hosts/iroha/gentoo/package.use/binutils deleted file mode 100644 index 3dbc67d..0000000 --- a/hosts/iroha/gentoo/package.use/binutils +++ /dev/null @@ -1 +0,0 @@ -sys-devel/binutils pgo -cet diff --git a/hosts/iroha/gentoo/package.use/binutils-libs b/hosts/iroha/gentoo/package.use/binutils-libs deleted file mode 100644 index d2d9d0d..0000000 --- a/hosts/iroha/gentoo/package.use/binutils-libs +++ /dev/null @@ -1 +0,0 @@ -sys-libs/binutils-libs -cet diff --git a/hosts/iroha/gentoo/package.use/blender b/hosts/iroha/gentoo/package.use/blender new file mode 100644 index 0000000..f42e33c --- /dev/null +++ b/hosts/iroha/gentoo/package.use/blender @@ -0,0 +1,3 @@ +media-gfx/blender wayland -bullet -color-management -cycles -cycles-bin-kernels -embree -ffmpeg -fftw -fluid -gmp -nanovdb -oidn -openpgl -opensubdiv -openvdb -pdf -potrace -pugixml -sndfile -tiff -truetype -webp +media-libs/freetype brotli +app-arch/brotli abi_x86_32 diff --git a/hosts/iroha/gentoo/package.use/cachyos-sources b/hosts/iroha/gentoo/package.use/cachyos-sources index df4a6a9..090a73b 100644 --- a/hosts/iroha/gentoo/package.use/cachyos-sources +++ b/hosts/iroha/gentoo/package.use/cachyos-sources @@ -1 +1 @@ -sys-kernel/cachyos-sources -auto-cpu-optimization mnative_amd experimental +sys-kernel/cachyos-sources mnative_amd experimental -auto-cpu-optimization diff --git a/hosts/iroha/gentoo/package.use/chromium b/hosts/iroha/gentoo/package.use/chromium new file mode 100644 index 0000000..c950c10 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/chromium @@ -0,0 +1,6 @@ +www-client/chromium pulseaudio -hangouts -official -proprietary-codecs -rar -widevine -system-png +dev-libs/libxml2 icu +media-libs/harfbuzz icu +media-libs/libva wayland +net-libs/nodejs inspector +dev-libs/icu abi_x86_32 diff --git a/hosts/iroha/gentoo/package.use/chrony b/hosts/iroha/gentoo/package.use/chrony new file mode 100644 index 0000000..826c085 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/chrony @@ -0,0 +1 @@ +net-misc/chrony samba diff --git a/hosts/iroha/gentoo/package.use/clang b/hosts/iroha/gentoo/package.use/clang new file mode 100644 index 0000000..10ffc6e --- /dev/null +++ b/hosts/iroha/gentoo/package.use/clang @@ -0,0 +1 @@ +llvm-core/clang -extra -static-analyzer diff --git a/hosts/iroha/gentoo/package.use/compiler-rt-sanitizers b/hosts/iroha/gentoo/package.use/compiler-rt-sanitizers index 537ebf4..7a0b680 100644 --- a/hosts/iroha/gentoo/package.use/compiler-rt-sanitizers +++ b/hosts/iroha/gentoo/package.use/compiler-rt-sanitizers @@ -1 +1 @@ -sys-libs/compiler-rt-sanitizers -asan -cfi -dfsan -gwp-asan -hwasan -libfuzzer -lsan -memprof -msan -orc -safestack -scudo -tsan -ubsan -xray +llvm-runtimes/compiler-rt-sanitizers -asan -cfi -dfsan -gwp-asan -hwasan -libfuzzer -lsan -memprof -msan -nsan -orc -safestack -rtsan -scudo -tsan -ubsan -xray diff --git a/hosts/iroha/gentoo/package.use/cups b/hosts/iroha/gentoo/package.use/cups new file mode 100644 index 0000000..8471987 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/cups @@ -0,0 +1 @@ +net-print/cups -acl -pam diff --git a/hosts/iroha/gentoo/package.use/dbus b/hosts/iroha/gentoo/package.use/dbus index 8d9a77c..4e2bab7 100644 --- a/hosts/iroha/gentoo/package.use/dbus +++ b/hosts/iroha/gentoo/package.use/dbus @@ -1 +1 @@ -sys-apps/dbus user-session +sys-apps/dbus X user-session diff --git a/hosts/iroha/gentoo/package.use/doas b/hosts/iroha/gentoo/package.use/doas new file mode 100644 index 0000000..2d1cc48 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/doas @@ -0,0 +1 @@ +app-admin/doas persist diff --git a/hosts/iroha/gentoo/package.use/elfutils b/hosts/iroha/gentoo/package.use/elfutils new file mode 100644 index 0000000..1c494f6 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/elfutils @@ -0,0 +1 @@ +dev-libs/elfutils zstd diff --git a/hosts/iroha/gentoo/package.use/elogind b/hosts/iroha/gentoo/package.use/elogind deleted file mode 100644 index fe13a8b..0000000 --- a/hosts/iroha/gentoo/package.use/elogind +++ /dev/null @@ -1 +0,0 @@ -sys-auth/elogind cgroup-hybrid diff --git a/hosts/iroha/gentoo/package.use/ffmpeg b/hosts/iroha/gentoo/package.use/ffmpeg new file mode 100644 index 0000000..7719922 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/ffmpeg @@ -0,0 +1 @@ +media-video/ffmpeg openh264 vaapi vulkan x265 -fontconfig -gnutls -libass -truetype -xml diff --git a/hosts/iroha/gentoo/package.use/fftw b/hosts/iroha/gentoo/package.use/fftw new file mode 100644 index 0000000..0079b61 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/fftw @@ -0,0 +1 @@ +sci-libs/fftw threads diff --git a/hosts/iroha/gentoo/package.use/firefox b/hosts/iroha/gentoo/package.use/firefox new file mode 100644 index 0000000..7b24bc7 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/firefox @@ -0,0 +1,3 @@ +www-client/firefox wayland dbus pulseaudio hwaccel eme-free openh264 system-pipewire system-png -X -gmp-autoupdate -telemetry +media-libs/libvpx postproc +media-libs/libpng apng diff --git a/hosts/iroha/gentoo/package.use/flac b/hosts/iroha/gentoo/package.use/flac new file mode 100644 index 0000000..a2cd03c --- /dev/null +++ b/hosts/iroha/gentoo/package.use/flac @@ -0,0 +1 @@ +#media-libs/flac -cxx diff --git a/hosts/iroha/gentoo/package.use/freetype b/hosts/iroha/gentoo/package.use/freetype index 513c56b..1558dfc 100644 --- a/hosts/iroha/gentoo/package.use/freetype +++ b/hosts/iroha/gentoo/package.use/freetype @@ -1 +1 @@ -media-libs/freetype -adobe-cff -bzip2 -cleartype-hinting png +media-libs/freetype png harfbuzz diff --git a/hosts/iroha/gentoo/package.use/frei0r-plugins b/hosts/iroha/gentoo/package.use/frei0r-plugins new file mode 100644 index 0000000..5c9981d --- /dev/null +++ b/hosts/iroha/gentoo/package.use/frei0r-plugins @@ -0,0 +1 @@ +media-plugins/frei0r-plugins -facedetect -scale0tilt diff --git a/hosts/iroha/gentoo/package.use/fwupd b/hosts/iroha/gentoo/package.use/fwupd index 7c024df..11ecb01 100644 --- a/hosts/iroha/gentoo/package.use/fwupd +++ b/hosts/iroha/gentoo/package.use/fwupd @@ -1 +1,4 @@ -sys-apps/fwupd minimal +sys-apps/fwupd nvme amdgpu +x11-libs/pango introspection +dev-libs/glib introspection +media-libs/harfbuzz introspection diff --git a/hosts/iroha/gentoo/package.use/gamemode b/hosts/iroha/gentoo/package.use/gamemode deleted file mode 100644 index e9d4d2b..0000000 --- a/hosts/iroha/gentoo/package.use/gamemode +++ /dev/null @@ -1 +0,0 @@ -games-util/gamemode elogind diff --git a/hosts/iroha/gentoo/package.use/gamescope b/hosts/iroha/gentoo/package.use/gamescope new file mode 100644 index 0000000..52b33cf --- /dev/null +++ b/hosts/iroha/gentoo/package.use/gamescope @@ -0,0 +1,2 @@ +gui-wm/gamescope libei +media-libs/libsdl2 vulkan diff --git a/hosts/iroha/gentoo/package.use/gcc b/hosts/iroha/gentoo/package.use/gcc index f301a50..4a5f9cd 100644 --- a/hosts/iroha/gentoo/package.use/gcc +++ b/hosts/iroha/gentoo/package.use/gcc @@ -1 +1 @@ -sys-devel/gcc pgo jit graphite -fortran -ssp -default-stack-clash-protection -default-znow -cet +sys-devel/gcc jit graphite -fortran -default-stack-clash-protection -default-znow diff --git a/hosts/iroha/gentoo/package.use/gimp b/hosts/iroha/gentoo/package.use/gimp new file mode 100644 index 0000000..014a44a --- /dev/null +++ b/hosts/iroha/gentoo/package.use/gimp @@ -0,0 +1,6 @@ +media-gfx/gimp webp +x11-libs/cairo X +dev-cpp/cairomm X +app-text/poppler cairo +media-libs/gegl cairo +media-libs/gexiv2 -vala diff --git a/hosts/iroha/gentoo/package.use/git b/hosts/iroha/gentoo/package.use/git new file mode 100644 index 0000000..553f74b --- /dev/null +++ b/hosts/iroha/gentoo/package.use/git @@ -0,0 +1 @@ +dev-vcs/git -webdav -perl diff --git a/hosts/iroha/gentoo/package.use/glib-networking b/hosts/iroha/gentoo/package.use/glib-networking index 77e8850..cb94f6f 100644 --- a/hosts/iroha/gentoo/package.use/glib-networking +++ b/hosts/iroha/gentoo/package.use/glib-networking @@ -1 +1 @@ -net-libs/glib-networking -libproxy +net-libs/glib-networking -libproxy -gnome diff --git a/hosts/iroha/gentoo/package.use/glibc b/hosts/iroha/gentoo/package.use/glibc index c64f8b7..330344b 100644 --- a/hosts/iroha/gentoo/package.use/glibc +++ b/hosts/iroha/gentoo/package.use/glibc @@ -1 +1 @@ -sys-libs/glibc -multiarch -ssp -profile -cet +sys-libs/glibc hash-sysv-compat -multiarch -profile diff --git a/hosts/iroha/gentoo/package.use/glog b/hosts/iroha/gentoo/package.use/glog new file mode 100644 index 0000000..c19269e --- /dev/null +++ b/hosts/iroha/gentoo/package.use/glog @@ -0,0 +1 @@ +dev-cpp/glog -libunwind diff --git a/hosts/iroha/gentoo/package.use/gmp b/hosts/iroha/gentoo/package.use/gmp index a5b882c..480ec45 100644 --- a/hosts/iroha/gentoo/package.use/gmp +++ b/hosts/iroha/gentoo/package.use/gmp @@ -1 +1 @@ -dev-libs/gmp cxx +dev-libs/gmp -cxx diff --git a/hosts/iroha/gentoo/package.use/gnupg b/hosts/iroha/gentoo/package.use/gnupg new file mode 100644 index 0000000..59b068e --- /dev/null +++ b/hosts/iroha/gentoo/package.use/gnupg @@ -0,0 +1 @@ +app-crypt/gnupg user-socket -smartcard -tofu diff --git a/hosts/iroha/gentoo/package.use/gst-plugins-base b/hosts/iroha/gentoo/package.use/gst-plugins-base new file mode 100644 index 0000000..b67c340 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/gst-plugins-base @@ -0,0 +1 @@ +media-libs/gst-plugins-base -egl -gles2 -pango diff --git a/hosts/iroha/gentoo/package.use/gtk b/hosts/iroha/gentoo/package.use/gtk new file mode 100644 index 0000000..3974801 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/gtk @@ -0,0 +1,2 @@ +gui-libs/gtk wayland +x11-libs/gtk+:3 wayland diff --git a/hosts/iroha/gentoo/package.use/harfbuzz b/hosts/iroha/gentoo/package.use/harfbuzz index 5df986b..64f70fa 100644 --- a/hosts/iroha/gentoo/package.use/harfbuzz +++ b/hosts/iroha/gentoo/package.use/harfbuzz @@ -1 +1 @@ -media-libs/harfbuzz -cairo -glib -graphite -introspection -truetype +media-libs/harfbuzz -cairo -graphite diff --git a/hosts/iroha/gentoo/package.use/htop b/hosts/iroha/gentoo/package.use/htop index 926bf14..b7af6cf 100644 --- a/hosts/iroha/gentoo/package.use/htop +++ b/hosts/iroha/gentoo/package.use/htop @@ -1 +1 @@ -sys-process/htop lm-sensors +sys-process/htop lm-sensors caps diff --git a/hosts/iroha/gentoo/package.use/imv b/hosts/iroha/gentoo/package.use/imv new file mode 100644 index 0000000..81cca53 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/imv @@ -0,0 +1 @@ +media-gfx/imv wayland png diff --git a/hosts/iroha/gentoo/package.use/installkernel b/hosts/iroha/gentoo/package.use/installkernel new file mode 100644 index 0000000..6622e7a --- /dev/null +++ b/hosts/iroha/gentoo/package.use/installkernel @@ -0,0 +1 @@ +sys-kernel/installkernel dracut grub diff --git a/hosts/iroha/gentoo/package.use/iputils b/hosts/iroha/gentoo/package.use/iputils deleted file mode 100644 index 4239492..0000000 --- a/hosts/iroha/gentoo/package.use/iputils +++ /dev/null @@ -1 +0,0 @@ -net-misc/iputils diff --git a/hosts/iroha/gentoo/package.use/jack2 b/hosts/iroha/gentoo/package.use/jack2 new file mode 100644 index 0000000..64853f5 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/jack2 @@ -0,0 +1 @@ +media-sound/jack2 -tools diff --git a/hosts/iroha/gentoo/package.use/kde b/hosts/iroha/gentoo/package.use/kde new file mode 100644 index 0000000..6727d0d --- /dev/null +++ b/hosts/iroha/gentoo/package.use/kde @@ -0,0 +1,3 @@ +kde-frameworks/kconfig dbus qml +kde-frameworks/kio -kwallet +kde-frameworks/kwindowsystem X wayland diff --git a/hosts/iroha/gentoo/package.use/kdenlive b/hosts/iroha/gentoo/package.use/kdenlive new file mode 100644 index 0000000..3f3e29e --- /dev/null +++ b/hosts/iroha/gentoo/package.use/kdenlive @@ -0,0 +1,6 @@ +media-libs/mlt qt6 ffmpeg frei0r jack opengl sdl xml +media-video/ffmpeg X sdl libass +media-libs/libva X +media-libs/libsdl2 X jack opengl pulseaudio +dev-qt/qtbase libproxy +dev-qt/qt5compat qml diff --git a/hosts/iroha/gentoo/package.use/kitty b/hosts/iroha/gentoo/package.use/kitty new file mode 100644 index 0000000..7b5046b --- /dev/null +++ b/hosts/iroha/gentoo/package.use/kitty @@ -0,0 +1 @@ +x11-terms/kitty wayland diff --git a/hosts/iroha/gentoo/package.use/lame b/hosts/iroha/gentoo/package.use/lame new file mode 100644 index 0000000..904d15a --- /dev/null +++ b/hosts/iroha/gentoo/package.use/lame @@ -0,0 +1 @@ +media-sound/lame -frontend diff --git a/hosts/iroha/gentoo/package.use/libaom b/hosts/iroha/gentoo/package.use/libaom new file mode 100644 index 0000000..3c852ac --- /dev/null +++ b/hosts/iroha/gentoo/package.use/libaom @@ -0,0 +1 @@ +media-libs/libaom -examples diff --git a/hosts/iroha/gentoo/package.use/libb2 b/hosts/iroha/gentoo/package.use/libb2 new file mode 100644 index 0000000..c55aa22 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/libb2 @@ -0,0 +1 @@ +app-crypt/libb2 native-cflags diff --git a/hosts/iroha/gentoo/package.use/libdecor b/hosts/iroha/gentoo/package.use/libdecor new file mode 100644 index 0000000..c33bf19 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/libdecor @@ -0,0 +1 @@ +gui-libs/libdecor -gtk diff --git a/hosts/iroha/gentoo/package.use/libdeflate b/hosts/iroha/gentoo/package.use/libdeflate new file mode 100644 index 0000000..127058a --- /dev/null +++ b/hosts/iroha/gentoo/package.use/libdeflate @@ -0,0 +1 @@ +app-arch/libdeflate -utils diff --git a/hosts/iroha/gentoo/package.use/libdrm b/hosts/iroha/gentoo/package.use/libdrm deleted file mode 100644 index dcc7d0c..0000000 --- a/hosts/iroha/gentoo/package.use/libdrm +++ /dev/null @@ -1 +0,0 @@ -x11-libs/libdrm video_cards_radeon diff --git a/hosts/iroha/gentoo/package.use/libheif b/hosts/iroha/gentoo/package.use/libheif new file mode 100644 index 0000000..1ebeb07 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/libheif @@ -0,0 +1 @@ +media-libs/libheif -aom -webp diff --git a/hosts/iroha/gentoo/package.use/libnl b/hosts/iroha/gentoo/package.use/libnl deleted file mode 100644 index 7970840..0000000 --- a/hosts/iroha/gentoo/package.use/libnl +++ /dev/null @@ -1 +0,0 @@ -dev-libs/libnl -debug diff --git a/hosts/iroha/gentoo/package.use/libosinfo b/hosts/iroha/gentoo/package.use/libosinfo deleted file mode 100644 index ae046f0..0000000 --- a/hosts/iroha/gentoo/package.use/libosinfo +++ /dev/null @@ -1 +0,0 @@ -sys-libs/libosinfo -vala diff --git a/hosts/iroha/gentoo/package.use/libpulse b/hosts/iroha/gentoo/package.use/libpulse new file mode 100644 index 0000000..b550da9 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/libpulse @@ -0,0 +1 @@ +media-libs/libpulse -asyncns diff --git a/hosts/iroha/gentoo/package.use/libsoup b/hosts/iroha/gentoo/package.use/libsoup deleted file mode 100644 index 3928d12..0000000 --- a/hosts/iroha/gentoo/package.use/libsoup +++ /dev/null @@ -1 +0,0 @@ -net-libs/libsoup -vala diff --git a/hosts/iroha/gentoo/package.use/libvirt b/hosts/iroha/gentoo/package.use/libvirt index 8a00dab..68912ba 100644 --- a/hosts/iroha/gentoo/package.use/libvirt +++ b/hosts/iroha/gentoo/package.use/libvirt @@ -1 +1 @@ -app-emulation/libvirt pcap parted lvm policykit iscsi iscsi-direct virtiofsd +app-emulation/libvirt pcap parted bash-completion diff --git a/hosts/iroha/gentoo/package.use/libwebp b/hosts/iroha/gentoo/package.use/libwebp new file mode 100644 index 0000000..b55f7f9 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/libwebp @@ -0,0 +1 @@ +media-libs/libwebp -png -jpeg diff --git a/hosts/iroha/gentoo/package.use/linux-firmware b/hosts/iroha/gentoo/package.use/linux-firmware new file mode 100644 index 0000000..5d0b8c9 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/linux-firmware @@ -0,0 +1 @@ +sys-kernel/linux-firmware compress-zstd diff --git a/hosts/iroha/gentoo/package.use/lua b/hosts/iroha/gentoo/package.use/lua new file mode 100644 index 0000000..e82452f --- /dev/null +++ b/hosts/iroha/gentoo/package.use/lua @@ -0,0 +1 @@ +dev-lang/lua -deprecated diff --git a/hosts/iroha/gentoo/package.use/lxc b/hosts/iroha/gentoo/package.use/lxc index 56754cb..0b6d483 100644 --- a/hosts/iroha/gentoo/package.use/lxc +++ b/hosts/iroha/gentoo/package.use/lxc @@ -1 +1 @@ -app-containers/lxc caps io-uring -apparmor +app-containers/lxc io-uring -apparmor diff --git a/hosts/iroha/gentoo/package.use/lynx b/hosts/iroha/gentoo/package.use/lynx new file mode 100644 index 0000000..a86dac8 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/lynx @@ -0,0 +1 @@ +www-client/lynx brotli cjk idn diff --git a/hosts/iroha/gentoo/package.use/mangohud b/hosts/iroha/gentoo/package.use/mangohud new file mode 100644 index 0000000..4fad800 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/mangohud @@ -0,0 +1,2 @@ +games-util/mangohud X wayland +media-libs/imgui opengl vulkan diff --git a/hosts/iroha/gentoo/package.use/mesa b/hosts/iroha/gentoo/package.use/mesa index b05c86a..dab1b17 100644 --- a/hosts/iroha/gentoo/package.use/mesa +++ b/hosts/iroha/gentoo/package.use/mesa @@ -1 +1 @@ -media-libs/mesa X llvm osmesa vulkan wayland -lm-sensors -proprietary-codecs -zstd +media-libs/mesa X wayland llvm vulkan vaapi proprietary-codecs -lm-sensors -osmesa diff --git a/hosts/iroha/gentoo/package.use/mesa-progs b/hosts/iroha/gentoo/package.use/mesa-progs index af5654e..ce960fa 100644 --- a/hosts/iroha/gentoo/package.use/mesa-progs +++ b/hosts/iroha/gentoo/package.use/mesa-progs @@ -1 +1 @@ -x11-apps/mesa-progs gles2 +x11-apps/mesa-progs wayland gles2 vulkan diff --git a/hosts/iroha/gentoo/package.use/miscfiles b/hosts/iroha/gentoo/package.use/miscfiles new file mode 100644 index 0000000..0d07a72 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/miscfiles @@ -0,0 +1 @@ +sys-apps/miscfiles minimal diff --git a/hosts/iroha/gentoo/package.use/mpg123-base b/hosts/iroha/gentoo/package.use/mpg123-base new file mode 100644 index 0000000..34f06f3 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/mpg123-base @@ -0,0 +1 @@ +media-sound/mpg123-base -ipv6 diff --git a/hosts/iroha/gentoo/package.use/mutt b/hosts/iroha/gentoo/package.use/mutt new file mode 100644 index 0000000..12f69e6 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/mutt @@ -0,0 +1 @@ +mail-client/mutt idn diff --git a/hosts/iroha/gentoo/package.use/ncurses b/hosts/iroha/gentoo/package.use/ncurses index 3158904..838288c 100644 --- a/hosts/iroha/gentoo/package.use/ncurses +++ b/hosts/iroha/gentoo/package.use/ncurses @@ -1 +1 @@ -sys-libs/ncurses -cxx minimal +sys-libs/ncurses minimal -cxx diff --git a/hosts/iroha/gentoo/package.use/nfs-utils b/hosts/iroha/gentoo/package.use/nfs-utils index bfc2b34..2fd1871 100644 --- a/hosts/iroha/gentoo/package.use/nfs-utils +++ b/hosts/iroha/gentoo/package.use/nfs-utils @@ -1 +1 @@ -net-fs/nfs-utils -nfsv3 nfsv4 +net-fs/nfs-utils nfsv4 -nfsv3 diff --git a/hosts/iroha/gentoo/package.use/nix b/hosts/iroha/gentoo/package.use/nix new file mode 100644 index 0000000..e69a887 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/nix @@ -0,0 +1,4 @@ +sys-apps/nix doc +dev-libs/boehm-gc cxx +virtual/libcrypt static-libs +sys-libs/libxcrypt static-libs diff --git a/hosts/iroha/gentoo/package.use/nodejs b/hosts/iroha/gentoo/package.use/nodejs new file mode 100644 index 0000000..a2876f4 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/nodejs @@ -0,0 +1 @@ +net-libs/nodejs -snapshot diff --git a/hosts/iroha/gentoo/package.use/noto b/hosts/iroha/gentoo/package.use/noto new file mode 100644 index 0000000..8564b5e --- /dev/null +++ b/hosts/iroha/gentoo/package.use/noto @@ -0,0 +1 @@ +media-fonts/noto -extra diff --git a/hosts/iroha/gentoo/package.use/numpy b/hosts/iroha/gentoo/package.use/numpy new file mode 100644 index 0000000..a8f01c0 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/numpy @@ -0,0 +1 @@ +dev-python/numpy -lapack diff --git a/hosts/iroha/gentoo/package.use/obs-studio b/hosts/iroha/gentoo/package.use/obs-studio new file mode 100644 index 0000000..b1f6ce1 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/obs-studio @@ -0,0 +1,5 @@ +media-video/obs-studio pipewire truetype wayland v4l +media-video/ffmpeg opus x264 +# usage of QX11Application not covered by gentoo deps. +dev-qt/qtbase X +x11-libs/libxkbcommon X diff --git a/hosts/iroha/gentoo/package.use/openimageio b/hosts/iroha/gentoo/package.use/openimageio new file mode 100644 index 0000000..77a8f15 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/openimageio @@ -0,0 +1 @@ +media-libs/openimageio -tools -truetype diff --git a/hosts/iroha/gentoo/package.use/pass b/hosts/iroha/gentoo/package.use/pass new file mode 100644 index 0000000..58f958b --- /dev/null +++ b/hosts/iroha/gentoo/package.use/pass @@ -0,0 +1,2 @@ +app-admin/pass -git -wayland +media-gfx/qrencode png diff --git a/hosts/iroha/gentoo/package.use/pinentry b/hosts/iroha/gentoo/package.use/pinentry new file mode 100644 index 0000000..5df447a --- /dev/null +++ b/hosts/iroha/gentoo/package.use/pinentry @@ -0,0 +1,2 @@ +app-crypt/pinentry X gtk wayland +app-crypt/gcr gtk diff --git a/hosts/iroha/gentoo/package.use/pipewire b/hosts/iroha/gentoo/package.use/pipewire index 90c2128..d96c9bd 100644 --- a/hosts/iroha/gentoo/package.use/pipewire +++ b/hosts/iroha/gentoo/package.use/pipewire @@ -1 +1,3 @@ -media-video/pipewire pipewire-alsa sound-server +# gstreamer for virt-viewer. +media-video/pipewire dbus extra fftw gstreamer pipewire-alsa sound-server jack-client -ssl +media-sound/jack2 dbus -tools diff --git a/hosts/iroha/gentoo/package.use/poppler b/hosts/iroha/gentoo/package.use/poppler new file mode 100644 index 0000000..457e12d --- /dev/null +++ b/hosts/iroha/gentoo/package.use/poppler @@ -0,0 +1 @@ +app-text/poppler -cxx -jpeg -jpeg2k -lcms -utils diff --git a/hosts/iroha/gentoo/package.use/portage-utils b/hosts/iroha/gentoo/package.use/portage-utils new file mode 100644 index 0000000..75a2d70 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/portage-utils @@ -0,0 +1 @@ +app-portage/portage-utils -qmanifest diff --git a/hosts/iroha/gentoo/package.use/prismlauncher b/hosts/iroha/gentoo/package.use/prismlauncher new file mode 100644 index 0000000..3d61cdd --- /dev/null +++ b/hosts/iroha/gentoo/package.use/prismlauncher @@ -0,0 +1 @@ +dev-libs/quazip qt6 diff --git a/hosts/iroha/gentoo/package.use/pulseaudio b/hosts/iroha/gentoo/package.use/pulseaudio new file mode 100644 index 0000000..4c0008f --- /dev/null +++ b/hosts/iroha/gentoo/package.use/pulseaudio @@ -0,0 +1 @@ +media-sound/pulseaudio -daemon diff --git a/hosts/iroha/gentoo/package.use/python b/hosts/iroha/gentoo/package.use/python index 10a653e..2ed6d28 100644 --- a/hosts/iroha/gentoo/package.use/python +++ b/hosts/iroha/gentoo/package.use/python @@ -1,3 +1,3 @@ -dev-lang/python sqlite pgo -bluetooth -*/* PYTHON_TARGETS: -* python3_12 -*/* PYTHON_SINGLE_TARGET: -* python3_12 +dev-lang/python sqlite -bluetooth +*/* PYTHON_TARGETS: -* python3_13 +*/* PYTHON_SINGLE_TARGET: -* python3_13 diff --git a/hosts/iroha/gentoo/package.use/qemu b/hosts/iroha/gentoo/package.use/qemu index ea27a26..d608fa7 100644 --- a/hosts/iroha/gentoo/package.use/qemu +++ b/hosts/iroha/gentoo/package.use/qemu @@ -1 +1 @@ -app-emulation/qemu -doc pin-upstream-blobs -gnutls -sdl -gtk io-uring jemalloc iscsi opengl spice usb usbredir virgl virtfs vnc gnutls -ncurses -oss -png QEMU_SOFTMMU_TARGETS: aarch64 x86_64 m68k i386 +app-emulation/qemu io-uring opengl pulseaudio spice usb usbredir virgl -doc -gnutls -jpeg -ncurses -oss -png -vnc -xattr QEMU_SOFTMMU_TARGETS: aarch64 x86_64 m68k i386 diff --git a/hosts/iroha/gentoo/package.use/qt b/hosts/iroha/gentoo/package.use/qt new file mode 100644 index 0000000..26292f1 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/qt @@ -0,0 +1,8 @@ +dev-qt/qtbase wayland icu opengl network sql sqlite ssl vulkan +dev-qt/qtgui wayland egl libinput udev vulkan -eglfs -gles2-only -png -dbus +dev-qt/qttools -assistant -linguist -opengl -qdbus -widgets +dev-qt/qtwidgets -dbus -png +dev-qt/qt5compat icu +dev-qt/qtdeclarative opengl vulkan -sql +dev-qt/qtwayland vulkan +dev-qt/qtmultimedia X opengl vulkan wayland diff --git a/hosts/iroha/gentoo/package.use/qtgui b/hosts/iroha/gentoo/package.use/qtgui deleted file mode 100644 index ecf6b50..0000000 --- a/hosts/iroha/gentoo/package.use/qtgui +++ /dev/null @@ -1 +0,0 @@ -dev-qt/qtgui linuxfb -egl -eglfs -gles2-only -png -dbus -libinput -udev diff --git a/hosts/iroha/gentoo/package.use/qtwidgets b/hosts/iroha/gentoo/package.use/qtwidgets deleted file mode 100644 index 5b50f8a..0000000 --- a/hosts/iroha/gentoo/package.use/qtwidgets +++ /dev/null @@ -1 +0,0 @@ -dev-qt/qtwidgets -dbus -png diff --git a/hosts/iroha/gentoo/package.use/rubberband b/hosts/iroha/gentoo/package.use/rubberband new file mode 100644 index 0000000..7244d9c --- /dev/null +++ b/hosts/iroha/gentoo/package.use/rubberband @@ -0,0 +1 @@ +media-libs/rubberband -programs diff --git a/hosts/iroha/gentoo/package.use/serd b/hosts/iroha/gentoo/package.use/serd new file mode 100644 index 0000000..a2d6678 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/serd @@ -0,0 +1 @@ +dev-libs/serd -tools diff --git a/hosts/iroha/gentoo/package.use/spice b/hosts/iroha/gentoo/package.use/spice index c185229..9d8beff 100644 --- a/hosts/iroha/gentoo/package.use/spice +++ b/hosts/iroha/gentoo/package.use/spice @@ -1 +1 @@ -app-emulation/spice lz4 +app-emulation/spice lz4 gstreamer diff --git a/hosts/iroha/gentoo/package.use/spice-gtk b/hosts/iroha/gentoo/package.use/spice-gtk new file mode 100644 index 0000000..49f15c2 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/spice-gtk @@ -0,0 +1 @@ +net-misc/spice-gtk lz4 wayland mjpeg diff --git a/hosts/iroha/gentoo/package.use/steam b/hosts/iroha/gentoo/package.use/steam new file mode 100644 index 0000000..6870d10 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/steam @@ -0,0 +1,78 @@ +games-util/steam-launcher -wayland +media-libs/vulkan-loader X +games-util/gamemode abi_x86_32 +games-util/mangohud abi_x86_32 +# for gamemode and mangohud, sort'd +dev-libs/libfmt abi_x86_32 +dev-libs/libxml2 abi_x86_32 +dev-libs/spdlog abi_x86_32 +dev-util/glslang abi_x86_32 +dev-util/vulkan-utility-libraries abi_x86_32 +media-libs/glew abi_x86_32 +media-libs/glu abi_x86_32 +media-libs/imgui abi_x86_32 +media-libs/implot abi_x86_32 +media-libs/vulkan-layers abi_x86_32 +media-libs/vulkan-loader abi_x86_32 +sys-apps/dbus abi_x86_32 +virtual/glu abi_x86_32 +x11-libs/libICE abi_x86_32 +x11-libs/libSM abi_x86_32 +x11-libs/libXi abi_x86_32 +x11-libs/libXmu abi_x86_32 +x11-libs/libXt abi_x86_32 +x11-libs/libxkbcommon abi_x86_32 +x11-libs/libxkbcommon0 abi_x86_32 +# sort'd +app-arch/bzip2 abi_x86_32 +app-arch/xz-utils abi_x86_32 +app-arch/zstd abi_x86_32 +dev-libs/elfutils abi_x86_32 +dev-libs/expat abi_x86_32 +dev-libs/glib abi_x86_32 +dev-libs/libffi abi_x86_32 +dev-libs/libpcre2 abi_x86_32 +dev-libs/wayland abi_x86_32 +dev-util/spirv-tools abi_x86_32 +llvm-core/llvm abi_x86_32 +media-libs/flac abi_x86_32 +media-libs/fontconfig abi_x86_32 +media-libs/freetype abi_x86_32 +media-libs/harfbuzz abi_x86_32 +media-libs/libglvnd abi_x86_32 +media-libs/libogg abi_x86_32 +media-libs/libpng abi_x86_32 +media-libs/libpulse abi_x86_32 +media-libs/libsndfile abi_x86_32 +media-libs/libva abi_x86_32 +media-libs/libvorbis abi_x86_32 +media-libs/mesa abi_x86_32 +media-libs/opus abi_x86_32 +media-sound/lame abi_x86_32 +media-sound/mpg123-base abi_x86_32 +sys-apps/systemd-utils abi_x86_32 +sys-apps/util-linux abi_x86_32 +sys-libs/gdbm abi_x86_32 +sys-libs/libcap abi_x86_32 +sys-libs/libudev-compat abi_x86_32 +sys-libs/ncurses abi_x86_32 +sys-libs/pam abi_x86_32 +sys-libs/readline abi_x86_32 +sys-libs/zlib abi_x86_32 +virtual/libelf abi_x86_32 +virtual/libiconv abi_x86_32 +virtual/libintl abi_x86_32 +virtual/libudev abi_x86_32 +virtual/opengl abi_x86_32 +x11-libs/libX11 abi_x86_32 +x11-libs/libXau abi_x86_32 +x11-libs/libXdmcp abi_x86_32 +x11-libs/libXext abi_x86_32 +x11-libs/libXfixes abi_x86_32 +x11-libs/libXrandr abi_x86_32 +x11-libs/libXrender abi_x86_32 +x11-libs/libXxf86vm abi_x86_32 +x11-libs/libdrm abi_x86_32 +x11-libs/libxcb abi_x86_32 +x11-libs/libxshmfence abi_x86_32 +x11-libs/xcb-util-keysyms abi_x86_32 diff --git a/hosts/iroha/gentoo/package.use/sway b/hosts/iroha/gentoo/package.use/sway new file mode 100644 index 0000000..2652b16 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/sway @@ -0,0 +1,3 @@ +gui-wm/sway X -swaybar +media-libs/libepoxy X +media-libs/mesa X diff --git a/hosts/iroha/gentoo/package.use/sysklogd b/hosts/iroha/gentoo/package.use/sysklogd new file mode 100644 index 0000000..4d866b0 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/sysklogd @@ -0,0 +1 @@ +app-admin/sysklogd logrotate diff --git a/hosts/iroha/gentoo/package.use/ufw b/hosts/iroha/gentoo/package.use/ufw deleted file mode 100644 index e892b19..0000000 --- a/hosts/iroha/gentoo/package.use/ufw +++ /dev/null @@ -1 +0,0 @@ -net-firewall/ufw diff --git a/hosts/iroha/gentoo/package.use/vim b/hosts/iroha/gentoo/package.use/vim index 247b1f2..d361594 100644 --- a/hosts/iroha/gentoo/package.use/vim +++ b/hosts/iroha/gentoo/package.use/vim @@ -1 +1 @@ -app-editors/vim minimal -crypt +app-editors/vim -minimal diff --git a/hosts/iroha/gentoo/package.use/vim-core b/hosts/iroha/gentoo/package.use/vim-core deleted file mode 100644 index 2ac6f19..0000000 --- a/hosts/iroha/gentoo/package.use/vim-core +++ /dev/null @@ -1 +0,0 @@ -app-editors/vim-core minimal diff --git a/hosts/iroha/gentoo/package.use/virglrenderer b/hosts/iroha/gentoo/package.use/virglrenderer new file mode 100644 index 0000000..a22f73d --- /dev/null +++ b/hosts/iroha/gentoo/package.use/virglrenderer @@ -0,0 +1 @@ +media-libs/virglrenderer vaapi diff --git a/hosts/iroha/gentoo/package.use/virt-manager b/hosts/iroha/gentoo/package.use/virt-manager new file mode 100644 index 0000000..2788806 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/virt-manager @@ -0,0 +1,12 @@ +app-emulation/virt-manager gui +app-emulation/libvirt-glib introspection +sys-libs/libosinfo introspection +net-libs/gtk-vnc introspection +net-misc/spice-gtk usbredir introspection +x11-libs/gtk+:3 introspection +x11-libs/vte introspection +sys-auth/polkit introspection +app-accessibility/at-spi2-core introspection +x11-libs/gdk-pixbuf introspection +media-libs/gstreamer introspection +x11-libs/gtksourceview introspection diff --git a/hosts/iroha/gentoo/package.use/vulkan-layers b/hosts/iroha/gentoo/package.use/vulkan-layers new file mode 100644 index 0000000..ad74e5a --- /dev/null +++ b/hosts/iroha/gentoo/package.use/vulkan-layers @@ -0,0 +1 @@ +media-libs/vulkan-layers X wayland diff --git a/hosts/iroha/gentoo/package.use/vulkan-loader b/hosts/iroha/gentoo/package.use/vulkan-loader new file mode 100644 index 0000000..67fe675 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/vulkan-loader @@ -0,0 +1 @@ +media-libs/vulkan-loader wayland layers diff --git a/hosts/iroha/gentoo/package.use/waydroid b/hosts/iroha/gentoo/package.use/waydroid new file mode 100644 index 0000000..0ac3720 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/waydroid @@ -0,0 +1,2 @@ +dev-python/pyclip wayland +sys-libs/libcap static-libs diff --git a/hosts/iroha/gentoo/package.use/wf-recorder b/hosts/iroha/gentoo/package.use/wf-recorder new file mode 100644 index 0000000..a3b0f91 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/wf-recorder @@ -0,0 +1 @@ +gui-apps/wf-recorder pipewire diff --git a/hosts/iroha/gentoo/package.use/wine b/hosts/iroha/gentoo/package.use/wine new file mode 100644 index 0000000..1ec80be --- /dev/null +++ b/hosts/iroha/gentoo/package.use/wine @@ -0,0 +1 @@ +app-emulation/wine-vanilla pulseaudio udev wayland wow64 -gecko -gstreamer -mingw -xcomposite -abi_x86_32 diff --git a/hosts/iroha/gentoo/package.use/wlroots b/hosts/iroha/gentoo/package.use/wlroots new file mode 100644 index 0000000..e1a6a62 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/wlroots @@ -0,0 +1 @@ +gui-libs/wlroots X vulkan lcms liftoff diff --git a/hosts/iroha/gentoo/package.use/xdg-utils b/hosts/iroha/gentoo/package.use/xdg-utils new file mode 100644 index 0000000..d2deeb3 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/xdg-utils @@ -0,0 +1 @@ +app-text/xmlto text diff --git a/hosts/iroha/gentoo/package.use/zz-autounmask b/hosts/iroha/gentoo/package.use/zz-autounmask deleted file mode 100644 index d49b2bb..0000000 --- a/hosts/iroha/gentoo/package.use/zz-autounmask +++ /dev/null @@ -1,38 +0,0 @@ -# required by app-containers/incus-0.7::gentoo -# required by incus (argument) ->=dev-libs/raft-0.22.0 lz4 -# required by app-containers/lxc-5.0.3::gentoo[tools,-caps] -# required by app-containers/incus-0.7::gentoo -# required by incus (argument) ->=sys-libs/libcap-2.69-r1 static-libs -# required by sys-boot/woeusb-5.2.4::gentoo -# required by woeusb (argument) ->=sys-boot/grub-2.12-r4 grub_platforms_pc -# required by app-containers/incus-6.1::gentoo -# required by @selected -# required by @world (argument) ->=dev-util/xdelta-3.0.11-r1 lzma -# required by app-containers/incus-6.1::gentoo -# required by @selected -# required by @world (argument) ->=sys-fs/squashfs-tools-4.6.1 lzma -# required by net-dns/bind-tools-9.18.0::gentoo -# required by @selected -# required by @world (argument) ->=net-dns/bind-9.18.29-r2 idn -# required by x11-drivers/nvidia-drivers-550.142::gentoo[tools] -# required by nvidia-drivers (argument) ->=x11-libs/gtk+-3.24.42-r1 X -# required by x11-libs/pango-1.52.2::gentoo -# required by x11-libs/gtk+-3.24.42-r1::gentoo -# required by x11-drivers/nvidia-drivers-550.142::gentoo[tools] -# required by nvidia-drivers (argument) ->=media-libs/harfbuzz-10.1.0 truetype glib -# required by x11-libs/gtk+-3.24.42-r1::gentoo -# required by x11-drivers/nvidia-drivers-550.142::gentoo[tools] -# required by nvidia-drivers (argument) ->=media-libs/libepoxy-1.5.10-r3 X -# required by x11-libs/gtk+-3.24.42-r1::gentoo -# required by x11-drivers/nvidia-drivers-550.142::gentoo[tools] -# required by nvidia-drivers (argument) ->=x11-libs/cairo-1.18.2-r1 X diff --git a/hosts/iroha/gentoo/patches/app-misc/neofetch/neofetch_hostcolor.diff b/hosts/iroha/gentoo/patches/app-misc/neofetch/neofetch_hostcolor.diff new file mode 100644 index 0000000..cb4bdb5 --- /dev/null +++ b/hosts/iroha/gentoo/patches/app-misc/neofetch/neofetch_hostcolor.diff @@ -0,0 +1,24 @@ +--- a/neofetch 2025-07-24 14:35:25.646237301 -0400 ++++ b/neofetch 2025-07-24 14:34:57.393924725 -0400 +@@ -1386,8 +1386,8 @@ + on) hostname=$(hostname -f) ;; + *) hostname=${HOSTNAME:-$(hostname)} ;; + esac +- +- title=${title_color}${bold}${user}${at_color}@${title_color}${bold}${hostname} ++ host_color=${HOSTCOLOR:-${title_color}} ++ title=${title_color}${bold}${user}${at_color}@${host_color}${bold}${hostname} + length=$((${#user} + ${#hostname} + 1)) + } + +@@ -4604,8 +4604,8 @@ + fi + + string="$(trim "${string//$'\e[0m'}")" +- length="$(strip_sequences "$string")" +- length="${#length}" ++ #length="$(strip_sequences "$string")" ++ #length="${#length}" + + # Format the output. + string="${string/:/${reset}${colon_color}${separator:=:}${info_color}}" diff --git a/hosts/iroha/gentoo/patches/app-misc/neofetch/neofetch_kitty_font.diff b/hosts/iroha/gentoo/patches/app-misc/neofetch/neofetch_kitty_font.diff new file mode 100644 index 0000000..5021746 --- /dev/null +++ b/hosts/iroha/gentoo/patches/app-misc/neofetch/neofetch_kitty_font.diff @@ -0,0 +1,17 @@ +--- a/neofetch 2025-07-24 14:38:08.897043445 -0400 ++++ b/neofetch 2025-07-30 08:35:41.870152352 -0400 +@@ -3301,11 +3301,9 @@ + ;; + + "kitty"*) +- kitty_config="$(kitty --debug-config)" +- [[ "$kitty_config" != *font_family* ]] && return +- +- term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' \ +- <<< "$kitty_config")" ++ term_font="from kitty.cli import *; o = create_default_opts(); \ ++ print(f'{o.font_family} {o.font_size}')" ++ term_font="$(kitty +runpy ''"$term_font"'')" + ;; + + "konsole" | "yakuake") diff --git a/hosts/iroha/gentoo/patches/app-misc/ufetch/ufetch_hostcolor.diff b/hosts/iroha/gentoo/patches/app-misc/ufetch/ufetch_hostcolor.diff new file mode 100644 index 0000000..efccd68 --- /dev/null +++ b/hosts/iroha/gentoo/patches/app-misc/ufetch/ufetch_hostcolor.diff @@ -0,0 +1,27 @@ +--- a/ufetch-gentoo 2025-07-28 12:44:02.768490943 -0400 ++++ b/ufetch-gentoo 2025-07-28 12:45:58.575888260 -0400 +@@ -64,7 +64,8 @@ + + # you can change these + lc="${reset}${bold}${magenta}" # labels +-nc="${reset}${bold}${magenta}" # user and hostname ++nc="${reset}${bold}${magenta}" # user ++hc="${reset}${bold}${cyan}" # hostname + ic="${reset}" # info + c0="${reset}${bold}${magenta}" # first color + c1="${reset}${magenta}" # second color +@@ -72,13 +73,11 @@ + ## OUTPUT + + cat <<EOF +- +-${c0} .-----. ${nc}${USER}${ic}@${nc}${host}${reset} ++${c0} .-----. ${nc}${USER}${ic}@${hc}${host}${reset} + ${c0} .\` _ \`. ${lc}OS: ${ic}${os}${reset} + ${c0} \`. (${c1}_) ${c0}\`. ${lc}KERNEL: ${ic}${kernel}${reset} + ${c0} \`${c1}. / ${lc}UPTIME: ${ic}${uptime}${reset} + ${c1} .\` .\` ${lc}PACKAGES: ${ic}${packages}${reset} + ${c1} / .\` ${lc}SHELL: ${ic}${shell}${reset} + ${c1} \____.-\` ${lc}${uitype}: ${ic}${ui}${reset} +- + EOF diff --git a/hosts/iroha/gentoo/patches/games-util/xone/3bc363c48ec38c4a08c4294ca111ed9f75e3e026.diff b/hosts/iroha/gentoo/patches/games-util/xone/3bc363c48ec38c4a08c4294ca111ed9f75e3e026.diff deleted file mode 100644 index f133faf..0000000 --- a/hosts/iroha/gentoo/patches/games-util/xone/3bc363c48ec38c4a08c4294ca111ed9f75e3e026.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/driver/headset.c b/driver/headset.c -index 5eada22..4c6e73e 100644 ---- a/driver/headset.c -+++ b/driver/headset.c -@@ -6,6 +6,7 @@ - #include <linux/module.h> - #include <linux/hrtimer.h> - #include <linux/vmalloc.h> -+#include <linux/version.h> - #include <sound/core.h> - #include <sound/initval.h> - #include <sound/pcm.h> -@@ -499,8 +500,13 @@ static int gip_headset_probe(struct gip_client *client) - INIT_DELAYED_WORK(&headset->work_power_on, gip_headset_power_on); - INIT_WORK(&headset->work_register, gip_headset_register); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0) -+ hrtimer_setup(&headset->timer, gip_headset_send_samples, -+ CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+#else - hrtimer_init(&headset->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - headset->timer.function = gip_headset_send_samples; -+#endif - - err = gip_enable_audio(client); - if (err) diff --git a/hosts/iroha/gentoo/patches/games-util/xone/53.diff b/hosts/iroha/gentoo/patches/games-util/xone/53.diff deleted file mode 100644 index 455452a..0000000 --- a/hosts/iroha/gentoo/patches/games-util/xone/53.diff +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/bus/bus.c b/bus/bus.c -index 4a6c64f..8dc9bbb 100644 ---- a/bus/bus.c -+++ b/bus/bus.c -@@ -56,7 +56,11 @@ static struct device_type gip_client_type = { - .release = gip_client_release, - }; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0) - static int gip_bus_match(struct device *dev, struct device_driver *driver) -+#else -+static int gip_bus_match(struct device *dev, const struct device_driver *driver) -+#endif - { - struct gip_client *client; - struct gip_driver *drv; -diff --git a/driver/headset.c b/driver/headset.c -index ebee92d..c736351 100644 ---- a/driver/headset.c -+++ b/driver/headset.c -@@ -5,6 +5,7 @@ - - #include <linux/module.h> - #include <linux/hrtimer.h> -+#include <linux/vmalloc.h> - #include <sound/core.h> - #include <sound/initval.h> - #include <sound/pcm.h> -@@ -90,13 +91,34 @@ static int gip_headset_pcm_close(struct snd_pcm_substream *sub) - static int gip_headset_pcm_hw_params(struct snd_pcm_substream *sub, - struct snd_pcm_hw_params *params) - { -- return snd_pcm_lib_alloc_vmalloc_buffer(sub, -- params_buffer_bytes(params)); -+ struct snd_pcm_runtime *runtime = sub->runtime; -+ size_t size = params_buffer_bytes(params); -+ -+ if (runtime->dma_area) { -+ if (runtime->dma_bytes >= size) -+ return 0; /* Already large enough */ -+ vfree(runtime->dma_area); -+ } -+ runtime->dma_area = vzalloc(size); -+ if (!runtime->dma_area) -+ return -ENOMEM; -+ runtime->dma_bytes = size; -+ return 1; - } - - static int gip_headset_pcm_hw_free(struct snd_pcm_substream *sub) - { -- return snd_pcm_lib_free_vmalloc_buffer(sub); -+ struct snd_pcm_runtime *runtime = sub->runtime; -+ -+ vfree(runtime->dma_area); -+ runtime->dma_area = NULL; -+ return 0; -+} -+ -+static struct page *gip_headset_pcm_get_page(struct snd_pcm_substream *sub, -+ unsigned long offset) -+{ -+ return vmalloc_to_page(sub->runtime->dma_area + offset); - } - - static int gip_headset_pcm_prepare(struct snd_pcm_substream *sub) -@@ -157,7 +179,7 @@ static const struct snd_pcm_ops gip_headset_pcm_ops = { - .prepare = gip_headset_pcm_prepare, - .trigger = gip_headset_pcm_trigger, - .pointer = gip_headset_pcm_pointer, -- .page = snd_pcm_lib_get_vmalloc_page, -+ .page = gip_headset_pcm_get_page, - }; - - static bool gip_headset_advance_pointer(struct gip_headset_stream *stream, diff --git a/hosts/iroha/gentoo/patches/games-util/xone/b18d6d5b51c308bca665e6dfe63f31aecb98cce5.diff b/hosts/iroha/gentoo/patches/games-util/xone/b18d6d5b51c308bca665e6dfe63f31aecb98cce5.diff deleted file mode 100644 index 7b23358..0000000 --- a/hosts/iroha/gentoo/patches/games-util/xone/b18d6d5b51c308bca665e6dfe63f31aecb98cce5.diff +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/driver/gamepad.c b/driver/gamepad.c -index eec2aeaa..d424774b 100644 ---- a/driver/gamepad.c -+++ b/driver/gamepad.c -@@ -6,6 +6,7 @@ - #include <linux/module.h> - #include <linux/uuid.h> - #include <linux/timer.h> -+#include <linux/version.h> - - #include "common.h" - #include "../auth/auth.h" -@@ -207,8 +208,11 @@ static int gip_gamepad_init_input(struct gip_gamepad *gamepad) - return 0; - - err_delete_timer: -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0) -+ timer_delete_sync(&gamepad->rumble.timer); -+#else - del_timer_sync(&gamepad->rumble.timer); -- -+#endif - return err; - } - -@@ -335,7 +339,11 @@ static void gip_gamepad_remove(struct gip_client *client) - { - struct gip_gamepad *gamepad = dev_get_drvdata(&client->dev); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0) -+ timer_delete_sync(&gamepad->rumble.timer); -+#else - del_timer_sync(&gamepad->rumble.timer); -+#endif - } - - static struct gip_driver gip_gamepad_driver = { diff --git a/hosts/iroha/gentoo/patches/gui-wm/gamescope/1826.diff b/hosts/iroha/gentoo/patches/gui-wm/gamescope/1826.diff new file mode 100644 index 0000000..69c85e8 --- /dev/null +++ b/hosts/iroha/gentoo/patches/gui-wm/gamescope/1826.diff @@ -0,0 +1,84 @@ +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index 7e68a44fb..65e35f525 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -2002,24 +2002,32 @@ namespace gamescope + // Prefer opaque for composition on the Wayland backend. + + uint32_t u8BitFormat = DRM_FORMAT_INVALID; +- if ( SupportsFormat( DRM_FORMAT_XRGB8888 ) ) +- u8BitFormat = DRM_FORMAT_XRGB8888; +- else if ( SupportsFormat( DRM_FORMAT_XBGR8888 ) ) +- u8BitFormat = DRM_FORMAT_XBGR8888; +- else if ( SupportsFormat( DRM_FORMAT_ARGB8888 ) ) +- u8BitFormat = DRM_FORMAT_ARGB8888; +- else if ( SupportsFormat( DRM_FORMAT_ABGR8888 ) ) +- u8BitFormat = DRM_FORMAT_ABGR8888; ++ for (int i = 0; i < 2 && u8BitFormat == DRM_FORMAT_INVALID; i++) ++ { ++ bool invalidOnly = i == 0; ++ if ( SupportsFormat( DRM_FORMAT_XRGB8888, invalidOnly ) ) ++ u8BitFormat = DRM_FORMAT_XRGB8888; ++ else if ( SupportsFormat( DRM_FORMAT_XBGR8888, invalidOnly ) ) ++ u8BitFormat = DRM_FORMAT_XBGR8888; ++ else if ( SupportsFormat( DRM_FORMAT_ARGB8888, invalidOnly ) ) ++ u8BitFormat = DRM_FORMAT_ARGB8888; ++ else if ( SupportsFormat( DRM_FORMAT_ABGR8888, invalidOnly ) ) ++ u8BitFormat = DRM_FORMAT_ABGR8888; ++ } + + uint32_t u10BitFormat = DRM_FORMAT_INVALID; +- if ( SupportsFormat( DRM_FORMAT_XBGR2101010 ) ) +- u10BitFormat = DRM_FORMAT_XBGR2101010; +- else if ( SupportsFormat( DRM_FORMAT_XRGB2101010 ) ) +- u10BitFormat = DRM_FORMAT_XRGB2101010; +- else if ( SupportsFormat( DRM_FORMAT_ABGR2101010 ) ) +- u10BitFormat = DRM_FORMAT_ABGR2101010; +- else if ( SupportsFormat( DRM_FORMAT_ARGB2101010 ) ) +- u10BitFormat = DRM_FORMAT_ARGB2101010; ++ for (int i = 0; i < 2 && u10BitFormat == DRM_FORMAT_INVALID; i++) ++ { ++ bool invalidOnly = i == 0; ++ if ( SupportsFormat( DRM_FORMAT_XBGR2101010, invalidOnly ) ) ++ u10BitFormat = DRM_FORMAT_XBGR2101010; ++ else if ( SupportsFormat( DRM_FORMAT_XRGB2101010, invalidOnly ) ) ++ u10BitFormat = DRM_FORMAT_XRGB2101010; ++ else if ( SupportsFormat( DRM_FORMAT_ABGR2101010, invalidOnly ) ) ++ u10BitFormat = DRM_FORMAT_ABGR2101010; ++ else if ( SupportsFormat( DRM_FORMAT_ARGB2101010, invalidOnly ) ) ++ u10BitFormat = DRM_FORMAT_ARGB2101010; ++ } + + assert( u8BitFormat != DRM_FORMAT_INVALID ); + +diff --git a/src/backend.h b/src/backend.h +index 29219dbc8..2767546cd 100644 +--- a/src/backend.h ++++ b/src/backend.h +@@ -309,9 +309,11 @@ namespace gamescope + + virtual bool UsesModifiers() const = 0; + virtual std::span<const uint64_t> GetSupportedModifiers( uint32_t uDrmFormat ) const = 0; +- inline bool SupportsFormat( uint32_t uDrmFormat ) const ++ inline bool SupportsFormat( uint32_t uDrmFormat, bool invalidOnly ) const + { +- return Algorithm::Contains( this->GetSupportedModifiers( uDrmFormat ), DRM_FORMAT_MOD_INVALID ); ++ if ( invalidOnly ) ++ return Algorithm::Contains( this->GetSupportedModifiers( uDrmFormat ), DRM_FORMAT_MOD_INVALID ); ++ return !this->GetSupportedModifiers( uDrmFormat ).empty(); + } + + virtual IBackendConnector *GetCurrentConnector() = 0; +diff --git a/src/rendervulkan.cpp b/src/rendervulkan.cpp +index b8412b8fd..f41ef4c9b 100644 +--- a/src/rendervulkan.cpp ++++ b/src/rendervulkan.cpp +@@ -2814,7 +2814,7 @@ bool vulkan_init_format(VkFormat format, uint32_t drmFormat) + } + else + { +- if ( GetBackend()->UsesModifiers() && !GetBackend()->SupportsFormat( drmFormat ) ) ++ if ( GetBackend()->UsesModifiers() && !GetBackend()->SupportsFormat( drmFormat, true ) ) + return false; + + wlr_drm_format_set_add( &sampledDRMFormats, drmFormat, DRM_FORMAT_MOD_INVALID ); diff --git a/hosts/iroha/gentoo/patches/gui-wm/gamescope/740_rebase.diff b/hosts/iroha/gentoo/patches/gui-wm/gamescope/740_rebase.diff new file mode 100644 index 0000000..79a87eb --- /dev/null +++ b/hosts/iroha/gentoo/patches/gui-wm/gamescope/740_rebase.diff @@ -0,0 +1,693 @@ +diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp +index 1ec2699..26c0afc 100644 +--- a/src/Backends/DRMBackend.cpp ++++ b/src/Backends/DRMBackend.cpp +@@ -3424,6 +3424,7 @@ namespace gamescope + bNeedsFullComposite |= bWasFirstFrame; + bNeedsFullComposite |= pFrameInfo->useFSRLayer0; + bNeedsFullComposite |= pFrameInfo->useNISLayer0; ++ bNeedsFullComposite |= pFrameInfo->useBICUBICLayer0; + bNeedsFullComposite |= pFrameInfo->blurLayer0; + bNeedsFullComposite |= bNeedsCompositeFromFilter; + bNeedsFullComposite |= !k_bUseCursorPlane && bDrewCursor; +diff --git a/src/Backends/OpenVRBackend.cpp b/src/Backends/OpenVRBackend.cpp +index 1f0e822..6756835 100644 +--- a/src/Backends/OpenVRBackend.cpp ++++ b/src/Backends/OpenVRBackend.cpp +@@ -1431,6 +1431,7 @@ namespace gamescope + bNeedsFullComposite |= cv_composite_force; + bNeedsFullComposite |= pFrameInfo->useFSRLayer0; + bNeedsFullComposite |= pFrameInfo->useNISLayer0; ++ bNeedsFullComposite |= pFrameInfo->useBICUBICLayer0; + bNeedsFullComposite |= pFrameInfo->blurLayer0; + bNeedsFullComposite |= bNeedsCompositeFromFilter; + bNeedsFullComposite |= g_bColorSliderInUse; +diff --git a/src/Backends/SDLBackend.cpp b/src/Backends/SDLBackend.cpp +index 2bb8fb0..87b1bed 100644 +--- a/src/Backends/SDLBackend.cpp ++++ b/src/Backends/SDLBackend.cpp +@@ -736,7 +736,7 @@ namespace gamescope + if ( event.key.keysym.mod & KMOD_LGUI ) + { + uint32_t key = SDLScancodeToLinuxKey( event.key.keysym.scancode ); +- const uint32_t shortcutKeys[] = {KEY_F, KEY_N, KEY_B, KEY_U, KEY_Y, KEY_I, KEY_O, KEY_S, KEY_G}; ++ const uint32_t shortcutKeys[] = {KEY_F, KEY_N, KEY_B, KEY_K, KEY_U, KEY_Y, KEY_I, KEY_O, KEY_S, KEY_G}; + const bool isShortcutKey = std::find(std::begin(shortcutKeys), std::end(shortcutKeys), key) != std::end(shortcutKeys); + if ( isShortcutKey ) + { +@@ -764,6 +764,10 @@ namespace gamescope + case KEY_B: + g_wantedUpscaleFilter = GamescopeUpscaleFilter::LINEAR; + break; ++ case KEY_K: ++ g_wantedDownscaleFilter = (g_wantedDownscaleFilter == GamescopeDownscaleFilter::BICUBIC) ? ++ GamescopeDownscaleFilter::LINEAR : GamescopeDownscaleFilter::BICUBIC; ++ break; + case KEY_U: + g_wantedUpscaleFilter = (g_wantedUpscaleFilter == GamescopeUpscaleFilter::FSR) ? + GamescopeUpscaleFilter::LINEAR : GamescopeUpscaleFilter::FSR; +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index 664ed0e..d942cd6 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -1022,6 +1022,7 @@ namespace gamescope + bNeedsFullComposite |= cv_composite_force; + bNeedsFullComposite |= pFrameInfo->useFSRLayer0; + bNeedsFullComposite |= pFrameInfo->useNISLayer0; ++ bNeedsFullComposite |= pFrameInfo->useBICUBICLayer0; + bNeedsFullComposite |= pFrameInfo->blurLayer0; + bNeedsFullComposite |= bNeedsCompositeFromFilter; + bNeedsFullComposite |= g_bColorSliderInUse; +@@ -2877,6 +2878,16 @@ namespace gamescope + return; + } + ++ case KEY_K: ++ { ++ if ( !bPressed ) ++ { ++ g_wantedDownscaleFilter = (g_wantedDownscaleFilter == GamescopeDownscaleFilter::BICUBIC) ? ++ GamescopeDownscaleFilter::LINEAR : GamescopeDownscaleFilter::BICUBIC; ++ } ++ return; ++ } ++ + case KEY_Y: + { + if ( !bPressed ) +diff --git a/src/main.cpp b/src/main.cpp +index cdb35c3..78e072b 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -7,6 +7,7 @@ + #include <mutex> + #include <vector> + #include <cstring> ++#include <sstream> + #include <string> + #if defined(__linux__) + #include <sys/capability.h> +@@ -297,11 +298,14 @@ bool g_bGrabbed = false; + float g_mouseSensitivity = 1.0; + + GamescopeUpscaleFilter g_upscaleFilter = GamescopeUpscaleFilter::LINEAR; ++GamescopeDownscaleFilter g_downscaleFilter = GamescopeDownscaleFilter::LINEAR; + GamescopeUpscaleScaler g_upscaleScaler = GamescopeUpscaleScaler::AUTO; + + GamescopeUpscaleFilter g_wantedUpscaleFilter = GamescopeUpscaleFilter::LINEAR; ++GamescopeDownscaleFilter g_wantedDownscaleFilter = GamescopeDownscaleFilter::LINEAR; + GamescopeUpscaleScaler g_wantedUpscaleScaler = GamescopeUpscaleScaler::AUTO; + int g_upscaleFilterSharpness = 2; ++GamescopeBicubicParams g_bicubicParams; + + gamescope::GamescopeModeGeneration g_eGamescopeModeGeneration = gamescope::GAMESCOPE_MODE_GENERATE_CVT; + +@@ -406,6 +410,54 @@ static enum GamescopeUpscaleFilter parse_upscaler_filter(const char *str) + } + } + ++static enum GamescopeDownscaleFilter parse_downscaler_filter(const char *str) ++{ ++ std::string_view arg{str}; ++ ++ // If the string is just 'bicubic' use default values ++ if ( arg == "bicubic" ) { ++ return GamescopeDownscaleFilter::BICUBIC; ++ } ++ ++ // Arguments start after ':' ++ if ( auto search = arg.find(':'); search == std::string::npos ) { ++ fprintf( stderr, "gamescope: invalid argument for --filter=bicubic:float,float\n" ); ++ exit(1); ++ } else { ++ arg = std::string_view(arg.data() + search + 1); ++ } ++ ++ // Push arguments to stream ++ std::stringstream ss; ++ ss << arg; ++ ++ // Validate arguments from stream ++ double b, c; ++ char comma; ++ if ((ss >> b >> comma >> c) && (comma == ',')) { ++ // clamp values ++ b = std::clamp(b, 0.0, 1.0); ++ c = std::clamp(c, 0.0, 1.0); ++ // Ovewrite default global parameters ++ g_bicubicParams.b = b; ++ g_bicubicParams.c = c; ++ // Set downscaler filters ++ return GamescopeDownscaleFilter::BICUBIC; ++ } ++ ++ fprintf( stderr, "gamescope: invalid value for --filter\n" ); ++ exit(1); ++} ++ ++static void parse_filter(const char *str) ++{ ++ if (std::string_view{str}.starts_with("bicubic")) { ++ g_wantedDownscaleFilter = parse_downscaler_filter(str); ++ } else { ++ g_wantedUpscaleFilter = parse_upscaler_filter(str); ++ } ++} ++ + static enum gamescope::GamescopeBackend parse_backend_name(const char *str) + { + if (strcmp(str, "auto") == 0) { +@@ -736,7 +788,7 @@ int main(int argc, char **argv) + g_wantedUpscaleScaler = parse_upscaler_scaler(optarg); + break; + case 'F': +- g_wantedUpscaleFilter = parse_upscaler_filter(optarg); ++ parse_filter(optarg); + break; + case 'b': + g_bBorderlessOutputWindow = true; +diff --git a/src/main.hpp b/src/main.hpp +index 2e6fb83..f8cc030 100644 +--- a/src/main.hpp ++++ b/src/main.hpp +@@ -40,6 +40,18 @@ enum class GamescopeUpscaleFilter : uint32_t + FROM_VIEW = 0xF, // internal + }; + ++enum class GamescopeDownscaleFilter : uint32_t ++{ ++ LINEAR = 0, ++ BICUBIC, ++}; ++ ++struct GamescopeBicubicParams ++{ ++ float b = 0.3f; ++ float c = 0.3f; ++}; ++ + static constexpr bool DoesHardwareSupportUpscaleFilter( GamescopeUpscaleFilter eFilter ) + { + // Could do nearest someday... AMDGPU DC supports custom tap placement to an extent. +@@ -57,10 +69,13 @@ enum class GamescopeUpscaleScaler : uint32_t + }; + + extern GamescopeUpscaleFilter g_upscaleFilter; ++extern GamescopeDownscaleFilter g_downscaleFilter; + extern GamescopeUpscaleScaler g_upscaleScaler; + extern GamescopeUpscaleFilter g_wantedUpscaleFilter; ++extern GamescopeDownscaleFilter g_wantedDownscaleFilter; + extern GamescopeUpscaleScaler g_wantedUpscaleScaler; + extern int g_upscaleFilterSharpness; ++extern GamescopeBicubicParams g_bicubicParams; + + extern bool g_bBorderlessOutputWindow; + +diff --git a/src/meson.build b/src/meson.build +index a3dfdab..5d3019f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -66,6 +66,7 @@ shader_src = [ + 'shaders/cs_composite_rcas.comp', + 'shaders/cs_easu.comp', + 'shaders/cs_easu_fp16.comp', ++ 'shaders/cs_bicubic.comp', + 'shaders/cs_gaussian_blur_horizontal.comp', + 'shaders/cs_nis.comp', + 'shaders/cs_nis_fp16.comp', +diff --git a/src/rendervulkan.cpp b/src/rendervulkan.cpp +index f79d26e..cc7edbb 100644 +--- a/src/rendervulkan.cpp ++++ b/src/rendervulkan.cpp +@@ -44,6 +44,7 @@ + #include "cs_composite_rcas.h" + #include "cs_easu.h" + #include "cs_easu_fp16.h" ++#include "cs_bicubic.h" + #include "cs_gaussian_blur_horizontal.h" + #include "cs_nis.h" + #include "cs_nis_fp16.h" +@@ -52,6 +53,7 @@ + #define A_CPU + #include "shaders/ffx_a.h" + #include "shaders/ffx_fsr1.h" ++#include "shaders/bicubic.h" + + #include "reshade_effect_manager.hpp" + +@@ -912,6 +914,7 @@ bool CVulkanDevice::createShaders() + SHADER(BLUR_COND, cs_composite_blur_cond); + SHADER(BLUR_FIRST_PASS, cs_gaussian_blur_horizontal); + SHADER(RCAS, cs_composite_rcas); ++ SHADER(BICUBIC, cs_bicubic); + if (m_bSupportsFp16) + { + SHADER(EASU, cs_easu_fp16); +@@ -1151,6 +1154,7 @@ void CVulkanDevice::compileAllPipelines() + SHADER(BLUR_FIRST_PASS, 1, 2, 1); + SHADER(RCAS, k_nMaxLayers, k_nMaxYcbcrMask_ToPreCompile, 1); + SHADER(EASU, 1, 1, 1); ++ SHADER(BICUBIC, 1, 1, 1); + SHADER(NIS, 1, 1, 1); + SHADER(RGB_TO_NV12, 1, 1, 1); + #undef SHADER +@@ -3732,6 +3736,17 @@ struct EasuPushData_t + } + }; + ++struct BicubicPushData_t ++{ ++ uvec4_t Const0; ++ uvec4_t Const1; ++ ++ BicubicPushData_t(float B, float C, uint32_t inputX, uint32_t inputY, uint32_t tempX, uint32_t tempY, uint32_t winX, uint32_t winY) ++ { ++ BicubicCon(&Const0.x, &Const1.x, B*10, C*10, inputX, inputY, tempX, tempY, winX, winY); ++ } ++}; ++ + struct RcasPushData_t + { + uvec2_t u_layer0Offset; +@@ -3950,7 +3965,51 @@ std::optional<uint64_t> vulkan_composite( struct FrameInfo_t *frameInfo, gamesco + for (uint32_t i = 0; i < EOTF_Count; i++) + cmdBuffer->bindColorMgmtLuts(i, frameInfo->shaperLut[i], frameInfo->lut3D[i]); + +- if ( frameInfo->useFSRLayer0 ) ++ if ( frameInfo->useBICUBICLayer0 ) ++ { ++ uint32_t inputX = frameInfo->layers[0].tex->width(); ++ uint32_t inputY = frameInfo->layers[0].tex->height(); ++ ++ uint32_t tempX = frameInfo->layers[0].integerWidth(); ++ uint32_t tempY = frameInfo->layers[0].integerHeight(); ++ ++ update_tmp_images(tempX, tempY); ++ ++ cmdBuffer->bindPipeline( g_device.pipeline(SHADER_TYPE_BICUBIC, frameInfo->layerCount, frameInfo->ycbcrMask())); ++ cmdBuffer->bindTarget(g_output.tmpOutput); ++ cmdBuffer->bindTexture(0, frameInfo->layers[0].tex); ++ cmdBuffer->setTextureSrgb(0, true); ++ cmdBuffer->setSamplerUnnormalized(0, false); ++ cmdBuffer->setSamplerNearest(0, false); ++ cmdBuffer->uploadConstants<BicubicPushData_t>(g_bicubicParams.b ++ , g_bicubicParams.c ++ , inputX ++ , inputY ++ , tempX ++ , tempY ++ , currentOutputWidth ++ , currentOutputHeight ++ ); ++ ++ int pixelsPerGroup = 16; ++ ++ cmdBuffer->dispatch(div_roundup(tempX, pixelsPerGroup), div_roundup(tempY, pixelsPerGroup)); ++ ++ struct FrameInfo_t bicFrameInfo = *frameInfo; ++ bicFrameInfo.layers[0].tex = g_output.tmpOutput; ++ bicFrameInfo.layers[0].scale.x = 1.0f; ++ bicFrameInfo.layers[0].scale.y = 1.0f; ++ ++ cmdBuffer->bindPipeline( g_device.pipeline(SHADER_TYPE_BLIT, bicFrameInfo.layerCount, bicFrameInfo.ycbcrMask())); ++ bind_all_layers(cmdBuffer.get(), &bicFrameInfo); ++ cmdBuffer->bindTarget(compositeImage); ++ cmdBuffer->uploadConstants<BlitPushData_t>(&bicFrameInfo); ++ ++ pixelsPerGroup = 8; ++ ++ cmdBuffer->dispatch(div_roundup(currentOutputWidth, pixelsPerGroup), div_roundup(currentOutputHeight, pixelsPerGroup)); ++ } ++ else if ( frameInfo->useFSRLayer0 ) + { + uint32_t inputX = frameInfo->layers[0].tex->width(); + uint32_t inputY = frameInfo->layers[0].tex->height(); +diff --git a/src/rendervulkan.hpp b/src/rendervulkan.hpp +index 63cc602..4092e82 100644 +--- a/src/rendervulkan.hpp ++++ b/src/rendervulkan.hpp +@@ -281,6 +281,7 @@ struct FrameInfo_t + { + bool useFSRLayer0; + bool useNISLayer0; ++ bool useBICUBICLayer0; + bool bFadingOut; + BlurMode blurLayer0; + int blurRadius; +@@ -556,6 +557,7 @@ enum ShaderType { + SHADER_TYPE_EASU, + SHADER_TYPE_RCAS, + SHADER_TYPE_NIS, ++ SHADER_TYPE_BICUBIC, + SHADER_TYPE_RGB_TO_NV12, + + SHADER_TYPE_COUNT +diff --git a/src/shaders/bicubic.h b/src/shaders/bicubic.h +new file mode 100644 +index 0000000..8117e87 +--- /dev/null ++++ b/src/shaders/bicubic.h +@@ -0,0 +1,44 @@ ++//_____________________________________________________________/\_______________________________________________________________ ++//============================================================================================================================== ++// ++// ++// BICUBIC IMAGE SCALING ++// ++// ++//------------------------------------------------------------------------------------------------------------------------------ ++//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ++//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ++//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ++//_____________________________________________________________/\_______________________________________________________________ ++//============================================================================================================================== ++// CONSTANT SETUP ++//============================================================================================================================== ++// Call to setup required constant values (works on CPU or GPU). ++A_STATIC void BicubicCon( ++outAU4 con0, ++outAU4 con1, ++// Configurable parameters ++AU1 B, ++AU1 C, ++// This the rendered image resolution ++AF1 inputRenderedSizeX, ++AF1 inputRenderedSizeY, ++// This is the resolution of the resource containing the input image (useful for dynamic resolution) ++AF1 inputCurrentSizeX, ++AF1 inputCurrentSizeY, ++// This is the window width / height ++AF1 outputTargetSizeX, ++AF1 outputTargetSizeY) ++{ ++ // Input/Output size information ++ con0[0]=AU1_AF1(inputRenderedSizeX); ++ con0[1]=AU1_AF1(inputRenderedSizeY); ++ con0[2]=AU1_AF1(inputCurrentSizeX); ++ con0[3]=AU1_AF1(inputCurrentSizeY); ++ ++ // Viewport pixel position to normalized image space. ++ con1[0]=AU1_AF1(outputTargetSizeX); ++ con1[1]=AU1_AF1(outputTargetSizeY); ++ con1[2]=B; ++ con1[3]=C; ++} +diff --git a/src/shaders/cs_bicubic.comp b/src/shaders/cs_bicubic.comp +new file mode 100644 +index 0000000..2b6dfb8 +--- /dev/null ++++ b/src/shaders/cs_bicubic.comp +@@ -0,0 +1,177 @@ ++// References ++// https://www.codeproject.com/Articles/236394/Bi-Cubic-and-Bi-Linear-Interpolation-with-GLSL ++// https://stackoverflow.com/questions/13501081/efficient-bicubic-filtering-code-in-glsl ++// https://web.archive.org/web/20180927181721/http://www.java-gaming.org/index.php?topic=35123.0 ++// https://gist.github.com/TheRealMJP/c83b8c0f46b63f3a88a5986f4fa982b1 ++ ++#version 460 ++ ++#extension GL_GOOGLE_include_directive : require ++#extension GL_EXT_shader_explicit_arithmetic_types_float16 : require ++#extension GL_EXT_scalar_block_layout : require ++ ++#include "descriptor_set.h" ++ ++layout( ++ local_size_x = 64, ++ local_size_y = 1, ++ local_size_z = 1) in; ++ ++// Push constant is a mechanism in modern OpenGL that allows passing small amounts of frequently ++// updated data to the shader without needing to bind a buffer ++layout(binding = 0, scalar) ++uniform layers_t { ++ uvec4 c0, c1; ++}; ++ ++#define A_GPU 1 ++#define A_GLSL 1 ++#define A_HALF 1 ++#include "ffx_a.h" ++#include "bicubic.h" ++ ++// The Mitchell–Netravali filters or BC-splines ++// https://en.wikipedia.org/wiki/Mitchell%E2%80%93Netravali_filters ++// Conditionals are slow in GPU code, so to represent 0 <= f < 1 and 1 <= f < 2 ++// the P(d) form shown in the wikipedia page is used ++vec4 mitchellNetravaliWeights(float f, float B, float C) ++{ ++ float w0 = ((12.0 - 9.0 * B - 6.0 * C) * pow(f, 3.0)) + ++ ((-18.0 + 12.0 * B + 6.0 * C) * pow(f, 2.0)) + ++ (6.0 - 2.0 * B); ++ ++ float w1 = ((-B - 6.0 * C) * pow(f - 1.0, 3.0)) + ++ ((6.0 * B + 30.0 * C) * pow(f - 1.0, 2.0)) + ++ ((-12.0 * B - 48.0 * C) * (f - 1.0)) + ++ (8.0 * B + 24.0 * C); ++ ++ float w2 = ((12.0 - 9.0 * B - 6.0 * C) * pow(1.0 - f, 3.0)) + ++ ((-18.0 + 12.0 * B + 6.0 * C) * pow(1.0 - f, 2.0)) + ++ (6.0 - 2.0 * B); ++ ++ float w3 = ((-B - 6.0 * C) * pow(2.0 - f, 3.0)) + ++ ((6.0 * B + 30.0 * C) * pow(2.0 - f, 2.0)) + ++ ((-12.0 * B - 48.0 * C) * (2.0 - f)) + ++ (8.0 * B + 24.0 * C); ++ ++ return vec4(w0, w1, w2, w3); ++} ++ ++// https://stackoverflow.com/questions/13501081/efficient-bicubic-filtering-code-in-glsl ++// https://web.archive.org/web/20180927181721/http://www.java-gaming.org/index.php?topic=35123.0 ++// This is an efficient method to implement bicubic filtering, it takes ++// advantage of the fact that the bilinear approach gives the weighted average ++// of a 2x2 area. ++vec4 textureBicubic(sampler2D splr, vec2 texCoords) ++{ ++ vec2 texSize = textureSize(splr, 0); ++ vec2 invTexSize = 1.0 / texSize; ++ ++ // Converts normalized coordinates into pixel-space coordinate ++ // Example: If texCoords is (0.5, 0.5), and the texture size is (1920, 1080), the result will be ++ // (960, 540)—the center of the texture in pixel space. ++ // Subtracting 0.5 ensures that you're sampling from the center of the texel rather than its corner ++ // Example: Assume we have a 3x3 texture and texCoords = (0.5, 0.5): ++ // [0,0][1,0][2,0] ++ // [0,1][1,1][2,1] ++ // [0,2][1,2][2,2] ++ // texCoords * texSize - 0.5 maps to (1.5, 1.5), which is between (1,1) and (2,2), then ++ // subtracts 0.5 to move it to (1.0, 1.0)—the center of the texel ++ texCoords = texCoords * texSize - 0.5; ++ ++ // Get B and C that were pushed from the user input (or default values) ++ float B = c1[2] / 10.0f; ++ float C = c1[3] / 10.0f; ++ ++ // Get the fractional part of the coordinates ++ // They are used in Mitchell Netravali's strategy to calculate the interpolation weights, ++ // i.e., how much influence the neighboring vertices have on the final pixel value ++ vec2 fxy = fract(texCoords); ++ texCoords -= fxy; ++ ++ // Calculate bicubic weights ++ // These weights represent how much influence each neighboring texel in the 4x4 grid will have ++ // on the final interpolated pixel value ++ vec4 xweights = mitchellNetravaliWeights(fxy.x, B, C); ++ vec4 yweights = mitchellNetravaliWeights(fxy.y, B, C); ++ ++ // Modify the current texture coordinates to have an offset in texels for each coordinate ++ // E.g. texCoords + vec(-1.0, 0.0) is a texel to the left ++ // texCoords + vec(1.0, 0.0) is a texel to the right ++ // texCoords + vec(0.0, 1.0) is a texel downwards ++ // texCoords + vec(0.0, -1.0) is a texel upwards ++ vec4 offsetTexels = texCoords.xxyy; ++ offsetTexels += vec2 (-1.0, +1.0).xyxy; ++ // Normalize weights to range between (0,1) ++ // vec4 sumWeights = vec4(xweights.xz + xweights.yw, yweights.xz + yweights.yw); ++ // vec4 normalizedWeights = vec4 (xweights.yw, yweights.yw) / sumWeights; ++ vec4 sumWeights = vec4(xweights.x + xweights.y, xweights.z + xweights.w, yweights.x + yweights.y, yweights.z + yweights.w); ++ vec4 normalizedWeights = vec4 (xweights.y, xweights.w, yweights.y, yweights.w) / sumWeights; ++ // Use the weights to influence the sampling position inside each texel ++ // Each texel has a size from (0,1) ++ vec4 offsetSampler = offsetTexels + normalizedWeights; ++ // Go back to normalized space ++ offsetSampler *= invTexSize.xxyy; ++ // Perform the sampling ++ vec4 sample0 = texture(splr, offsetSampler.xz); ++ vec4 sample1 = texture(splr, offsetSampler.yz); ++ vec4 sample2 = texture(splr, offsetSampler.xw); ++ vec4 sample3 = texture(splr, offsetSampler.yw); ++ ++ // Now we perform linear interpolation in the selected points ++ // The mix(a, b, t) function in GLSL performs linear interpolation between a and b based on the ++ // parameter t, t is between 0 and 1 ++ // https://registry.khronos.org/OpenGL-Refpages/gl4/html/mix.xhtml ++ ++ // Here we want to normalize sx and sy to between 0 and 1 (t value) ++ float sx = sumWeights.x / (sumWeights.x + sumWeights.y); ++ float sy = sumWeights.z / (sumWeights.z + sumWeights.w); ++ ++ return mix( ++ mix(sample3, sample2, sx), mix(sample1, sample0, sx) ++ , sy); ++} ++ ++void bicPass(uvec2 pos) ++{ ++ // Retrieve pushed values ++ AF2 inputRenderedSize = AF2_AU2(c0.xy); ++ AF2 inputCurrentSize = AF2_AU2(c0.zw); ++ AF2 outputTargetSize = AF2_AU2(c1.xy); ++ ++ // ARcpF1(x) == 1.0 / x ++ // scaleFactor is the division between the rendered image and the size it should have at the end ++ // E.g.: Rendered 1920x1080, window size is 960x540, then scaleFactor is 2x2 ++ AF2 scaleFactor = inputRenderedSize * vec2(ARcpF1(inputCurrentSize.x), ARcpF1(inputCurrentSize.y)); ++ ++ // The parameter pos of this function is used to iterate over the output image (e.g. 960x540) ++ // The position of the processed pixel should be taken from the rendered image (e.g. 1920x1080) ++ // 10x10 in the output, corresponds to 20x20 in the original image ++ AF2 positionPixel=AF2(pos)*scaleFactor; ++ ++ // Normalize the image space to be between [0,1] ++ positionPixel=positionPixel*vec2(ARcpF1(inputRenderedSize.x),ARcpF1(inputRenderedSize.y)); ++ ++ // Apply the bicubic algorithm in the normalized pixel position ++ vec4 bicPass = textureBicubic(s_samplers[0], positionPixel); ++ ++ imageStore(dst, ivec2(pos), bicPass); ++} ++ ++ ++void main() ++{ ++ // AMD recommends to use this swizzle and to process 4 pixel per invocation ++ // for better cache utilisation ++ uvec2 pos = ARmp8x8(gl_LocalInvocationID.x) + uvec2(gl_WorkGroupID.x << 4u, gl_WorkGroupID.y << 4u); ++ ++ bicPass(pos); ++ pos.x += 8u; ++ bicPass(pos); ++ pos.y += 8u; ++ bicPass(pos); ++ pos.x -= 8u; ++ bicPass(pos); ++} ++ ++/* vim: set expandtab ft=cpp fdm=marker ts=4 sw=4 tw=100 et :*/ +diff --git a/src/shaders/descriptor_set.h b/src/shaders/descriptor_set.h +index f2b8527..64cc1c9 100644 +--- a/src/shaders/descriptor_set.h ++++ b/src/shaders/descriptor_set.h +@@ -21,6 +21,7 @@ const int filter_nearest = 1; + const int filter_fsr = 2; + const int filter_nis = 3; + const int filter_pixel = 4; ++const int filter_bicubic = 5; + const int filter_from_view = 255; + + const int EOTF_Gamma22 = 0; +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index c1d49fd..44cb223 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -1015,6 +1015,7 @@ gamescope::ConCommand cc_debug_set_fps_limit( "debug_set_fps_limit", "Set refres + static int g_nRuntimeInfoFd = -1; + + bool g_bFSRActive = false; ++bool g_bBicubicActive = false; + + BlurMode g_BlurMode = BLUR_MODE_OFF; + BlurMode g_BlurModeOld = BLUR_MODE_OFF; +@@ -2555,6 +2556,8 @@ paint_all( global_focus_t *pFocus, bool async ) + paint_window(w, w, &frameInfo, pFocus->cursor, PaintWindowFlag::BasePlane | PaintWindowFlag::DrawBorders, 1.0f, override); + + bool needsScaling = frameInfo.layers[0].scale.x < 0.999f && frameInfo.layers[0].scale.y < 0.999f; ++ bool needsDownScaling = true; ++ frameInfo.useBICUBICLayer0 = g_downscaleFilter == GamescopeDownscaleFilter::BICUBIC && needsDownScaling; + frameInfo.useFSRLayer0 = g_upscaleFilter == GamescopeUpscaleFilter::FSR && needsScaling; + frameInfo.useNISLayer0 = g_upscaleFilter == GamescopeUpscaleFilter::NIS && needsScaling; + } +@@ -2696,6 +2699,7 @@ paint_all( global_focus_t *pFocus, bool async ) + } + + frameInfo.useFSRLayer0 = false; ++ frameInfo.useBICUBICLayer0 = false; + frameInfo.useNISLayer0 = false; + } + +@@ -5761,6 +5765,9 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev) + g_wantedUpscaleScaler = GamescopeUpscaleScaler::AUTO; + g_wantedUpscaleFilter = GamescopeUpscaleFilter::NIS; + break; ++ case 5: ++ g_wantedDownscaleFilter = GamescopeDownscaleFilter::BICUBIC; ++ break; + } + hasRepaint = true; + } +@@ -7391,6 +7398,7 @@ void init_xwayland_ctx(uint32_t serverId, gamescope_xwayland_server_t *xwayland_ + ctx->atoms.gamescopeLowLatency = XInternAtom( ctx->dpy, "GAMESCOPE_LOW_LATENCY", false ); + + ctx->atoms.gamescopeFSRFeedback = XInternAtom( ctx->dpy, "GAMESCOPE_FSR_FEEDBACK", false ); ++ ctx->atoms.gamescopeBicubicFeedback = XInternAtom( ctx->dpy, "GAMESCOPE_BICUBIC_FEEDBACK", false ); + + ctx->atoms.gamescopeBlurMode = XInternAtom( ctx->dpy, "GAMESCOPE_BLUR_MODE", false ); + ctx->atoms.gamescopeBlurRadius = XInternAtom( ctx->dpy, "GAMESCOPE_BLUR_RADIUS", false ); +@@ -7645,6 +7653,7 @@ extern int g_nPreferredOutputWidth; + extern int g_nPreferredOutputHeight; + + static bool g_bWasFSRActive = false; ++static bool g_bWasBicubicActive = false; + + bool g_bAppWantsHDRCached = false; + +@@ -8091,6 +8100,16 @@ steamcompmgr_main(int argc, char **argv) + flush_root = true; + } + ++ if ( g_bBicubicActive != g_bWasBicubicActive ) ++ { ++ uint32_t active = g_bBicubicActive ? 1 : 0; ++ XChangeProperty( root_ctx->dpy, root_ctx->root, root_ctx->atoms.gamescopeBicubicFeedback, XA_CARDINAL, 32, PropModeReplace, ++ (unsigned char *)&active, 1 ); ++ ++ g_bWasBicubicActive = g_bBicubicActive; ++ flush_root = true; ++ } ++ + static gamescope::VirtualConnectorStrategy s_eLastVirtualConnectorStrategy = gamescope::cv_backend_virtual_connector_strategy; + gamescope::VirtualConnectorStrategy eVirtualConnectorStrategy = gamescope::cv_backend_virtual_connector_strategy; + +@@ -8439,6 +8458,7 @@ steamcompmgr_main(int argc, char **argv) + g_bSteamIsActiveWindow = false; + g_upscaleScaler = g_wantedUpscaleScaler; + g_upscaleFilter = g_wantedUpscaleFilter; ++ g_downscaleFilter = g_wantedDownscaleFilter; + } + + // If we're in the middle of a fade, then keep us +diff --git a/src/steamcompmgr.hpp b/src/steamcompmgr.hpp +index 98e9272..ea7de13 100644 +--- a/src/steamcompmgr.hpp ++++ b/src/steamcompmgr.hpp +@@ -129,6 +129,7 @@ extern float focusedWindowOffsetX; + extern float focusedWindowOffsetY; + + extern bool g_bFSRActive; ++extern bool g_bBicubicActive; + + extern uint32_t inputCounter; + extern uint64_t g_lastWinSeq; +diff --git a/src/xwayland_ctx.hpp b/src/xwayland_ctx.hpp +index df2af70..e212a11 100644 +--- a/src/xwayland_ctx.hpp ++++ b/src/xwayland_ctx.hpp +@@ -164,6 +164,7 @@ struct xwayland_ctx_t final : public gamescope::IWaitable + Atom gamescopeLowLatency; + + Atom gamescopeFSRFeedback; ++ Atom gamescopeBicubicFeedback; + + Atom gamescopeBlurMode; + Atom gamescopeBlurRadius; diff --git a/hosts/iroha/gentoo/profile/package.use.force/force.conf b/hosts/iroha/gentoo/profile/package.use.force/force.conf index 13ec281..d146a47 100644 --- a/hosts/iroha/gentoo/profile/package.use.force/force.conf +++ b/hosts/iroha/gentoo/profile/package.use.force/force.conf @@ -1,2 +1,3 @@ -*/* -pie -sys-devel/gcc -default-stack-clash-protection -default-znow +sys-devel/gcc -pie -default-stack-clash-protection -default-znow +llvm-core/clang -pie +sys-devel/binutils -cet diff --git a/hosts/iroha/gentoo/profile/use.mask b/hosts/iroha/gentoo/profile/use.mask deleted file mode 100644 index 30afb9c..0000000 --- a/hosts/iroha/gentoo/profile/use.mask +++ /dev/null @@ -1,3 +0,0 @@ --custom-cflags --pie --lto diff --git a/hosts/iroha/gentoo/repos.conf/eselect-repo.conf b/hosts/iroha/gentoo/repos.conf/eselect-repo.conf index e601b11..bcfb263 100644 --- a/hosts/iroha/gentoo/repos.conf/eselect-repo.conf +++ b/hosts/iroha/gentoo/repos.conf/eselect-repo.conf @@ -1,7 +1,20 @@ # created by eselect-repo -[src_prepare-overlay] -location = /var/db/repos/src_prepare-overlay +[steam-overlay] +location = /var/db/repos/steam-overlay sync-type = git -sync-uri = https://github.com/gentoo-mirror/src_prepare-overlay.git +sync-uri = https://github.com/anyc/steam-overlay.git +[guru] +location = /var/db/repos/guru +sync-type = git +sync-uri = https://github.com/gentoo-mirror/guru.git +#priority = 1 + +[localrepo] +location = /var/db/repos/localrepo + +[tatsh-overlay] +location = /var/db/repos/tatsh-overlay +sync-type = git +sync-uri = https://github.com/Tatsh/tatsh-overlay.git diff --git a/hosts/iroha/gentoo/repos.conf/gentoo.conf b/hosts/iroha/gentoo/repos.conf/gentoo.conf new file mode 120000 index 0000000..c5fa1f0 --- /dev/null +++ b/hosts/iroha/gentoo/repos.conf/gentoo.conf @@ -0,0 +1 @@ +/usr/share/portage/config/repos.conf
\ No newline at end of file diff --git a/hosts/iroha/gentoo/repos.conf/localrepo.conf b/hosts/iroha/gentoo/repos.conf/localrepo.conf new file mode 100644 index 0000000..4de0869 --- /dev/null +++ b/hosts/iroha/gentoo/repos.conf/localrepo.conf @@ -0,0 +1,2 @@ +[localrepo] +location = /var/db/repos/localrepo diff --git a/hosts/iroha/gentoo/repos.conf/nix-guix.conf b/hosts/iroha/gentoo/repos.conf/nix-guix.conf new file mode 100644 index 0000000..0574edd --- /dev/null +++ b/hosts/iroha/gentoo/repos.conf/nix-guix.conf @@ -0,0 +1,4 @@ +[nix-guix] +location = /var/db/repos/nix-guix +sync-type = git +sync-uri = https://github.com/trofi/nix-guix-gentoo.git diff --git a/hosts/iroha/gentoo_install.txt b/hosts/iroha/gentoo_install.txt deleted file mode 100644 index e7cf415..0000000 --- a/hosts/iroha/gentoo_install.txt +++ /dev/null @@ -1,63 +0,0 @@ -== Gentoo - - Stable only packages. - - Chroot desktop. - - Package binhost. - - Set /etc/locale.gen as soon as possible. - - Parallel OpenRC. - - Mitigations off. - - Ebuilds for camu and mauri. - - nix dev shell? - - https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Performance-tuning#realtime-scheduling - - https://wiki.gentoo.org/wiki/Gentoo_Cheat_Sheet#eix - - https://wiki.gentoo.org/wiki/Steam - - https://wiki.gentoo.org/wiki/Wine - - https://github.com/CachyOS/CachyOS-Settings/blob/master/usr/lib/udev/rules.d/60-ioschedulers.rules - - https://wiki.cachyos.org/features/cachyos_settings/#udev-rules - -== Desktop - - **dotfiles. - - GNU Stow? - - back to pywal. - - BASED Neovim package manager. - - Greeter/Lockscreen? - - Curses clock. - - libvirt - -== Personal Server - - incus containers no vms? - -== Waydroid - - VPN? - -= Ideas -== What to encrypt -=== Iroha -- $HOME on sperate partition (64gb) -=== Moyo -- Aux nvme -== Names -- denpa -> station -- yashinoki -> palm -== Restrict directory access -- move as many things a possible out of $HOME/. -- unwritable ~/.config? -== Maintanence file -- Manual list of installed packages. -- list of possible "app data" locations -== zram > zswap or portage tmpfs - - 8GB swap - - 8GB tmp - - 16GB /var/tmp/portage - - disable zswap in kernel config? - -== TODO - - [x] Pass on dotfiles. - - [x] /etc/sysctl.d and /etc/modules-load.d - - [-] Commit current stuff. - - [ ] Remake moyo. - - [ ] Re-install gentoo. - - [ ] denpa on a debian incus container. - - [ ] Remote ssh access. - - [ ] Wake-on-lan? - - [ ] Remake iroha. - - [ ] Remake yashinoki. diff --git a/hosts/iroha/grub_config b/hosts/iroha/grub_config index b306505..496d0bb 100644 --- a/hosts/iroha/grub_config +++ b/hosts/iroha/grub_config @@ -11,10 +11,10 @@ GRUB_DISTRIBUTOR="Gentoo" # Default menu entry -GRUB_DEFAULT=0 +#GRUB_DEFAULT=0 # Boot the default entry this many seconds after the menu is displayed -#GRUB_TIMEOUT=5 +GRUB_TIMEOUT=3 #GRUB_TIMEOUT_STYLE=menu # Append parameters to the linux kernel command line @@ -31,14 +31,15 @@ GRUB_CMDLINE_LINUX="quiet text rd.lvm.vg=iroha-vg0" # Append parameters to the linux kernel command line for non-recovery entries # default_hugepagesz=1G hugepagesz=1G hugepages=48 # drm.debug=0xe log_buf_len=4M ignore_loglevel xe.guc_log_level=2 -GRUB_CMDLINE_LINUX_DEFAULT="nowatchdog nmi_watchdog=0 amd_pstate=guided amd_iommu=on iommu=pt pcie_no_flr=1022:149c acpi_enforce_resources=lax fbcon=map:11111000 amdgpu.ppfeaturemask=0xffffffff i915.force_probe=!56a0 xe.force_probe=56a0 psi=1 mitigations=off" +# nowatchdog nmi_watchdog=0 +GRUB_CMDLINE_LINUX_DEFAULT="amd_pstate=guided amd_iommu=on iommu=pt pcie_no_flr=1022:149c acpi_enforce_resources=lax amdgpu.ppfeaturemask=0xffffffff i915.force_probe=!56a0 xe.force_probe=56a0 mitigations=off" # Uncomment to disable graphical terminal (grub-pc only) #GRUB_TERMINAL=console -# The resolution used on graphical terminal. -# Note that you can use only modes which your graphic card supports via VBE. -# You can see them in real GRUB with the command `vbeinfo'. +# Resolution used on graphical terminal. +# The list of valid modes may be obtained using the 'vbeinfo' (PC BIOS) or +# 'videoinfo' (EFI) command from a GRUB boot prompt. #GRUB_GFXMODE=640x480 # Set to 'text' to force the Linux kernel to boot in normal text diff --git a/hosts/iroha/iroha_maintenance.txt b/hosts/iroha/iroha_maintenance.txt new file mode 100644 index 0000000..04cb878 --- /dev/null +++ b/hosts/iroha/iroha_maintenance.txt @@ -0,0 +1,130 @@ += Iroha + +== Processes +=== Thumb Drive Setup +(as root) + cryptsetup luksFormat --key-size 512 /dev/sdd1 + cryptsetup luksHeaderBackup /dev/sdd1 --header-backup-file crypt_headers/thumb_drive.img + cryptsetup luksOpen /dev/sdd1 thumb_drive + mkfs.ext4 /dev/mapper/thumb_drive + mount /dev/mapper/thumb_drive /mnt/tmp + +== World +* app-admin/doas +* app-admin/pass +* app-admin/stow +* app-admin/sysklogd +* app-arch/7zip + - More common dependency over p7zip. +* app-arch/unrar +* app-containers/docker +* app-containers/docker-cli +* app-containers/waydroid +* app-crypt/pinentry +* app-editors/vim +* app-emulation/virt-manager +* app-emulation/wine-vanilla +* app-eselect/eselect-repository +* app-misc/neofetch +* app-misc/openrgb +* app-misc/screen +* app-misc/ufetch +* app-portage/gentoolkit +* app-portage/portage-utils +* app-shells/bash-completion +* app-text/aspell +* app-text/dos2unix +* app-text/sloccount +* dev-java/openjdk-bin:8 +* dev-lang/rust + - rust-bin is pulled in by default, so prefer this. +* dev-libs/bemenu +* dev-perl/Archive-Zip + - crc32. +* dev-ruby/asciidoctor +* dev-ruby/rouge + - Best asciidoc syntax highlighting. +* dev-util/pkgdev +* dev-vcs/git +* games-action/prismlauncher +* games-arcade/osu-lazer +* games-emulation/ryujinx +* games-util/gamemode +* games-util/mangohud +* games-util/steam-launcher +* games-util/umu-launcher +* games-util/xone +* games-util/xpadneo +* gnome-extra/zenity + - Steam. +* gui-apps/grim +* gui-apps/mako +* gui-apps/slurp +* gui-apps/swaybg +* gui-apps/swayidle +* gui-apps/wf-recorder +* gui-apps/wl-clipboard +* gui-apps/wlsunset +* gui-wm/gamescope +* gui-wm/sway +* mail-client/mutt +* media-fonts/noto +* media-fonts/noto-cjk +* media-fonts/noto-emoji +* media-gfx/gimp +* media-plugins/gst-plugins-pulse + - Needed for audio in virt-manager. +* media-sound/alsa-utils +* media-sound/ardour +* media-sound/pavucontrol +* media-sound/qpwgraph +* media-video/ffmpeg +* media-video/obs-studio +* media-video/pipewire + - We explicity launch pipewire, so keep it in world. +* media-video/v4l2loopback +* media-video/wlrobs + - 9999 because stable doesn't build. +* net-fs/nfs-utils +* net-misc/chrony +* net-misc/dhcpcd +* net-misc/megatools +* net-misc/socat +* net-misc/yt-dlp +* net-p2p/qbittorrent +* sys-apps/amdgpu_top +* sys-apps/fwupd +* sys-apps/nix +* sys-apps/nvme-cli + - dracut. +* sys-auth/rtkit +* sys-block/io-scheduler-udev-rules +* sys-fs/cryptsetup + - dracut. +* sys-fs/dosfstools + - /efi fsck. +* sys-fs/lvm2 + - dracut. +* sys-fs/multipath-tools + - kpartx. +* sys-kernel/installkernel +* sys-kernel/linux-firmware +* sys-power/cpupower +* sys-process/htop +* www-client/chromium +* www-client/firefox +* www-client/lynx + - Mutt. +* x11-apps/mesa-progs +* x11-apps/xprop +* x11-apps/xrandr +* x11-apps/xrdb +* x11-apss/xset + - obs +* x11-libs/libnotify + - notify-send +* x11-misc/xdg-user-dirs + - Steam. +* x11-misc/xdg-utils + - For kitty links. +* x11-terms/kitty diff --git a/hosts/iroha/kernel_config b/hosts/iroha/kernel_config index e4f5ee2..7aed50f 100644 --- a/hosts/iroha/kernel_config +++ b/hosts/iroha/kernel_config @@ -1,28 +1,27 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.15.5-gentoo Kernel Configuration +# Linux/x86 6.12.41-gentoo Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Gentoo 15.1.1_p20250705-r1 p2) 15.1.1 20250705" +CONFIG_CC_VERSION_TEXT="gcc (Gentoo 14.3.1_p20250801 p4) 14.3.1 20250801" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=150101 +CONFIG_GCC_VERSION=140301 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24400 +CONFIG_AS_VERSION=24500 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24400 +CONFIG_LD_VERSION=24500 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=108700 -CONFIG_RUSTC_LLVM_VERSION=200107 +CONFIG_RUSTC_VERSION=108900 +CONFIG_RUSTC_LLVM_VERSION=200108 CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_CC_HAS_COUNTED_BY=y -CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y -CONFIG_RUSTC_HAS_COERCE_POINTEE=y +CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y CONFIG_PAHOLE_VERSION=130 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -77,6 +76,7 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_MSI_IRQ=y +CONFIG_IRQ_MSI_IOMMU=y CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y CONFIG_GENERIC_IRQ_RESERVATION_MODE=y CONFIG_IRQ_FORCED_THREADING=y @@ -124,21 +124,15 @@ CONFIG_BPF_JIT=y CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set -# CONFIG_BPF_LSM is not set # end of BPF subsystem -CONFIG_PREEMPT_BUILD=y -CONFIG_ARCH_HAS_PREEMPT_LAZY=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -# CONFIG_PREEMPT_LAZY is not set -# CONFIG_PREEMPT_RT is not set +# CONFIG_PREEMPT is not set +CONFIG_PREEMPT_RT=y CONFIG_PREEMPT_COUNT=y CONFIG_PREEMPTION=y -CONFIG_PREEMPT_DYNAMIC=y CONFIG_SCHED_CORE=y -CONFIG_SCHED_CLASS_EXT=y # # CPU/Task time and stats accounting @@ -155,7 +149,7 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_PSI=y -CONFIG_PSI_DEFAULT_DISABLED=y +# CONFIG_PSI_DEFAULT_DISABLED is not set # end of CPU/Task time and stats accounting CONFIG_CPU_ISOLATION=y @@ -173,6 +167,8 @@ CONFIG_TASKS_RCU=y CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_DELAY=500 # end of RCU Subsystem CONFIG_IKCONFIG=y @@ -187,7 +183,6 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=5 -# CONFIG_SCHED_ALT is not set # end of Scheduler features CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y @@ -204,7 +199,7 @@ CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set CONFIG_MEMCG=y -CONFIG_MEMCG_V1=y +# CONFIG_MEMCG_V1 is not set CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y @@ -212,17 +207,15 @@ CONFIG_GROUP_SCHED_WEIGHT=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y # CONFIG_RT_GROUP_SCHED is not set -CONFIG_EXT_GROUP_SCHED=y CONFIG_SCHED_MM_CID=y CONFIG_UCLAMP_TASK_GROUP=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set -CONFIG_CGROUP_DMEM=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y CONFIG_CPUSETS=y -CONFIG_CPUSETS_V1=y -CONFIG_PROC_PID_CPUSET=y +# CONFIG_CPUSETS_V1 is not set +# CONFIG_PROC_PID_CPUSET is not set CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y @@ -242,12 +235,12 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set CONFIG_RD_ZSTD=y # CONFIG_BOOT_CONFIG is not set CONFIG_INITRAMFS_PRESERVE_MTIME=y @@ -258,12 +251,12 @@ CONFIG_LD_ORPHAN_WARN_LEVEL="warn" CONFIG_SYSCTL=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_SYSFS_SYSCALL=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y CONFIG_FHANDLE=y CONFIG_POSIX_TIMERS=y CONFIG_PRINTK=y @@ -290,8 +283,8 @@ CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set # CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y @@ -304,7 +297,6 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_PROFILING is not set -CONFIG_TRACEPOINTS=y # # Kexec and crash features @@ -340,6 +332,7 @@ CONFIG_X86_64_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=4 +CONFIG_CC_HAS_SANE_STACKPROTECTOR=y # # Processor type and features @@ -349,7 +342,6 @@ CONFIG_X86_X2APIC=y # CONFIG_X86_POSTED_MSI is not set # CONFIG_X86_MPPARSE is not set CONFIG_X86_CPU_RESCTRL=y -CONFIG_RESCTRL_FS_PSEUDO_LOCK=y # CONFIG_X86_FRED is not set # CONFIG_X86_EXTENDED_PLATFORM is not set # CONFIG_X86_INTEL_LPSS is not set @@ -358,16 +350,60 @@ CONFIG_IOSF_MBI=m CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_HYPERVISOR_GUEST is not set +# CONFIG_MK8 is not set +# CONFIG_MK8SSE3 is not set +# CONFIG_MK10 is not set +# CONFIG_MBARCELONA is not set +# CONFIG_MBOBCAT is not set +# CONFIG_MJAGUAR is not set +# CONFIG_MBULLDOZER is not set +# CONFIG_MPILEDRIVER is not set +# CONFIG_MSTEAMROLLER is not set +# CONFIG_MEXCAVATOR is not set +# CONFIG_MZEN is not set +CONFIG_MZEN2=y +# CONFIG_MZEN3 is not set +# CONFIG_MZEN4 is not set +# CONFIG_MZEN5 is not set +# CONFIG_MPSC is not set +# CONFIG_MATOM is not set +# CONFIG_MCORE2 is not set +# CONFIG_MNEHALEM is not set +# CONFIG_MWESTMERE is not set +# CONFIG_MSILVERMONT is not set +# CONFIG_MGOLDMONT is not set +# CONFIG_MGOLDMONTPLUS is not set +# CONFIG_MSANDYBRIDGE is not set +# CONFIG_MIVYBRIDGE is not set +# CONFIG_MHASWELL is not set +# CONFIG_MBROADWELL is not set +# CONFIG_MSKYLAKE is not set +# CONFIG_MSKYLAKEX is not set +# CONFIG_MCANNONLAKE is not set +# CONFIG_MICELAKE_CLIENT is not set +# CONFIG_MICELAKE_SERVER is not set +# CONFIG_MCASCADELAKE is not set +# CONFIG_MCOOPERLAKE is not set +# CONFIG_MTIGERLAKE is not set +# CONFIG_MSAPPHIRERAPIDS is not set +# CONFIG_MROCKETLAKE is not set +# CONFIG_MALDERLAKE is not set +# CONFIG_MRAPTORLAKE is not set +# CONFIG_MMETEORLAKE is not set +# CONFIG_MEMERALDRAPIDS is not set +# CONFIG_GENERIC_CPU is not set +# CONFIG_MNATIVE_INTEL is not set +# CONFIG_MNATIVE_AMD is not set CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y CONFIG_X86_HAVE_PAE=y -CONFIG_X86_CX8=y +CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y CONFIG_PROCESSOR_SELECT=y -CONFIG_BROADCAST_TLB_FLUSH=y # CONFIG_CPU_SUP_INTEL is not set CONFIG_CPU_SUP_AMD=y # CONFIG_CPU_SUP_HYGON is not set @@ -427,7 +463,11 @@ CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -# CONFIG_MTRR is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y CONFIG_X86_UMIP=y CONFIG_CC_HAS_IBT=y # CONFIG_X86_KERNEL_IBT is not set @@ -472,7 +512,6 @@ CONFIG_LEGACY_VSYSCALL_NONE=y CONFIG_MODIFY_LDT_SYSCALL=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set CONFIG_HAVE_LIVEPATCH=y -CONFIG_X86_BUS_LOCK_DETECT=y # end of Processor type and features CONFIG_CC_HAS_NAMED_AS=y @@ -489,21 +528,8 @@ CONFIG_ARCH_HAS_ADD_PAGES=y # # Power management and ACPI options # -CONFIG_ARCH_HIBERNATION_HEADER=y -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_HIBERNATION_SNAPSHOT_DEV=y -CONFIG_HIBERNATION_COMP_LZO=y -CONFIG_HIBERNATION_DEF_COMP="lzo" -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_USERSPACE_AUTOSLEEP is not set -# CONFIG_PM_WAKELOCKS is not set +# CONFIG_SUSPEND is not set +# CONFIG_HIBERNATION is not set CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_PM_CLK=y @@ -519,17 +545,14 @@ CONFIG_ACPI_THERMAL_LIB=y CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_LPIT=y -CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y -CONFIG_ACPI_EC=y # CONFIG_ACPI_EC_DEBUGFS is not set # CONFIG_ACPI_AC is not set # CONFIG_ACPI_BATTERY is not set CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=y -# CONFIG_ACPI_TAD is not set -CONFIG_ACPI_DOCK=y +# CONFIG_ACPI_DOCK is not set CONFIG_ACPI_CPU_FREQ_PSS=y CONFIG_ACPI_PROCESSOR_CSTATE=y CONFIG_ACPI_PROCESSOR_IDLE=y @@ -549,6 +572,7 @@ CONFIG_ACPI_HOTPLUG_IOAPIC=y # CONFIG_ACPI_HED is not set # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +CONFIG_ACPI_NHLT=y CONFIG_ACPI_NFIT=m # CONFIG_NFIT_SECURITY_DEBUG is not set CONFIG_HAVE_ACPI_APEI=y @@ -569,7 +593,6 @@ CONFIG_X86_PM_TIMER=y # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set @@ -578,9 +601,9 @@ CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y @@ -599,7 +622,6 @@ CONFIG_X86_AMD_PSTATE_DEFAULT_MODE=4 # # shared options # -CONFIG_CPUFREQ_ARCH_CUR_FREQ=y # end of CPU Frequency scaling # @@ -618,10 +640,10 @@ CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_MMCONF_FAM10H=y +# CONFIG_PCI_CNB20LE_QUIRK is not set # CONFIG_ISA_BUS is not set CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y -CONFIG_AMD_NODE=y # end of Bus options (PCI etc.) # @@ -657,58 +679,18 @@ CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_HAVE_KVM_PM_NOTIFIER=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y CONFIG_KVM_GENERIC_MMU_NOTIFIER=y -CONFIG_KVM_ELIDE_TLB_FLUSH_IF_YOUNG=y -CONFIG_KVM_MMU_LOCKLESS_AGING=y -CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES=y -CONFIG_KVM_PRIVATE_MEM=y -CONFIG_KVM_GENERIC_PRIVATE_MEM=y -CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE=y -CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE=y CONFIG_VIRTUALIZATION=y CONFIG_KVM_X86=m CONFIG_KVM=m # CONFIG_KVM_WERROR is not set # CONFIG_KVM_SW_PROTECTED_VM is not set CONFIG_KVM_AMD=m -CONFIG_KVM_AMD_SEV=y +# CONFIG_KVM_AMD_SEV is not set CONFIG_KVM_SMM=y CONFIG_KVM_HYPERV=y # CONFIG_KVM_XEN is not set # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_MAX_NR_VCPUS=1024 -CONFIG_X86_REQUIRED_FEATURE_ALWAYS=y -CONFIG_X86_REQUIRED_FEATURE_NOPL=y -CONFIG_X86_REQUIRED_FEATURE_CX8=y -CONFIG_X86_REQUIRED_FEATURE_CMOV=y -CONFIG_X86_REQUIRED_FEATURE_CPUID=y -CONFIG_X86_REQUIRED_FEATURE_FPU=y -CONFIG_X86_REQUIRED_FEATURE_PAE=y -CONFIG_X86_REQUIRED_FEATURE_PSE=y -CONFIG_X86_REQUIRED_FEATURE_PGE=y -CONFIG_X86_REQUIRED_FEATURE_MSR=y -CONFIG_X86_REQUIRED_FEATURE_FXSR=y -CONFIG_X86_REQUIRED_FEATURE_XMM=y -CONFIG_X86_REQUIRED_FEATURE_XMM2=y -CONFIG_X86_REQUIRED_FEATURE_LM=y -CONFIG_X86_DISABLED_FEATURE_VME=y -CONFIG_X86_DISABLED_FEATURE_K6_MTRR=y -CONFIG_X86_DISABLED_FEATURE_CYRIX_ARR=y -CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y -CONFIG_X86_DISABLED_FEATURE_LA57=y -CONFIG_X86_DISABLED_FEATURE_PTI=y -CONFIG_X86_DISABLED_FEATURE_RETPOLINE=y -CONFIG_X86_DISABLED_FEATURE_RETPOLINE_LFENCE=y -CONFIG_X86_DISABLED_FEATURE_RETHUNK=y -CONFIG_X86_DISABLED_FEATURE_UNRET=y -CONFIG_X86_DISABLED_FEATURE_CALL_DEPTH=y -CONFIG_X86_DISABLED_FEATURE_LAM=y -CONFIG_X86_DISABLED_FEATURE_ENQCMD=y -CONFIG_X86_DISABLED_FEATURE_SGX=y -CONFIG_X86_DISABLED_FEATURE_XENPV=y -CONFIG_X86_DISABLED_FEATURE_TDX_GUEST=y -CONFIG_X86_DISABLED_FEATURE_USER_SHSTK=y -CONFIG_X86_DISABLED_FEATURE_IBT=y -CONFIG_X86_DISABLED_FEATURE_FRED=y CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y @@ -734,7 +716,6 @@ CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set # CONFIG_STATIC_CALL_SELFTEST is not set CONFIG_OPTPROBES=y -CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y @@ -775,8 +756,6 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y -CONFIG_MMU_GATHER_TABLE_FREE=y -CONFIG_MMU_GATHER_RCU_TABLE_FREE=y CONFIG_MMU_GATHER_MERGE_VMAS=y CONFIG_MMU_LAZY_TLB_REFCOUNT=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y @@ -798,8 +777,6 @@ CONFIG_HAVE_STACKPROTECTOR=y CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y CONFIG_LTO_NONE=y -CONFIG_ARCH_SUPPORTS_AUTOFDO_CLANG=y -CONFIG_ARCH_SUPPORTS_PROPELLER_CLANG=y CONFIG_ARCH_SUPPORTS_CFI_CLANG=y CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y CONFIG_HAVE_CONTEXT_TRACKING_USER=y @@ -813,14 +790,11 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_HAVE_ARCH_HUGE_VMALLOC=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_WANT_PMD_MKWRITE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_ARCH_HAS_EXECMEM_ROX=y CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y -CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y @@ -856,7 +830,6 @@ CONFIG_STRICT_MODULE_RWX=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y -CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y CONFIG_HAVE_PREEMPT_DYNAMIC=y @@ -870,7 +843,6 @@ CONFIG_DYNAMIC_SIGFRAME=y CONFIG_ARCH_HAS_HW_PTE_YOUNG=y CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y -CONFIG_ARCH_VMLINUX_NEEDS_RELOCS=y # # GCOV-based kernel profiling @@ -968,7 +940,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=y -CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y @@ -976,7 +947,6 @@ CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_QUEUED_SPINLOCKS=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y -CONFIG_QUEUED_RWLOCKS=y CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y @@ -1009,8 +979,12 @@ CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd" +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc" +# CONFIG_ZBUD is not set +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_ZSMALLOC=y # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC_CHAIN_SIZE=8 @@ -1019,7 +993,6 @@ CONFIG_ZSMALLOC_CHAIN_SIZE=8 # Slab allocator options # CONFIG_SLUB=y -CONFIG_KVFREE_RCU_BATCHED=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y # CONFIG_SLAB_FREELIST_RANDOM is not set @@ -1036,10 +1009,8 @@ CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_SPARSEMEM_VMEMMAP_PREINIT=y CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y -CONFIG_ARCH_WANT_HUGETLB_VMEMMAP_PREINIT=y CONFIG_HAVE_GUP_FAST=y CONFIG_MEMORY_ISOLATION=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y @@ -1047,10 +1018,7 @@ CONFIG_HAVE_BOOTMEM_INFO_NODE=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_MEMORY_HOTPLUG=y -CONFIG_MHP_DEFAULT_ONLINE_TYPE_OFFLINE=y -# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO is not set -# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_KERNEL is not set -# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_MOVABLE is not set +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTREMOVE=y CONFIG_MHP_MEMMAP_ON_MEMORY=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y @@ -1058,12 +1026,11 @@ CONFIG_SPLIT_PTE_PTLOCKS=y CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_SPLIT_PMD_PTLOCKS=y CONFIG_COMPACTION=y -CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 +CONFIG_COMPACT_UNEVICTABLE_DEFAULT=0 CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y CONFIG_DEVICE_MIGRATION=y CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y -CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y @@ -1071,22 +1038,11 @@ CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -# CONFIG_MEMORY_FAILURE is not set +CONFIG_MEMORY_FAILURE=y +# CONFIG_HWPOISON_INJECT is not set CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANTS_THP_SWAP=y -CONFIG_MM_ID=y -CONFIG_TRANSPARENT_HUGEPAGE=y -# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y -# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set -CONFIG_THP_SWAP=y -# CONFIG_READ_ONLY_THP_FOR_FS is not set -# CONFIG_NO_PAGE_MAPCOUNT is not set -CONFIG_PAGE_MAPCOUNT=y CONFIG_PGTABLE_HAS_HUGE_LEAVES=y -CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y -CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y -CONFIG_ARCH_SUPPORTS_PUD_PFNMAP=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y @@ -1106,9 +1062,9 @@ CONFIG_ZONE_DEVICE=y CONFIG_HMM_MIRROR=y CONFIG_GET_FREE_REGION=y CONFIG_DEVICE_PRIVATE=y -CONFIG_VMAP_PFN=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y +CONFIG_ARCH_USES_PG_ARCH_2=y CONFIG_VM_EVENT_COUNTERS=y # CONFIG_PERCPU_STATS is not set @@ -1133,8 +1089,6 @@ CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y CONFIG_IOMMU_MM_DATA=y CONFIG_EXECMEM=y -CONFIG_ARCH_SUPPORTS_PT_RECLAIM=y -CONFIG_PT_RECLAIM=y # # Data Access Monitoring @@ -1171,7 +1125,6 @@ CONFIG_XFRM_AH=m CONFIG_XFRM_ESP=m CONFIG_XFRM_IPCOMP=m # CONFIG_NET_KEY is not set -# CONFIG_XFRM_IPTFS is not set # CONFIG_XDP_SOCKETS is not set CONFIG_NET_HANDSHAKE=y CONFIG_INET=y @@ -1314,8 +1267,9 @@ CONFIG_NF_NAT_MASQUERADE=y CONFIG_NF_TABLES=m CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_NETDEV=y -# CONFIG_NFT_NUMGEN is not set +CONFIG_NFT_NUMGEN=m CONFIG_NFT_CT=m +# CONFIG_NFT_FLOW_OFFLOAD is not set # CONFIG_NFT_CONNLIMIT is not set CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m @@ -1323,13 +1277,13 @@ CONFIG_NFT_MASQ=m # CONFIG_NFT_REDIR is not set CONFIG_NFT_NAT=m CONFIG_NFT_TUNNEL=m -# CONFIG_NFT_QUOTA is not set +CONFIG_NFT_QUOTA=m CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m # CONFIG_NFT_HASH is not set # CONFIG_NFT_XFRM is not set -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m # CONFIG_NFT_OSF is not set # CONFIG_NFT_TPROXY is not set # CONFIG_NFT_SYNPROXY is not set @@ -1337,7 +1291,9 @@ CONFIG_NFT_COMPAT=m # CONFIG_NFT_DUP_NETDEV is not set # CONFIG_NFT_FWD_NETDEV is not set # CONFIG_NFT_REJECT_NETDEV is not set -# CONFIG_NF_FLOW_TABLE is not set +# CONFIG_NF_FLOW_TABLE_INET is not set +CONFIG_NF_FLOW_TABLE=m +# CONFIG_NF_FLOW_TABLE_PROCFS is not set CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XTABLES_COMPAT is not set @@ -1484,7 +1440,7 @@ CONFIG_IP_VS_NFCT=y # CONFIG_NF_DEFRAG_IPV4=m CONFIG_IP_NF_IPTABLES_LEGACY=m -# CONFIG_NF_SOCKET_IPV4 is not set +CONFIG_NF_SOCKET_IPV4=m # CONFIG_NF_TPROXY_IPV4 is not set CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_REJECT_IPV4=m @@ -1512,7 +1468,6 @@ CONFIG_IP_NF_MANGLE=m # CONFIG_IP_NF_TARGET_TTL is not set CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_SECURITY is not set -# CONFIG_IP_NF_ARPTABLES is not set # CONFIG_IP_NF_ARPFILTER is not set # end of IP: Netfilter Configuration @@ -1520,7 +1475,7 @@ CONFIG_IP_NF_RAW=m # IPv6: Netfilter Configuration # CONFIG_IP6_NF_IPTABLES_LEGACY=m -# CONFIG_NF_SOCKET_IPV6 is not set +CONFIG_NF_SOCKET_IPV6=m # CONFIG_NF_TPROXY_IPV6 is not set CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_REJECT_IPV6=m @@ -1681,6 +1636,7 @@ CONFIG_NET_ACT_CSUM=m # CONFIG_NET_ACT_SKBMOD is not set # CONFIG_NET_ACT_IFE is not set # CONFIG_NET_ACT_TUNNEL_KEY is not set +# CONFIG_NET_ACT_CT is not set # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_TC_SKB_EXT is not set CONFIG_NET_SCH_FIFO=y @@ -1718,7 +1674,6 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # # CONFIG_NET_PKTGEN is not set -# CONFIG_NET_DROP_MONITOR is not set # end of Network testing # end of Networking options @@ -1726,12 +1681,9 @@ CONFIG_NET_FLOW_LIMIT=y # CONFIG_CAN is not set CONFIG_BT=m CONFIG_BT_BREDR=y -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m +# CONFIG_BT_RFCOMM is not set +# CONFIG_BT_BNEP is not set +# CONFIG_BT_HIDP is not set CONFIG_BT_LE=y CONFIG_BT_LE_L2CAP_ECRED=y # CONFIG_BT_LEDS is not set @@ -1746,13 +1698,11 @@ CONFIG_BT_LE_L2CAP_ECRED=y CONFIG_BT_INTEL=m CONFIG_BT_BCM=m CONFIG_BT_RTL=m -CONFIG_BT_MTK=m CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y CONFIG_BT_HCIBTUSB_POLL_SYNC=y -# CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT is not set CONFIG_BT_HCIBTUSB_BCM=y -CONFIG_BT_HCIBTUSB_MTK=y +# CONFIG_BT_HCIBTUSB_MTK is not set CONFIG_BT_HCIBTUSB_RTL=y # CONFIG_BT_HCIUART is not set # CONFIG_BT_HCIBCM203X is not set @@ -1798,7 +1748,7 @@ CONFIG_GRO_CELLS=y CONFIG_NET_SELFTESTS=m CONFIG_NET_SOCK_MSG=y CONFIG_PAGE_POOL=y -CONFIG_PAGE_POOL_STATS=y +# CONFIG_PAGE_POOL_STATS is not set CONFIG_FAILOVER=m CONFIG_ETHTOOL_NETLINK=y @@ -1827,13 +1777,11 @@ CONFIG_PCI_QUIRKS=y # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_STUB is not set CONFIG_PCI_ATS=y -# CONFIG_PCI_DOE is not set CONFIG_PCI_LOCKLESS_CONFIG=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_NPEM is not set CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y -# CONFIG_PCIE_TPH is not set # CONFIG_PCI_P2PDMA is not set CONFIG_PCI_LABEL=y # CONFIG_PCIE_BUS_TUNE_OFF is not set @@ -1846,7 +1794,6 @@ CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_ACPI is not set # CONFIG_HOTPLUG_PCI_CPCI is not set -# CONFIG_HOTPLUG_PCI_OCTEONEP is not set # CONFIG_HOTPLUG_PCI_SHPC is not set # @@ -1889,7 +1836,6 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_PCI_SW_SWITCHTEC is not set # end of PCI switch controller drivers -# CONFIG_PCI_PWRCTL_SLOT is not set # CONFIG_CXL_BUS is not set # CONFIG_PCCARD is not set # CONFIG_RAPIDIO is not set @@ -1897,7 +1843,6 @@ CONFIG_HOTPLUG_PCI=y # # Generic Driver Options # -CONFIG_AUXILIARY_BUS=y # CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y @@ -1909,20 +1854,16 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y -CONFIG_FW_LOADER_PAGED_BUF=y -CONFIG_EXTRA_FIRMWARE="amd-ucode/microcode_amd_fam17h.bin amdgpu/dimgrey_cavefish_ce.bin amdgpu/dimgrey_cavefish_me.bin amdgpu/dimgrey_cavefish_mec2.bin amdgpu/dimgrey_cavefish_rlc.bin amdgpu/dimgrey_cavefish_smc.bin amdgpu/dimgrey_cavefish_ta.bin amdgpu/dimgrey_cavefish_dmcub.bin amdgpu/dimgrey_cavefish_mec.bin amdgpu/dimgrey_cavefish_pfp.bin amdgpu/dimgrey_cavefish_sdma.bin amdgpu/dimgrey_cavefish_sos.bin amdgpu/dimgrey_cavefish_vcn.bin i915/dg2_huc_gsc.bin i915/dg2_guc_70.bin i915/dg2_dmc_ver2_08.bin" +CONFIG_EXTRA_FIRMWARE="amdgpu/dimgrey_cavefish_ce.bin.zst amdgpu/dimgrey_cavefish_me.bin.zst amdgpu/dimgrey_cavefish_mec2.bin.zst amdgpu/dimgrey_cavefish_rlc.bin.zst amdgpu/dimgrey_cavefish_smc.bin.zst amdgpu/dimgrey_cavefish_ta.bin.zst amdgpu/dimgrey_cavefish_dmcub.bin.zst amdgpu/dimgrey_cavefish_mec.bin.zst amdgpu/dimgrey_cavefish_pfp.bin.zst amdgpu/dimgrey_cavefish_sdma.bin.zst amdgpu/dimgrey_cavefish_sos.bin.zst amdgpu/dimgrey_cavefish_vcn.bin.zst amd-ucode/microcode_amd_fam17h.bin" CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware" # CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER_COMPRESS=y -CONFIG_FW_LOADER_COMPRESS_XZ=y +# CONFIG_FW_LOADER_COMPRESS_XZ is not set CONFIG_FW_LOADER_COMPRESS_ZSTD=y -CONFIG_FW_CACHE=y # CONFIG_FW_UPLOAD is not set # end of Firmware loader -CONFIG_WANT_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y -CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set @@ -1931,6 +1872,7 @@ CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m CONFIG_DMA_SHARED_BUFFER=y # CONFIG_DMA_FENCE_TRACE is not set # CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set @@ -2001,7 +1943,6 @@ CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # end of Tegra firmware driver # end of Firmware Drivers -# CONFIG_FWCTL is not set # CONFIG_GNSS is not set # CONFIG_MTD is not set # CONFIG_OF is not set @@ -2037,7 +1978,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y # CONFIG_NVME_MULTIPATH is not set -# CONFIG_NVME_VERBOSE_ERRORS is not set +CONFIG_NVME_VERBOSE_ERRORS=y CONFIG_NVME_HWMON=y # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set @@ -2067,7 +2008,6 @@ CONFIG_NVME_HWMON=y # CONFIG_DW_XDATA_PCIE is not set # CONFIG_PCI_ENDPOINT_TEST is not set # CONFIG_XILINX_SDFEC is not set -CONFIG_NTSYNC=y # CONFIG_NSM is not set # CONFIG_C2PORT is not set @@ -2082,15 +2022,15 @@ CONFIG_EEPROM_93CX6=m # end of EEPROM support # CONFIG_CB710_CORE is not set + +# +# Texas Instruments shared transport line discipline +# +# end of Texas Instruments shared transport line discipline + # CONFIG_SENSORS_LIS3_I2C is not set # CONFIG_ALTERA_STAPL is not set -CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=m -# CONFIG_INTEL_MEI_TXE is not set -CONFIG_INTEL_MEI_GSC=m -CONFIG_INTEL_MEI_HDCP=m -CONFIG_INTEL_MEI_PXP=m -# CONFIG_INTEL_MEI_GSC_PROXY is not set +# CONFIG_INTEL_MEI is not set # CONFIG_VMWARE_VMCI is not set # CONFIG_GENWQE is not set # CONFIG_ECHO is not set @@ -2196,7 +2136,7 @@ CONFIG_ATA=y CONFIG_SATA_HOST=y CONFIG_PATA_TIMINGS=y CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_FORCE=y +# CONFIG_ATA_FORCE is not set CONFIG_ATA_ACPI=y # CONFIG_SATA_ZPODD is not set CONFIG_SATA_PMP=y @@ -2211,83 +2151,7 @@ CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_INIC162X is not set # CONFIG_SATA_ACARD_AHCI is not set # CONFIG_SATA_SIL24 is not set -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -# CONFIG_PDC_ADMA is not set -# CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SX4 is not set -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -# CONFIG_ATA_PIIX is not set -# CONFIG_SATA_DWC is not set -# CONFIG_SATA_MV is not set -# CONFIG_SATA_NV is not set -# CONFIG_SATA_PROMISE is not set -# CONFIG_SATA_SIL is not set -# CONFIG_SATA_SIS is not set -# CONFIG_SATA_SVW is not set -# CONFIG_SATA_ULI is not set -# CONFIG_SATA_VIA is not set -# CONFIG_SATA_VITESSE is not set - -# -# PATA SFF controllers with BMDMA -# -# CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set -# CONFIG_PATA_ARTOP is not set -# CONFIG_PATA_ATIIXP is not set -# CONFIG_PATA_ATP867X is not set -# CONFIG_PATA_CMD64X is not set -# CONFIG_PATA_CYPRESS is not set -# CONFIG_PATA_EFAR is not set -# CONFIG_PATA_HPT366 is not set -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -# CONFIG_PATA_HPT3X3 is not set -# CONFIG_PATA_IT8213 is not set -# CONFIG_PATA_IT821X is not set -# CONFIG_PATA_JMICRON is not set -# CONFIG_PATA_MARVELL is not set -# CONFIG_PATA_NETCELL is not set -# CONFIG_PATA_NINJA32 is not set -# CONFIG_PATA_NS87415 is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_OPTIDMA is not set -# CONFIG_PATA_PDC2027X is not set -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_RADISYS is not set -# CONFIG_PATA_RDC is not set -# CONFIG_PATA_SCH is not set -# CONFIG_PATA_SERVERWORKS is not set -# CONFIG_PATA_SIL680 is not set -# CONFIG_PATA_SIS is not set -# CONFIG_PATA_TOSHIBA is not set -# CONFIG_PATA_TRIFLEX is not set -# CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set - -# -# PIO-only SFF controllers -# -# CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_NS87410 is not set -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_RZ1000 is not set - -# -# Generic fallback / legacy drivers -# -# CONFIG_PATA_ACPI is not set -# CONFIG_ATA_GENERIC is not set -# CONFIG_PATA_LEGACY is not set +# CONFIG_ATA_SFF is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y @@ -2318,9 +2182,9 @@ CONFIG_DM_MIRROR=y # CONFIG_DM_LOG_USERSPACE is not set CONFIG_DM_RAID=y CONFIG_DM_ZERO=y -CONFIG_DM_MULTIPATH=y -CONFIG_DM_MULTIPATH_QL=y -CONFIG_DM_MULTIPATH_ST=y +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH_QL is not set +# CONFIG_DM_MULTIPATH_ST is not set # CONFIG_DM_MULTIPATH_HST is not set # CONFIG_DM_MULTIPATH_IOA is not set # CONFIG_DM_DELAY is not set @@ -2412,7 +2276,6 @@ CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_FUNGIBLE is not set # CONFIG_NET_VENDOR_GOOGLE is not set -# CONFIG_NET_VENDOR_HISILICON is not set # CONFIG_NET_VENDOR_HUAWEI is not set CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_INTEL=y @@ -2531,7 +2394,6 @@ CONFIG_FIXED_PHY=m # CONFIG_QCA808X_PHY is not set # CONFIG_QSEMI_PHY is not set CONFIG_REALTEK_PHY=m -CONFIG_REALTEK_PHY_HWMON=y # CONFIG_RENESAS_PHY is not set # CONFIG_ROCKCHIP_PHY is not set # CONFIG_SMSC_PHY is not set @@ -2645,6 +2507,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers @@ -2726,7 +2589,6 @@ CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -2761,7 +2623,6 @@ CONFIG_SERIAL_8250_DWLIB=y CONFIG_SERIAL_8250_LPSS=y CONFIG_SERIAL_8250_MID=y # CONFIG_SERIAL_8250_PERICOM is not set -# CONFIG_SERIAL_8250_NI is not set # # Non-8250 serial port support @@ -2807,21 +2668,7 @@ CONFIG_HPET=y CONFIG_HPET_MMAP=y CONFIG_HPET_MMAP_DEFAULT=y # CONFIG_HANGCHECK_TIMER is not set -CONFIG_TCG_TPM=m -CONFIG_TCG_TPM2_HMAC=y -CONFIG_HW_RANDOM_TPM=y -# CONFIG_TCG_TIS is not set -# CONFIG_TCG_TIS_I2C is not set -# CONFIG_TCG_TIS_I2C_CR50 is not set -# CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_INFINEON is not set -# CONFIG_TCG_TIS_I2C_NUVOTON is not set -# CONFIG_TCG_NSC is not set -# CONFIG_TCG_ATMEL is not set -# CONFIG_TCG_INFINEON is not set -# CONFIG_TCG_CRB is not set -# CONFIG_TCG_VTPM_PROXY is not set -# CONFIG_TCG_TIS_ST33ZP24_I2C is not set +# CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set # CONFIG_XILLYBUS is not set # CONFIG_XILLYUSB is not set @@ -2862,7 +2709,6 @@ CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_AMD756 is not set # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_AMD_MP2 is not set -# CONFIG_I2C_AMD_ASF is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set # CONFIG_I2C_ISMT is not set @@ -2919,7 +2765,19 @@ CONFIG_I2C_PIIX4=m # CONFIG_SPI is not set # CONFIG_SPMI is not set # CONFIG_HSI is not set -# CONFIG_PPS is not set +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +# CONFIG_PPS_CLIENT_GPIO is not set + +# +# PPS generators support +# # # PTP clock support @@ -3054,12 +2912,10 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_G762 is not set # CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HS3001 is not set -# CONFIG_SENSORS_HTU31 is not set # CONFIG_SENSORS_I5500 is not set # CONFIG_SENSORS_CORETEMP is not set -# CONFIG_SENSORS_ISL28022 is not set # CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m # CONFIG_SENSORS_POWERZ is not set # CONFIG_SENSORS_POWR1220 is not set # CONFIG_SENSORS_LENOVO_EC is not set @@ -3115,7 +2971,6 @@ CONFIG_SENSORS_FAM15H_POWER=m CONFIG_SENSORS_NCT6775_CORE=m CONFIG_SENSORS_NCT6775=m # CONFIG_SENSORS_NCT6775_I2C is not set -# CONFIG_SENSORS_NCT7363 is not set # CONFIG_SENSORS_NCT7802 is not set # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_NPCM7XX is not set @@ -3199,7 +3054,6 @@ CONFIG_THERMAL_GOV_STEP_WISE=y # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_USER_SPACE=y # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set -# CONFIG_PCIE_THERMAL is not set # CONFIG_THERMAL_EMULATION is not set # @@ -3218,7 +3072,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y # end of Intel thermal drivers CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set +CONFIG_WATCHDOG_CORE=m # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y CONFIG_WATCHDOG_OPEN_TIMEOUT=0 @@ -3228,13 +3082,13 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # # Watchdog Pretimeout Governors # +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set # # Watchdog Device Drivers # # CONFIG_SOFT_WATCHDOG is not set # CONFIG_LENOVO_SE10_WDT is not set -# CONFIG_LENOVO_SE30_WDT is not set # CONFIG_WDAT_WDT is not set # CONFIG_XILINX_WATCHDOG is not set # CONFIG_ZIIRAVE_WATCHDOG is not set @@ -3249,7 +3103,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_EBC_C384_WDT is not set # CONFIG_EXAR_WDT is not set # CONFIG_F71808E_WDT is not set -# CONFIG_SP5100_TCO is not set +CONFIG_SP5100_TCO=m # CONFIG_SBC_FITPC2_WATCHDOG is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_IB700_WDT is not set @@ -3265,6 +3119,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_PC87413_WDT is not set # CONFIG_NV_TCO is not set # CONFIG_60XX_WDT is not set +# CONFIG_CPU5_WDT is not set # CONFIG_SMSC_SCH311X_WDT is not set # CONFIG_SMSC37B787_WDT is not set # CONFIG_TQMX86_WDT is not set @@ -3274,7 +3129,6 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_W83977F_WDT is not set # CONFIG_MACHZ_WDT is not set # CONFIG_SBC_EPX_C3_WATCHDOG is not set -# CONFIG_INTEL_MEI_WDT is not set # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set @@ -3302,7 +3156,6 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set # CONFIG_MFD_AXP20X_I2C is not set -# CONFIG_MFD_CGBC is not set # CONFIG_MFD_CS42L43_I2C is not set # CONFIG_MFD_MADERA is not set # CONFIG_PMIC_DA903X is not set @@ -3329,7 +3182,6 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_MAX14577 is not set # CONFIG_MFD_MAX77541 is not set # CONFIG_MFD_MAX77693 is not set -# CONFIG_MFD_MAX77705 is not set # CONFIG_MFD_MAX77843 is not set # CONFIG_MFD_MAX8907 is not set # CONFIG_MFD_MAX8925 is not set @@ -3341,6 +3193,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_MENF21BMC is not set # CONFIG_MFD_VIPERBOARD is not set # CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_SY7636A is not set # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_RT4831 is not set @@ -3376,13 +3229,10 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_WM8994 is not set # CONFIG_MFD_ATC260X_I2C is not set # CONFIG_MFD_CS40L50_I2C is not set -# CONFIG_MFD_UPBOARD_FPGA is not set # end of Multifunction device drivers # CONFIG_REGULATOR is not set # CONFIG_RC_CORE is not set -CONFIG_CEC_CORE=m -CONFIG_CEC_NOTIFIER=y # # CEC support @@ -3444,7 +3294,7 @@ CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_USB_S2255 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +# CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set # # Analog TV USB devices @@ -3521,6 +3371,7 @@ CONFIG_MEDIA_ATTACH=y # CONFIG_VIDEO_CS53L32A is not set # CONFIG_VIDEO_MSP3400 is not set # CONFIG_VIDEO_SONY_BTF_MPX is not set +# CONFIG_VIDEO_TDA1997X is not set # CONFIG_VIDEO_TDA7432 is not set # CONFIG_VIDEO_TDA9840 is not set # CONFIG_VIDEO_TEA6415C is not set @@ -3547,7 +3398,6 @@ CONFIG_MEDIA_ATTACH=y # CONFIG_VIDEO_BT819 is not set # CONFIG_VIDEO_BT856 is not set # CONFIG_VIDEO_BT866 is not set -# CONFIG_VIDEO_LT6911UXE is not set # CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_ML86V7667 is not set # CONFIG_VIDEO_SAA7110 is not set @@ -3678,49 +3528,40 @@ CONFIG_SCREEN_INFO=y CONFIG_VIDEO=y # CONFIG_AUXDISPLAY is not set # CONFIG_AGP is not set -CONFIG_INTEL_GTT=m # CONFIG_VGA_SWITCHEROO is not set CONFIG_DRM=m -CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_PANIC is not set # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set -CONFIG_DRM_CLIENT=y -CONFIG_DRM_CLIENT_LIB=m -CONFIG_DRM_CLIENT_SELECTION=m -CONFIG_DRM_CLIENT_SETUP=y - -# -# Supported DRM clients -# CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set -# CONFIG_DRM_CLIENT_LOG is not set -CONFIG_DRM_CLIENT_DEFAULT_FBDEV=y -CONFIG_DRM_CLIENT_DEFAULT="fbdev" -# end of Supported DRM clients - # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set CONFIG_DRM_DISPLAY_HELPER=m # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set CONFIG_DRM_DISPLAY_DP_HELPER=y -CONFIG_DRM_DISPLAY_DSC_HELPER=y CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m -CONFIG_DRM_GPUVM=m -CONFIG_DRM_GPUSVM=m CONFIG_DRM_BUDDY=m CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_SUBALLOC_HELPER=m CONFIG_DRM_SCHED=m # +# I2C encoder or helper chips +# +# CONFIG_DRM_I2C_CH7006 is not set +# CONFIG_DRM_I2C_SIL164 is not set +# CONFIG_DRM_I2C_NXP_TDA998X is not set +# CONFIG_DRM_I2C_NXP_TDA9950 is not set +# end of I2C encoder or helper chips + +# # ARM devices # # end of ARM devices @@ -3749,76 +3590,7 @@ CONFIG_DRM_AMD_DC_FP=y CONFIG_HSA_AMD=y CONFIG_HSA_AMD_SVM=y # CONFIG_DRM_NOUVEAU is not set -CONFIG_DRM_I915=m -CONFIG_DRM_I915_FORCE_PROBE="" -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_USERPTR=y -# CONFIG_DRM_I915_GVT_KVMGT is not set -CONFIG_DRM_I915_PXP=y - -# -# drm/i915 Debugging -# -# CONFIG_DRM_I915_WERROR is not set -# CONFIG_DRM_I915_REPLAY_GPU_HANGS_API is not set -# CONFIG_DRM_I915_DEBUG is not set -# CONFIG_DRM_I915_DEBUG_MMIO is not set -# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set -# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set -# CONFIG_DRM_I915_DEBUG_GUC is not set -# CONFIG_DRM_I915_SELFTEST is not set -# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set -# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set -# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set -# CONFIG_DRM_I915_DEBUG_WAKEREF is not set -# end of drm/i915 Debugging - -# -# drm/i915 Profile Guided Optimisation -# -CONFIG_DRM_I915_REQUEST_TIMEOUT=20000 -CONFIG_DRM_I915_FENCE_TIMEOUT=10000 -CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 -CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500 -CONFIG_DRM_I915_PREEMPT_TIMEOUT=640 -CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500 -CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000 -CONFIG_DRM_I915_STOP_TIMEOUT=100 -CONFIG_DRM_I915_TIMESLICE_DURATION=1 -# end of drm/i915 Profile Guided Optimisation - -CONFIG_DRM_XE=m -CONFIG_DRM_XE_DISPLAY=y -CONFIG_DRM_XE_DEVMEM_MIRROR=y -CONFIG_DRM_XE_FORCE_PROBE="" - -# -# drm/Xe Debugging -# -# CONFIG_DRM_XE_WERROR is not set -# CONFIG_DRM_XE_DEBUG is not set -# CONFIG_DRM_XE_DEBUG_VM is not set -# CONFIG_DRM_XE_DEBUG_MEMIRQ is not set -# CONFIG_DRM_XE_DEBUG_SRIOV is not set -# CONFIG_DRM_XE_DEBUG_MEM is not set -# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set -# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set -# end of drm/Xe Debugging - -# -# drm/xe Profile Guided Optimisation -# -CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000 -CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1 -CONFIG_DRM_XE_TIMESLICE_MAX=10000000 -CONFIG_DRM_XE_TIMESLICE_MIN=1 -CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000 -CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000 -CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1 -CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y -# end of drm/xe Profile Guided Optimisation - +# CONFIG_DRM_XE is not set # CONFIG_DRM_VGEM is not set # CONFIG_DRM_VKMS is not set # CONFIG_DRM_GMA500 is not set @@ -3831,7 +3603,6 @@ CONFIG_DRM_PANEL=y # # Display Panels # -# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set # end of Display Panels CONFIG_DRM_BRIDGE=y @@ -3840,13 +3611,10 @@ CONFIG_DRM_PANEL_BRIDGE=y # # Display Interface Bridges # -# CONFIG_DRM_I2C_NXP_TDA998X is not set # CONFIG_DRM_ANALOGIX_ANX78XX is not set # end of Display Interface Bridges # CONFIG_DRM_ETNAVIV is not set -# CONFIG_DRM_HISI_HIBMC is not set -# CONFIG_DRM_APPLETBDRM is not set # CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CIRRUS_QEMU is not set # CONFIG_DRM_GM12U320 is not set @@ -3854,7 +3622,6 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_VBOXVIDEO is not set # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set -CONFIG_DRM_PANEL_BACKLIGHT_QUIRKS=m # CONFIG_DRM_WERROR is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y @@ -3972,6 +3739,8 @@ CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_SEQ_DEVICE=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y # CONFIG_SND_OSSEMUL is not set CONFIG_SND_PCM_TIMER=y CONFIG_SND_HRTIMER=m @@ -3983,29 +3752,122 @@ CONFIG_SND_CTL_FAST_LOOKUP=y # CONFIG_SND_DEBUG is not set # CONFIG_SND_CTL_INPUT_VALIDATION is not set # CONFIG_SND_UTIMER is not set +CONFIG_SND_VMASTER=y CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_CTL_LED=m CONFIG_SND_SEQUENCER=m # CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQ_MIDI_EVENT=m CONFIG_SND_SEQ_MIDI=m CONFIG_SND_SEQ_UMP=y -CONFIG_SND_DRIVERS=y -# CONFIG_SND_PCSP is not set -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_ALOOP is not set -# CONFIG_SND_VIRMIDI is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set -# CONFIG_SND_PCI is not set +# CONFIG_SND_DRIVERS is not set +CONFIG_SND_PCI=y +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ASIHPI is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LOLA is not set +# CONFIG_SND_LX6464ES is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SE6X is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set # # HD-Audio # +CONFIG_SND_HDA=m +CONFIG_SND_HDA_GENERIC_LEDS=y +CONFIG_SND_HDA_INTEL=m +# CONFIG_SND_HDA_HWDEP is not set +# CONFIG_SND_HDA_RECONFIG is not set +# CONFIG_SND_HDA_INPUT_BEEP is not set +# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_SCODEC_COMPONENT=m +# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set +# CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set +# CONFIG_SND_HDA_SCODEC_TAS2781_I2C is not set +CONFIG_SND_HDA_CODEC_REALTEK=m +# CONFIG_SND_HDA_CODEC_ANALOG is not set +# CONFIG_SND_HDA_CODEC_SIGMATEL is not set +# CONFIG_SND_HDA_CODEC_VIA is not set +# CONFIG_SND_HDA_CODEC_HDMI is not set +# CONFIG_SND_HDA_CODEC_CIRRUS is not set +# CONFIG_SND_HDA_CODEC_CS8409 is not set +# CONFIG_SND_HDA_CODEC_CONEXANT is not set +# CONFIG_SND_HDA_CODEC_SENARYTECH is not set +# CONFIG_SND_HDA_CODEC_CA0110 is not set +# CONFIG_SND_HDA_CODEC_CA0132 is not set +# CONFIG_SND_HDA_CODEC_CMEDIA is not set +# CONFIG_SND_HDA_CODEC_SI3054 is not set +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +# CONFIG_SND_HDA_CTL_DEV_ID is not set # end of HD-Audio +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_PREALLOC_SIZE=0 +CONFIG_SND_INTEL_NHLT=y +CONFIG_SND_INTEL_DSP_CONFIG=m +CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m # CONFIG_SND_USB_AUDIO_MIDI_V2 is not set @@ -4021,8 +3883,224 @@ CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set -# CONFIG_SND_SOC is not set -# CONFIG_SND_X86 is not set +CONFIG_SND_SOC=m +# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_AMD_ACP is not set +# CONFIG_SND_SOC_AMD_ACP3x is not set +# CONFIG_SND_SOC_AMD_RENOIR is not set +# CONFIG_SND_SOC_AMD_ACP5x is not set +# CONFIG_SND_SOC_AMD_ACP6x is not set +# CONFIG_SND_AMD_ACP_CONFIG is not set +# CONFIG_SND_SOC_AMD_ACP_COMMON is not set +# CONFIG_SND_SOC_AMD_RPL_ACP6x is not set +# CONFIG_SND_ATMEL_SOC is not set +# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set +# CONFIG_SND_DESIGNWARE_I2S is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_AUDMIX is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_FSL_MICFIL is not set +# CONFIG_SND_SOC_FSL_XCVR is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +# end of SoC Audio for Freescale CPUs + +# CONFIG_SND_SOC_CHV3_I2S is not set +# CONFIG_SND_I2S_HI6210_I2S is not set +# CONFIG_SND_SOC_IMG is not set +# CONFIG_SND_SOC_INTEL_SST_TOPLEVEL is not set +# CONFIG_SND_SOC_INTEL_AVS is not set +# CONFIG_SND_SOC_MTK_BTCVSD is not set +# CONFIG_SND_SOC_SOF_TOPLEVEL is not set + +# +# STMicroelectronics STM32 SOC audio support +# +# end of STMicroelectronics STM32 SOC audio support + +# CONFIG_SND_SOC_XILINX_I2S is not set +# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set +# CONFIG_SND_SOC_XILINX_SPDIF is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_ADAU1372_I2C is not set +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_ADAU1761_I2C is not set +# CONFIG_SND_SOC_ADAU7002 is not set +# CONFIG_SND_SOC_ADAU7118_HW is not set +# CONFIG_SND_SOC_ADAU7118_I2C is not set +# CONFIG_SND_SOC_AK4118 is not set +# CONFIG_SND_SOC_AK4375 is not set +# CONFIG_SND_SOC_AK4458 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_AK4619 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_AK5558 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_AW8738 is not set +# CONFIG_SND_SOC_AW88395 is not set +# CONFIG_SND_SOC_AW88261 is not set +# CONFIG_SND_SOC_AW87390 is not set +# CONFIG_SND_SOC_AW88399 is not set +# CONFIG_SND_SOC_BD28623 is not set +# CONFIG_SND_SOC_BT_SCO is not set +# CONFIG_SND_SOC_CHV3_CODEC is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS35L33 is not set +# CONFIG_SND_SOC_CS35L34 is not set +# CONFIG_SND_SOC_CS35L35 is not set +# CONFIG_SND_SOC_CS35L36 is not set +# CONFIG_SND_SOC_CS35L41_I2C is not set +# CONFIG_SND_SOC_CS35L45_I2C is not set +# CONFIG_SND_SOC_CS35L56_I2C is not set +# CONFIG_SND_SOC_CS42L42 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS42L83 is not set +# CONFIG_SND_SOC_CS4234 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +# CONFIG_SND_SOC_CS43130 is not set +# CONFIG_SND_SOC_CS4341 is not set +# CONFIG_SND_SOC_CS4349 is not set +# CONFIG_SND_SOC_CS53L30 is not set +# CONFIG_SND_SOC_CS530X_I2C is not set +# CONFIG_SND_SOC_CX2072X is not set +# CONFIG_SND_SOC_DA7213 is not set +# CONFIG_SND_SOC_DMIC is not set +# CONFIG_SND_SOC_ES7134 is not set +# CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_ES8311 is not set +# CONFIG_SND_SOC_ES8316 is not set +# CONFIG_SND_SOC_ES8326 is not set +# CONFIG_SND_SOC_ES8328_I2C is not set +# CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_HDA is not set +# CONFIG_SND_SOC_ICS43432 is not set +# CONFIG_SND_SOC_MAX98088 is not set +# CONFIG_SND_SOC_MAX98090 is not set +# CONFIG_SND_SOC_MAX98357A is not set +# CONFIG_SND_SOC_MAX98504 is not set +# CONFIG_SND_SOC_MAX9867 is not set +# CONFIG_SND_SOC_MAX98927 is not set +# CONFIG_SND_SOC_MAX98520 is not set +# CONFIG_SND_SOC_MAX98373_I2C is not set +# CONFIG_SND_SOC_MAX98388 is not set +# CONFIG_SND_SOC_MAX98390 is not set +# CONFIG_SND_SOC_MAX98396 is not set +# CONFIG_SND_SOC_MAX9860 is not set +# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1789_I2C is not set +# CONFIG_SND_SOC_PCM179X_I2C is not set +# CONFIG_SND_SOC_PCM186X_I2C is not set +# CONFIG_SND_SOC_PCM3060_I2C is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_PCM5102A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM6240 is not set +# CONFIG_SND_SOC_RT5616 is not set +# CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5640 is not set +# CONFIG_SND_SOC_RT5659 is not set +# CONFIG_SND_SOC_RT9120 is not set +# CONFIG_SND_SOC_RTQ9128 is not set +# CONFIG_SND_SOC_SGTL5000 is not set +# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set +# CONFIG_SND_SOC_SMA1303 is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SRC4XXX_I2C is not set +# CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS2562 is not set +# CONFIG_SND_SOC_TAS2764 is not set +# CONFIG_SND_SOC_TAS2770 is not set +# CONFIG_SND_SOC_TAS2780 is not set +# CONFIG_SND_SOC_TAS2781_I2C is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set +# CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TAS5805M is not set +# CONFIG_SND_SOC_TAS6424 is not set +# CONFIG_SND_SOC_TDA7419 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TFA989X is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set +# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set +# CONFIG_SND_SOC_TLV320ADCX140 is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_TSCS42XX is not set +# CONFIG_SND_SOC_TSCS454 is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731_I2C is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8782 is not set +# CONFIG_SND_SOC_WM8804_I2C is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8904 is not set +# CONFIG_SND_SOC_WM8940 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8961 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8974 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_WM8985 is not set +# CONFIG_SND_SOC_MT6351 is not set +# CONFIG_SND_SOC_MT6357 is not set +# CONFIG_SND_SOC_MT6358 is not set +# CONFIG_SND_SOC_MT6660 is not set +# CONFIG_SND_SOC_NAU8315 is not set +# CONFIG_SND_SOC_NAU8540 is not set +# CONFIG_SND_SOC_NAU8810 is not set +# CONFIG_SND_SOC_NAU8821 is not set +# CONFIG_SND_SOC_NAU8822 is not set +# CONFIG_SND_SOC_NAU8824 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# CONFIG_SND_SOC_LPASS_RX_MACRO is not set +# CONFIG_SND_SOC_LPASS_TX_MACRO is not set +# end of CODEC drivers + +# CONFIG_SND_SIMPLE_CARD is not set +CONFIG_SND_X86=y # CONFIG_SND_VIRTIO is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -4039,8 +4117,6 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_ACRUX is not set # CONFIG_HID_APPLE is not set # CONFIG_HID_APPLEIR is not set -# CONFIG_HID_APPLETB_BL is not set -# CONFIG_HID_APPLETB_KBD is not set # CONFIG_HID_ASUS is not set # CONFIG_HID_AUREAL is not set # CONFIG_HID_BELKIN is not set @@ -4072,7 +4148,6 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_GT683R is not set # CONFIG_HID_KEYTOUCH is not set # CONFIG_HID_KYE is not set -# CONFIG_HID_KYSONA is not set # CONFIG_HID_UCLOGIC is not set # CONFIG_HID_WALTOP is not set # CONFIG_HID_VIEWSONIC is not set @@ -4101,15 +4176,12 @@ CONFIG_HID_NINTENDO=m CONFIG_NINTENDO_FF=y # CONFIG_HID_NTI is not set # CONFIG_HID_NTRIG is not set -# CONFIG_HID_NVIDIA_SHIELD is not set # CONFIG_HID_ORTEK is not set # CONFIG_HID_PANTHERLORD is not set # CONFIG_HID_PENMOUNT is not set # CONFIG_HID_PETALYNX is not set # CONFIG_HID_PICOLCD is not set # CONFIG_HID_PLANTRONICS is not set -CONFIG_HID_PLAYSTATION=m -CONFIG_PLAYSTATION_FF=y # CONFIG_HID_PXRC is not set # CONFIG_HID_RAZER is not set # CONFIG_HID_PRIMAX is not set @@ -4152,6 +4224,21 @@ CONFIG_HID_WIIMOTE=m # # end of HID-BPF support +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# end of USB HID Boot Protocol drivers +# end of USB HID support + CONFIG_I2C_HID=y # CONFIG_I2C_HID_ACPI is not set # CONFIG_I2C_HID_OF is not set @@ -4168,27 +4255,6 @@ CONFIG_I2C_HID=y CONFIG_AMD_SFH_HID=m # end of AMD SFH HID Support -# -# Intel THC HID Support -# -# CONFIG_INTEL_THC_HID is not set -# end of Intel THC HID Support - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set -# end of USB HID Boot Protocol drivers -# end of USB HID support - CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y @@ -4248,7 +4314,11 @@ CONFIG_USB_UHCI_HCD=y # CONFIG_USB_TMC is not set # -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; see USB_STORAGE Help for more info +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info # CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set @@ -4265,7 +4335,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set +CONFIG_USB_UAS=m # # USB Imaging devices @@ -4335,7 +4405,7 @@ CONFIG_USB_STORAGE=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y # CONFIG_LEDS_CLASS_FLASH is not set -CONFIG_LEDS_CLASS_MULTICOLOR=m +# CONFIG_LEDS_CLASS_MULTICOLOR is not set # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set # @@ -4375,7 +4445,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m # # RGB LED drivers # -# CONFIG_LEDS_KTD202X is not set # # LED Triggers @@ -4386,7 +4455,6 @@ CONFIG_LEDS_TRIGGERS=y # CONFIG_LEDS_TRIGGER_DISK is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -# CONFIG_LEDS_TRIGGER_CPU is not set # CONFIG_LEDS_TRIGGER_ACTIVITY is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set @@ -4402,7 +4470,7 @@ CONFIG_LEDS_TRIGGERS=y # CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set # -# Simatic LED drivers +# Simple LED drivers # # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set @@ -4412,14 +4480,12 @@ CONFIG_EDAC=y CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=m -# CONFIG_EDAC_SCRUB is not set -# CONFIG_EDAC_ECS is not set -# CONFIG_EDAC_MEM_REPAIR is not set # CONFIG_EDAC_AMD64 is not set # CONFIG_EDAC_E752X is not set # CONFIG_EDAC_I82975X is not set # CONFIG_EDAC_I3000 is not set # CONFIG_EDAC_I3200 is not set +# CONFIG_EDAC_IE31200 is not set # CONFIG_EDAC_X38 is not set # CONFIG_EDAC_I5400 is not set # CONFIG_EDAC_I5100 is not set @@ -4534,8 +4600,8 @@ CONFIG_DMA_ACPI=y # CONFIG_PLX_DMA is not set # CONFIG_XILINX_DMA is not set # CONFIG_XILINX_XDMA is not set -# CONFIG_AMD_PTDMA is not set # CONFIG_AMD_QDMA is not set +# CONFIG_AMD_PTDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_HIDMA is not set CONFIG_DW_DMAC_CORE=y @@ -4556,7 +4622,7 @@ CONFIG_HSU_DMA=y # DMABUF options # CONFIG_SYNC_FILE=y -CONFIG_UDMABUF=y +# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set @@ -4566,7 +4632,6 @@ CONFIG_UDMABUF=y # CONFIG_UIO is not set CONFIG_VFIO=m -# CONFIG_VFIO_DEVICE_CDEV is not set CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m @@ -4577,6 +4642,7 @@ CONFIG_VFIO_VIRQFD=y # VFIO support for PCI devices # CONFIG_VFIO_PCI_CORE=m +CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y @@ -4623,16 +4689,8 @@ CONFIG_ACPI_WMI=m # CONFIG_YOGABOOK is not set # CONFIG_ACERHDF is not set # CONFIG_ACER_WIRELESS is not set - -# -# AMD HSMP Driver -# -# CONFIG_AMD_HSMP_ACPI is not set -# CONFIG_AMD_HSMP_PLAT is not set -# end of AMD HSMP Driver - -# CONFIG_AMD_PMC is not set -# CONFIG_AMD_3D_VCACHE is not set +# CONFIG_AMD_PMF is not set +# CONFIG_AMD_HSMP is not set # CONFIG_AMD_WBRF is not set # CONFIG_ADV_SWBUTTON is not set # CONFIG_APPLE_GMUX is not set @@ -4645,7 +4703,6 @@ CONFIG_ACPI_WMI=m # CONFIG_X86_PLATFORM_DRIVERS_HP is not set # CONFIG_WIRELESS_HOTKEY is not set # CONFIG_IBM_RTL is not set -# CONFIG_LENOVO_WMI_HOTKEY_UTILITIES is not set # CONFIG_SENSORS_HDAPS is not set # CONFIG_THINKPAD_LMI is not set # CONFIG_INTEL_ATOMISP2_PM is not set @@ -4688,6 +4745,7 @@ CONFIG_ACPI_WMI=m # CONFIG_SONY_LAPTOP is not set # CONFIG_TOPSTAR_LAPTOP is not set # CONFIG_SERIAL_MULTI_INSTANTIATE is not set +# CONFIG_MLX_PLATFORM is not set # CONFIG_INSPUR_PLATFORM_PROFILE is not set # CONFIG_LENOVO_WMI_CAMERA is not set # CONFIG_INTEL_IPS is not set @@ -4720,7 +4778,6 @@ CONFIG_PCC=y # CONFIG_ALTERA_MBOX is not set CONFIG_IOMMU_IOVA=y CONFIG_IOMMU_API=y -CONFIG_IOMMUFD_DRIVER=y CONFIG_IOMMU_SUPPORT=y # @@ -4737,8 +4794,7 @@ CONFIG_IOMMU_SVA=y CONFIG_IOMMU_IOPF=y CONFIG_AMD_IOMMU=y # CONFIG_INTEL_IOMMU is not set -CONFIG_IOMMUFD_DRIVER_CORE=y -CONFIG_IOMMUFD=y +# CONFIG_IOMMUFD is not set CONFIG_IRQ_REMAP=y # CONFIG_VIRTIO_IOMMU is not set @@ -4755,6 +4811,8 @@ CONFIG_IRQ_REMAP=y # CONFIG_RPMSG_VIRTIO is not set # end of Rpmsg drivers +# CONFIG_SOUNDWIRE is not set + # # SOC (System On Chip) specific Drivers # @@ -4862,7 +4920,10 @@ CONFIG_IRQ_REMAP=y # CONFIG_PHY_INTEL_LGM_EMMC is not set # end of PHY Subsystem -# CONFIG_POWERCAP is not set +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL_CORE=m +CONFIG_INTEL_RAPL=m +# CONFIG_IDLE_INJECT is not set # CONFIG_MCB is not set # @@ -4872,13 +4933,15 @@ CONFIG_IRQ_REMAP=y # end of Performance monitor support CONFIG_RAS=y +CONFIG_AMD_ATL=m +CONFIG_AMD_ATL_PRM=y # CONFIG_USB4 is not set # # Android # CONFIG_ANDROID_BINDER_IPC=y -# CONFIG_ANDROID_BINDERFS is not set +CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set # end of Android @@ -4894,9 +4957,8 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_KEYS=y # CONFIG_NVDIMM_SECURITY_TEST is not set CONFIG_DAX=y -# CONFIG_DEV_DAX is not set CONFIG_NVMEM=y -# CONFIG_NVMEM_SYSFS is not set +CONFIG_NVMEM_SYSFS=y # CONFIG_NVMEM_LAYOUTS is not set # CONFIG_NVMEM_RMEM is not set @@ -4908,7 +4970,8 @@ CONFIG_NVMEM=y # end of HW tracing support # CONFIG_FPGA is not set -# CONFIG_TEE is not set +CONFIG_TEE=m +CONFIG_AMDTEE=m # CONFIG_SIOX is not set # CONFIG_SLIMBUS is not set # CONFIG_INTERCONNECT is not set @@ -4936,6 +4999,7 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set @@ -4955,19 +5019,12 @@ CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y # CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -# CONFIG_QFMT_V1 is not set -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y +# CONFIG_QUOTA is not set CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m # CONFIG_CUSE is not set CONFIG_VIRTIO_FS=m CONFIG_FUSE_PASSTHROUGH=y -CONFIG_FUSE_IO_URING=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -5007,10 +5064,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_FAT_DEFAULT_UTF8 is not set CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS3_FS=m -# CONFIG_NTFS3_64BIT_CLUSTER is not set -CONFIG_NTFS3_LZX_XPRESS=y -# CONFIG_NTFS3_FS_POSIX_ACL is not set +# CONFIG_NTFS3_FS is not set # CONFIG_NTFS_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems @@ -5052,23 +5106,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set -CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y -# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set -CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y -# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_LZ4 is not set -# CONFIG_SQUASHFS_LZO is not set -# CONFIG_SQUASHFS_XZ is not set -# CONFIG_SQUASHFS_ZSTD is not set -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set @@ -5077,6 +5115,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_PSTORE is not set +# CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # CONFIG_EROFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y @@ -5108,7 +5147,6 @@ CONFIG_NFSD_V4=y CONFIG_NFSD_V4_2_INTER_SSC=y # CONFIG_NFSD_V4_SECURITY_LABEL is not set # CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set -# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_GRACE_PERIOD=m CONFIG_LOCKD=m CONFIG_LOCKD_V4=y @@ -5200,7 +5238,6 @@ CONFIG_IO_WQ=y CONFIG_KEYS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_PERSISTENT_KEYRINGS=y -# CONFIG_BIG_KEYS is not set # CONFIG_TRUSTED_KEYS is not set CONFIG_ENCRYPTED_KEYS=y # CONFIG_USER_DECRYPTED_DATA is not set @@ -5211,11 +5248,12 @@ CONFIG_PROC_MEM_ALWAYS_FORCE=y # CONFIG_PROC_MEM_FORCE_PTRACE is not set # CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y -CONFIG_HAS_SECURITY_AUDIT=y # CONFIG_SECURITYFS is not set CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set # CONFIG_SECURITY_PATH is not set +# CONFIG_HARDENED_USERCOPY is not set +# CONFIG_FORTIFY_SOURCE is not set # CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_SECURITY_SELINUX is not set # CONFIG_SECURITY_SMACK is not set @@ -5256,13 +5294,6 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # end of Memory initialization # -# Bounds checking -# -# CONFIG_FORTIFY_SOURCE is not set -# CONFIG_HARDENED_USERCOPY is not set -# end of Bounds checking - -# # Hardening of kernel data structures # # CONFIG_LIST_HARDENED is not set @@ -5313,7 +5344,6 @@ CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_KRB5ENC is not set # CONFIG_CRYPTO_TEST is not set CONFIG_CRYPTO_SIMD=m # end of Crypto core or helper @@ -5356,15 +5386,17 @@ CONFIG_CRYPTO_DES=m # Length-preserving ciphers and modes # # CONFIG_CRYPTO_ADIANTUM is not set -CONFIG_CRYPTO_ARC4=y +# CONFIG_CRYPTO_ARC4 is not set # CONFIG_CRYPTO_CHACHA20 is not set CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTR=y # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=y -# CONFIG_CRYPTO_HCTR2 is not set +CONFIG_CRYPTO_HCTR2=m +# CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_PCBC is not set +CONFIG_CRYPTO_XCTR=m CONFIG_CRYPTO_XTS=m # end of Length-preserving ciphers and modes @@ -5391,6 +5423,7 @@ CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_MICHAEL_MIC is not set +CONFIG_CRYPTO_POLYVAL=m # CONFIG_CRYPTO_POLY1305 is not set # CONFIG_CRYPTO_RMD160 is not set CONFIG_CRYPTO_SHA1=y @@ -5399,6 +5432,7 @@ CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_STREEBOG is not set +# CONFIG_CRYPTO_VMAC is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_XCBC is not set CONFIG_CRYPTO_XXHASH=y @@ -5409,13 +5443,14 @@ CONFIG_CRYPTO_XXHASH=y # CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32 is not set +CONFIG_CRYPTO_CRCT10DIF=m # end of CRCs (cyclic redundancy checks) # # Compression # -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_LZO is not set # CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set @@ -5441,8 +5476,8 @@ CONFIG_CRYPTO_KDF800108_CTR=y # # Userspace interface # -CONFIG_CRYPTO_USER_API=y -CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_RNG=m # CONFIG_CRYPTO_USER_API_RNG_CAVP is not set @@ -5480,13 +5515,16 @@ CONFIG_CRYPTO_CHACHA20_X86_64=m # CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set CONFIG_CRYPTO_BLAKE2S_X86=y -# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set +CONFIG_CRYPTO_POLYVAL_CLMUL_NI=m CONFIG_CRYPTO_POLY1305_X86_64=m -# CONFIG_CRYPTO_SHA1_SSSE3 is not set +CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m -# CONFIG_CRYPTO_SHA512_SSSE3 is not set +CONFIG_CRYPTO_SHA512_SSSE3=m # CONFIG_CRYPTO_SM3_AVX_X86_64 is not set -# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m # end of Accelerated Cryptographic Algorithms for CPU (x86) CONFIG_CRYPTO_HW=y @@ -5530,7 +5568,6 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # end of Certificates for signature checking -# CONFIG_CRYPTO_KRB5 is not set CONFIG_BINARY_PRINTF=y # @@ -5556,8 +5593,6 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y # CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LIB_AES=y -CONFIG_CRYPTO_LIB_AESCFB=m -CONFIG_CRYPTO_LIB_ARC4=y CONFIG_CRYPTO_LIB_GF128MUL=m CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y @@ -5582,20 +5617,24 @@ CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y -CONFIG_ARCH_HAS_CRC_T10DIF=y +CONFIG_CRC_T10DIF=m +# CONFIG_CRC64_ROCKSOFT is not set CONFIG_CRC_ITU_T=m CONFIG_CRC32=y -CONFIG_ARCH_HAS_CRC32=y -CONFIG_CRC32_ARCH=y -CONFIG_ARCH_HAS_CRC64=y -CONFIG_CRC_OPTIMIZATIONS=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +# CONFIG_CRC64 is not set +# CONFIG_CRC4 is not set +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=y +# CONFIG_CRC8 is not set CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZLIB_DEFLATE=y CONFIG_ZSTD_COMMON=y CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y @@ -5610,16 +5649,9 @@ CONFIG_XZ_DEC_RISCV=y # CONFIG_XZ_DEC_MICROLZMA is not set CONFIG_XZ_DEC_BCJ=y # CONFIG_XZ_DEC_TEST is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y CONFIG_DECOMPRESS_ZSTD=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_INTERVAL_TREE=y -CONFIG_INTERVAL_TREE_SPAN_ITER=y CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y @@ -5652,7 +5684,6 @@ CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_VDSO_TIME_NS=y CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y CONFIG_VDSO_GETRANDOM=y -CONFIG_GENERIC_VDSO_DATA_STORE=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y @@ -5669,7 +5700,6 @@ CONFIG_SBITMAP=y # end of Library routines CONFIG_FIRMWARE_TABLE=y -CONFIG_UNION_FIND=y # # Kernel hacking @@ -5697,22 +5727,11 @@ CONFIG_DEBUG_KERNEL=y # # Compile-time checks and compiler options # -CONFIG_DEBUG_INFO=y CONFIG_AS_HAS_NON_CONST_ULEB128=y -# CONFIG_DEBUG_INFO_NONE is not set -CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +CONFIG_DEBUG_INFO_NONE=y +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_REDUCED is not set -CONFIG_DEBUG_INFO_COMPRESSED_NONE=y -# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set -# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set -# CONFIG_DEBUG_INFO_SPLIT is not set -CONFIG_DEBUG_INFO_BTF=y -CONFIG_PAHOLE_HAS_SPLIT_BTF=y -CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y -# CONFIG_DEBUG_INFO_BTF_MODULES is not set -# CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set @@ -5721,7 +5740,6 @@ CONFIG_FRAME_WARN=2048 CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set CONFIG_OBJTOOL=y -# CONFIG_OBJTOOL_WERROR is not set # CONFIG_VMLINUX_MAP is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # end of Compile-time checks and compiler options @@ -5749,7 +5767,6 @@ CONFIG_HAVE_KCSAN_COMPILER=y # CONFIG_NET_DEV_REFCNT_TRACKER is not set # CONFIG_NET_NS_REFCNT_TRACKER is not set # CONFIG_DEBUG_NET is not set -# CONFIG_DEBUG_NET_SMALL_RTNL is not set # end of Networking Debugging # @@ -5761,11 +5778,10 @@ CONFIG_HAVE_KCSAN_COMPILER=y # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_TABLE_CHECK is not set # CONFIG_PAGE_POISONING is not set -# CONFIG_DEBUG_PAGE_REF is not set # CONFIG_DEBUG_RODATA_TEST is not set CONFIG_ARCH_HAS_DEBUG_WX=y # CONFIG_DEBUG_WX is not set -CONFIG_ARCH_HAS_PTDUMP=y +CONFIG_GENERIC_PTDUMP=y CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_PER_VMA_LOCK_STATS is not set @@ -5773,7 +5789,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_SCHED_STACK_END_CHECK is not set CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y -# CONFIG_DEBUG_VFS is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_VM_PGTABLE is not set CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y @@ -5829,9 +5844,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -5875,7 +5888,6 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 # CONFIG_LATENCYTOP is not set # CONFIG_DEBUG_CGROUP_REF is not set CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y CONFIG_HAVE_RETHOOK=y CONFIG_RETHOOK=y CONFIG_HAVE_FUNCTION_TRACER=y @@ -5883,7 +5895,6 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y -CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS=y CONFIG_HAVE_DYNAMIC_FTRACE_NO_PATCHABLE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y @@ -5892,48 +5903,8 @@ CONFIG_HAVE_OBJTOOL_MCOUNT=y CONFIG_HAVE_OBJTOOL_NOP_MCOUNT=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_TRACING=y CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -# CONFIG_BOOTTIME_TRACING is not set -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_HWLAT_TRACER is not set -# CONFIG_OSNOISE_TRACER is not set -# CONFIG_TIMERLAT_TRACER is not set -# CONFIG_MMIOTRACE is not set -# CONFIG_ENABLE_DEFAULT_TRACERS is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_TRACER_SNAPSHOT is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_PROBE_EVENTS_BTF_ARGS is not set -CONFIG_KPROBE_EVENTS=y -CONFIG_UPROBE_EVENTS=y -CONFIG_BPF_EVENTS=y -CONFIG_DYNAMIC_EVENTS=y -CONFIG_PROBE_EVENTS=y -# CONFIG_SYNTH_EVENTS is not set -# CONFIG_USER_EVENTS is not set -# CONFIG_HIST_TRIGGERS is not set -# CONFIG_TRACE_EVENT_INJECT is not set -# CONFIG_TRACEPOINT_BENCHMARK is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_TRACE_EVAL_MAP_FILE is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set -# CONFIG_PREEMPTIRQ_DELAY_TEST is not set -# CONFIG_KPROBE_EVENT_GEN_TEST is not set -# CONFIG_RV is not set +# CONFIG_FTRACE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y @@ -5986,8 +5957,6 @@ CONFIG_ARCH_USE_MEMTEST=y # end of Rust hacking # end of Kernel hacking -CONFIG_IO_URING_ZCRX=y - # # Gentoo Linux # @@ -5999,7 +5968,7 @@ CONFIG_GENTOO_LINUX_PORTAGE=y # Support for init systems, system and service managers # CONFIG_GENTOO_LINUX_INIT_SCRIPT=y -CONFIG_GENTOO_LINUX_INIT_SYSTEMD=y +# CONFIG_GENTOO_LINUX_INIT_SYSTEMD is not set # end of Support for init systems, system and service managers # CONFIG_GENTOO_KERNEL_SELF_PROTECTION is not set diff --git a/hosts/iroha/libvirt/qemu/arcade.xml b/hosts/iroha/libvirt/qemu/arcade.xml deleted file mode 100644 index 28177e3..0000000 --- a/hosts/iroha/libvirt/qemu/arcade.xml +++ /dev/null @@ -1,204 +0,0 @@ -<!-- -WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE -OVERWRITTEN AND LOST. Changes to this xml configuration should be made using: - virsh edit arcade -or other application using the libvirt API. ---> - -<domain type='kvm'> - <name>arcade</name> - <uuid>ddc28570-735e-0000-0000-000000000000</uuid> - <metadata> - <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> - <libosinfo:os id="http://microsoft.com/win/11"/> - </libosinfo:libosinfo> - </metadata> - <memory unit='KiB'>16777216</memory> - <currentMemory unit='KiB'>16777216</currentMemory> - <vcpu placement='static'>12</vcpu> - <iothreads>1</iothreads> - <cputune> - <vcpupin vcpu='0' cpuset='0'/> - <vcpupin vcpu='1' cpuset='12'/> - <vcpupin vcpu='2' cpuset='1'/> - <vcpupin vcpu='3' cpuset='13'/> - <vcpupin vcpu='4' cpuset='2'/> - <vcpupin vcpu='5' cpuset='14'/> - <vcpupin vcpu='6' cpuset='3'/> - <vcpupin vcpu='7' cpuset='15'/> - <vcpupin vcpu='8' cpuset='4'/> - <vcpupin vcpu='9' cpuset='16'/> - <vcpupin vcpu='10' cpuset='5'/> - <vcpupin vcpu='11' cpuset='17'/> - <emulatorpin cpuset='6,18'/> - <iothreadpin iothread='1' cpuset='7,19'/> - </cputune> - <os firmware='efi'> - <type arch='x86_64' machine='pc-q35-9.2'>hvm</type> - <firmware> - <feature enabled='no' name='enrolled-keys'/> - <feature enabled='no' name='secure-boot'/> - </firmware> - <loader readonly='yes' type='pflash' format='raw'>/usr/share/edk2-ovmf/OVMF_CODE.fd</loader> - <nvram template='/usr/share/edk2-ovmf/OVMF_VARS.fd' templateFormat='raw' format='raw'>/var/lib/libvirt/qemu/nvram/arcade_VARS.fd</nvram> - <boot dev='hd'/> - <smbios mode='host'/> - </os> - <features> - <acpi/> - <apic/> - <hyperv mode='passthrough'> - </hyperv> - <kvm> - <hidden state='on'/> - </kvm> - <vmport state='off'/> - <smm state='off'/> - <msrs unknown='ignore'/> - </features> - <cpu mode='host-passthrough' check='none' migratable='off'> - <topology sockets='1' dies='1' clusters='1' cores='6' threads='2'/> - <cache mode='passthrough'/> - <feature policy='require' name='topoext'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='svm'/> - <feature policy='disable' name='monitor'/> - </cpu> - <clock offset='localtime'> - <timer name='rtc' present='no' tickpolicy='catchup'/> - <timer name='pit' tickpolicy='delay'/> - <timer name='hpet' present='no'/> - <timer name='tsc' present='yes' mode='native'/> - <timer name='kvmclock' present='no'/> - <timer name='hypervclock' present='yes'/> - </clock> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <pm> - <suspend-to-mem enabled='no'/> - <suspend-to-disk enabled='no'/> - </pm> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='1' port='0x10'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='2' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='2' port='0x11'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/> - </controller> - <controller type='pci' index='3' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='3' port='0x12'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/> - </controller> - <controller type='pci' index='4' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='4' port='0x13'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/> - </controller> - <controller type='pci' index='5' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='5' port='0x14'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/> - </controller> - <controller type='pci' index='6' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='6' port='0x15'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/> - </controller> - <controller type='pci' index='7' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='7' port='0x16'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/> - </controller> - <controller type='pci' index='8' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='8' port='0x17'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/> - </controller> - <controller type='pci' index='9' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='9' port='0x18'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='10' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='10' port='0x19'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/> - </controller> - <controller type='pci' index='11' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='11' port='0x1a'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/> - </controller> - <controller type='pci' index='12' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='12' port='0x1b'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/> - </controller> - <controller type='pci' index='13' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='13' port='0x1c'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/> - </controller> - <controller type='pci' index='14' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='14' port='0x1d'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/> - </controller> - <controller type='pci' index='15' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='15' port='0x8'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> - </controller> - <controller type='pci' index='16' model='pcie-to-pci-bridge'> - <model name='pcie-pci-bridge'/> - <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> - </controller> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <controller type='usb' index='0' model='qemu-xhci' ports='15'> - <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/> - </controller> - <interface type='network'> - <mac address='52:54:00:b3:a7:83'/> - <source network='default'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> - </interface> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <tpm model='tpm-crb'> - <backend type='emulator' version='2.0'/> - </tpm> - <audio id='1' type='none'/> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x12' slot='0x00' function='0x3'/> - </source> - <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> - </hostdev> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> - </source> - <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/> - </hostdev> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x03' slot='0x00' function='0x1'/> - </source> - <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/> - </hostdev> - <watchdog model='itco' action='reset'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/hosts/iroha/libvirt/qemu/corpa-nogpu.xml b/hosts/iroha/libvirt/qemu/corpa-nogpu.xml deleted file mode 100644 index 9078981..0000000 --- a/hosts/iroha/libvirt/qemu/corpa-nogpu.xml +++ /dev/null @@ -1,251 +0,0 @@ -<!-- -WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE -OVERWRITTEN AND LOST. Changes to this xml configuration should be made using: - virsh edit corpa-nogpu -or other application using the libvirt API. ---> - -<domain type='kvm'> - <name>corpa-nogpu</name> - <uuid>df007a1b-9a75-406a-98d2-b02a9d327715</uuid> - <metadata> - <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> - <libosinfo:os id="http://microsoft.com/win/11"/> - </libosinfo:libosinfo> - </metadata> - <memory unit='KiB'>16777216</memory> - <currentMemory unit='KiB'>16777216</currentMemory> - <memoryBacking> - <source type='memfd'/> - <access mode='shared'/> - </memoryBacking> - <vcpu placement='static'>12</vcpu> - <iothreads>1</iothreads> - <cputune> - <vcpupin vcpu='0' cpuset='0'/> - <vcpupin vcpu='1' cpuset='12'/> - <vcpupin vcpu='2' cpuset='1'/> - <vcpupin vcpu='3' cpuset='13'/> - <vcpupin vcpu='4' cpuset='2'/> - <vcpupin vcpu='5' cpuset='14'/> - <vcpupin vcpu='6' cpuset='3'/> - <vcpupin vcpu='7' cpuset='15'/> - <vcpupin vcpu='8' cpuset='4'/> - <vcpupin vcpu='9' cpuset='16'/> - <vcpupin vcpu='10' cpuset='5'/> - <vcpupin vcpu='11' cpuset='17'/> - <emulatorpin cpuset='6,18'/> - <iothreadpin iothread='1' cpuset='7,19'/> - </cputune> - <os firmware='efi'> - <type arch='x86_64' machine='pc-q35-9.2'>hvm</type> - <firmware> - <feature enabled='no' name='enrolled-keys'/> - <feature enabled='no' name='secure-boot'/> - </firmware> - <loader readonly='yes' type='pflash' format='raw'>/usr/share/edk2-ovmf/OVMF_CODE.fd</loader> - <nvram template='/usr/share/edk2-ovmf/OVMF_VARS.fd' templateFormat='raw' format='raw'>/var/lib/libvirt/qemu/nvram/corpa-nogpu_VARS.fd</nvram> - <smbios mode='host'/> - </os> - <features> - <acpi/> - <apic/> - <hyperv mode='passthrough'> - </hyperv> - <kvm> - <hidden state='on'/> - </kvm> - <vmport state='off'/> - <smm state='off'/> - <msrs unknown='ignore'/> - </features> - <cpu mode='host-passthrough' check='none' migratable='off'> - <topology sockets='1' dies='1' clusters='1' cores='6' threads='2'/> - <cache mode='passthrough'/> - <feature policy='require' name='topoext'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='svm'/> - <feature policy='disable' name='monitor'/> - </cpu> - <clock offset='localtime'> - <timer name='rtc' present='no' tickpolicy='catchup'/> - <timer name='pit' tickpolicy='delay'/> - <timer name='hpet' present='no'/> - <timer name='tsc' present='yes' mode='native'/> - <timer name='kvmclock' present='no'/> - <timer name='hypervclock' present='yes'/> - </clock> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <pm> - <suspend-to-mem enabled='no'/> - <suspend-to-disk enabled='no'/> - </pm> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' io='io_uring' iothread='1'/> - <source file='/var/lib/libvirt/images/corpa-1.qcow2'/> - <target dev='vdb' bus='virtio'/> - <boot order='1'/> - <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw'/> - <source file='/home/andrew/isos/virtio-win-0.1.271.iso'/> - <target dev='sda' bus='sata'/> - <readonly/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0' model='qemu-xhci' ports='15'> - <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> - </controller> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='1' port='0x10'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='2' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='2' port='0x11'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/> - </controller> - <controller type='pci' index='3' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='3' port='0x12'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/> - </controller> - <controller type='pci' index='4' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='4' port='0x13'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/> - </controller> - <controller type='pci' index='5' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='5' port='0x14'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/> - </controller> - <controller type='pci' index='6' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='6' port='0x15'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/> - </controller> - <controller type='pci' index='7' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='7' port='0x16'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/> - </controller> - <controller type='pci' index='8' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='8' port='0x17'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/> - </controller> - <controller type='pci' index='9' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='9' port='0x18'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='10' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='10' port='0x19'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/> - </controller> - <controller type='pci' index='11' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='11' port='0x1a'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/> - </controller> - <controller type='pci' index='12' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='12' port='0x1b'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/> - </controller> - <controller type='pci' index='13' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='13' port='0x1c'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/> - </controller> - <controller type='pci' index='14' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='14' port='0x1d'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/> - </controller> - <controller type='pci' index='15' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='15' port='0x1e'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/> - </controller> - <controller type='pci' index='16' model='pcie-to-pci-bridge'> - <model name='pcie-pci-bridge'/> - <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/> - </controller> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> - </controller> - <filesystem type='mount' accessmode='passthrough'> - <driver type='virtiofs' queue='1024'/> - <binary path='/usr/libexec/virtiofsd' xattr='on'/> - <source dir='/mnt/hdd/Roms'/> - <target dir='HostMountA'/> - <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/> - </filesystem> - <interface type='bridge'> - <mac address='52:54:00:80:5f:39'/> - <source bridge='virbr0'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> - </interface> - <channel type='spicevmc'> - <target type='virtio' name='com.redhat.spice.0'/> - <address type='virtio-serial' controller='0' bus='0' port='1'/> - </channel> - <input type='mouse' bus='virtio'> - <address type='pci' domain='0x0000' bus='0x0b' slot='0x00' function='0x0'/> - </input> - <input type='keyboard' bus='virtio'> - <address type='pci' domain='0x0000' bus='0x0c' slot='0x00' function='0x0'/> - </input> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <tpm model='tpm-crb'> - <backend type='emulator' version='2.0'/> - </tpm> - <graphics type='spice' port='5900' autoport='no' listen='0.0.0.0'> - <listen type='address' address='0.0.0.0'/> - <channel name='main' mode='insecure'/> - <channel name='record' mode='insecure'/> - <image compression='auto_glz'/> - <jpeg compression='auto'/> - <zlib compression='auto'/> - <playback compression='on'/> - <streaming mode='filter'/> - <clipboard copypaste='yes'/> - <filetransfer enable='no'/> - <gl enable='no'/> - </graphics> - <sound model='ich9'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/> - </sound> - <audio id='1' type='spice'/> - <video> - <model type='qxl' ram='65536' vram='65536' vgamem='32768' heads='1' primary='yes'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> - </video> - <redirdev bus='usb' type='spicevmc'> - <address type='usb' bus='0' port='2'/> - </redirdev> - <watchdog model='itco' action='reset'/> - <memballoon model='none'/> - <shmem name='looking-glass'> - <model type='ivshmem-plain'/> - <size unit='M'>64</size> - <address type='pci' domain='0x0000' bus='0x10' slot='0x01' function='0x0'/> - </shmem> - </devices> -</domain> diff --git a/hosts/iroha/libvirt/qemu/corpa.xml b/hosts/iroha/libvirt/qemu/corpa.xml index 3c61a81..0bd09c7 100644 --- a/hosts/iroha/libvirt/qemu/corpa.xml +++ b/hosts/iroha/libvirt/qemu/corpa.xml @@ -7,56 +7,41 @@ or other application using the libvirt API. <domain type='kvm'> <name>corpa</name> - <uuid>b8f2eddd-26fb-427a-8885-bb415ba49cc7</uuid> + <uuid></uuid> <metadata> <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> - <libosinfo:os id="http://microsoft.com/win/11"/> + <libosinfo:os id="http://microsoft.com/win/10"/> </libosinfo:libosinfo> </metadata> - <memory unit='KiB'>16777216</memory> - <currentMemory unit='KiB'>16777216</currentMemory> - <vcpu placement='static'>12</vcpu> - <iothreads>1</iothreads> - <cputune> - <vcpupin vcpu='0' cpuset='0'/> - <vcpupin vcpu='1' cpuset='12'/> - <vcpupin vcpu='2' cpuset='1'/> - <vcpupin vcpu='3' cpuset='13'/> - <vcpupin vcpu='4' cpuset='2'/> - <vcpupin vcpu='5' cpuset='14'/> - <vcpupin vcpu='6' cpuset='3'/> - <vcpupin vcpu='7' cpuset='15'/> - <vcpupin vcpu='8' cpuset='4'/> - <vcpupin vcpu='9' cpuset='16'/> - <vcpupin vcpu='10' cpuset='5'/> - <vcpupin vcpu='11' cpuset='17'/> - <emulatorpin cpuset='6,18'/> - <iothreadpin iothread='1' cpuset='7,19'/> - </cputune> - <os firmware='efi'> - <type arch='x86_64' machine='pc-q35-9.2'>hvm</type> - <firmware> - <feature enabled='no' name='enrolled-keys'/> - <feature enabled='no' name='secure-boot'/> - </firmware> - <loader readonly='yes' type='pflash' format='raw'>/usr/share/edk2-ovmf/OVMF_CODE.fd</loader> - <nvram template='/usr/share/edk2-ovmf/OVMF_VARS.fd' templateFormat='raw' format='raw'>/var/lib/libvirt/qemu/nvram/corpa_VARS.fd</nvram> - <smbios mode='host'/> + <memory unit='KiB'>8388608</memory> + <currentMemory unit='KiB'>8388608</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='x86_64' machine='pc-q35-10.0'>hvm</type> + <boot dev='hd'/> </os> <features> <acpi/> <apic/> - <hyperv mode='passthrough'> + <hyperv mode='custom'> + <relaxed state='on'/> + <vapic state='on'/> + <spinlocks state='on' retries='8191'/> + <vpindex state='on'/> + <runtime state='on'/> + <synic state='on'/> + <stimer state='on'/> + <frequencies state='on'/> + <tlbflush state='on'/> + <ipi state='on'/> + <avic state='on'/> </hyperv> - <kvm> - <hidden state='on'/> - </kvm> <vmport state='off'/> <smm state='off'/> <msrs unknown='ignore'/> </features> - <cpu mode='host-passthrough' check='none' migratable='off'> - <topology sockets='1' dies='1' clusters='1' cores='6' threads='2'/> + <cpu mode='host-passthrough' check='none' migratable='on'> + <topology sockets='1' dies='1' clusters='1' cores='4' threads='2'/> <cache mode='passthrough'/> <feature policy='require' name='topoext'/> <feature policy='require' name='hypervisor'/> @@ -80,21 +65,27 @@ or other application using the libvirt API. <suspend-to-disk enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> + <emulator>/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' io='io_uring' iothread='1'/> - <source file='/var/lib/libvirt/images/corpa-1.qcow2'/> - <target dev='vdb' bus='virtio'/> - <boot order='1'/> - <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/> + <driver name='qemu' type='qcow2' io='io_uring' discard='unmap'/> + <source file='/var/lib/libvirt/images/corpa.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> </disk> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> - <source file='/home/andrew/isos/virtio-win-0.1.271.iso'/> + <source file='/home/andrew/dl/isos/en-us_windows_10_iot_enterprise_ltsc_2021_x64_dvd_257ad90f.iso'/> <target dev='sdb' bus='sata'/> <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/home/andrew/dl/isos/virtio-win-0.1.285.iso'/> + <target dev='sdc' bus='sata'/> + <readonly/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> <controller type='usb' index='0' model='qemu-xhci' ports='15'> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> </controller> @@ -176,7 +167,7 @@ or other application using the libvirt API. </controller> <controller type='pci' index='16' model='pcie-to-pci-bridge'> <model name='pcie-pci-bridge'/> - <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/> </controller> <controller type='sata' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> @@ -185,30 +176,30 @@ or other application using the libvirt API. <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> </controller> <interface type='bridge'> - <mac address='52:54:00:c6:ef:20'/> + <mac address=''/> <source bridge='virbr0'/> - <model type='virtio'/> + <model type='e1000e'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </interface> + <serial type='pty'> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> <channel type='spicevmc'> <target type='virtio' name='com.redhat.spice.0'/> <address type='virtio-serial' controller='0' bus='0' port='1'/> </channel> - <input type='mouse' bus='virtio'> - <address type='pci' domain='0x0000' bus='0x0b' slot='0x00' function='0x0'/> - </input> - <input type='keyboard' bus='virtio'> - <address type='pci' domain='0x0000' bus='0x0c' slot='0x00' function='0x0'/> + <input type='tablet' bus='usb'> + <address type='usb' bus='0' port='1'/> </input> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <tpm model='tpm-crb'> - <backend type='emulator' version='2.0'/> - </tpm> - <graphics type='spice' port='5900' autoport='no' listen='0.0.0.0'> - <listen type='address' address='0.0.0.0'/> - <channel name='main' mode='insecure'/> - <channel name='record' mode='insecure'/> + <graphics type='spice'> + <listen type='none'/> <image compression='auto_glz'/> <jpeg compression='auto'/> <zlib compression='auto'/> @@ -218,34 +209,17 @@ or other application using the libvirt API. <filetransfer enable='no'/> <gl enable='no'/> </graphics> - <audio id='1' type='none'/> + <sound model='ich9'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/> + </sound> + <audio id='1' type='spice'/> <video> - <model type='none'/> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </video> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x12' slot='0x00' function='0x3'/> - </source> - <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> - </hostdev> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> - </source> - <address type='pci' domain='0x0000' bus='0x09' slot='0x00' function='0x0'/> - </hostdev> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x03' slot='0x00' function='0x1'/> - </source> - <address type='pci' domain='0x0000' bus='0x0a' slot='0x00' function='0x0'/> - </hostdev> <watchdog model='itco' action='reset'/> - <memballoon model='none'/> - <shmem name='looking-glass'> - <model type='ivshmem-plain'/> - <size unit='M'>64</size> - <address type='pci' domain='0x0000' bus='0x10' slot='0x01' function='0x0'/> - </shmem> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> + </memballoon> </devices> </domain> diff --git a/hosts/iroha/libvirt/qemu/soy.xml b/hosts/iroha/libvirt/qemu/soy.xml index c7a26c7..fedef36 100644 --- a/hosts/iroha/libvirt/qemu/soy.xml +++ b/hosts/iroha/libvirt/qemu/soy.xml @@ -7,40 +7,29 @@ or other application using the libvirt API. <domain type='kvm'> <name>soy</name> - <uuid>e2036eaa-3309-4cef-863f-82389718b55f</uuid> + <uuid></uuid> <metadata> <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> - <libosinfo:os id="http://ubuntu.com/ubuntu/23.04"/> + <libosinfo:os id="http://ubuntu.com/ubuntu/24.04"/> </libosinfo:libosinfo> </metadata> - <memory unit='KiB'>12582912</memory> - <currentMemory unit='KiB'>12582912</currentMemory> - <memoryBacking> - <source type='memfd'/> - <access mode='shared'/> - </memoryBacking> + <memory unit='KiB'>8388608</memory> + <currentMemory unit='KiB'>8388608</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='x86_64' machine='pc-q35-9.2'>hvm</type> + <type arch='x86_64' machine='pc-q35-10.0'>hvm</type> + <boot dev='hd'/> </os> <features> <acpi/> <apic/> <vmport state='off'/> </features> - <cpu mode='host-passthrough' check='none' migratable='on'> - <topology sockets='1' dies='1' clusters='1' cores='3' threads='2'/> - <cache mode='passthrough'/> - <feature policy='require' name='topoext'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='svm'/> - <feature policy='disable' name='monitor'/> - </cpu> + <cpu mode='host-passthrough' check='none' migratable='on'/> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> <timer name='hpet' present='no'/> - <timer name='tsc' present='yes' mode='native'/> </clock> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -50,14 +39,19 @@ or other application using the libvirt API. <suspend-to-disk enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> + <emulator>/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' cache='writeback' io='io_uring' discard='unmap'/> + <driver name='qemu' type='qcow2' discard='unmap'/> <source file='/var/lib/libvirt/images/soy.qcow2'/> <target dev='vda' bus='virtio'/> - <boot order='1'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='sda' bus='sata'/> + <readonly/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> <controller type='usb' index='0' model='qemu-xhci' ports='15'> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> </controller> @@ -138,9 +132,9 @@ or other application using the libvirt API. <controller type='virtio-serial' index='0'> <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> </controller> - <interface type='bridge'> - <mac address='52:54:00:8c:30:01'/> - <source bridge='virbr0'/> + <interface type='network'> + <mac address=''/> + <source network='default'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </interface> @@ -165,30 +159,16 @@ or other application using the libvirt API. </input> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <graphics type='spice' port='5900' autoport='no' listen='0.0.0.0'> - <listen type='address' address='0.0.0.0'/> - <channel name='main' mode='insecure'/> - <channel name='record' mode='insecure'/> - <image compression='auto_glz'/> - <jpeg compression='never'/> - <zlib compression='auto'/> - <playback compression='on'/> - <streaming mode='filter'/> - <clipboard copypaste='yes'/> - <filetransfer enable='no'/> - </graphics> - <graphics type='egl-headless'> - <gl rendernode='/dev/dri/renderD128'/> + <graphics type='spice' autoport='yes'> + <listen type='address'/> + <image compression='off'/> </graphics> <sound model='ich9'> <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/> </sound> <audio id='1' type='spice'/> <video> - <driver iommu='on' ats='on' packed='on'/> - <model type='virtio' heads='1' primary='yes'> - <acceleration accel3d='yes'/> - </model> + <model type='virtio' heads='1' primary='yes'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </video> <redirdev bus='usb' type='spicevmc'> diff --git a/hosts/iroha/libvirt/qemu/xp.xml b/hosts/iroha/libvirt/qemu/xp.xml index 05f69fc..ead043b 100644 --- a/hosts/iroha/libvirt/qemu/xp.xml +++ b/hosts/iroha/libvirt/qemu/xp.xml @@ -7,7 +7,7 @@ or other application using the libvirt API. <domain type='kvm'> <name>xp</name> - <uuid>24263fff-8e17-4aa7-9868-56c04c9782c0</uuid> + <uuid></uuid> <metadata> <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> <libosinfo:os id="http://microsoft.com/win/xp"/> @@ -17,21 +17,28 @@ or other application using the libvirt API. <currentMemory unit='KiB'>2097152</currentMemory> <vcpu placement='static'>2</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-9.2'>hvm</type> + <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> - <hyperv mode='passthrough'> + <hyperv mode='custom'> + <relaxed state='on'/> + <vapic state='on'/> + <spinlocks state='on' retries='8191'/> + <vpindex state='on'/> + <runtime state='on'/> + <synic state='on'/> + <stimer state='on'/> + <frequencies state='on'/> + <tlbflush state='on'/> + <ipi state='on'/> + <avic state='on'/> </hyperv> <vmport state='off'/> - <smm state='off'/> - <msrs unknown='ignore'/> </features> - <cpu mode='host-passthrough' check='none' migratable='off'> - <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/> - </cpu> + <cpu mode='host-passthrough' check='none' migratable='on'/> <clock offset='localtime'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> @@ -46,7 +53,7 @@ or other application using the libvirt API. <suspend-to-disk enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> + <emulator>/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' discard='unmap'/> <source file='/var/lib/libvirt/images/xp.qcow2'/> @@ -55,14 +62,14 @@ or other application using the libvirt API. </disk> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> - <source file='/home/andrew/isos/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso'/> + <source file='/home/andrew/dl/isos/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso'/> <target dev='hdb' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> - <source file='/home/andrew/isos/virtio-win-0.1.271.iso'/> + <source file='/home/andrew/dl/isos/virtio-win-0.1.271.iso'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> @@ -89,9 +96,9 @@ or other application using the libvirt API. <controller type='virtio-serial' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> - <interface type='bridge'> - <mac address='52:54:00:a7:04:e8'/> - <source bridge='virbr0'/> + <interface type='network'> + <mac address=''/> + <source network='default'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> @@ -112,16 +119,16 @@ or other application using the libvirt API. </input> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <graphics type='spice' port='5900' autoport='no' listen='0.0.0.0'> - <listen type='address' address='0.0.0.0'/> - <gl enable='no'/> + <graphics type='spice' autoport='yes'> + <listen type='address'/> + <image compression='off'/> </graphics> <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <audio id='1' type='spice'/> <video> - <model type='qxl' ram='65536' vram='65536' vgamem='32768' heads='1' primary='yes'/> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <redirdev bus='usb' type='spicevmc'> diff --git a/hosts/iroha/limits.d/10-proton.conf b/hosts/iroha/limits.d/10-proton.conf new file mode 100644 index 0000000..89fcb70 --- /dev/null +++ b/hosts/iroha/limits.d/10-proton.conf @@ -0,0 +1 @@ +* hard nofile 524288 diff --git a/hosts/iroha/modules-load.d/kvm_amd.conf b/hosts/iroha/modules-load.d/kvm_amd.conf new file mode 100644 index 0000000..52f7224 --- /dev/null +++ b/hosts/iroha/modules-load.d/kvm_amd.conf @@ -0,0 +1 @@ +kvm-amd diff --git a/hosts/iroha/new_desktop.txt b/hosts/iroha/new_desktop.txt deleted file mode 100644 index 210818e..0000000 --- a/hosts/iroha/new_desktop.txt +++ /dev/null @@ -1,56 +0,0 @@ -== Essential Packages -dosfstools -glibc -multiarch, muslc -amdgpu_top > radeontop -https://wiki.gentoo.org/wiki/Gentoo_Binary_Host_Quickstart - -== Ideas for a "Stable" Feeling System -(Ignoring the obvious factor of OS stability) -=== Hardware -Minimize USB finickery -Monitor flicker -Easy monitor source switching -HID latency -No wireless -Solid keyboard -Minimize/Eliminate fan noise -No audio noise -MOUSE USB: Second up from bottom, forward - -=== Software -No container BS -Well kept working directory and easy backups -Seperate system for gaming - -== Notes -https://wiki.gentoo.org/wiki/LTO -https://musl.libc.org/ -https://www.intel.com/content/www/us/en/products/sku/53427/intel-core-i32120t-processor-3m-cache-2-60-ghz/specifications.html -https://community.intel.com/cipcp26785/attachments/cipcp26785/desktop-boards/876/1/DH77DF_TechProdSpec04.pdf -https://forum.proxmox.com/threads/choice-of-storage-type-for-vms-nvme-sata-ssd-hdd.118254/ - -== Shopping -PSU https://www.quietpcusa.com/Streacom-90W-nanoPSU-and-ACDC-adapter-block?ItemId=3398696 -Case https://www.quietpcusa.com/streacom-db1-fanless-case -SSD https://www.newegg.com/western-digital-red-sa500-500gb/p/N82E16820250122?Item=9SIAAY9KGJ2444&cm_sp=product-_-from-price-options -SSD https://www.newegg.com/samsung-500gb-870-evo-series-sata/p/N82E16820147792 -SSD(msata) https://www.newegg.com/kingston-256gb-kc600/p/0D9-001B-004P2?Item=9SIA12KEAH2586 -SSD(nvme) https://www.ebay.com/itm/388510820288 - -=== Acquired -CPU https://www.ebay.com/itm/176997759085 -MB https://www.ebay.com/itm/256822587988 -Ram https://www.ebay.com/itm/226244059510 - -=== Peripherals -https://www.ebay.com/itm/335297968303 -https://www.samsung.com/us/computing/monitors/smart-monitors/27-s3-s30gd-fhd-ips-100hz-monitor-ls27d300ganxza/ -https://www.startech.com/en-us/usb-hubs/5g4aibs-usb-hub-na -https://www.pckeyboard.com/page/product/UNI0416 -https://www.amazon.com/Realforce-Topre-Bluetooth-Mechanical-Keyboard/dp/B09VPCZWR5 -https://www.amazon.com/Realforce-TKL-Wireless-Keyboard-White/dp/B0B3R54RNG?ref_=ast_sto_dp&th=1 -https://mechanicalkeyboards.com/products/topre-realforce-r2-ivory -https://www.amazon.co.jp/-/en/HP-A3mk2-Headphone-Amplifier-Supports-Resolution/dp/B0C2Y66NGN -https://www.amazon.co.jp/-/en/Semi-Open-Dynamic-Headphones-T60RPmk2-Diaphragm/dp/B0F4WLPD7T - -// vim: set syntax=asciidoc: diff --git a/hosts/iroha/scripts/disable-rgb b/hosts/iroha/scripts/disable-rgb index c05c1a5..a36eaab 100755 --- a/hosts/iroha/scripts/disable-rgb +++ b/hosts/iroha/scripts/disable-rgb @@ -1,2 +1,2 @@ #! /usr/bin/env sh -su -c 'openrgb -d 0 -m off && openrgb -d 1 -m off && openrgb -d 2 -m off && openrgb -d 3 -m off' +su -c 'modprobe i2c-dev && openrgb -d 0 -m off && openrgb -d 1 -m off && openrgb -d 2 -m off && openrgb -d 3 -m off' diff --git a/hosts/iroha/scripts/do-grub-install b/hosts/iroha/scripts/do-grub-install deleted file mode 100755 index 8dda1cb..0000000 --- a/hosts/iroha/scripts/do-grub-install +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -sudo grub-install --target=x86_64-efi --efi-directory=/boot diff --git a/hosts/iroha/scripts/emerge-update b/hosts/iroha/scripts/emerge-update deleted file mode 100755 index 2f8d3fe..0000000 --- a/hosts/iroha/scripts/emerge-update +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -sudo emerge --ask --verbose --update --deep --newuse @world diff --git a/hosts/iroha/scripts/energy-preference b/hosts/iroha/scripts/energy-preference deleted file mode 100755 index 2b0ddfa..0000000 --- a/hosts/iroha/scripts/energy-preference +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -echo "power" | sudo tee /sys/devices/system/cpu/*/cpufreq/energy_performance_preference diff --git a/hosts/iroha/scripts/export-nfs b/hosts/iroha/scripts/export-nfs deleted file mode 100755 index 3643fa3..0000000 --- a/hosts/iroha/scripts/export-nfs +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -sudo exportfs -o rw,async,insecure,no_subtree_check,crossmnt -i 192.168.0.0/16:$1 diff --git a/hosts/iroha/scripts/game.sh b/hosts/iroha/scripts/game.sh deleted file mode 100755 index c8d626d..0000000 --- a/hosts/iroha/scripts/game.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/env sh -sudo su -c 'echo high > /sys/class/drm/card0/device/power_dpm_force_performance_level' -read -p "Waiting..." -#sudo scx_bpfland -sudo su -c 'echo auto > /sys/class/drm/card0/device/power_dpm_force_performance_level' diff --git a/hosts/iroha/scripts/id-dm-device b/hosts/iroha/scripts/id-dm-device deleted file mode 100755 index b7d5781..0000000 --- a/hosts/iroha/scripts/id-dm-device +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -sudo sudo dmsetup info /dev/$1 diff --git a/hosts/iroha/scripts/map-kernel-ata b/hosts/iroha/scripts/map-kernel-ata deleted file mode 100755 index db18971..0000000 --- a/hosts/iroha/scripts/map-kernel-ata +++ /dev/null @@ -1,3 +0,0 @@ -#! /usr/bin/env sh -#sudo grep '[0-9]' /sys/class/scsi_host/host{0..9}/unique_id -sudo ls -l /sys/block/* diff --git a/hosts/iroha/scripts/mount-nfs b/hosts/iroha/scripts/mount-nfs deleted file mode 100755 index a07f4cf..0000000 --- a/hosts/iroha/scripts/mount-nfs +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -sudo mount -t nfs4 -o noatime,nodiratime,rw,hard,fsc,proto=tcp,timeo=600,retrans=2,nfsvers=4,minorversion=2 moyo:$1 $2 diff --git a/hosts/iroha/scripts/mount-vm-disk b/hosts/iroha/scripts/mount-vm-disk deleted file mode 100755 index 341a046..0000000 --- a/hosts/iroha/scripts/mount-vm-disk +++ /dev/null @@ -1,22 +0,0 @@ -#! /usr/bin/env sh - -#sudo LIBGUESTFS_PATH=/usr/share/guestfs/appliance \ -# guestmount -a "$1" -m /dev/vda1 --ro "$2" -sudo modprobe nbd max_part=8 - -#sudo qemu-nbd --connect=/dev/nbd0 /var/lib/libvirt/images/devuan.qcow2 -#sudo cryptsetup open /dev/nbd0p3 vm-disk -#sudo pvscan --cache /dev/mapper/vm-disk - -sudo qemu-nbd --connect=/dev/nbd1 /var/lib/libvirt/images/nixos-test.qcow2 -sudo pvscan --cache /dev/ndb1p3 - -#sudo qemu-nbd --connect=/dev/nbd2 /var/lib/libvirt/images/tora.qcow2 -#sudo pvscan --cache /dev/ndb2p3 - -sudo vgscan -sudo lvscan - -#sudo mount /dev/shima-vg/root /mnt/tmp/ -sudo mount /dev/test-vg0/root /mnt/tmp/ -#sudo mount /dev/tora-vg0/root /mnt/tmp/ diff --git a/hosts/iroha/scripts/prepare-gpu b/hosts/iroha/scripts/prepare-gpu deleted file mode 100755 index eaf93cf..0000000 --- a/hosts/iroha/scripts/prepare-gpu +++ /dev/null @@ -1,3 +0,0 @@ -#! /usr/bin/env sh -# https://github.com/sibradzic/amdgpu-clocks/blob/504785df769e1d128d16a6f1545d2f425d70a310/amdgpu-clocks -sudo $HOME/run/amdgpu-clocks diff --git a/hosts/iroha/scripts/prepare-mounts b/hosts/iroha/scripts/prepare-mounts index b033d68..f8cc6af 100755 --- a/hosts/iroha/scripts/prepare-mounts +++ b/hosts/iroha/scripts/prepare-mounts @@ -1,7 +1,6 @@ #! /usr/bin/env sh - -sudo kpartx -a /dev/iroha-vg1/iroha-store0-raid1 -sudo cryptsetup open /dev/mapper/iroha--vg1-iroha--store0--raid1p1 store -sudo mount /dev/mapper/store /mnt/store - -sudo mount /dev/iroha-vg1/iroha-store1-raid1 /mnt/data +doas kpartx -a /dev/iroha-vg1/iroha-store0-raid1 +doas lvscan +doas cryptsetup open /dev/mapper/iroha--vg1-iroha--store0--raid1p1 store +doas mount /dev/mapper/store /mnt/store +doas mount /dev/iroha-vg1/iroha-store1-raid1 /mnt/data diff --git a/hosts/iroha/scripts/prepare-network-mounts b/hosts/iroha/scripts/prepare-network-mounts index 06cf01b..4de8df1 100755 --- a/hosts/iroha/scripts/prepare-network-mounts +++ b/hosts/iroha/scripts/prepare-network-mounts @@ -1,4 +1,2 @@ #! /usr/bin/env sh -$HOME/scripts/mount-nfs /srv/nfs/c /mnt/nfs/c -$HOME/scripts/mount-nfs /srv/nfs/pics /mnt/nfs/pics -$HOME/scripts/mount-nfs /srv/nfs/samba /mnt/nfs/samba +su -c 'mount-nfs /srv/nfs/c /mnt/nfs/c && mount-nfs /srv/nfs/pics /mnt/nfs/pics && mount-nfs /srv/nfs/samba /mnt/nfs/samba' diff --git a/hosts/iroha/scripts/raid-status b/hosts/iroha/scripts/raid-status deleted file mode 100755 index 44ccda6..0000000 --- a/hosts/iroha/scripts/raid-status +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -sudo lvs -a -o name,copy_percent,health_status,devices iroha-vg1 diff --git a/hosts/iroha/scripts/rebuild-modules b/hosts/iroha/scripts/rebuild-modules deleted file mode 100755 index ad400f8..0000000 --- a/hosts/iroha/scripts/rebuild-modules +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/env sh -#sudo emerge --ask --verbose v4l2loopback xpad-noone \=games-util/xone-0.3_p20240226 nvidia-drivers -sudo emerge --ask --verbose xpad-noone v4l2loopback - diff --git a/hosts/iroha/scripts/run-pipewire b/hosts/iroha/scripts/run-pipewire deleted file mode 100755 index ef6a987..0000000 --- a/hosts/iroha/scripts/run-pipewire +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/env sh -sudo mkdir -p /run/user/1000 -sudo chown andrew:users /run/user/1000 -export XDG_RUNTIME_DIR=/run/user/1000 -gentoo-pipewire-launcher restart & diff --git a/hosts/iroha/scripts/run-sway b/hosts/iroha/scripts/run-sway new file mode 100755 index 0000000..7ae945e --- /dev/null +++ b/hosts/iroha/scripts/run-sway @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +dbus-run-session env WLR_RENDERER=vulkan sway diff --git a/hosts/iroha/scripts/thumb_drive_setup.txt b/hosts/iroha/scripts/thumb_drive_setup.txt deleted file mode 100644 index b5facd0..0000000 --- a/hosts/iroha/scripts/thumb_drive_setup.txt +++ /dev/null @@ -1,5 +0,0 @@ -sudo cryptsetup luksFormat --key-size 512 /dev/sdd1 -sudo cryptsetup luksHeaderBackup /dev/sdd1 --header-backup-file crypt_headers/thumb_drive.img -sudo cryptsetup luksOpen /dev/sdd1 thumb_drive -sudo mkfs.ext4 /dev/mapper/thumb_drive -sudo mount /dev/mapper/thumb_drive /mnt/tmp diff --git a/hosts/iroha/sshd_config b/hosts/iroha/sshd_config deleted file mode 100644 index 91fe201..0000000 --- a/hosts/iroha/sshd_config +++ /dev/null @@ -1,7 +0,0 @@ -PermitRootLogin no -PubkeyAuthentication yes -PasswordAuthentication no -PermitEmptyPasswords no -KbdInteractiveAuthentication no -Subsystem sftp /usr/lib64/misc/sftp-server -Include "/etc/ssh/sshd_config.d/*.conf" diff --git a/hosts/iroha/sshd_config.d/9999999iroha.conf b/hosts/iroha/sshd_config.d/9999999iroha.conf new file mode 100644 index 0000000..7c25be7 --- /dev/null +++ b/hosts/iroha/sshd_config.d/9999999iroha.conf @@ -0,0 +1,4 @@ +PermitRootLogin no +PermitEmptyPasswords no +KbdInteractiveAuthentication no +PubkeyAuthentication yes diff --git a/hosts/iroha/stow.txt b/hosts/iroha/stow.txt new file mode 100644 index 0000000..eea1a01 --- /dev/null +++ b/hosts/iroha/stow.txt @@ -0,0 +1,101 @@ +UNLINK: .Xresources +UNLINK: .asoundrc +UNLINK: .bashrc +UNLINK: .config/MangoHud +UNLINK: .config/gdb +UNLINK: .config/gentoo-pipewire-launcher.conf +UNLINK: .config/gtk-3.0 +UNLINK: .config/gtk-4.0 +UNLINK: .config/kitty +UNLINK: .config/pipewire +UNLINK: .config/sway +UNLINK: .config/user-dirs.dirs +UNLINK: .gitconfig +UNLINK: .gtkrc-2.0 +UNLINK: .local/bin/bemenu-colored +UNLINK: .local/bin/check-orphans +UNLINK: .local/bin/dmenu-emoji +UNLINK: .local/bin/dmenu-path +UNLINK: .local/bin/gpg-pubkey +UNLINK: .local/bin/id-dm-device +UNLINK: .local/bin/img-fstype +UNLINK: .local/bin/map-kernel-ata +UNLINK: .local/bin/moonrune-charset-utf8 +UNLINK: .local/bin/mount-nfs +UNLINK: .local/bin/proton-env +UNLINK: .local/bin/proton-env32 +UNLINK: .local/bin/raid-status +UNLINK: .local/bin/rewrite-git +UNLINK: .local/bin/rip-dvd +UNLINK: .local/bin/screenshot +UNLINK: .local/bin/shift-jis-zip +UNLINK: .local/bin/sp +UNLINK: .local/bin/term-font-size +UNLINK: .local/bin/ts-date +UNLINK: .local/bin/unzip-all +UNLINK: .local/bin/use-flags +UNLINK: .local/bin/wlsunset-toggle +UNLINK: .local/bin/xbox-controller-battery +UNLINK: .local/bin/xbox360-ffmpeg-enc +UNLINK: .profile +UNLINK: .vim/autoload +UNLINK: .vim/colors +UNLINK: .vim/pack/downloads/create_opt.sh +UNLINK: .vim/patches +UNLINK: .vim/plugin +UNLINK: .vim/vimrc +UNLINK: scripts/disable-rgb +UNLINK: scripts/prepare-mounts +UNLINK: scripts/prepare-network-mounts +UNLINK: scripts/run-sway +LINK: .Xresources => c/dotfiles/hosts/iroha/stow/.Xresources (reverts previous action) +LINK: .asoundrc => c/dotfiles/hosts/iroha/stow/.asoundrc (reverts previous action) +LINK: .bashrc => c/dotfiles/hosts/iroha/stow/.bashrc (reverts previous action) +LINK: .config/MangoHud => ../c/dotfiles/hosts/iroha/stow/.config/MangoHud (reverts previous action) +LINK: .config/gdb => ../c/dotfiles/hosts/iroha/stow/.config/gdb (reverts previous action) +LINK: .config/gentoo-pipewire-launcher.conf => ../c/dotfiles/hosts/iroha/stow/.config/gentoo-pipewire-launcher.conf (reverts previous action) +LINK: .config/gtk-3.0 => ../c/dotfiles/hosts/iroha/stow/.config/gtk-3.0 (reverts previous action) +LINK: .config/gtk-4.0 => ../c/dotfiles/hosts/iroha/stow/.config/gtk-4.0 (reverts previous action) +LINK: .config/kitty => ../c/dotfiles/hosts/iroha/stow/.config/kitty (reverts previous action) +LINK: .config/pipewire => ../c/dotfiles/hosts/iroha/stow/.config/pipewire (reverts previous action) +LINK: .config/sway => ../c/dotfiles/hosts/iroha/stow/.config/sway (reverts previous action) +LINK: .config/user-dirs.dirs => ../c/dotfiles/hosts/iroha/stow/.config/user-dirs.dirs (reverts previous action) +LINK: .gitconfig => c/dotfiles/hosts/iroha/stow/.gitconfig (reverts previous action) +LINK: .gtkrc-2.0 => c/dotfiles/hosts/iroha/stow/.gtkrc-2.0 (reverts previous action) +LINK: .local/bin/bemenu-colored => ../../c/dotfiles/hosts/iroha/stow/.local/bin/bemenu-colored (reverts previous action) +LINK: .local/bin/check-orphans => ../../c/dotfiles/hosts/iroha/stow/.local/bin/check-orphans (reverts previous action) +LINK: .local/bin/dmenu-emoji => ../../c/dotfiles/hosts/iroha/stow/.local/bin/dmenu-emoji (reverts previous action) +LINK: .local/bin/dmenu-path => ../../c/dotfiles/hosts/iroha/stow/.local/bin/dmenu-path (reverts previous action) +LINK: .local/bin/gpg-pubkey => ../../c/dotfiles/hosts/iroha/stow/.local/bin/gpg-pubkey (reverts previous action) +LINK: .local/bin/id-dm-device => ../../c/dotfiles/hosts/iroha/stow/.local/bin/id-dm-device (reverts previous action) +LINK: .local/bin/img-fstype => ../../c/dotfiles/hosts/iroha/stow/.local/bin/img-fstype (reverts previous action) +LINK: .local/bin/map-kernel-ata => ../../c/dotfiles/hosts/iroha/stow/.local/bin/map-kernel-ata (reverts previous action) +LINK: .local/bin/moonrune-charset-utf8 => ../../c/dotfiles/hosts/iroha/stow/.local/bin/moonrune-charset-utf8 (reverts previous action) +LINK: .local/bin/mount-nfs => ../../c/dotfiles/hosts/iroha/stow/.local/bin/mount-nfs (reverts previous action) +LINK: .local/bin/proton-env => ../../c/dotfiles/hosts/iroha/stow/.local/bin/proton-env (reverts previous action) +LINK: .local/bin/proton-env32 => ../../c/dotfiles/hosts/iroha/stow/.local/bin/proton-env32 (reverts previous action) +LINK: .local/bin/raid-status => ../../c/dotfiles/hosts/iroha/stow/.local/bin/raid-status (reverts previous action) +LINK: .local/bin/rewrite-git => ../../c/dotfiles/hosts/iroha/stow/.local/bin/rewrite-git (reverts previous action) +LINK: .local/bin/rip-dvd => ../../c/dotfiles/hosts/iroha/stow/.local/bin/rip-dvd (reverts previous action) +LINK: .local/bin/screenshot => ../../c/dotfiles/hosts/iroha/stow/.local/bin/screenshot (reverts previous action) +LINK: .local/bin/shift-jis-zip => ../../c/dotfiles/hosts/iroha/stow/.local/bin/shift-jis-zip (reverts previous action) +LINK: .local/bin/sp => ../../c/dotfiles/hosts/iroha/stow/.local/bin/sp (reverts previous action) +LINK: .local/bin/term-font-size => ../../c/dotfiles/hosts/iroha/stow/.local/bin/term-font-size (reverts previous action) +LINK: .local/bin/ts-date => ../../c/dotfiles/hosts/iroha/stow/.local/bin/ts-date (reverts previous action) +LINK: .local/bin/unzip-all => ../../c/dotfiles/hosts/iroha/stow/.local/bin/unzip-all (reverts previous action) +LINK: .local/bin/use-flags => ../../c/dotfiles/hosts/iroha/stow/.local/bin/use-flags (reverts previous action) +LINK: .local/bin/wlsunset-toggle => ../../c/dotfiles/hosts/iroha/stow/.local/bin/wlsunset-toggle (reverts previous action) +LINK: .local/bin/xbox-controller-battery => ../../c/dotfiles/hosts/iroha/stow/.local/bin/xbox-controller-battery (reverts previous action) +LINK: .local/bin/xbox360-ffmpeg-enc => ../../c/dotfiles/hosts/iroha/stow/.local/bin/xbox360-ffmpeg-enc (reverts previous action) +LINK: .muttrc => c/dotfiles/hosts/iroha/stow/.muttrc +LINK: .profile => c/dotfiles/hosts/iroha/stow/.profile (reverts previous action) +LINK: .vim/autoload => ../c/dotfiles/hosts/iroha/stow/.vim/autoload (reverts previous action) +LINK: .vim/colors => ../c/dotfiles/hosts/iroha/stow/.vim/colors (reverts previous action) +LINK: .vim/pack/downloads/create_opt.sh => ../../../c/dotfiles/hosts/iroha/stow/.vim/pack/downloads/create_opt.sh (reverts previous action) +LINK: .vim/patches => ../c/dotfiles/hosts/iroha/stow/.vim/patches (reverts previous action) +LINK: .vim/plugin => ../c/dotfiles/hosts/iroha/stow/.vim/plugin (reverts previous action) +LINK: .vim/vimrc => ../c/dotfiles/hosts/iroha/stow/.vim/vimrc (reverts previous action) +LINK: scripts/disable-rgb => ../c/dotfiles/hosts/iroha/stow/scripts/disable-rgb (reverts previous action) +LINK: scripts/prepare-mounts => ../c/dotfiles/hosts/iroha/stow/scripts/prepare-mounts (reverts previous action) +LINK: scripts/prepare-network-mounts => ../c/dotfiles/hosts/iroha/stow/scripts/prepare-network-mounts (reverts previous action) +LINK: scripts/run-sway => ../c/dotfiles/hosts/iroha/stow/scripts/run-sway (reverts previous action) diff --git a/hosts/iroha/stow/.Xresources b/hosts/iroha/stow/.Xresources new file mode 120000 index 0000000..5216571 --- /dev/null +++ b/hosts/iroha/stow/.Xresources @@ -0,0 +1 @@ +../../../files/gtk/Xresources
\ No newline at end of file diff --git a/hosts/iroha/stow/.asoundrc b/hosts/iroha/stow/.asoundrc new file mode 120000 index 0000000..d1bc0a7 --- /dev/null +++ b/hosts/iroha/stow/.asoundrc @@ -0,0 +1 @@ +../../../files/audio/asoundrc
\ No newline at end of file diff --git a/hosts/iroha/stow/.bashrc b/hosts/iroha/stow/.bashrc new file mode 120000 index 0000000..5fa6feb --- /dev/null +++ b/hosts/iroha/stow/.bashrc @@ -0,0 +1 @@ +../../../files/shell/bashrc
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/MangoHud/MangoHud.conf b/hosts/iroha/stow/.config/MangoHud/MangoHud.conf new file mode 120000 index 0000000..f4c0817 --- /dev/null +++ b/hosts/iroha/stow/.config/MangoHud/MangoHud.conf @@ -0,0 +1 @@ +../../../../../files/gaming/MangoHud.conf
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/gdb/gdbinit b/hosts/iroha/stow/.config/gdb/gdbinit new file mode 120000 index 0000000..566eba8 --- /dev/null +++ b/hosts/iroha/stow/.config/gdb/gdbinit @@ -0,0 +1 @@ +../../../../../files/gdbinit
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/gentoo-pipewire-launcher.conf b/hosts/iroha/stow/.config/gentoo-pipewire-launcher.conf new file mode 120000 index 0000000..61c0000 --- /dev/null +++ b/hosts/iroha/stow/.config/gentoo-pipewire-launcher.conf @@ -0,0 +1 @@ +../../../../files/audio/gentoo-pipewire-launcher.conf
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/gtk-3.0/config.ini b/hosts/iroha/stow/.config/gtk-3.0/config.ini new file mode 120000 index 0000000..c57d9f7 --- /dev/null +++ b/hosts/iroha/stow/.config/gtk-3.0/config.ini @@ -0,0 +1 @@ +../../../../../files/gtk/gtk3_config.ini
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/gtk-3.0/gtk.css b/hosts/iroha/stow/.config/gtk-3.0/gtk.css new file mode 120000 index 0000000..aad7f8e --- /dev/null +++ b/hosts/iroha/stow/.config/gtk-3.0/gtk.css @@ -0,0 +1 @@ +../../../../../themes/iroha/gtk/gtk3-dark.css
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/gtk-4.0/gtk.css b/hosts/iroha/stow/.config/gtk-4.0/gtk.css new file mode 120000 index 0000000..a4fe1b7 --- /dev/null +++ b/hosts/iroha/stow/.config/gtk-4.0/gtk.css @@ -0,0 +1 @@ +../../../../../themes/iroha/gtk/gtk4-dark.css
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/kitty/kitty.conf b/hosts/iroha/stow/.config/kitty/kitty.conf new file mode 120000 index 0000000..d6518b0 --- /dev/null +++ b/hosts/iroha/stow/.config/kitty/kitty.conf @@ -0,0 +1 @@ +../../../../../files/kitty/kitty.conf
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/pipewire/client.conf.d/92-client-user.conf b/hosts/iroha/stow/.config/pipewire/client.conf.d/92-client-user.conf new file mode 120000 index 0000000..8c4bd27 --- /dev/null +++ b/hosts/iroha/stow/.config/pipewire/client.conf.d/92-client-user.conf @@ -0,0 +1 @@ +../../../../../../files/audio/pipewire/92-client-user.conf
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/pipewire/pipewire-pulse.conf.d/92-pulse-user.conf b/hosts/iroha/stow/.config/pipewire/pipewire-pulse.conf.d/92-pulse-user.conf new file mode 120000 index 0000000..d4bdf58 --- /dev/null +++ b/hosts/iroha/stow/.config/pipewire/pipewire-pulse.conf.d/92-pulse-user.conf @@ -0,0 +1 @@ +../../../../../../files/audio/pipewire/92-pulse-user.conf
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/90-elegia-convolver.conf b/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/90-elegia-convolver.conf new file mode 120000 index 0000000..047ff74 --- /dev/null +++ b/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/90-elegia-convolver.conf @@ -0,0 +1 @@ +../../../../../../files/audio/pipewire/90-elegia-convolver.conf
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/90-x570-taichi-spdif.conf b/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/90-x570-taichi-spdif.conf new file mode 120000 index 0000000..cb37d30 --- /dev/null +++ b/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/90-x570-taichi-spdif.conf @@ -0,0 +1 @@ +../../../../../../files/audio/pipewire/90-x570-taichi-spdif.conf
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/92-user.conf b/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/92-user.conf new file mode 120000 index 0000000..7f481a0 --- /dev/null +++ b/hosts/iroha/stow/.config/pipewire/pipewire.conf.d/92-user.conf @@ -0,0 +1 @@ +../../../../../../files/audio/pipewire/92-user.conf
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/sway/config b/hosts/iroha/stow/.config/sway/config new file mode 120000 index 0000000..6cbcb25 --- /dev/null +++ b/hosts/iroha/stow/.config/sway/config @@ -0,0 +1 @@ +../../../../../files/sway/config
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/sway/config.d/sway_gtk b/hosts/iroha/stow/.config/sway/config.d/sway_gtk new file mode 120000 index 0000000..dff9029 --- /dev/null +++ b/hosts/iroha/stow/.config/sway/config.d/sway_gtk @@ -0,0 +1 @@ +../../../../../../files/gtk/sway_gtk
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/sway/config.d/sway_input_output b/hosts/iroha/stow/.config/sway/config.d/sway_input_output new file mode 120000 index 0000000..70a9328 --- /dev/null +++ b/hosts/iroha/stow/.config/sway/config.d/sway_input_output @@ -0,0 +1 @@ +../../../../sway_input_output
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/sway/config.d/theme b/hosts/iroha/stow/.config/sway/config.d/theme new file mode 120000 index 0000000..6cb80a9 --- /dev/null +++ b/hosts/iroha/stow/.config/sway/config.d/theme @@ -0,0 +1 @@ +../../../../../../themes/iroha/sway/theme
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/sway/config.d/window_rules b/hosts/iroha/stow/.config/sway/config.d/window_rules new file mode 120000 index 0000000..a6599e8 --- /dev/null +++ b/hosts/iroha/stow/.config/sway/config.d/window_rules @@ -0,0 +1 @@ +../../../../../../files/sway/window_rules
\ No newline at end of file diff --git a/hosts/iroha/stow/.config/user-dirs.dirs b/hosts/iroha/stow/.config/user-dirs.dirs new file mode 120000 index 0000000..4ec1886 --- /dev/null +++ b/hosts/iroha/stow/.config/user-dirs.dirs @@ -0,0 +1 @@ +../../../../files/user-dirs.dirs
\ No newline at end of file diff --git a/hosts/iroha/stow/.gitconfig b/hosts/iroha/stow/.gitconfig new file mode 120000 index 0000000..d2d744f --- /dev/null +++ b/hosts/iroha/stow/.gitconfig @@ -0,0 +1 @@ +../../../files/gitconfig
\ No newline at end of file diff --git a/hosts/iroha/stow/.gtkrc-2.0 b/hosts/iroha/stow/.gtkrc-2.0 new file mode 120000 index 0000000..7f3e4aa --- /dev/null +++ b/hosts/iroha/stow/.gtkrc-2.0 @@ -0,0 +1 @@ +../../../files/gtk/gtkrc-2.0
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/bemenu-colored b/hosts/iroha/stow/.local/bin/bemenu-colored new file mode 120000 index 0000000..4863980 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/bemenu-colored @@ -0,0 +1 @@ +../../../../../themes/iroha/bemenu-colored
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/check-orphans b/hosts/iroha/stow/.local/bin/check-orphans new file mode 120000 index 0000000..aa765cf --- /dev/null +++ b/hosts/iroha/stow/.local/bin/check-orphans @@ -0,0 +1 @@ +../../../../../scripts/gentoo/check-orphans
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/dmenu-emoji b/hosts/iroha/stow/.local/bin/dmenu-emoji new file mode 120000 index 0000000..c6ffb7c --- /dev/null +++ b/hosts/iroha/stow/.local/bin/dmenu-emoji @@ -0,0 +1 @@ +../../../../../scripts/desktop/dmenu-emoji
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/dmenu-path b/hosts/iroha/stow/.local/bin/dmenu-path new file mode 120000 index 0000000..2c4badf --- /dev/null +++ b/hosts/iroha/stow/.local/bin/dmenu-path @@ -0,0 +1 @@ +../../../../../scripts/desktop/dmenu-path
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/gpg-pubkey b/hosts/iroha/stow/.local/bin/gpg-pubkey new file mode 120000 index 0000000..c4ef767 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/gpg-pubkey @@ -0,0 +1 @@ +../../../../../scripts/desktop/gpg-pubkey
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/id-dm-device b/hosts/iroha/stow/.local/bin/id-dm-device new file mode 120000 index 0000000..cff80f7 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/id-dm-device @@ -0,0 +1 @@ +../../../../../scripts/desktop/id-dm-device
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/img-fstype b/hosts/iroha/stow/.local/bin/img-fstype new file mode 120000 index 0000000..2b3e1e4 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/img-fstype @@ -0,0 +1 @@ +../../../../../scripts/desktop/img-fstype
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/map-kernel-ata b/hosts/iroha/stow/.local/bin/map-kernel-ata new file mode 120000 index 0000000..b53b61f --- /dev/null +++ b/hosts/iroha/stow/.local/bin/map-kernel-ata @@ -0,0 +1 @@ +../../../../../scripts/desktop/map-kernel-ata
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/moonrune-charset-utf8 b/hosts/iroha/stow/.local/bin/moonrune-charset-utf8 new file mode 120000 index 0000000..762b8d0 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/moonrune-charset-utf8 @@ -0,0 +1 @@ +../../../../../scripts/desktop/moonrune-charset-utf8
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/mount-nfs b/hosts/iroha/stow/.local/bin/mount-nfs new file mode 120000 index 0000000..b585075 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/mount-nfs @@ -0,0 +1 @@ +../../../../../scripts/desktop/mount-nfs
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/proton-env b/hosts/iroha/stow/.local/bin/proton-env new file mode 120000 index 0000000..22da6cf --- /dev/null +++ b/hosts/iroha/stow/.local/bin/proton-env @@ -0,0 +1 @@ +../../../../../scripts/desktop/proton-env
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/proton-env32 b/hosts/iroha/stow/.local/bin/proton-env32 new file mode 120000 index 0000000..13e80e4 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/proton-env32 @@ -0,0 +1 @@ +../../../../../scripts/desktop/proton-env32
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/raid-status b/hosts/iroha/stow/.local/bin/raid-status new file mode 120000 index 0000000..6a3f9d8 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/raid-status @@ -0,0 +1 @@ +../../../../../scripts/desktop/raid-status
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/rewrite-git b/hosts/iroha/stow/.local/bin/rewrite-git new file mode 120000 index 0000000..1312b3f --- /dev/null +++ b/hosts/iroha/stow/.local/bin/rewrite-git @@ -0,0 +1 @@ +../../../../../scripts/desktop/rewrite-git
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/rip-dvd b/hosts/iroha/stow/.local/bin/rip-dvd new file mode 120000 index 0000000..fd25d50 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/rip-dvd @@ -0,0 +1 @@ +../../../../../scripts/desktop/rip-dvd
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/screenshot b/hosts/iroha/stow/.local/bin/screenshot new file mode 120000 index 0000000..5112d6b --- /dev/null +++ b/hosts/iroha/stow/.local/bin/screenshot @@ -0,0 +1 @@ +../../../../../scripts/desktop/screenshot
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/shift-jis-zip b/hosts/iroha/stow/.local/bin/shift-jis-zip new file mode 120000 index 0000000..74e0dfd --- /dev/null +++ b/hosts/iroha/stow/.local/bin/shift-jis-zip @@ -0,0 +1 @@ +../../../../../scripts/desktop/shift-jis-zip
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/sp b/hosts/iroha/stow/.local/bin/sp new file mode 120000 index 0000000..7c4a3fd --- /dev/null +++ b/hosts/iroha/stow/.local/bin/sp @@ -0,0 +1 @@ +../../../../../scripts/desktop/sp
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/term-font-size b/hosts/iroha/stow/.local/bin/term-font-size new file mode 120000 index 0000000..7720a32 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/term-font-size @@ -0,0 +1 @@ +../../../../../scripts/desktop/term-font-size
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/ts-date b/hosts/iroha/stow/.local/bin/ts-date new file mode 120000 index 0000000..45ccda4 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/ts-date @@ -0,0 +1 @@ +../../../../../scripts/desktop/ts-date
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/unzip-all b/hosts/iroha/stow/.local/bin/unzip-all new file mode 120000 index 0000000..4106e7a --- /dev/null +++ b/hosts/iroha/stow/.local/bin/unzip-all @@ -0,0 +1 @@ +../../../../../scripts/desktop/unzip-all
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/use-flags b/hosts/iroha/stow/.local/bin/use-flags new file mode 120000 index 0000000..fdb0e6a --- /dev/null +++ b/hosts/iroha/stow/.local/bin/use-flags @@ -0,0 +1 @@ +../../../../../scripts/gentoo/use-flags
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/wlsunset-toggle b/hosts/iroha/stow/.local/bin/wlsunset-toggle new file mode 120000 index 0000000..0da108a --- /dev/null +++ b/hosts/iroha/stow/.local/bin/wlsunset-toggle @@ -0,0 +1 @@ +../../../../../scripts/desktop/wlsunset-toggle
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/xbox-controller-battery b/hosts/iroha/stow/.local/bin/xbox-controller-battery new file mode 120000 index 0000000..850d66d --- /dev/null +++ b/hosts/iroha/stow/.local/bin/xbox-controller-battery @@ -0,0 +1 @@ +../../../../../scripts/desktop/xbox-controller-battery
\ No newline at end of file diff --git a/hosts/iroha/stow/.local/bin/xbox360-ffmpeg-enc b/hosts/iroha/stow/.local/bin/xbox360-ffmpeg-enc new file mode 120000 index 0000000..b725e32 --- /dev/null +++ b/hosts/iroha/stow/.local/bin/xbox360-ffmpeg-enc @@ -0,0 +1 @@ +../../../../../scripts/desktop/xbox360-ffmpeg-enc
\ No newline at end of file diff --git a/hosts/iroha/stow/.muttrc b/hosts/iroha/stow/.muttrc new file mode 120000 index 0000000..d4f0ec2 --- /dev/null +++ b/hosts/iroha/stow/.muttrc @@ -0,0 +1 @@ +../../../files/email/muttrc
\ No newline at end of file diff --git a/hosts/iroha/stow/.profile b/hosts/iroha/stow/.profile new file mode 120000 index 0000000..eda9ba9 --- /dev/null +++ b/hosts/iroha/stow/.profile @@ -0,0 +1 @@ +../../../files/shell/profile
\ No newline at end of file diff --git a/files/nixpkgs-patches/.gitignore b/hosts/iroha/stow/.stow-local-ignore index e69de29..e69de29 100644 --- a/files/nixpkgs-patches/.gitignore +++ b/hosts/iroha/stow/.stow-local-ignore diff --git a/hosts/iroha/stow/.vim/autoload b/hosts/iroha/stow/.vim/autoload new file mode 120000 index 0000000..e694474 --- /dev/null +++ b/hosts/iroha/stow/.vim/autoload @@ -0,0 +1 @@ +../../../../files/vim/autoload
\ No newline at end of file diff --git a/hosts/iroha/stow/.vim/colors b/hosts/iroha/stow/.vim/colors new file mode 120000 index 0000000..9aa246e --- /dev/null +++ b/hosts/iroha/stow/.vim/colors @@ -0,0 +1 @@ +../../../../files/vim/colors
\ No newline at end of file diff --git a/hosts/iroha/stow/.vim/pack/downloads/create_opt.sh b/hosts/iroha/stow/.vim/pack/downloads/create_opt.sh new file mode 120000 index 0000000..251101d --- /dev/null +++ b/hosts/iroha/stow/.vim/pack/downloads/create_opt.sh @@ -0,0 +1 @@ +../../../../../../files/vim/pack/downloads/create_opt.sh
\ No newline at end of file diff --git a/hosts/iroha/stow/.vim/patches b/hosts/iroha/stow/.vim/patches new file mode 120000 index 0000000..1558439 --- /dev/null +++ b/hosts/iroha/stow/.vim/patches @@ -0,0 +1 @@ +../../../../files/vim/patches
\ No newline at end of file diff --git a/hosts/iroha/stow/.vim/plugin b/hosts/iroha/stow/.vim/plugin new file mode 120000 index 0000000..f4a1c2a --- /dev/null +++ b/hosts/iroha/stow/.vim/plugin @@ -0,0 +1 @@ +../../../../files/vim/plugin
\ No newline at end of file diff --git a/hosts/iroha/stow/.vim/vimrc b/hosts/iroha/stow/.vim/vimrc new file mode 120000 index 0000000..defa903 --- /dev/null +++ b/hosts/iroha/stow/.vim/vimrc @@ -0,0 +1 @@ +../../../../files/vim/vimrc
\ No newline at end of file diff --git a/hosts/iroha/stow/scripts b/hosts/iroha/stow/scripts new file mode 120000 index 0000000..a339954 --- /dev/null +++ b/hosts/iroha/stow/scripts @@ -0,0 +1 @@ +../scripts
\ No newline at end of file diff --git a/hosts/iroha/sway_input_output b/hosts/iroha/sway_input_output new file mode 100644 index 0000000..06936cc --- /dev/null +++ b/hosts/iroha/sway_input_output @@ -0,0 +1,55 @@ +set $mod4 Mod4 + +input "type:keyboard" { + repeat_rate 45 + repeat_delay 220 + xkb_options ctrl:nocaps +} + +input "type:touchpad" { + pointer_accel 0.50 + natural_scroll enabled +} + +input "1189:32769:BenQ_ZOWIE_BenQ_ZOWIE_Gaming_Mouse" { + accel_profile flat + pointer_accel -0.675 + scroll_factor 1.0 +} + +input "1133:50504:Logitech_USB_Receiver_Mouse" { + accel_profile flat + pointer_accel -0.15 + scroll_factor 1.0 +} + +output "DP-1" { + mode 2560x1440@144.000Hz + #position 3000 200 + position 1080 200 + allow_tearing yes + max_render_time off + adaptive_sync on + render_bit_depth 10 +} + +output "DP-2" { + mode 1920x1080@60.000Hz + transform 270 + #position 1920 0 + position 0 0 + allow_tearing yes + max_render_time off + render_bit_depth 10 +} + +#output "HDMI-A-1" { +# mode 1920x1080@60.000Hz +# position 0 1000 +# allow_tearing yes +# max_render_time off +# render_bit_depth 10 +#} + +bindsym $mod4+r exec swaymsg -- output DP-1 transform 90 +bindsym $mod4+Shift+r exec swaymsg -- output DP-1 transform 0 diff --git a/hosts/iroha/sysctl.d/forwarding.conf b/hosts/iroha/sysctl.d/forwarding.conf deleted file mode 100644 index 35dec7b..0000000 --- a/hosts/iroha/sysctl.d/forwarding.conf +++ /dev/null @@ -1,4 +0,0 @@ -#net.ipv4.ip_forward = 1 -#net.ipv4.conf.all.route_localnet = 1 -#net.ipv6.conf.default.forwarding = 1 -#net.ipv6.conf.all.forwarding = 1 diff --git a/hosts/iroha/sysctl.d/proton.conf b/hosts/iroha/sysctl.d/proton.conf index 141e349..b2aaaa4 100644 --- a/hosts/iroha/sysctl.d/proton.conf +++ b/hosts/iroha/sysctl.d/proton.conf @@ -1,2 +1 @@ vm.max_map_count = 1048576 -kernel.split_lock_mitigate = 0 diff --git a/hosts/iroha/udev/rules.d/51-gcadapter.rules b/hosts/iroha/udev/rules.d/51-gcadapter.rules deleted file mode 100644 index afd1e49..0000000 --- a/hosts/iroha/udev/rules.d/51-gcadapter.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="0337", MODE="0666" diff --git a/hosts/iroha/udev/rules.d/99-hidraw-permissions.rules b/hosts/iroha/udev/rules.d/99-hidraw-permissions.rules deleted file mode 100644 index 659b50d..0000000 --- a/hosts/iroha/udev/rules.d/99-hidraw-permissions.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", GROUP="input" diff --git a/hosts/iroha/udev/rules.d/99-scheduler.rules b/hosts/iroha/udev/rules.d/99-scheduler.rules deleted file mode 100644 index 15830d0..0000000 --- a/hosts/iroha/udev/rules.d/99-scheduler.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add|change", SUBSYSTEM=="block", ENV{ID_SERIAL}=="WD_BLACK_SN770_1TB_230423802979_1", ATTR{queue/scheduler}="bfq" diff --git a/hosts/iroha/udev/rules.d/99-static-uinput.rules b/hosts/iroha/udev/rules.d/99-static-uinput.rules deleted file mode 100644 index 6fe34ab..0000000 --- a/hosts/iroha/udev/rules.d/99-static-uinput.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="uinput", MODE="0666", GROUP="input", OPTIONS+="static_node=uinput" diff --git a/hosts/iroha/udev/rules.d/99-usb-input.rules b/hosts/iroha/udev/rules.d/99-usb-input.rules deleted file mode 100644 index 677a532..0000000 --- a/hosts/iroha/udev/rules.d/99-usb-input.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="input", MODE="0666", GROUP="input", TAG+="uaccess" diff --git a/hosts/moyo/conf.d/dmcrypt b/hosts/moyo/conf.d/dmcrypt new file mode 100644 index 0000000..d4179cd --- /dev/null +++ b/hosts/moyo/conf.d/dmcrypt @@ -0,0 +1,67 @@ +# /etc/conf.d/dmcrypt + +# For people who run dmcrypt on top of some other layer (like raid), +# use rc_need to specify that requirement. See the runscript(8) man +# page for more information. + +#-------------------- +# Instructions +#-------------------- + +# Note regarding the syntax of this file. This file is *almost* bash, +# but each line is evaluated separately. Separate swaps/targets can be +# specified. The init-script which reads this file assumes that a +# swap= or target= line starts a new section, similar to lilo or grub +# configuration. + +# Note when using gpg keys and /usr on a separate partition, you will +# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly +# and ensure that gpg has been compiled statically. +# See http://bugs.gentoo.org/90482 for more information. + +# Note that the init-script which reads this file detects whether your +# partition is LUKS or not. No mkfs is run unless you specify a makefs +# option. + +# Global options: +#---------------- + +# How long to wait for each timeout (in seconds). +dmcrypt_key_timeout=1 + +# Max number of checks to perform (see dmcrypt_key_timeout). +#dmcrypt_max_timeout=300 + +# Number of password retries. +dmcrypt_retries=10 + +# Arguments: +#----------- +# target=<name> == Mapping name for partition. +# swap=<name> == Mapping name for swap partition. +# source='<dev>' == Real device for partition. +# Note: You can (and should) specify a tag like UUID +# for blkid (see -t option). This is safer than using +# the full path to the device. +# key='</path/to/keyfile>[:<mode>]' == Fullpath from / or from inside removable media. +# header='</path/to/header>' == Full path to detached LUKS header file. +# remdev='<dev>' == Device that will be assigned to removable media. +# gpg_options='<opts>' == Default are --quiet --decrypt +# options='<opts>' == cryptsetup, for LUKS you can only use --readonly +# loop_file='<file>' == Loopback file. +# Note: If you omit $source, then a free loopback will +# be looked up automatically. +# pre_mount='cmds' == commands to execute before mounting partition. +# post_mount='cmds' == commands to execute after mounting partition. +# wait=5 == wait given amount of seconds for source or +# detached header file appear. +#----------- +# Supported Modes +# gpg == decrypt and pipe key into cryptsetup. +# Note: new-line character must not be part of key. +# Command to erase \n char: 'cat key | tr -d '\n' > cleanKey' + +target=store +source=UUID="b68bd1f0-912f-42f8-8d35-35db086ae323" + +# The file must be terminated by a newline. Or leave this comment last. diff --git a/hosts/moyo/conf.d/hostname b/hosts/moyo/conf.d/hostname new file mode 100644 index 0000000..19f60ac --- /dev/null +++ b/hosts/moyo/conf.d/hostname @@ -0,0 +1,2 @@ +# Hostname fallback if /etc/hostname does not exist +hostname="moyo" diff --git a/hosts/moyo/gentoo/make.conf b/hosts/moyo/gentoo/make.conf index 9ee18b9..0873043 100644 --- a/hosts/moyo/gentoo/make.conf +++ b/hosts/moyo/gentoo/make.conf @@ -1,37 +1,46 @@ WARNING_FLAGS="-Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing" -COMMON_FLAGS="-O2 -pipe -march=znver1 -mtune=znver1 -fno-semantic-interposition -flto ${WARNING_FLAGS}" +COMMON_FLAGS="-O2 -pipe -march=znver1 -mtune=znver1 -fno-semantic-interposition -fomit-frame-pointer -fno-stack-protector -flto ${WARNING_FLAGS}" CFLAGS="${COMMON_FLAGS}" CXXFLAGS="${COMMON_FLAGS}" FCFLAGS="${COMMON_FLAGS}" FFLAGS="${COMMON_FLAGS}" +LDFLAGS="${COMMON_FLAGS} ${LDFLAGS} ${WARNING_FLAGS}" CGO_CFLAGS="${COMMON_FLAGS}" CGO_CXXFLAGS="${COMMON_FLAGS}" CGO_FFLAGS="${COMMON_FLAGS}" CGO_LDFLAGS="${LDFLAGS}" -RUSTFLAGS="-C opt-level=2 -C target-cpu=znver1" +RUSTFLAGS="${RUSTFLAGS} -C target-cpu=znver1" -MAKEOPTS="-j4" +MAKEOPTS="-j4 -l5" +#EMERGE_DEFAULT_OPTS="--jobs 2 --with-bdeps-auto=n" EMERGE_DEFAULT_OPTS="--jobs 2" RUBY_TARGETS="ruby32" +PERL_FEATURES="" + LUA_SINGLE_TARGET="lua5-4" LUA_TARGETS="lua5-4" -KERNEL="linux" - ACCEPT_KEYWORDS="amd64" -ACCEPT_LICENSE="-* @FREE @BINARY-REDISTRIBUTABLE" +ACCEPT_LICENSE="-* @FREE" -USE="lto pgo orc native-extensions dbus udev policykit acl -systemd -consolekit -X -wayland -gtk -gnome -kde -qt5 -qt6 -alsa -jack -pulseaudio -bluetooth -introspection -nls -numa -selinux -caps -filecaps -sysprof -pie -pic -unwind -ssp -hardened -sanitize -debug -cpudetection" +USE="modules-compress lto pgo orc \ + -numa -selinux -sysprof -pie -pic -unwind -ssp -cet -hardened -sanitize -debug \ + -policykit -consolekit -systemd -nls -introspection -vala \ + -X -wayland -gtk -qt5 -qt6 -gnome -kde \ + -dbus -bluetooth -alsa -jack -pulseaudio -pipewire" GRUB_PLATFORMS="efi-64" -VIDEO_CARDS="amdgpu radeonsi" INPUT_DEVICES="keyboard" -L10N="en" -LC_MESSAGES=C.utf8 +L10N="en en-US" +LC_MESSAGES="C.utf8" + +GENTOO_MIRRORS="https://gentoo.osuosl.org/ \ + https://mirror.servaxnet.com/gentoo/ \ + http://gentoo-mirror.flux.utah.edu/" diff --git a/hosts/moyo/gentoo/package.accept_keywords/cowsql b/hosts/moyo/gentoo/package.accept_keywords/cowsql deleted file mode 100644 index 744c16e..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/cowsql +++ /dev/null @@ -1 +0,0 @@ -dev-libs/cowsql ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/foot-terminfo b/hosts/moyo/gentoo/package.accept_keywords/foot-terminfo deleted file mode 100644 index c42d2a9..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/foot-terminfo +++ /dev/null @@ -1 +0,0 @@ -gui-apps/foot-terminfo ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/incus b/hosts/moyo/gentoo/package.accept_keywords/incus deleted file mode 100644 index 5fae8e1..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/incus +++ /dev/null @@ -1 +0,0 @@ -app-containers/incus ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/qemu b/hosts/moyo/gentoo/package.accept_keywords/qemu deleted file mode 100644 index 0d5a3eb..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/qemu +++ /dev/null @@ -1 +0,0 @@ -app-emulation/qemu ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/samba b/hosts/moyo/gentoo/package.accept_keywords/samba deleted file mode 100644 index 90d7b6d..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/samba +++ /dev/null @@ -1 +0,0 @@ -net-fs/samba ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/seabios-bin b/hosts/moyo/gentoo/package.accept_keywords/seabios-bin deleted file mode 100644 index 02519e6..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/seabios-bin +++ /dev/null @@ -1 +0,0 @@ -sys-firmware/seabios-bin ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/talloc b/hosts/moyo/gentoo/package.accept_keywords/talloc deleted file mode 100644 index f08e38b..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/talloc +++ /dev/null @@ -1 +0,0 @@ -sys-libs/talloc ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/tdb b/hosts/moyo/gentoo/package.accept_keywords/tdb deleted file mode 100644 index 4b53952..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/tdb +++ /dev/null @@ -1 +0,0 @@ -sys-libs/tdb ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/tevent b/hosts/moyo/gentoo/package.accept_keywords/tevent deleted file mode 100644 index 924bdcc..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/tevent +++ /dev/null @@ -1 +0,0 @@ -sys-libs/tevent ~amd64 diff --git a/hosts/moyo/gentoo/package.accept_keywords/virtiofsd b/hosts/moyo/gentoo/package.accept_keywords/virtiofsd deleted file mode 100644 index f7504db..0000000 --- a/hosts/moyo/gentoo/package.accept_keywords/virtiofsd +++ /dev/null @@ -1 +0,0 @@ -app-emulation/virtiofsd ~amd64 diff --git a/hosts/moyo/gentoo/package.license/kernel b/hosts/moyo/gentoo/package.license/kernel new file mode 100644 index 0000000..348558e --- /dev/null +++ b/hosts/moyo/gentoo/package.license/kernel @@ -0,0 +1 @@ +sys-kernel/linux-firmware linux-fw-redistributable diff --git a/hosts/moyo/gentoo/package.mask/python b/hosts/moyo/gentoo/package.mask/python index 20d7841..af9ebaf 100644 --- a/hosts/moyo/gentoo/package.mask/python +++ b/hosts/moyo/gentoo/package.mask/python @@ -1 +1 @@ ->=dev-lang/python-3.13 +>=dev-lang/python-3.14.0 diff --git a/hosts/moyo/gentoo/package.use/00cpu-flags b/hosts/moyo/gentoo/package.use/00cpu-flags index 102a85d..ea302d2 100644 --- a/hosts/moyo/gentoo/package.use/00cpu-flags +++ b/hosts/moyo/gentoo/package.use/00cpu-flags @@ -1 +1 @@ -*/* CPU_FLAGS_X86: aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3 +*/* CPU_FLAGS_X86: aes avx avx2 bmi1 bmi2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3 diff --git a/hosts/moyo/gentoo/package.use/00video-cards b/hosts/moyo/gentoo/package.use/00video-cards new file mode 100644 index 0000000..320548a --- /dev/null +++ b/hosts/moyo/gentoo/package.use/00video-cards @@ -0,0 +1 @@ +*/* VIDEO_CARDS: -* amdgpu radeonsi radeon diff --git a/hosts/moyo/gentoo/package.use/apparmor-profiles b/hosts/moyo/gentoo/package.use/apparmor-profiles new file mode 100644 index 0000000..7993ade --- /dev/null +++ b/hosts/moyo/gentoo/package.use/apparmor-profiles @@ -0,0 +1 @@ +sec-policy/apparmor-profiles minimal diff --git a/hosts/moyo/gentoo/package.use/binutils b/hosts/moyo/gentoo/package.use/binutils deleted file mode 100644 index 3dbc67d..0000000 --- a/hosts/moyo/gentoo/package.use/binutils +++ /dev/null @@ -1 +0,0 @@ -sys-devel/binutils pgo -cet diff --git a/hosts/moyo/gentoo/package.use/binutils-libs b/hosts/moyo/gentoo/package.use/binutils-libs deleted file mode 100644 index d2d9d0d..0000000 --- a/hosts/moyo/gentoo/package.use/binutils-libs +++ /dev/null @@ -1 +0,0 @@ -sys-libs/binutils-libs -cet diff --git a/hosts/moyo/gentoo/package.use/chrony b/hosts/moyo/gentoo/package.use/chrony new file mode 100644 index 0000000..826c085 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/chrony @@ -0,0 +1 @@ +net-misc/chrony samba diff --git a/hosts/moyo/gentoo/package.use/connman b/hosts/moyo/gentoo/package.use/connman new file mode 100644 index 0000000..001a89a --- /dev/null +++ b/hosts/moyo/gentoo/package.use/connman @@ -0,0 +1 @@ +net-misc/connman -wifi diff --git a/hosts/moyo/gentoo/package.use/dhcp b/hosts/moyo/gentoo/package.use/dhcp new file mode 100644 index 0000000..068becd --- /dev/null +++ b/hosts/moyo/gentoo/package.use/dhcp @@ -0,0 +1 @@ +net-misc/dhcp -server diff --git a/hosts/moyo/gentoo/package.use/doas b/hosts/moyo/gentoo/package.use/doas new file mode 100644 index 0000000..2d1cc48 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/doas @@ -0,0 +1 @@ +app-admin/doas persist diff --git a/hosts/moyo/gentoo/package.use/elfutils b/hosts/moyo/gentoo/package.use/elfutils new file mode 100644 index 0000000..1c494f6 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/elfutils @@ -0,0 +1 @@ +dev-libs/elfutils zstd diff --git a/hosts/moyo/gentoo/package.use/ffmpeg b/hosts/moyo/gentoo/package.use/ffmpeg new file mode 100644 index 0000000..3434c7a --- /dev/null +++ b/hosts/moyo/gentoo/package.use/ffmpeg @@ -0,0 +1 @@ +media-video/ffmpeg -libass diff --git a/hosts/moyo/gentoo/package.use/freetype b/hosts/moyo/gentoo/package.use/freetype index 4a5bb71..f8b3be5 100644 --- a/hosts/moyo/gentoo/package.use/freetype +++ b/hosts/moyo/gentoo/package.use/freetype @@ -1 +1 @@ -media-libs/freetype -adobe-cff -bzip2 -cleartype-hinting -png +media-libs/freetype -harfbuzz -adobe-cff -bzip2 -cleartype-hinting -png diff --git a/hosts/moyo/gentoo/package.use/gcc b/hosts/moyo/gentoo/package.use/gcc index f301a50..4a5f9cd 100644 --- a/hosts/moyo/gentoo/package.use/gcc +++ b/hosts/moyo/gentoo/package.use/gcc @@ -1 +1 @@ -sys-devel/gcc pgo jit graphite -fortran -ssp -default-stack-clash-protection -default-znow -cet +sys-devel/gcc jit graphite -fortran -default-stack-clash-protection -default-znow diff --git a/hosts/moyo/gentoo/package.use/git b/hosts/moyo/gentoo/package.use/git new file mode 100644 index 0000000..553f74b --- /dev/null +++ b/hosts/moyo/gentoo/package.use/git @@ -0,0 +1 @@ +dev-vcs/git -webdav -perl diff --git a/hosts/moyo/gentoo/package.use/glib b/hosts/moyo/gentoo/package.use/glib new file mode 100644 index 0000000..fce79db --- /dev/null +++ b/hosts/moyo/gentoo/package.use/glib @@ -0,0 +1 @@ +dev-libs/glib -mime diff --git a/hosts/moyo/gentoo/package.use/glibc b/hosts/moyo/gentoo/package.use/glibc index 33fe408..ec6d969 100644 --- a/hosts/moyo/gentoo/package.use/glibc +++ b/hosts/moyo/gentoo/package.use/glibc @@ -1 +1 @@ -sys-libs/glibc -multiarch -profile -ssp -cet +sys-libs/glibc -multiarch -profile diff --git a/hosts/moyo/gentoo/package.use/gmp b/hosts/moyo/gentoo/package.use/gmp index a5b882c..9ff5eb5 100644 --- a/hosts/moyo/gentoo/package.use/gmp +++ b/hosts/moyo/gentoo/package.use/gmp @@ -1 +1 @@ -dev-libs/gmp cxx +dev-libs/gmp -cxx -cpudetection diff --git a/hosts/moyo/gentoo/package.use/harfbuzz b/hosts/moyo/gentoo/package.use/harfbuzz index 5df986b..036249d 100644 --- a/hosts/moyo/gentoo/package.use/harfbuzz +++ b/hosts/moyo/gentoo/package.use/harfbuzz @@ -1 +1 @@ -media-libs/harfbuzz -cairo -glib -graphite -introspection -truetype +media-libs/harfbuzz graphite -cairo -glib -introspection diff --git a/hosts/moyo/gentoo/package.use/htop b/hosts/moyo/gentoo/package.use/htop index 926bf14..b7af6cf 100644 --- a/hosts/moyo/gentoo/package.use/htop +++ b/hosts/moyo/gentoo/package.use/htop @@ -1 +1 @@ -sys-process/htop lm-sensors +sys-process/htop lm-sensors caps diff --git a/hosts/moyo/gentoo/package.use/installkernel b/hosts/moyo/gentoo/package.use/installkernel new file mode 100644 index 0000000..6622e7a --- /dev/null +++ b/hosts/moyo/gentoo/package.use/installkernel @@ -0,0 +1 @@ +sys-kernel/installkernel dracut grub diff --git a/hosts/moyo/gentoo/package.use/libglvnd b/hosts/moyo/gentoo/package.use/libglvnd index 9471c08..992f32b 100644 --- a/hosts/moyo/gentoo/package.use/libglvnd +++ b/hosts/moyo/gentoo/package.use/libglvnd @@ -1 +1 @@ -media-libs/libglvnd X +media-libs/libglvnd -X diff --git a/hosts/moyo/gentoo/package.use/libnl b/hosts/moyo/gentoo/package.use/libnl deleted file mode 100644 index 7970840..0000000 --- a/hosts/moyo/gentoo/package.use/libnl +++ /dev/null @@ -1 +0,0 @@ -dev-libs/libnl -debug diff --git a/hosts/moyo/gentoo/package.use/libvirt b/hosts/moyo/gentoo/package.use/libvirt index ccd9468..6aae84f 100644 --- a/hosts/moyo/gentoo/package.use/libvirt +++ b/hosts/moyo/gentoo/package.use/libvirt @@ -1 +1 @@ -app-emulation/libvirt pcap parted lvm policykit iscsi iscsi-direct +app-emulation/libvirt pcap diff --git a/hosts/moyo/gentoo/package.use/linux-firmware b/hosts/moyo/gentoo/package.use/linux-firmware new file mode 100644 index 0000000..5d0b8c9 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/linux-firmware @@ -0,0 +1 @@ +sys-kernel/linux-firmware compress-zstd diff --git a/hosts/moyo/gentoo/package.use/lxc b/hosts/moyo/gentoo/package.use/lxc index 56754cb..0b6d483 100644 --- a/hosts/moyo/gentoo/package.use/lxc +++ b/hosts/moyo/gentoo/package.use/lxc @@ -1 +1 @@ -app-containers/lxc caps io-uring -apparmor +app-containers/lxc io-uring -apparmor diff --git a/hosts/moyo/gentoo/package.use/miscfiles b/hosts/moyo/gentoo/package.use/miscfiles new file mode 100644 index 0000000..0d07a72 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/miscfiles @@ -0,0 +1 @@ +sys-apps/miscfiles minimal diff --git a/hosts/moyo/gentoo/package.use/nvidia-drivers b/hosts/moyo/gentoo/package.use/nvidia-drivers deleted file mode 100644 index 502813d..0000000 --- a/hosts/moyo/gentoo/package.use/nvidia-drivers +++ /dev/null @@ -1 +0,0 @@ -x11-drivers/nvidia-drivers -X -wayland -multilib -abi_x86_32 kms -gtk3 -tools -compat uvm diff --git a/hosts/moyo/gentoo/package.use/pillow b/hosts/moyo/gentoo/package.use/pillow new file mode 100644 index 0000000..37f5d53 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/pillow @@ -0,0 +1 @@ +dev-python/pillow -jpeg -zlib diff --git a/hosts/moyo/gentoo/package.use/python b/hosts/moyo/gentoo/package.use/python index 10a653e..f4d398e 100644 --- a/hosts/moyo/gentoo/package.use/python +++ b/hosts/moyo/gentoo/package.use/python @@ -1,3 +1,3 @@ -dev-lang/python sqlite pgo -bluetooth -*/* PYTHON_TARGETS: -* python3_12 -*/* PYTHON_SINGLE_TARGET: -* python3_12 +dev-lang/python sqlite +*/* PYTHON_TARGETS: -* python3_13 +*/* PYTHON_SINGLE_TARGET: -* python3_13 diff --git a/hosts/moyo/gentoo/package.use/qemu b/hosts/moyo/gentoo/package.use/qemu index 1a2a440..dd22332 100644 --- a/hosts/moyo/gentoo/package.use/qemu +++ b/hosts/moyo/gentoo/package.use/qemu @@ -1 +1 @@ -app-emulation/qemu -doc pin-upstream-blobs -gnutls -sdl -gtk io-uring jemalloc iscsi -opengl spice usb usbredir -virgl virtfs -vnc -ncurses -oss -png QEMU_SOFTMMU_TARGETS: aarch64 x86_64 m68k i386 +app-emulation/qemu io-uring -doc -gnutls -jpeg -ncurses -opengl -oss -png -vnc -xattr QEMU_SOFTMMU_TARGETS: x86_64 diff --git a/hosts/moyo/gentoo/package.use/qtgui b/hosts/moyo/gentoo/package.use/qtgui deleted file mode 100644 index ecf6b50..0000000 --- a/hosts/moyo/gentoo/package.use/qtgui +++ /dev/null @@ -1 +0,0 @@ -dev-qt/qtgui linuxfb -egl -eglfs -gles2-only -png -dbus -libinput -udev diff --git a/hosts/moyo/gentoo/package.use/qtwidgets b/hosts/moyo/gentoo/package.use/qtwidgets deleted file mode 100644 index 5b50f8a..0000000 --- a/hosts/moyo/gentoo/package.use/qtwidgets +++ /dev/null @@ -1 +0,0 @@ -dev-qt/qtwidgets -dbus -png diff --git a/hosts/moyo/gentoo/package.use/sysklogd b/hosts/moyo/gentoo/package.use/sysklogd new file mode 100644 index 0000000..4d866b0 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/sysklogd @@ -0,0 +1 @@ +app-admin/sysklogd logrotate diff --git a/hosts/moyo/gentoo/package.use/talloc b/hosts/moyo/gentoo/package.use/talloc new file mode 100644 index 0000000..04e8a13 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/talloc @@ -0,0 +1 @@ +sys-libs/talloc -python diff --git a/hosts/moyo/gentoo/package.use/zlib b/hosts/moyo/gentoo/package.use/zlib index b934da8..e7c562a 100644 --- a/hosts/moyo/gentoo/package.use/zlib +++ b/hosts/moyo/gentoo/package.use/zlib @@ -1 +1,14 @@ sys-libs/zlib minizip +# required by app-containers/incus-6.0.4-r1::gentoo +# required by incus (argument) +>=dev-libs/raft-0.22.1 lz4 +# required by app-containers/incus-6.0.4-r1::gentoo +# required by incus (argument) +>=dev-util/xdelta-3.0.11-r1 lzma +# required by app-containers/incus-6.0.4-r1::gentoo +# required by incus (argument) +>=sys-fs/squashfs-tools-4.7 lzma +# required by app-containers/lxc-6.0.4-r1::gentoo[tools,caps] +# required by app-containers/incus-6.0.4-r1::gentoo +# required by incus (argument) +>=sys-libs/libcap-2.76 static-libs diff --git a/hosts/moyo/gentoo/package.use/zz-autounmask b/hosts/moyo/gentoo/package.use/zz-autounmask deleted file mode 100644 index a25b21a..0000000 --- a/hosts/moyo/gentoo/package.use/zz-autounmask +++ /dev/null @@ -1,17 +0,0 @@ -# required by app-containers/incus-6.0.0-r1::gentoo -# required by incus (argument) ->=dev-libs/raft-0.22.1 lz4 -# required by app-containers/incus-6.0.0-r1::gentoo -# required by incus (argument) ->=dev-util/xdelta-3.0.11-r1 lzma -# required by app-containers/incus-6.0.0-r1::gentoo -# required by incus (argument) ->=sys-fs/squashfs-tools-4.6.1 lzma -# required by app-containers/lxc-6.0.0-r1::gentoo[-caps,tools] -# required by app-containers/incus-6.0.0-r1::gentoo -# required by incus (argument) ->=sys-libs/libcap-2.69-r1 static-libs -# required by net-dns/bind-tools-9.18.0::gentoo -# required by @selected -# required by @world (argument) ->=net-dns/bind-9.18.29-r2 idn diff --git a/hosts/moyo/gentoo/profile/package.use.force/force.conf b/hosts/moyo/gentoo/profile/package.use.force/force.conf index 13ec281..eb5575d 100644 --- a/hosts/moyo/gentoo/profile/package.use.force/force.conf +++ b/hosts/moyo/gentoo/profile/package.use.force/force.conf @@ -1,2 +1,2 @@ -*/* -pie -sys-devel/gcc -default-stack-clash-protection -default-znow +sys-devel/gcc -pie -default-stack-clash-protection -default-znow +sys-devel/binutils -cet diff --git a/hosts/moyo/kernel_config b/hosts/moyo/kernel_config index 5a6b3d1..6abe5dd 100644 --- a/hosts/moyo/kernel_config +++ b/hosts/moyo/kernel_config @@ -47,8 +47,8 @@ CONFIG_HAVE_KERNEL_ZSTD=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_LZ4=y -# CONFIG_KERNEL_ZSTD is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_KERNEL_ZSTD=y CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SYSVIPC=y @@ -234,12 +234,12 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set CONFIG_RD_ZSTD=y # CONFIG_BOOT_CONFIG is not set CONFIG_INITRAMFS_PRESERVE_MTIME=y @@ -344,7 +344,7 @@ CONFIG_X86_CPU_RESCTRL=y # CONFIG_X86_EXTENDED_PLATFORM is not set # CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_AMD_PLATFORM_DEVICE=y -# CONFIG_IOSF_MBI is not set +CONFIG_IOSF_MBI=m CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_HYPERVISOR_GUEST is not set @@ -461,7 +461,11 @@ CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -# CONFIG_MTRR is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y CONFIG_X86_UMIP=y CONFIG_CC_HAS_IBT=y # CONFIG_X86_KERNEL_IBT is not set @@ -522,16 +526,10 @@ CONFIG_ARCH_HAS_ADD_PAGES=y # # Power management and ACPI options # -CONFIG_ARCH_HIBERNATION_HEADER=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_SUSPEND_SKIP_SYNC is not set -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_HIBERNATION_SNAPSHOT_DEV=y -CONFIG_HIBERNATION_COMP_LZO=y -CONFIG_HIBERNATION_DEF_COMP="lzo" -CONFIG_PM_STD_PARTITION="" +# CONFIG_HIBERNATION is not set CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y # CONFIG_PM_AUTOSLEEP is not set @@ -888,9 +886,9 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set CONFIG_MODULE_COMPRESS=y -CONFIG_MODULE_COMPRESS_GZIP=y +# CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS_XZ is not set -# CONFIG_MODULE_COMPRESS_ZSTD is not set +CONFIG_MODULE_COMPRESS_ZSTD=y CONFIG_MODULE_COMPRESS_ALL=y # CONFIG_MODULE_DECOMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set @@ -1059,7 +1057,8 @@ CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -# CONFIG_MEMORY_FAILURE is not set +CONFIG_MEMORY_FAILURE=y +# CONFIG_HWPOISON_INJECT is not set CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_TRANSPARENT_HUGEPAGE=y @@ -1093,6 +1092,7 @@ CONFIG_GET_FREE_REGION=y CONFIG_DEVICE_PRIVATE=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y +CONFIG_ARCH_USES_PG_ARCH_2=y CONFIG_VM_EVENT_COUNTERS=y # CONFIG_PERCPU_STATS is not set @@ -1829,12 +1829,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y -CONFIG_FW_LOADER_PAGED_BUF=y -CONFIG_EXTRA_FIRMWARE="amdgpu/vega12_asd.bin amdgpu/vega12_ce.bin amdgpu/vega12_gpu_info.bin amdgpu/vega12_me.bin amdgpu/vega12_mec.bin amdgpu/vega12_mec2.bin amdgpu/vega12_pfp.bin amdgpu/vega12_rlc.bin amdgpu/vega12_sdma.bin amdgpu/vega12_sdma1.bin amdgpu/vega12_smc.bin amdgpu/vega12_sos.bin amdgpu/vega12_uvd.bin amdgpu/vega12_vce.bin amd-ucode/microcode_amd_fam17h.bin" +CONFIG_EXTRA_FIRMWARE="amdgpu/vega12_asd.bin.zst amdgpu/vega12_ce.bin.zst amdgpu/vega12_gpu_info.bin.zst amdgpu/vega12_me.bin.zst amdgpu/vega12_mec.bin.zst amdgpu/vega12_mec2.bin.zst amdgpu/vega12_pfp.bin.zst amdgpu/vega12_rlc.bin.zst amdgpu/vega12_sdma.bin.zst amdgpu/vega12_sdma1.bin.zst amdgpu/vega12_smc.bin.zst amdgpu/vega12_sos.bin.zst amdgpu/vega12_uvd.bin.zst amdgpu/vega12_vce.bin.zst amd-ucode/microcode_amd_fam17h.bin" CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware" # CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER_COMPRESS=y -CONFIG_FW_LOADER_COMPRESS_XZ=y +# CONFIG_FW_LOADER_COMPRESS_XZ is not set CONFIG_FW_LOADER_COMPRESS_ZSTD=y CONFIG_FW_CACHE=y # CONFIG_FW_UPLOAD is not set @@ -1849,6 +1848,7 @@ CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m CONFIG_DMA_SHARED_BUFFER=y # CONFIG_DMA_FENCE_TRACE is not set # CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set @@ -1954,7 +1954,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y # CONFIG_NVME_MULTIPATH is not set -# CONFIG_NVME_VERBOSE_ERRORS is not set +CONFIG_NVME_VERBOSE_ERRORS=y CONFIG_NVME_HWMON=y # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set @@ -1994,7 +1994,7 @@ CONFIG_NVME_HWMON=y # CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set # CONFIG_EEPROM_IDT_89HPESX is not set -# CONFIG_EEPROM_EE1004 is not set +CONFIG_EEPROM_EE1004=m # end of EEPROM support # CONFIG_CB710_CORE is not set @@ -2112,7 +2112,7 @@ CONFIG_ATA=y CONFIG_SATA_HOST=y CONFIG_PATA_TIMINGS=y CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_FORCE=y +# CONFIG_ATA_FORCE is not set CONFIG_ATA_ACPI=y # CONFIG_SATA_ZPODD is not set CONFIG_SATA_PMP=y @@ -2127,83 +2127,7 @@ CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_INIC162X is not set # CONFIG_SATA_ACARD_AHCI is not set # CONFIG_SATA_SIL24 is not set -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -# CONFIG_PDC_ADMA is not set -# CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SX4 is not set -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -# CONFIG_ATA_PIIX is not set -# CONFIG_SATA_DWC is not set -# CONFIG_SATA_MV is not set -# CONFIG_SATA_NV is not set -# CONFIG_SATA_PROMISE is not set -# CONFIG_SATA_SIL is not set -# CONFIG_SATA_SIS is not set -# CONFIG_SATA_SVW is not set -# CONFIG_SATA_ULI is not set -# CONFIG_SATA_VIA is not set -# CONFIG_SATA_VITESSE is not set - -# -# PATA SFF controllers with BMDMA -# -# CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set -# CONFIG_PATA_ARTOP is not set -# CONFIG_PATA_ATIIXP is not set -# CONFIG_PATA_ATP867X is not set -# CONFIG_PATA_CMD64X is not set -# CONFIG_PATA_CYPRESS is not set -# CONFIG_PATA_EFAR is not set -# CONFIG_PATA_HPT366 is not set -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -# CONFIG_PATA_HPT3X3 is not set -# CONFIG_PATA_IT8213 is not set -# CONFIG_PATA_IT821X is not set -# CONFIG_PATA_JMICRON is not set -# CONFIG_PATA_MARVELL is not set -# CONFIG_PATA_NETCELL is not set -# CONFIG_PATA_NINJA32 is not set -# CONFIG_PATA_NS87415 is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_OPTIDMA is not set -# CONFIG_PATA_PDC2027X is not set -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_RADISYS is not set -# CONFIG_PATA_RDC is not set -# CONFIG_PATA_SCH is not set -# CONFIG_PATA_SERVERWORKS is not set -# CONFIG_PATA_SIL680 is not set -# CONFIG_PATA_SIS is not set -# CONFIG_PATA_TOSHIBA is not set -# CONFIG_PATA_TRIFLEX is not set -# CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set - -# -# PIO-only SFF controllers -# -# CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_NS87410 is not set -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_RZ1000 is not set - -# -# Generic fallback / legacy drivers -# -# CONFIG_PATA_ACPI is not set -# CONFIG_ATA_GENERIC is not set -# CONFIG_PATA_LEGACY is not set +# CONFIG_ATA_SFF is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y @@ -2234,11 +2158,7 @@ CONFIG_DM_MIRROR=y # CONFIG_DM_LOG_USERSPACE is not set CONFIG_DM_RAID=y CONFIG_DM_ZERO=y -CONFIG_DM_MULTIPATH=y -CONFIG_DM_MULTIPATH_QL=y -CONFIG_DM_MULTIPATH_ST=y -# CONFIG_DM_MULTIPATH_HST is not set -# CONFIG_DM_MULTIPATH_IOA is not set +# CONFIG_DM_MULTIPATH is not set # CONFIG_DM_DELAY is not set # CONFIG_DM_DUST is not set # CONFIG_DM_INIT is not set @@ -2884,7 +2804,6 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_UG3105 is not set # CONFIG_FUEL_GAUGE_MM8013 is not set CONFIG_HWMON=y -CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2940,7 +2859,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_I5500 is not set # CONFIG_SENSORS_CORETEMP is not set # CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m # CONFIG_SENSORS_POWERZ is not set # CONFIG_SENSORS_POWR1220 is not set # CONFIG_SENSORS_LENOVO_EC is not set @@ -2993,8 +2912,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_NCT6683 is not set -CONFIG_SENSORS_NCT6775_CORE=m -CONFIG_SENSORS_NCT6775=m +# CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NCT6775_I2C is not set # CONFIG_SENSORS_NCT7802 is not set # CONFIG_SENSORS_NCT7904 is not set @@ -3097,7 +3015,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y # end of Intel thermal drivers CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set +CONFIG_WATCHDOG_CORE=m # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y CONFIG_WATCHDOG_OPEN_TIMEOUT=0 @@ -3107,6 +3025,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # # Watchdog Pretimeout Governors # +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set # # Watchdog Device Drivers @@ -3127,7 +3046,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_EBC_C384_WDT is not set # CONFIG_EXAR_WDT is not set # CONFIG_F71808E_WDT is not set -# CONFIG_SP5100_TCO is not set +CONFIG_SP5100_TCO=m # CONFIG_SBC_FITPC2_WATCHDOG is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_IB700_WDT is not set @@ -3710,7 +3629,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set +CONFIG_USB_UAS=m # # USB Imaging devices @@ -4064,6 +3983,7 @@ CONFIG_ACPI_WMI=m # CONFIG_YOGABOOK is not set # CONFIG_ACERHDF is not set # CONFIG_ACER_WIRELESS is not set +# CONFIG_AMD_PMF is not set # CONFIG_AMD_PMC is not set # CONFIG_AMD_HSMP is not set # CONFIG_AMD_WBRF is not set @@ -4080,6 +4000,7 @@ CONFIG_ACPI_WMI=m # CONFIG_IBM_RTL is not set # CONFIG_SENSORS_HDAPS is not set # CONFIG_THINKPAD_LMI is not set +# CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_SAR_INT1092 is not set # @@ -4292,7 +4213,10 @@ CONFIG_IRQ_REMAP=y # CONFIG_PHY_INTEL_LGM_EMMC is not set # end of PHY Subsystem -# CONFIG_POWERCAP is not set +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL_CORE=m +CONFIG_INTEL_RAPL=m +# CONFIG_IDLE_INJECT is not set # CONFIG_MCB is not set # @@ -4302,6 +4226,8 @@ CONFIG_IRQ_REMAP=y # end of Performance monitor support CONFIG_RAS=y +CONFIG_AMD_ATL=m +CONFIG_AMD_ATL_PRM=y # CONFIG_USB4 is not set # @@ -4326,7 +4252,7 @@ CONFIG_NVDIMM_KEYS=y CONFIG_DAX=y # CONFIG_DEV_DAX is not set CONFIG_NVMEM=y -# CONFIG_NVMEM_SYSFS is not set +CONFIG_NVMEM_SYSFS=y # CONFIG_NVMEM_LAYOUTS is not set # CONFIG_NVMEM_RMEM is not set @@ -4338,7 +4264,8 @@ CONFIG_NVMEM=y # end of HW tracing support # CONFIG_FPGA is not set -# CONFIG_TEE is not set +CONFIG_TEE=m +CONFIG_AMDTEE=m # CONFIG_SIOX is not set # CONFIG_SLIMBUS is not set # CONFIG_INTERCONNECT is not set @@ -4784,10 +4711,11 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTR=y # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=y -# CONFIG_CRYPTO_HCTR2 is not set +CONFIG_CRYPTO_HCTR2=m # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_PCBC is not set +CONFIG_CRYPTO_XCTR=m CONFIG_CRYPTO_XTS=m # end of Length-preserving ciphers and modes @@ -4814,6 +4742,7 @@ CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_MICHAEL_MIC is not set +CONFIG_CRYPTO_POLYVAL=m # CONFIG_CRYPTO_POLY1305 is not set # CONFIG_CRYPTO_RMD160 is not set CONFIG_CRYPTO_SHA1=y @@ -4833,14 +4762,14 @@ CONFIG_CRYPTO_XXHASH=y # CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32 is not set -# CONFIG_CRYPTO_CRCT10DIF is not set +CONFIG_CRYPTO_CRCT10DIF=m # end of CRCs (cyclic redundancy checks) # # Compression # CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_LZO=y +# CONFIG_CRYPTO_LZO is not set # CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set @@ -4905,15 +4834,16 @@ CONFIG_CRYPTO_CHACHA20_X86_64=m # CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set CONFIG_CRYPTO_BLAKE2S_X86=y -# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set +CONFIG_CRYPTO_POLYVAL_CLMUL_NI=m CONFIG_CRYPTO_POLY1305_X86_64=m -# CONFIG_CRYPTO_SHA1_SSSE3 is not set +CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m -# CONFIG_CRYPTO_SHA512_SSSE3 is not set +CONFIG_CRYPTO_SHA512_SSSE3=m # CONFIG_CRYPTO_SM3_AVX_X86_64 is not set -# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m # end of Accelerated Cryptographic Algorithms for CPU (x86) CONFIG_CRYPTO_HW=y @@ -5006,7 +4936,7 @@ CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y -# CONFIG_CRC_T10DIF is not set +CONFIG_CRC_T10DIF=m # CONFIG_CRC64_ROCKSOFT is not set CONFIG_CRC_ITU_T=m CONFIG_CRC32=y @@ -5022,11 +4952,8 @@ CONFIG_LIBCRC32C=y # CONFIG_CRC8 is not set CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set -CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_DECOMPRESS=y CONFIG_ZSTD_COMMON=y CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y @@ -5041,12 +4968,6 @@ CONFIG_XZ_DEC_RISCV=y # CONFIG_XZ_DEC_MICROLZMA is not set CONFIG_XZ_DEC_BCJ=y # CONFIG_XZ_DEC_TEST is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y CONFIG_DECOMPRESS_ZSTD=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_INTERVAL_TREE=y diff --git a/hosts/moyo/moyo_maintenance.txt b/hosts/moyo/moyo_maintenance.txt new file mode 100644 index 0000000..899ccc9 --- /dev/null +++ b/hosts/moyo/moyo_maintenance.txt @@ -0,0 +1,70 @@ += Moyo + +== TODO +- [ ] Auto mount /dev/store without manual password input. + +== World +* app-admin/doas +* app-admin/sysklogd +* app-editors/vim minimal + - Effectively `vi`. +* app-emulation/libvirt +* app-misc/jq + - Old pizzabot. +* app-misc/neofetch +* app-misc/screen +* app-shells/bash-completion +* dev-lang/rust + - rust-bin is pulled in by default, so prefer this. +* dev-vcs/git +* media-video/ffmpeg + - Old pizzabot. +* net-fs/nfs-utils +* net-fs/samba +* net-misc/chrony +* net-misc/dhcpcd +* sys-apps/amdgpu_top +* sys-apps/lm-sensors +* sys-apps/nvme-cli + - dracut. +* sys-block/io-scheduler-udev-rules +* sys-fs/cryptsetup + - dracut. +* sys-fs/dosfstools + - /efi fsck +* sys-fs/lvm2 + - dracut. +* sys-kernel/gentoo-sources +* sys-kernel/installkernel +* sys-kernel/linux-firmware +* sys-process/htop +* x11-terms/kitty-terminfo + +== Services +default: + sysklogd + cronie + dhcpcd + chronyd + libvirtd + libvirt-guests + sshd +boot: + dmcrypt + +== Config +/etc/rc.conf + rc_logger="YES" + +== Kernel +=== General +* No debugging. +* Hardware mitigations not compiled in. +* Select zstd for all compression. +=== Specific CONFIG_* Rationale +* CONFIG_MTTR & CONFIG_X86_PAT + - Requested by amdgpu. +* CONFIG_AMD_ATL + - Should look into what this actually changes. +* CONFIG_ATA_SFF + - Pretty sure no hardware I have uses this. diff --git a/hosts/soy/Scripts/mount-samba.sh b/hosts/soy/Scripts/mount-samba.sh index 63ca111..343ac5b 100755 --- a/hosts/soy/Scripts/mount-samba.sh +++ b/hosts/soy/Scripts/mount-samba.sh @@ -1,2 +1,2 @@ #! /usr/bin/env sh -sudo mount -t nfs4 -o rw,bg,hard,fsc,rsize=32768,wsize=32768,tcp,timeo=600,nfsvers=4,minorversion=2 192.168.1.206:/srv/nfs/samba /home/andrew/samba +sudo mount -t nfs4 -o rw,bg,hard,fsc,rsize=32768,wsize=32768,tcp,timeo=600,nfsvers=4,minorversion=2 192.168.1.206:/srv/nfs/samba /home/andrew/Samba diff --git a/hosts/denpa/cgit/cgitrc b/hosts/station/cgit/cgitrc index 31e23d8..1dc4158 100644 --- a/hosts/denpa/cgit/cgitrc +++ b/hosts/station/cgit/cgitrc @@ -4,6 +4,8 @@ enable-commit-graph=1 repository-sort=age branch-sort=age +robots=noindex, nofollow + logo= css=/custom.css @@ -13,7 +15,7 @@ email-filter=/usr/local/lib/cgit/filters/email-libravatar.py remove-suffix=1 virtual-root=/ -clone-url=https://git.akon.city/$CGIT_REPO_URL +clone-url=https://git.akon.city/$CGIT_REPO_URL.git root-title=Akon City Software Inc. root-desc= @@ -30,4 +32,4 @@ mimetype.svg=image/svg+xml readme=./README.html -scan-path=/mnt/git +scan-path=/var/git/ diff --git a/hosts/denpa/cgit/custom.css b/hosts/station/cgit/custom.css index 1f7dd9c..2349906 100644 --- a/hosts/denpa/cgit/custom.css +++ b/hosts/station/cgit/custom.css @@ -8,54 +8,26 @@ * Then fill out pygments colors. * */ :root { - --background: #fdfbfc; - --highlight1: 249, 119, 158; /* #f9779e */ - --highlight2: 132, 146, 95; /* #84925f */ - --highlight3: 238, 186, 179; /* #eebab3 */ - --highlight4: 89, 160, 254; /* #59a8fe */ - --color1: #f1f5ff; - --color2: #e8eefc; - --color3: #fdfbfc; - --black: #13090c; - --gray: 119, 119, 119; /* #777777 */ - --gray0: #393232; - --gray1: #777; - --gray2: #aaa; -} - -div#cgit a.tag-annotated-deco { - color: var(--black); - margin: 0px 0.5em; - padding: 0px 0.25em; - border: solid 1px var(--black); - background: linear-gradient(90deg, #eebab3 0%, #f7afab 12%, #eebab3 37%, #ffe5dc 50%, #eebab3 62%, #f7afab 79%, #eebab3 100%); - animation: shine 3.45s infinite; - background-size: 200%; - background-position: left; - background-repeat: repeat-x; - -webkit-animation-timing-function: linear; - -webkit-animation-duration: 3.45s; -} - -div#cgit a:hover.tag-annotated-deco { - color: var(--black) !important; -} - -@keyframes shine { - 0% {background-position:-100%;} - 100% {background-position:100%;} -} - -* { - line-height: 1.35em; + --background: #ffffff; + --black: #000000; + --gray: #808080; + --accent1: #d9d8d1; + --accent2: #edece6; + --accent3: #f6f6f0; + --green: #5bd154; + --red: #d95988; + --yellow: #f1ed73; + --blue: #51a2be; } body { background-color: var(--background); } +/* Readme Formatting */ + h2 { - border-bottom: 1px solid rgb(var(--gray)); + border-bottom: 1px solid var(--accent1); } h1, h2 { @@ -63,7 +35,7 @@ h1, h2 { } h3, h4, h5 { - margin: 0.8em 0em -0.10em 0em; + margin: 0.8em 0em 0.10em 0em; } pre { @@ -74,23 +46,25 @@ p { margin: 0.4em 0em; } -a:hover { - color: rgb(var(--highlight4)) !important; -} - ul { padding-left: 1.25rem; } -p code { - padding: 0em 0.1em; +td.tableblock { + border: 1px solid #dedede; } +table tr td { + padding: .1em .25em; +} + +/* Code Blocks */ + .listingblock, code { font-family: monospace; - font-size: 11pt; - background-color: var(--color1); + font-size: 10pt; + background-color: var(--accent3); background-size: cover; } @@ -98,23 +72,52 @@ code { text-wrap: stable; word-break: break-all; display: inline-block; - border: solid 1px var(--gray2); + border: solid 1px var(--accent1); margin: 0.35em 0em; padding: 0em 0.4em !important; } +p code { + padding: 0em 0.1em; +} + +/* Animated Tag */ + +div#cgit a.tag-annotated-deco { + color: var(--black); + margin: 0px 0.5em; + padding: 0px 0.25em; + border: solid 1px var(--black); + background: linear-gradient(90deg, #eebab3 0%, #f7afab 12%, #eebab3 37%, #ffe5dc 50%, #eebab3 62%, #f7afab 79%, #eebab3 100%); + animation: shine 3.45s infinite; + background-size: 200%; + background-position: left; + background-repeat: repeat-x; + -webkit-animation-timing-function: linear; + -webkit-animation-duration: 3.45s; +} + +div#cgit a:hover.tag-annotated-deco { + color: var(--black) !important; +} + +@keyframes shine { + 0% {background-position:-100%;} + 100% {background-position:100%;} +} + +/* Cgit Overrides */ + div#cgit { margin: auto; - font-family: monospace; - font-size: 11pt; + font-size: 10pt; -moz-tab-size: 4; tab-size: 4; background: var(--background); - color: var(--gray0); } div#cgit table.tabs { - border-bottom: solid 2px var(--color1); + border-bottom: solid 2px var(--accent3); } div#cgit table.tabs td { @@ -123,14 +126,18 @@ div#cgit table.tabs td { div#cgit table.tabs td a { padding: 1px 0.75em; - color: var(--gray1); + color: var(--gray); font-size: 110%; } div#cgit table.tabs td a.active { - color: var(--gray0); - background: var(--color1); - border-bottom: solid 2px var(--gray2); + color: var(--black); + background: var(--background); + border-bottom: solid 2px var(--gray); +} + +div#cgit table#header { + margin-bottom: -1em; } div#cgit table#header td.main { @@ -138,7 +145,7 @@ div#cgit table#header td.main { } div#cgit table#header td.main a { - color: var(--gray0); + color: var(--black); } div#cgit table#header td.sub { @@ -154,6 +161,14 @@ div#cgit div.content { padding: 0em; } +div#cgit > div.content { + padding: 1.25em; +} + +div#cgit table.list { + max-width: 100ch; +} + div#cgit table.list th a { color: inherit; } @@ -163,11 +178,11 @@ div#cgit table.list tr:nth-child(even) { } div#cgit table.list tr:nth-child(odd) { - background: var(--color1); + background: var(--accent3); } div#cgit table.list tr:hover { - background: var(--color2); + background: var(--accent2); } div#cgit table.list tr.nohover { @@ -182,14 +197,8 @@ div#cgit table.list tr.nohover-highlight:hover:nth-child(even) { background: inherit; } -div#cgit table.blob td.linenumbers a:target { - color: goldenrod; - text-decoration: underline; - outline: none; -} - div#cgit a.deco { - background-color: rgba(var(--highlight1), 0.65); + background-color: var(--red); border: solid 1px var(--black); } @@ -198,7 +207,7 @@ div#cgit a:hover.deco { } div#cgit a.branch-deco { - background-color: rgba(var(--highlight2), 0.65); + background-color: var(--green); border: solid 1px var(--black); } @@ -207,68 +216,68 @@ div#cgit a:hover.branch-deco { } div#cgit div#summary { - max-width: 90ch; + max-width: 100ch; margin: 0.5em; overflow-wrap: break-word; } div#cgit table.diffstat { border-collapse: collapse; - border: solid 1px var(--gray2); - background-color: var(--color3); + border: solid 1px var(--black); + background-color: var(--accent3); +} + +div#cgit div.diffstat-header a { + color: var(--black); } div#cgit table.diffstat td.graph td.add { - background-color: rgba(var(--highlight2), 0.75); + background-color: var(--green); } div#cgit table.diffstat td.graph td.rem { - background-color: rgba(var(--highlight1), 0.75); + background-color: var(--red); } div#cgit table.diffstat td.add a { - color: rgba(var(--highlight2), 0.85); + color: var(--green); } div#cgit table.diffstat td.del a { - color: rgba(var(--highlight1), 0.85); + color: var(--red); } div#cgit table.diffstat td.upd a { - color: rgba(var(--highlight3), 0.9); -} - -div#cgit table.diff td div.head { - color: var(--gray0); + color: var(--blue); } div#cgit table.diff td div.del { - color: rgba(var(--highlight1), 1.0); + color: var(--red); } div#cgit table.diff td div.add { - color: rgba(var(--highlight2), 1.0); + color: var(--green); } div#cgit table.diff td div.hunk { - color: rgba(var(--highlight3), 0.9); + color: var(--gray); } div#cgit div.cgit-panel table { border-collapse: collapse; - border: solid 1px var(--gray2); - background-color: var(--color3); + border: solid 1px var(--black); + background-color: var(--accent3); } div#cgit input, div#cgit select { - background-color: var(--color3); - border: solid 1px var(--gray2); + border: solid 1px var(--black); + background-color: var(--accent3); border-radius: 0.25em; } div#cgit input.txt { - background-color: var(--color3); + background-color: var(--accent3); } div#cgit div.path { @@ -279,13 +288,21 @@ div#cgit div.path { } div#cgit a { - color: rgba(var(--highlight4), 1.0); + color: var(--blue); +} + +div#cgit a:hover { + color: var(--gray) !important; } div#cgit a.permalink { color: inherit; } +div#cgit table.list td a.ls-dir { + color: var(--blue); +} + /* div#cgit span.age-hours { color: #080; @@ -319,7 +336,7 @@ div#cgit span.deletions { /* https://git.zx2c4.com/cgit.css:905 */ div#cgit span.libravatar img.onhover { display: none; - border: solid 1px var(--gray2); + border: solid 1px var(--black); padding: 0em; border-radius: 3px; width: 12em; @@ -327,8 +344,8 @@ div#cgit span.libravatar img.onhover { } div#cgit span.libravatar img.inline { - width: 1.5em; - height: 1.5em; + width: 1.3em; + height: 1.3em; margin-right: 0.2em; border-radius: 3px; vertical-align: bottom; @@ -339,7 +356,7 @@ div#cgit span.libravatar:hover > img.onhover { position: absolute; margin-left: 1.5em; background-color: var(--background); - box-shadow: 0.15em 0.15em 0.4em rgba(var(--gray), 0.75); + box-shadow: 0.15em 0.15em 0.4em var(--black); } pre.pygments .hll { background-color: #ffffcc } diff --git a/hosts/denpa/cgit/email-libravatar.py b/hosts/station/cgit/email-libravatar.py index 045ca17..045ca17 100755 --- a/hosts/denpa/cgit/email-libravatar.py +++ b/hosts/station/cgit/email-libravatar.py diff --git a/hosts/denpa/cgit/readme_in_summary_no_about.diff b/hosts/station/cgit/readme_in_summary_no_about.diff index 73267e0..73267e0 100644 --- a/hosts/denpa/cgit/readme_in_summary_no_about.diff +++ b/hosts/station/cgit/readme_in_summary_no_about.diff diff --git a/hosts/denpa/fail2ban/fail2ban.d/denpa.local b/hosts/station/fail2ban/fail2ban.d/station.local index b3d98c4..b3d98c4 100644 --- a/hosts/denpa/fail2ban/fail2ban.d/denpa.local +++ b/hosts/station/fail2ban/fail2ban.d/station.local diff --git a/hosts/denpa/fail2ban/jail.d/denpa.local b/hosts/station/fail2ban/jail.d/station.local index 70973fe..2110612 100644 --- a/hosts/denpa/fail2ban/jail.d/denpa.local +++ b/hosts/station/fail2ban/jail.d/station.local @@ -14,11 +14,7 @@ banaction_allports = nftables-allports [postfix] enabled = true mode = aggressive -journalmatch=_SYSTEMD_UNIT=postfix@-.service - -[postfix-sasl] -enabled = true -journalmatch=_SYSTEMD_UNIT=postfix@-.service +journalmatch=_SYSTEMD_UNIT=postfix.service [sieve] enabled = true @@ -28,6 +24,11 @@ journalmatch=_SYSTEMD_UNIT=dovecot.service enabled = true journalmatch=_SYSTEMD_UNIT=dovecot.service +[dovecot-pop3imap] +enabled = true +filter = dovecot-pop3imap +journalmatch=_SYSTEMD_UNIT=dovecot.service + [nginx-limit-req] enabled = true journalmatch=_SYSTEMD_UNIT=nginx.service diff --git a/hosts/denpa/git/git-template.zip b/hosts/station/git/git-template.zip Binary files differindex 4ade69c..4ade69c 100644 --- a/hosts/denpa/git/git-template.zip +++ b/hosts/station/git/git-template.zip diff --git a/hosts/station/git/gitconfig b/hosts/station/git/gitconfig new file mode 100644 index 0000000..1082bea --- /dev/null +++ b/hosts/station/git/gitconfig @@ -0,0 +1,3 @@ +[init] + defaultBranch = master + templatedir = /var/git//.git-template diff --git a/hosts/denpa/init.d/fcgiwrap b/hosts/station/init.d/fcgiwrap index 33b2b7d..1dde958 100755 --- a/hosts/denpa/init.d/fcgiwrap +++ b/hosts/station/init.d/fcgiwrap @@ -26,8 +26,8 @@ test -x $DAEMON || exit 0 # FCGI_APP Variables FCGI_CHILDREN="1" FCGI_SOCKET="/run/$NAME.socket" -FCGI_USER="git" -FCGI_GROUP="git" +FCGI_USER="www-data" +FCGI_GROUP="www-data" . /lib/lsb/init-functions diff --git a/hosts/denpa/nftables.conf b/hosts/station/nftables.conf index 8f736ce..8f736ce 100755 --- a/hosts/denpa/nftables.conf +++ b/hosts/station/nftables.conf diff --git a/hosts/denpa/nginx/akoncity b/hosts/station/nginx/akoncity index bd5d254..0f33432 100644 --- a/hosts/denpa/nginx/akoncity +++ b/hosts/station/nginx/akoncity @@ -1,5 +1,8 @@ +limit_req_zone $binary_remote_addr zone=main:1m rate=10r/s; # This is completely untuned. + server { - error_log syslog; + error_log syslog:server=unix:/dev/log; + access_log syslog:server=unix:/dev/log; server_name akon.city www.akon.city; @@ -21,20 +24,23 @@ server { } server { - error_log syslog; + error_log syslog:server=unix:/dev/log; + access_log syslog:server=unix:/dev/log; server_name git.akon.city; root /var/www/htdocs/cgit; try_files $uri @cgit; - location ~ ^.*\.git/(HEAD|info/refs|objects/info/.*|git-(upload|receive)-pack)$ { + location ~ ^.*(/.+|/.+\.git)/(HEAD|info/refs|objects/info/.*|git-(upload|receive)-pack)$ { client_max_body_size 0; include fastcgi_params; fastcgi_param SCRIPT_FILENAME /usr/lib/git-core/git-http-backend; - fastcgi_param GIT_HTTP_EXPORT_ALL ""; - fastcgi_param GIT_PROJECT_ROOT /mnt/git; + fastcgi_param GIT_HTTP_EXPORT_ALL "1"; + fastcgi_param GIT_PROJECT_ROOT /var/git; fastcgi_param PATH_INFO $uri; + fastcgi_param REQUEST_METHOD $request_method; + fastcgi_param QUERY_STRING $query_string; fastcgi_pass unix:/var/run/fcgiwrap.socket; } diff --git a/hosts/denpa/scripts/fail2ban-ban-ip b/hosts/station/scripts/fail2ban-ban-ip index b1b97c6..b1b97c6 100755 --- a/hosts/denpa/scripts/fail2ban-ban-ip +++ b/hosts/station/scripts/fail2ban-ban-ip diff --git a/hosts/denpa/scripts/fail2ban-unban-ip b/hosts/station/scripts/fail2ban-unban-ip index a562cbc..a562cbc 100755 --- a/hosts/denpa/scripts/fail2ban-unban-ip +++ b/hosts/station/scripts/fail2ban-unban-ip diff --git a/hosts/station/scripts/mail-stats b/hosts/station/scripts/mail-stats new file mode 100755 index 0000000..69e7c9a --- /dev/null +++ b/hosts/station/scripts/mail-stats @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +sudo journalctl --no-tail _SYSTEMD_UNIT=postfix.service | sudo pflogsumm diff --git a/hosts/station/scripts/vacumm b/hosts/station/scripts/vacumm new file mode 100755 index 0000000..70185e1 --- /dev/null +++ b/hosts/station/scripts/vacumm @@ -0,0 +1,3 @@ +#! /usr/bin/env sh +sudo journalctl --rotate +sudo journalctl --vacuum-time=1s diff --git a/hosts/station/station_maintenance.txt b/hosts/station/station_maintenance.txt new file mode 100644 index 0000000..1ca3925 --- /dev/null +++ b/hosts/station/station_maintenance.txt @@ -0,0 +1,80 @@ += Station + +== Libvirt +virsh start station +virsh console station +'e' on grub menu +add `console=tty0 console=ttyS0,115200` to the cmdline +add ipv6 to default network +virsh net-edit default +--- +<ip family='ipv6' address='6014:aa3:efbb:1245:fe::2' prefix='96'> + <dhcp> + <range start='6014:aa3:efbb:1245:fe::1000' end='6014:aa3:efbb:1245:fe::2000'/> + </dhcp> +</ip> +--- +virsh net-destroy default +virsh net-start default + +== Debian +apt install rsync +disable sudo mail_badpass + +=== Wireguard +apt install wireguard wireguard-tools +cp wg-rod.conf /etc/wireguard/ +cp nftables.conf /etc/nftables.conf +sudo systemctl enable wg-quick@wg-rod +-apt install resolvconf- +apt install systemd-resolved +various things rely on resolv.conf +spamassassin has an issue with dns, systemd-resolved seems to avoid it. + +=== SSL +apt install nginx python3-certbox-nginx fcgiwrap +cp letsencrypt.zip /etc/letsencrypt +unzip letsencrypt.zip +cp akoncity /etc/nginx/sites-available +ln -s /etc/nginx/sites-available/akoncity /etc/nginx/sites +-enabled/ +sudo usermod --append --groups www-data git +sudo usermod --append --groups git www-data + +=== fail2ban +cp fail2ban.d/station.local /etc/fail2ban/fail2ban.d/ +cp jail.d/station.local /etc/fail2ban/jail.d/ +filter.d/dovecot-pop3imap.conf +https://doc.dovecot.org/main/howto/fail2ban.html + +=== email +apt install postfix postfix-pcre dovecot-imapd dovecot-pop3d dovecot-sieve opendkim opendkim-tools spamassassin spamc net-tools bind9-host +apt install pflogsumm +sudo postaliases /etc/aliases +sudo postmap [hash: files] +sievec default.sieve +chown dovecot:dovecot /var/lib/dovecot +sudo chown -R root:opendkim /etc/postfix/dkim +sudo groupadd -g 1001 vmail +sudo useradd -m -d /var/vmail -s /bin/false -u 1001 -g vmail vmail +sudo chown vmail:vmail /var/vmail +sudo chmod 2770 /var/vmail/ + +=== git +sudo groupadd git +sudo useradd -m -d /var/git -s /bin/bash -g git git +sudo chmod 755 /var/git +sudo cp git-config /var/git/.git-config +sudo unzip git-template.zip -d /var/git/.git-template +add .ssh/authorized_keys +sudo apt install asciidoctor python3-pygments ruby-pygments.rb + +=== cgit +git clone --recursive https://git.zx2c4.com/cgit +git apply ../../denpa/cgit/readme_in_summary_no_about.diff +apt install build-essential libcurl4-openssl-dev +make NO_LUA=1 +sudo make NO_LUA=1 install +cp custom.css /var/www/htdocs/cgit/ +cp cgitrc /etc/cgitrc +cp email-libravatar.py /usr/local/lib/cgit/filters/ diff --git a/hosts/denpa/systemd/fcgiwrap.service b/hosts/station/systemd/fcgiwrap.service index 8617259..f36f65f 100644 --- a/hosts/denpa/systemd/fcgiwrap.service +++ b/hosts/station/systemd/fcgiwrap.service @@ -1,14 +1,15 @@ [Unit] Description=Simple CGI Server +Documentation=man:fcgiwrap(8) After=nss-user-lookup.target Requires=fcgiwrap.socket [Service] Environment=DAEMON_OPTS=-f EnvironmentFile=-/etc/default/fcgiwrap -ExecStart=/usr/sbin/fcgiwrap ${DAEMON_OPTS} -User=git -Group=git +ExecStart=/usr/sbin/fcgiwrap $DAEMON_OPTS +User=www-data +Group=www-data [Install] Also=fcgiwrap.socket diff --git a/hosts/denpa/wg-rod.conf.in b/hosts/station/wg-rod.conf.in index dc295c7..dc295c7 100644 --- a/hosts/denpa/wg-rod.conf.in +++ b/hosts/station/wg-rod.conf.in diff --git a/files/nvim/fzf_no_linenum.diff b/nix_archive/files/nvim/fzf_no_linenum.diff index bed26be..bed26be 100644 --- a/files/nvim/fzf_no_linenum.diff +++ b/nix_archive/files/nvim/fzf_no_linenum.diff diff --git a/files/nvim/init.vim b/nix_archive/files/nvim/init.vim index 780f9d5..7a1d5bc 100644 --- a/files/nvim/init.vim +++ b/nix_archive/files/nvim/init.vim @@ -62,7 +62,7 @@ set clipboard+=unnamedplus set ssop=skiprtp,blank,buffers,folds,winsize,terminal set vop-=curdir if isdirectory(expand('~/c')) - let view_dir = expand('~/c/sessions/views') + let view_dir = expand('~/c/sessions/nvim/views') if !isdirectory(view_dir) call mkdir(view_dir, 'p', 0755) endif @@ -71,7 +71,7 @@ if isdirectory(expand('~/c')) " Staggered backups. let backup_dir = '/mnt/store/backup/vim' if !isdirectory(backup_dir) - let backup_dir = expand('~/c/sessions/backup//') + let backup_dir = expand('~/c/sessions/nvim/backup//') if !isdirectory(backup_dir) call mkdir(backup_dir, 'p', 0755) endif @@ -80,14 +80,14 @@ if isdirectory(expand('~/c')) set backup " Swap file directory. - let swap_dir = expand('~/c/sessions/swaps//') + let swap_dir = expand('~/c/sessions/nvim/swaps//') if !isdirectory(swap_dir) call mkdir(swap_dir, 'p', 0755) endif let &directory=swap_dir if has('persistent_undo') - let undo_dir = expand('~/c/sessions/undo') + let undo_dir = expand('~/c/sessions/nvim/undo') if !isdirectory(undo_dir) call mkdir(undo_dir, 'p', 0755) endif @@ -201,7 +201,7 @@ inoremap <expr> <Down> pumvisible() ? '<C-n>' : '<Down>' nmap <C-d> <C-]> " Fzf binds. nmap <silent> \ :Buffers<CR> -nmap <silent> <C-i> :GGrep<CR> +nmap <silent> <C-o> :GGrep<CR> nmap <silent> <C-\> :GFiles<CR> " Only Neogit bind, handle all further operations from this menu. nmap <silent> Y :Neogit<CR> diff --git a/files/nvim/local/autoload/Juliana.vim b/nix_archive/files/nvim/local/autoload/Juliana.vim index 1b684b9..1b684b9 100644 --- a/files/nvim/local/autoload/Juliana.vim +++ b/nix_archive/files/nvim/local/autoload/Juliana.vim diff --git a/files/nvim/mini_completion_no_title.diff b/nix_archive/files/nvim/mini_completion_no_title.diff index e69de29..e69de29 100644 --- a/files/nvim/mini_completion_no_title.diff +++ b/nix_archive/files/nvim/mini_completion_no_title.diff diff --git a/files/nvim/mini_starter_picture.diff b/nix_archive/files/nvim/mini_starter_picture.diff index 2efc2a1..2efc2a1 100644 --- a/files/nvim/mini_starter_picture.diff +++ b/nix_archive/files/nvim/mini_starter_picture.diff diff --git a/flake.lock b/nix_archive/flake.lock index 5e681ca..4109bf8 100644 --- a/flake.lock +++ b/nix_archive/flake.lock @@ -5,6 +5,7 @@ "home-manager": [ "home-manager" ], + "nixgl": "nixgl", "nixos-hardware": [ "nixos-hardware" ], @@ -14,11 +15,11 @@ ] }, "locked": { - "lastModified": 1749311695, - "narHash": "sha256-2pIov+zC+D708V+HcmSW7r1cmlDi4mrO6kSwXADafmk=", + "lastModified": 1757553294, + "narHash": "sha256-GOdswZ7kgdrXFF3qPlCBgPaPfYYGjsJ4sOt1SblHnUA=", "ref": "refs/heads/master", - "rev": "e9475ce94ba69bd437d8cf0cf3f78062be928568", - "revCount": 133, + "rev": "77837d7b63240c069b3351a919a7d2af670f46cd", + "revCount": 149, "type": "git", "url": "https://git.akon.city/camu" }, @@ -30,11 +31,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -77,8 +78,9 @@ "type": "github" }, "original": { - "id": "flake-utils", - "type": "indirect" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } }, "home-manager": { @@ -88,11 +90,11 @@ ] }, "locked": { - "lastModified": 1752780113, - "narHash": "sha256-w312x4qtwWzJZSLG8c9srlr/hQTh1IfyOaV40xmg4Fg=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "e595fe1df49d75e971b33f311e365f032089f450", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -103,17 +105,16 @@ }, "mauri": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1749651958, - "narHash": "sha256-zDQnjPDw4eDoBI+1WRlEtsdCrz72EMHHtN9xxN1j1eM=", + "lastModified": 1755211482, + "narHash": "sha256-ifly37Yij9iKGHVo0m1OaY6gKNogn8tFMPZqopOhgoQ=", "ref": "refs/heads/master", - "rev": "5986c8bf61fc980a9a3383a426479a1296d179e7", - "revCount": 69, + "rev": "ca800f761080289735561154f02eddb21198a876", + "revCount": 72, "type": "git", "url": "https://git.akon.city/mauri" }, @@ -122,13 +123,32 @@ "url": "https://git.akon.city/mauri" } }, + "nixgl": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1752054764, + "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "owner": "nix-community", + "repo": "nixGL", + "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixGL", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -141,14 +161,14 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746453552, - "narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=", + "lastModified": 1757427959, + "narHash": "sha256-p0i07rLfAMzJWYfsjFOXEtIWeS1EGVxJaCi9gfyCwRE=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "be618645aa0adf461f778500172b6896d5ab2d01", + "rev": "785f1b67b6c53de088f640f2a7da50ca4b2d7161", "type": "github" }, "original": { @@ -160,27 +180,42 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1746378225, + "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "93e8cdce7afc64297cfec447c311470788131cd9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -198,11 +233,11 @@ ] }, "locked": { - "lastModified": 1752780775, - "narHash": "sha256-Z9M2+gg+FMhm8720XpljMW/ME8p73GjHSlaP+PeeySU=", + "lastModified": 1760455591, + "narHash": "sha256-QrVA0pTq+NDxjY4lJSp81XpKByguMKLD18Yy/y2Jwww=", "owner": "nix-community", "repo": "NUR", - "rev": "abc31ffdbf2a85922a7e7c807eee09907a87af07", + "rev": "881b3f1edac47a9eb36e9cbeae13d5627ef1cad6", "type": "github" }, "original": { @@ -217,7 +252,7 @@ "home-manager": "home-manager", "mauri": "mauri", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur" } }, diff --git a/flake.nix b/nix_archive/flake.nix index 5f3f80e..ca1992f 100644 --- a/flake.nix +++ b/nix_archive/flake.nix @@ -32,10 +32,10 @@ outputs = { self, nixpkgs, nixos-hardware, home-manager, nur, camu, mauri }: let local-fonts = { name = "Local Fonts"; - src = self; + src = ./../files/fonts; installPhase = '' mkdir -p $out/share/fonts/local - cp files/fonts/* $out/share/fonts/local + cp * $out/share/fonts/local ''; }; optimizeWithFlags = (pkg: flags: @@ -130,11 +130,7 @@ nixpkgs-patched = source-pkgs.applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ - ./files/nixpkgs-patches/425312.diff - ./files/nixpkgs-patches/4c3870b23dded4e75292be48bdb03cd870fb1719.diff - ./files/nixpkgs-patches/425843.diff - ]; + patches = []; }; nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix"); in nixosSystem { @@ -180,7 +176,7 @@ (self: super: { adw-gtk3 = super.adw-gtk3.overrideAttrs (oldAttrs: { patches = [ - ./files/adw-gtk3-non-blue-accent.diff + ../files/patches/adw-gtk3-non-blue-accent.diff ]; }); }) @@ -247,15 +243,13 @@ ]; }; - nixosConfigurations.yashinoki = let + nixosConfigurations.palm = let system = "x86_64-linux"; source-pkgs = nixpkgs.legacyPackages.${system}; nixpkgs-patched = source-pkgs.applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ - ./files/nixpkgs-patches/425312.diff - ]; + patches = []; }; nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix"); in nixosSystem { @@ -285,7 +279,7 @@ (self: super: { adw-gtk3 = super.adw-gtk3.overrideAttrs (oldAttrs: { patches = [ - ./files/adw-gtk3-non-blue-accent.diff + ../files/patches/adw-gtk3-non-blue-accent.diff ]; }); }) @@ -314,7 +308,8 @@ nixos-hardware.nixosModules.common-pc-laptop-ssd nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-gpu-nvidia-disable - ./hosts/yashinoki/configuration.nix + nixos-hardware.nixosModules.common-gpu-intel-kaby-lake + ./hosts/palm/configuration.nix ]; }; diff --git a/hosts/moyo/container.nix b/nix_archive/hosts/moyo/container.nix index 23e7b02..23e7b02 100644 --- a/hosts/moyo/container.nix +++ b/nix_archive/hosts/moyo/container.nix diff --git a/hosts/yashinoki/configuration.nix b/nix_archive/hosts/palm/configuration.nix index c88d87b..42cf14c 100644 --- a/hosts/yashinoki/configuration.nix +++ b/nix_archive/hosts/palm/configuration.nix @@ -28,9 +28,9 @@ in { local = rec { font = { - name = "Dina"; - size = 14; - baseline = 0; + name = "Lotion"; + size = 15; + baseline = -2; cell-height-offset = 0; }; ui-font = { @@ -50,7 +50,7 @@ in { top_padding = 0; picture = ../../themes/year_of_snake/splash.png; width = 64; - padding = { top = -2; left = -6; text = 0; }; + padding = { top = -3; left = -4; text = 5; }; position = "left"; header = ""; footer = ""; @@ -72,7 +72,7 @@ in { boot.kernelPackages = pkgs.linuxPackages_latest; boot.loader.systemd-boot.enable = true; - boot.kernelParams = [ "mitigations=off" "file_caps=1" "i915.enable_guc=2" ]; + boot.kernelParams = [ "mitigations=off" "file_caps=1" ]; services.fwupd.enable = true; virtualisation.kvmgt = { @@ -115,7 +115,7 @@ in { programs.light.enable = true; networking = { - hostName = "yashinoki"; + hostName = "palm"; nameservers = [ "9.9.9.9" "149.112.112.112" @@ -184,7 +184,7 @@ in { output = { "${monitor1}" = { mode = "3000x2000@59.999Hz"; - position = "1920 540"; + position = "1024 540"; render_bit_depth = "10"; allow_tearing = "no"; max_render_time = "10"; @@ -192,10 +192,10 @@ in { bg = "${../../themes/year_of_snake/wallpaper.png} fit"; }; "${monitor2}" = { - mode = "1920x1080@60.000Hz"; + mode = "1024x768@60.004Hz"; position = "0 0"; render_bit_depth = "10"; - allow_tearing = "no"; + allow_tearing = "yes"; max_render_time = "10"; scale = "1"; bg = "#${colo.background-alt} solid_color"; diff --git a/hosts/yashinoki/hardware-configuration.nix b/nix_archive/hosts/palm/hardware-configuration.nix index fe5e08d..fe5e08d 100644 --- a/hosts/yashinoki/hardware-configuration.nix +++ b/nix_archive/hosts/palm/hardware-configuration.nix diff --git a/hosts/yashinoki/programs.nix b/nix_archive/hosts/palm/programs.nix index d82e72a..d82e72a 100644 --- a/hosts/yashinoki/programs.nix +++ b/nix_archive/hosts/palm/programs.nix diff --git a/hosts/sofue/configuration.nix b/nix_archive/hosts/sofue/configuration.nix index f3f908e..f3f908e 100644 --- a/hosts/sofue/configuration.nix +++ b/nix_archive/hosts/sofue/configuration.nix diff --git a/hosts/sofue/gccarch_mesa.nix b/nix_archive/hosts/sofue/gccarch_mesa.nix index e06bdd5..e06bdd5 100644 --- a/hosts/sofue/gccarch_mesa.nix +++ b/nix_archive/hosts/sofue/gccarch_mesa.nix diff --git a/hosts/sofue/incus.yaml b/nix_archive/hosts/sofue/incus.yaml index 407e604..407e604 100644 --- a/hosts/sofue/incus.yaml +++ b/nix_archive/hosts/sofue/incus.yaml diff --git a/hosts/sofue/programs.nix b/nix_archive/hosts/sofue/programs.nix index d964fbf..d964fbf 100644 --- a/hosts/sofue/programs.nix +++ b/nix_archive/hosts/sofue/programs.nix diff --git a/nix/amdgpu.nix b/nix_archive/nix/amdgpu.nix index 3d28b1d..3d28b1d 100644 --- a/nix/amdgpu.nix +++ b/nix_archive/nix/amdgpu.nix diff --git a/nix/audio.nix b/nix_archive/nix/audio.nix index 80ef231..adac55b 100644 --- a/nix/audio.nix +++ b/nix_archive/nix/audio.nix @@ -106,8 +106,8 @@ pavucontrol ]; environment.etc = { - "convolver/Focal_Elegia_minimum_phase_44100Hz.wav".source = ../files/convolver/Focal_Elegia_minimum_phase_44100Hz.wav; - "convolver/Focal_Elegia_minimum_phase_48000Hz.wav".source = ../files/convolver/Focal_Elegia_minimum_phase_48000Hz.wav; + "convolver/Focal_Elegia_minimum_phase_44100Hz.wav".source = ../../files/audio/convolver/Focal_Elegia_minimum_phase_44100Hz.wav; + "convolver/Focal_Elegia_minimum_phase_48000Hz.wav".source = ../../files/audio/convolver/Focal_Elegia_minimum_phase_48000Hz.wav; }; security.rtkit.enable = true; } diff --git a/nix/bluetooth.nix b/nix_archive/nix/bluetooth.nix index 18b9a42..18b9a42 100644 --- a/nix/bluetooth.nix +++ b/nix_archive/nix/bluetooth.nix diff --git a/nix/email.nix b/nix_archive/nix/email.nix index 96924ab..8320d88 100644 --- a/nix/email.nix +++ b/nix_archive/nix/email.nix @@ -153,6 +153,6 @@ color body brightblue black (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+ ''; }; - home.file.".mailcap".source = ../files/mailcap; + home.file.".mailcap".source = ../../files/mailcap; }; } diff --git a/nix/gaming.nix b/nix_archive/nix/gaming.nix index e86cd61..e86cd61 100644 --- a/nix/gaming.nix +++ b/nix_archive/nix/gaming.nix diff --git a/nix/intel.nix b/nix_archive/nix/intel.nix index 7b69ba8..7b69ba8 100644 --- a/nix/intel.nix +++ b/nix_archive/nix/intel.nix diff --git a/nix/mesa_git.nix b/nix_archive/nix/mesa_git.nix index ba2dcc1..ba2dcc1 100644 --- a/nix/mesa_git.nix +++ b/nix_archive/nix/mesa_git.nix diff --git a/nix/programs/bash.nix b/nix_archive/nix/programs/bash.nix index 571b4fe..571b4fe 100644 --- a/nix/programs/bash.nix +++ b/nix_archive/nix/programs/bash.nix diff --git a/nix/programs/docker.nix b/nix_archive/nix/programs/docker.nix index 3491a80..3491a80 100644 --- a/nix/programs/docker.nix +++ b/nix_archive/nix/programs/docker.nix diff --git a/nix/programs/firefox.nix b/nix_archive/nix/programs/firefox.nix index 9364d29..d278bd4 100644 --- a/nix/programs/firefox.nix +++ b/nix_archive/nix/programs/firefox.nix @@ -12,15 +12,15 @@ in { home-manager.users.andrew = { home.file."user-overrides.js" = { target = ".mozilla/firefox/default/user-overrides.js"; - source = ../../files/firefox/user-overrides.js; + source = ../../../files/firefox/user-overrides.js; }; home.file."firefox-gnome-theme" = { target = ".mozilla/firefox/default/chrome/firefox-gnome-theme"; source = (pkgs.fetchFromGitHub { owner = "rafaelmardojai"; repo = "firefox-gnome-theme"; - rev = "4eb2714fbed2b80e234312611a947d6cb7d70caf"; - hash = "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA="; + rev = "0909cfe4a2af8d358ad13b20246a350e14c2473d"; + hash = "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk="; }); }; home.file."customChrome.css" = { diff --git a/nix/programs/foot.nix b/nix_archive/nix/programs/foot.nix index 5c85ce7..5c85ce7 100644 --- a/nix/programs/foot.nix +++ b/nix_archive/nix/programs/foot.nix diff --git a/nix/programs/kdeconnect.nix b/nix_archive/nix/programs/kdeconnect.nix index 8d8b366..8d8b366 100644 --- a/nix/programs/kdeconnect.nix +++ b/nix_archive/nix/programs/kdeconnect.nix diff --git a/nix/programs/kitty.nix b/nix_archive/nix/programs/kitty.nix index f3c11a4..86ad720 100644 --- a/nix/programs/kitty.nix +++ b/nix_archive/nix/programs/kitty.nix @@ -38,9 +38,9 @@ in { cursor_shape block #cursor_blink_interval -1 linear ease-out #cursor_stop_blinking_after 20.0 - cursor_trail 2 - cursor_trail_decay 0.075 0.425 - cursor_trail_start_threshold 3 + #cursor_trail 2 + #cursor_trail_decay 0.075 0.425 + #cursor_trail_start_threshold 3 cursor #${colo.foreground} #cursor none cursor_text_color background diff --git a/nix/programs/nvim.nix b/nix_archive/nix/programs/nvim.nix index 3cdf12e..3cdf12e 100644 --- a/nix/programs/nvim.nix +++ b/nix_archive/nix/programs/nvim.nix diff --git a/nix/programs/obs.nix b/nix_archive/nix/programs/obs.nix index 59dca35..59dca35 100644 --- a/nix/programs/obs.nix +++ b/nix_archive/nix/programs/obs.nix diff --git a/nix/programs/sunshine.nix b/nix_archive/nix/programs/sunshine.nix index dff4d97..dff4d97 100644 --- a/nix/programs/sunshine.nix +++ b/nix_archive/nix/programs/sunshine.nix diff --git a/nix/programs/sway.nix b/nix_archive/nix/programs/sway.nix index 07f8d2c..b5dcb5f 100644 --- a/nix/programs/sway.nix +++ b/nix_archive/nix/programs/sway.nix @@ -219,7 +219,7 @@ in { accel_profile = "flat"; scroll_factor = "0.75"; }; - "1390:268:ELECOM_TrackBall_Mouse_HUGE_TrackBall_Mouse" = { + "1390:268:ELECOM_TrackBall_Mouse_HUGE_TrackBall" = { accel_profile = "flat"; scroll_factor = "0.25"; scroll_method = "on_button_down"; @@ -328,13 +328,13 @@ in { { command = "wlsunset-toggle"; } ]; }; - extraConfig = '' - blur enable - blur_passes 4 - blur_radius 2 - blur_contrast 1.5 - blur_saturation 1.1 - ''; +# extraConfig = '' +# blur enable +# blur_passes 4 +# blur_radius 2 +# blur_contrast 1.5 +# blur_saturation 1.1 +# ''; }; services.swayidle = { enable = true; diff --git a/nix/programs/waydroid.nix b/nix_archive/nix/programs/waydroid.nix index af0c207..af0c207 100644 --- a/nix/programs/waydroid.nix +++ b/nix_archive/nix/programs/waydroid.nix diff --git a/nix/programs/zsh.nix b/nix_archive/nix/programs/zsh.nix index 6071429..6071429 100644 --- a/nix/programs/zsh.nix +++ b/nix_archive/nix/programs/zsh.nix diff --git a/nix/scripts.nix b/nix_archive/nix/scripts.nix index 8fac0a3..2f53a2a 100644 --- a/nix/scripts.nix +++ b/nix_archive/nix/scripts.nix @@ -12,7 +12,7 @@ in { environment.systemPackages = with pkgs; [ (writeShellScriptBin "bemenu-colored" '' bemenu -C --single-instance -B 0 -M 0 --hp 6 \ - --fn "${loc.font.name} ${toString (loc.font.size - 1)}" -H ${toString ((loc.font.size * 2) - 1)} \ + --fn "${loc.font.name} ${toString (loc.font.size - 1)}" -H ${toString ((loc.font.size * 2) - 4)} \ --cf "#${colo.foreground}" --cb "#${colo.background}" \ --hf "#${colo.background}" --hb "#${colo.color4}" \ --nf "#${colo.foreground}" --nb "#${colo.background}" \ @@ -21,7 +21,7 @@ in { '') ] ++ (lib.lists.forEach loc.scripts.imports (x: pkgs.writeTextFile { name = x; - text = (builtins.readFile ../scripts/desktop/${x}); + text = (builtins.readFile ../../scripts/desktop/${x}); executable = true; destination = "/bin/${x}"; })); diff --git a/nix/settings.nix b/nix_archive/nix/settings.nix index 743529c..743529c 100644 --- a/nix/settings.nix +++ b/nix_archive/nix/settings.nix diff --git a/nix/steam.nix b/nix_archive/nix/steam.nix index 66d675f..66d675f 100644 --- a/nix/steam.nix +++ b/nix_archive/nix/steam.nix diff --git a/nix/system.nix b/nix_archive/nix/system.nix index 92b95df..92b95df 100644 --- a/nix/system.nix +++ b/nix_archive/nix/system.nix diff --git a/nix/user.nix b/nix_archive/nix/user.nix index 91a6e6b..817d36e 100644 --- a/nix/user.nix +++ b/nix_archive/nix/user.nix @@ -180,7 +180,7 @@ in { init.defaultBranch = "master"; }; }; - home.file.".config/gdb/gdbinit".source = ../files/gdbinit; + home.file.".config/gdb/gdbinit".source = ../../files/gdbinit; home.file.".config/colors.json".text = '' { "special": { diff --git a/nix/virtualisation.nix b/nix_archive/nix/virtualisation.nix index bc6a6c0..bc6a6c0 100644 --- a/nix/virtualisation.nix +++ b/nix_archive/nix/virtualisation.nix diff --git a/nix/x86.nix b/nix_archive/nix/x86.nix index a8ebdd1..a8ebdd1 100644 --- a/nix/x86.nix +++ b/nix_archive/nix/x86.nix diff --git a/nix_archive/nixpkgs-patches/.gitignore b/nix_archive/nixpkgs-patches/.gitignore new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/nix_archive/nixpkgs-patches/.gitignore diff --git a/hosts/iroha/scripts/port-forward b/nix_archive/port-forward index f1965a6..f1965a6 100755 --- a/hosts/iroha/scripts/port-forward +++ b/nix_archive/port-forward diff --git a/themes/year_of_snake/snake.nix b/nix_archive/themes/year_of_snake/snake.nix index a764487..a764487 100644 --- a/themes/year_of_snake/snake.nix +++ b/nix_archive/themes/year_of_snake/snake.nix diff --git a/themes/year_of_snake/splash.kra b/nix_archive/themes/year_of_snake/splash.kra Binary files differindex 8f94fa2..8f94fa2 100644 --- a/themes/year_of_snake/splash.kra +++ b/nix_archive/themes/year_of_snake/splash.kra diff --git a/themes/year_of_snake/splash.png b/nix_archive/themes/year_of_snake/splash.png Binary files differindex bedee26..bedee26 100644 --- a/themes/year_of_snake/splash.png +++ b/nix_archive/themes/year_of_snake/splash.png diff --git a/themes/year_of_snake/wallpaper.kra b/nix_archive/themes/year_of_snake/wallpaper.kra Binary files differindex 5503f36..5503f36 100644 --- a/themes/year_of_snake/wallpaper.kra +++ b/nix_archive/themes/year_of_snake/wallpaper.kra diff --git a/themes/year_of_snake/wallpaper.png b/nix_archive/themes/year_of_snake/wallpaper.png Binary files differindex df88d73..df88d73 100644 --- a/themes/year_of_snake/wallpaper.png +++ b/nix_archive/themes/year_of_snake/wallpaper.png diff --git a/scripts/desktop/bemenu-colored b/scripts/desktop/bemenu-colored new file mode 100755 index 0000000..2636cab --- /dev/null +++ b/scripts/desktop/bemenu-colored @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +bemenu -C --single-instance -B 0 -M 0 --hp 6 -p "" diff --git a/scripts/desktop/dbus-sway-environment b/scripts/desktop/dbus-sway-environment index 249d610..27dd28c 100755 --- a/scripts/desktop/dbus-sway-environment +++ b/scripts/desktop/dbus-sway-environment @@ -1,5 +1,4 @@ #! /usr/bin/env sh - dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK systemctl --user stop pipewire{,-pulse}.{socket,service} xdg-desktop-portal xdg-desktop-portal-wlr systemctl --user start pipewire{,-pulse}.{socket,service} xdg-desktop-portal xdg-desktop-portal-wlr diff --git a/scripts/desktop/dmenu-emoji b/scripts/desktop/dmenu-emoji index 07c1900..083cd65 100755 --- a/scripts/desktop/dmenu-emoji +++ b/scripts/desktop/dmenu-emoji @@ -1,2 +1,3 @@ #! /usr/bin/env sh -jq -r ".[] | .emoji + \" \" + (.aliases[0])" /etc/emoji.json +# https://raw.githubusercontent.com/chalda-pnuzig/emojis.json/refs/heads/master/dist/categories.min.json +jq -r ".emojis[][][] | .emoji + \" \" + .name" ../categories.min.json diff --git a/scripts/desktop/dmenu-path b/scripts/desktop/dmenu-path index 9c8122a..da86257 100755 --- a/scripts/desktop/dmenu-path +++ b/scripts/desktop/dmenu-path @@ -1,3 +1,3 @@ #! /usr/bin/env sh # https://github.com/ema/dotfiles/blob/fb7f5cab530daba74edefb9cecb401262db063a9/bin/dmenu_path -printf $PATH -print0 | tr ':' '\0' | uniq -z | xargs -0 ls -Llu --time-style=+%s | awk '/^(-|l)/ { printf $6" "$7"\n" }' | sort -rn | cut -d' ' -f 2 +printf $PATH -print0 | tr ':' '\0' | uniq -z | xargs -0 ls -Llu --time-style=+%s 2>/dev/null | awk '/^(-|l)/ { printf $6" "$7"\n" }' | sort -rn | cut -d' ' -f 2 diff --git a/scripts/desktop/dmenu-path0 b/scripts/desktop/dmenu-path0 index 593ecf6..c90ecfe 100755 --- a/scripts/desktop/dmenu-path0 +++ b/scripts/desktop/dmenu-path0 @@ -1,3 +1,3 @@ #! /usr/bin/env sh # https://github.com/ema/dotfiles/blob/fb7f5cab530daba74edefb9cecb401262db063a9/bin/dmenu_path -printf $PATH -print0 | tr ':' '\0' | uniq -z | xargs -0 ls -Llu --time-style=+%s | awk '/^(-|l)/ { printf $6" "$7"\0" }' | sort -zrn | cut -z -d' ' -f 2 +printf $PATH -print0 | tr ':' '\0' | uniq -z | xargs -0 ls -Llu --time-style=+%s 2>/dev/null | awk '/^(-|l)/ { printf $6" "$7"\0" }' | sort -zrn | cut -z -d' ' -f 2 diff --git a/scripts/desktop/export-nfs b/scripts/desktop/export-nfs new file mode 100755 index 0000000..deb3beb --- /dev/null +++ b/scripts/desktop/export-nfs @@ -0,0 +1,6 @@ +#! /usr/bin/env sh +if [ "$(id -u)" -ne 0 ]; then + echo 'This script must be run by root.' >&2 + exit 1 +fi +exportfs -o rw,async,insecure,no_subtree_check,crossmnt -i 192.168.0.0/16:$1 diff --git a/scripts/desktop/id-dm-device b/scripts/desktop/id-dm-device new file mode 100755 index 0000000..7b6eaa6 --- /dev/null +++ b/scripts/desktop/id-dm-device @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +doas dmsetup info /dev/$1 diff --git a/hosts/iroha/scripts/iommu-groups b/scripts/desktop/iommu-groups index 217d1e2..56cfd85 100755 --- a/hosts/iroha/scripts/iommu-groups +++ b/scripts/desktop/iommu-groups @@ -1,4 +1,5 @@ #! /usr/bin/env bash +# This was copied from somewhere a while ago, forgot to put the link. for d in /sys/kernel/iommu_groups/*/devices/*; do n=${d#*/iommu_groups/*}; n=${n%%/*} printf 'IOMMU Group %s ' "$n" diff --git a/scripts/desktop/map-kernel-ata b/scripts/desktop/map-kernel-ata new file mode 100755 index 0000000..2af6918 --- /dev/null +++ b/scripts/desktop/map-kernel-ata @@ -0,0 +1,4 @@ +#! /usr/bin/env sh +# https://superuser.com/a/617193 +#doas grep '[0-9]' /sys/class/scsi_host/host{0..9}/unique_id +doas ls -l /sys/block/* diff --git a/scripts/desktop/mount-nfs b/scripts/desktop/mount-nfs index a07f4cf..09095d3 100755 --- a/scripts/desktop/mount-nfs +++ b/scripts/desktop/mount-nfs @@ -1,2 +1,6 @@ #! /usr/bin/env sh -sudo mount -t nfs4 -o noatime,nodiratime,rw,hard,fsc,proto=tcp,timeo=600,retrans=2,nfsvers=4,minorversion=2 moyo:$1 $2 +if [ "$(id -u)" -ne 0 ]; then + echo 'This script must be run by root.' >&2 + exit 1 +fi +mount -t nfs4 -o noatime,nodiratime,rw,hard,fsc,proto=tcp,timeo=600,retrans=2,nfsvers=4,minorversion=2 moyo:$1 $2 diff --git a/scripts/desktop/mount-vm-disk b/scripts/desktop/mount-vm-disk new file mode 100755 index 0000000..3d1423d --- /dev/null +++ b/scripts/desktop/mount-vm-disk @@ -0,0 +1,28 @@ +#! /usr/bin/env sh +if [ "$(id -u)" -ne 0 ]; then + echo 'This script must be run by root.' >&2 + exit 1 +fi + +# https://gist.github.com/pshchelo/6ffabbffaedc46456b39c037d16e1d8c + +#LIBGUESTFS_PATH=/usr/share/guestfs/appliance \ +# guestmount -a "$1" -m /dev/vda1 --ro "$2" +modprobe nbd max_part=8 + +#qemu-nbd --connect=/dev/nbd0 /var/lib/libvirt/images/devuan.qcow2 +#cryptsetup open /dev/nbd0p3 vm-disk +#pvscan --cache /dev/mapper/vm-disk + +qemu-nbd --connect=/dev/nbd1 /var/lib/libvirt/images/nixos-test.qcow2 +pvscan --cache /dev/ndb1p3 + +#qemu-nbd --connect=/dev/nbd2 /var/lib/libvirt/images/tora.qcow2 +#pvscan --cache /dev/ndb2p3 + +vgscan +lvscan + +#mount /dev/shima-vg/root /mnt/tmp/ +mount /dev/test-vg0/root /mnt/tmp/ +#mount /dev/tora-vg0/root /mnt/tmp/ diff --git a/hosts/iroha/scripts/nvidia-fan-speed b/scripts/desktop/nvidia-fan-speed index 87cc9ec..87cc9ec 100755 --- a/hosts/iroha/scripts/nvidia-fan-speed +++ b/scripts/desktop/nvidia-fan-speed diff --git a/hosts/iroha/scripts/prepare-virt b/scripts/desktop/prepare-virt-shm index 95cc848..95cc848 100755 --- a/hosts/iroha/scripts/prepare-virt +++ b/scripts/desktop/prepare-virt-shm diff --git a/scripts/desktop/proton-env b/scripts/desktop/proton-env new file mode 100755 index 0000000..c25fe30 --- /dev/null +++ b/scripts/desktop/proton-env @@ -0,0 +1,24 @@ +#! /usr/bin/env sh + +# https://gist.github.com/Kron4ek/af1bbc1353302751a0941308294ec24a + +export STEAM_COMPAT_LAUNCHER_SERVICE=proton + +export DXVK_HUD=compiler +export DXVK_LOG_LEVEL=none +export DXVK_DEBUG=none + +export VKD3D_HUD=compiler +export VKD3D_DEBUG=none +export VKD3D_SHADER_DEBUG=none + +unset SDL_VIDEODRIVER +unset SDL_VIDEO_DRIVER + +xrandr --output $MAIN_MONITOR --primary + +if [[ $MANGOHUD == 1 || -z $MANGOHUD ]]; then + exec env LD_PRELOAD="/usr/lib64/libgamemodeauto.so:/usr/lib64/libMangoHud.so:/usr/lib64/libMangoHud_opengl.so" mangohud "$@" +else + exec env LD_PRELOAD="/usr/lib64/libgamemodeauto.so" "$@" +fi diff --git a/scripts/desktop/proton-env32 b/scripts/desktop/proton-env32 new file mode 100755 index 0000000..067ef02 --- /dev/null +++ b/scripts/desktop/proton-env32 @@ -0,0 +1,22 @@ +#! /usr/bin/env sh + +export STEAM_COMPAT_LAUNCHER_SERVICE=proton + +export DXVK_HUD=compiler +export DXVK_LOG_LEVEL=none +export DXVK_DEBUG=none + +export VKD3D_HUD=compiler +export VKD3D_DEBUG=none +export VKD3D_SHADER_DEBUG=none + +unset SDL_VIDEODRIVER +unset SDL_VIDEO_DRIVER + +xrandr --output $MAIN_MONITOR --primary + +if [[ $MANGOHUD == 1 || -z $MANGOHUD ]]; then + exec env LD_PRELOAD="/usr/lib/libgamemodeauto.so:/usr/lib/libMangoHud.so:/usr/lib/libMangoHud_opengl.so" mangohud "$@" +else + exec env LD_PRELOAD="/usr/lib/libgamemodeauto.so" "$@" +fi diff --git a/scripts/desktop/raid-status b/scripts/desktop/raid-status new file mode 100755 index 0000000..516ffd8 --- /dev/null +++ b/scripts/desktop/raid-status @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +doas lvs -a -o name,copy_percent,health_status,devices $1 diff --git a/hosts/iroha/scripts/rip-dvd b/scripts/desktop/rip-dvd index 6886ee9..6886ee9 100755 --- a/hosts/iroha/scripts/rip-dvd +++ b/scripts/desktop/rip-dvd diff --git a/scripts/desktop/sp b/scripts/desktop/sp index 19d38a1..6ccdfce 100755 --- a/scripts/desktop/sp +++ b/scripts/desktop/sp @@ -1,6 +1,7 @@ #! /usr/bin/env sh if [ $# -eq 0 ]; then - wl-paste | aspell -a + INPUT=$(wl-paste) else - echo "$@" | aspell -a + INPUT="$@" fi +echo $INPUT | aspell -a | tee /dev/tty | awk 'FNR==2{ printf $5}' | sed 's/,//' | wl-copy diff --git a/scripts/desktop/unrar-all b/scripts/desktop/unrar-all new file mode 100755 index 0000000..7c9f531 --- /dev/null +++ b/scripts/desktop/unrar-all @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +find "$1" ! -path "${1%/}/$(basename $PWD)/*" -name '*.rar' -exec sh -c 'x=${1%.*}; 7z x -o"${x##*/}" "$1"' _ {} \; diff --git a/scripts/unzip-all b/scripts/desktop/unzip-all index 0982666..0982666 100755 --- a/scripts/unzip-all +++ b/scripts/desktop/unzip-all diff --git a/hosts/iroha/scripts/xbox-controller-battery b/scripts/desktop/xbox-controller-battery index 84913cc..84913cc 100755 --- a/hosts/iroha/scripts/xbox-controller-battery +++ b/scripts/desktop/xbox-controller-battery diff --git a/scripts/gentoo/check-orphans b/scripts/gentoo/check-orphans new file mode 100755 index 0000000..b253282 --- /dev/null +++ b/scripts/gentoo/check-orphans @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +find $1 -type f | xargs -I{} qfile -o {} diff --git a/scripts/gentoo/do-grub-install b/scripts/gentoo/do-grub-install new file mode 100755 index 0000000..eb5d04e --- /dev/null +++ b/scripts/gentoo/do-grub-install @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +doas grub-install --target=x86_64-efi --efi-directory=/efi diff --git a/hosts/iroha/scripts/gen-dracut b/scripts/gentoo/gen-dracut index a8d692f..a8d692f 100755 --- a/hosts/iroha/scripts/gen-dracut +++ b/scripts/gentoo/gen-dracut diff --git a/hosts/iroha/scripts/use-flags b/scripts/gentoo/use-flags index ea691bb..ea691bb 100755 --- a/hosts/iroha/scripts/use-flags +++ b/scripts/gentoo/use-flags diff --git a/scripts/sync/pull.sh b/scripts/sync/pull.sh index 1bf5b48..924499a 100755 --- a/scripts/sync/pull.sh +++ b/scripts/sync/pull.sh @@ -3,7 +3,7 @@ set -e SOURCE="$(cat remote)/" -if [ ! -d $SOURCE ]; then +if [ ! -d $SOURCE ] && [[ ! $SOURCE =~ ":" ]]; then echo "Path $SOURCE does not exist." exit 1 fi @@ -24,6 +24,10 @@ while getopts 'cfdr' opt; do r) # Revert FORCE=1 ;; + *) + echo "Unknown argument" + exit 1 + ;; esac done @@ -31,4 +35,4 @@ if [ $FORCE = 0 ]; then ARGS+=('--update') fi -rsync --archive --itemize-changes "${ARGS[@]}" $SOURCE . +rsync --archive --itemize-changes "${ARGS[@]}" $SOURCE/$2 . diff --git a/scripts/sync/push.sh b/scripts/sync/push.sh index 3adbd02..9e35994 100755 --- a/scripts/sync/push.sh +++ b/scripts/sync/push.sh @@ -1,9 +1,11 @@ #! /usr/bin/env sh +# https://serverfault.com/a/211083 + set -e DEST="$(cat remote)" -if [ ! -d $DEST ]; then +if [ ! -d $DEST ] && [[ ! $DEST =~ ":" ]]; then echo "Path $DEST does not exist." exit 1 fi @@ -24,6 +26,10 @@ while getopts 'cfdr' opt; do r) # Revert FORCE=1 ;; + *) + echo "Unknown argument" + exit 1 + ;; esac done @@ -31,4 +37,4 @@ if [ $FORCE = 0 ]; then ARGS+=('--update') fi -rsync --archive --itemize-changes "${ARGS[@]}" ./ $DEST +rsync --archive --itemize-changes "${ARGS[@]}" ./$2 $DEST diff --git a/themes/christmas_rwby/christmas_rwby.nix b/themes/archive/christmas_rwby/christmas_rwby.nix index 1ba019b..1ba019b 100644 --- a/themes/christmas_rwby/christmas_rwby.nix +++ b/themes/archive/christmas_rwby/christmas_rwby.nix diff --git a/themes/christmas_rwby/merry_christmas!/preview.jpg b/themes/archive/christmas_rwby/merry_christmas!/preview.jpg Binary files differindex 207010d..207010d 100644 --- a/themes/christmas_rwby/merry_christmas!/preview.jpg +++ b/themes/archive/christmas_rwby/merry_christmas!/preview.jpg diff --git a/themes/christmas_rwby/merry_christmas!/project.json b/themes/archive/christmas_rwby/merry_christmas!/project.json index 5a67930..5a67930 100644 --- a/themes/christmas_rwby/merry_christmas!/project.json +++ b/themes/archive/christmas_rwby/merry_christmas!/project.json diff --git a/themes/christmas_rwby/merry_christmas!/scene.pkg b/themes/archive/christmas_rwby/merry_christmas!/scene.pkg Binary files differindex 1db7afa..1db7afa 100644 --- a/themes/christmas_rwby/merry_christmas!/scene.pkg +++ b/themes/archive/christmas_rwby/merry_christmas!/scene.pkg diff --git a/themes/christmas_rwby/pixiv_i_78473294_media0.png b/themes/archive/christmas_rwby/pixiv_i_78473294_media0.png Binary files differindex 8f2f69d..8f2f69d 100644 --- a/themes/christmas_rwby/pixiv_i_78473294_media0.png +++ b/themes/archive/christmas_rwby/pixiv_i_78473294_media0.png diff --git a/themes/christmas_rwby/sources.txt b/themes/archive/christmas_rwby/sources.txt index 8fc0363..8fc0363 100644 --- a/themes/christmas_rwby/sources.txt +++ b/themes/archive/christmas_rwby/sources.txt diff --git a/themes/christmas_rwby/weiss2_flipped_fade.png b/themes/archive/christmas_rwby/weiss2_flipped_fade.png Binary files differindex 0fd161e..0fd161e 100644 --- a/themes/christmas_rwby/weiss2_flipped_fade.png +++ b/themes/archive/christmas_rwby/weiss2_flipped_fade.png diff --git a/themes/dva_halloween/__d_va_overwatch/preview.jpg b/themes/archive/dva_halloween/__d_va_overwatch/preview.jpg Binary files differindex 54c370f..54c370f 100644 --- a/themes/dva_halloween/__d_va_overwatch/preview.jpg +++ b/themes/archive/dva_halloween/__d_va_overwatch/preview.jpg diff --git a/themes/dva_halloween/__d_va_overwatch/project.json b/themes/archive/dva_halloween/__d_va_overwatch/project.json index 2408f56..2408f56 100644 --- a/themes/dva_halloween/__d_va_overwatch/project.json +++ b/themes/archive/dva_halloween/__d_va_overwatch/project.json diff --git a/themes/dva_halloween/__d_va_overwatch/scene.pkg b/themes/archive/dva_halloween/__d_va_overwatch/scene.pkg Binary files differindex 898aec2..898aec2 100644 --- a/themes/dva_halloween/__d_va_overwatch/scene.pkg +++ b/themes/archive/dva_halloween/__d_va_overwatch/scene.pkg diff --git a/themes/dva_halloween/__d_va_overwatch_and_1_more_drawn_by_kaoruru_sakuno2911__6aab129a53a65dcdad7a33bc88f54067.png b/themes/archive/dva_halloween/__d_va_overwatch_and_1_more_drawn_by_kaoruru_sakuno2911__6aab129a53a65dcdad7a33bc88f54067.png Binary files differindex 2670921..2670921 100644 --- a/themes/dva_halloween/__d_va_overwatch_and_1_more_drawn_by_kaoruru_sakuno2911__6aab129a53a65dcdad7a33bc88f54067.png +++ b/themes/archive/dva_halloween/__d_va_overwatch_and_1_more_drawn_by_kaoruru_sakuno2911__6aab129a53a65dcdad7a33bc88f54067.png diff --git a/themes/dva_halloween/__d_va_overwatch_and_1_more_drawn_by_lasterk__24e4737b9834a09f4fbcb955972781bb.jpg b/themes/archive/dva_halloween/__d_va_overwatch_and_1_more_drawn_by_lasterk__24e4737b9834a09f4fbcb955972781bb.jpg Binary files differindex 5ad0fa9..5ad0fa9 100644 --- a/themes/dva_halloween/__d_va_overwatch_and_1_more_drawn_by_lasterk__24e4737b9834a09f4fbcb955972781bb.jpg +++ b/themes/archive/dva_halloween/__d_va_overwatch_and_1_more_drawn_by_lasterk__24e4737b9834a09f4fbcb955972781bb.jpg diff --git a/themes/dva_halloween/dva.nix b/themes/archive/dva_halloween/dva.nix index d5f63cd..d5f63cd 100644 --- a/themes/dva_halloween/dva.nix +++ b/themes/archive/dva_halloween/dva.nix diff --git a/themes/dva_halloween/sources.txt b/themes/archive/dva_halloween/sources.txt index 1fd8b9a..1fd8b9a 100644 --- a/themes/dva_halloween/sources.txt +++ b/themes/archive/dva_halloween/sources.txt diff --git a/themes/dva_halloween/splash1.kra b/themes/archive/dva_halloween/splash1.kra Binary files differindex 1e8fdca..1e8fdca 100644 --- a/themes/dva_halloween/splash1.kra +++ b/themes/archive/dva_halloween/splash1.kra diff --git a/themes/dva_halloween/splash1.png b/themes/archive/dva_halloween/splash1.png Binary files differindex d989909..d989909 100644 --- a/themes/dva_halloween/splash1.png +++ b/themes/archive/dva_halloween/splash1.png diff --git a/themes/godzillacolle/116237053_p0.kra b/themes/archive/godzillacolle/116237053_p0.kra Binary files differindex 476af5a..476af5a 100644 --- a/themes/godzillacolle/116237053_p0.kra +++ b/themes/archive/godzillacolle/116237053_p0.kra diff --git a/themes/godzillacolle/70618047_p1.jpg b/themes/archive/godzillacolle/70618047_p1.jpg Binary files differindex 97ff4ec..97ff4ec 100644 --- a/themes/godzillacolle/70618047_p1.jpg +++ b/themes/archive/godzillacolle/70618047_p1.jpg diff --git a/themes/godzillacolle/85865372_p0.jpg b/themes/archive/godzillacolle/85865372_p0.jpg Binary files differindex 44c49f2..44c49f2 100644 --- a/themes/godzillacolle/85865372_p0.jpg +++ b/themes/archive/godzillacolle/85865372_p0.jpg diff --git a/themes/godzillacolle/godzillacolle.nix b/themes/archive/godzillacolle/godzillacolle.nix index 3a0f286..3a0f286 100644 --- a/themes/godzillacolle/godzillacolle.nix +++ b/themes/archive/godzillacolle/godzillacolle.nix diff --git a/themes/godzillacolle/sources.txt b/themes/archive/godzillacolle/sources.txt index 93057b5..93057b5 100644 --- a/themes/godzillacolle/sources.txt +++ b/themes/archive/godzillacolle/sources.txt diff --git a/themes/godzillacolle/splash1.kra b/themes/archive/godzillacolle/splash1.kra Binary files differindex 29c9905..29c9905 100644 --- a/themes/godzillacolle/splash1.kra +++ b/themes/archive/godzillacolle/splash1.kra diff --git a/themes/godzillacolle/splash1.png b/themes/archive/godzillacolle/splash1.png Binary files differindex 2e83104..2e83104 100644 --- a/themes/godzillacolle/splash1.png +++ b/themes/archive/godzillacolle/splash1.png diff --git a/themes/godzillacolle/wallpaper1.png b/themes/archive/godzillacolle/wallpaper1.png Binary files differindex 4a449a9..4a449a9 100644 --- a/themes/godzillacolle/wallpaper1.png +++ b/themes/archive/godzillacolle/wallpaper1.png diff --git a/themes/halloween_warlock/halloween_warlock.nix b/themes/archive/halloween_warlock/halloween_warlock.nix index fa21cfc..fa21cfc 100644 --- a/themes/halloween_warlock/halloween_warlock.nix +++ b/themes/archive/halloween_warlock/halloween_warlock.nix diff --git a/themes/halloween_warlock/pixiv_i_71458841_media0.png b/themes/archive/halloween_warlock/pixiv_i_71458841_media0.png Binary files differindex f086215..f086215 100644 --- a/themes/halloween_warlock/pixiv_i_71458841_media0.png +++ b/themes/archive/halloween_warlock/pixiv_i_71458841_media0.png diff --git a/themes/halloween_warlock/sources.txt b/themes/archive/halloween_warlock/sources.txt index e57106e..e57106e 100644 --- a/themes/halloween_warlock/sources.txt +++ b/themes/archive/halloween_warlock/sources.txt diff --git a/themes/miia_new_years_2025/miia.nix b/themes/archive/miia_new_years_2025/miia.nix index 45864fd..45864fd 100644 --- a/themes/miia_new_years_2025/miia.nix +++ b/themes/archive/miia_new_years_2025/miia.nix diff --git a/themes/miia_new_years_2025/sources.txt b/themes/archive/miia_new_years_2025/sources.txt index 1dc057e..1dc057e 100644 --- a/themes/miia_new_years_2025/sources.txt +++ b/themes/archive/miia_new_years_2025/sources.txt diff --git a/themes/miia_new_years_2025/splash.kra b/themes/archive/miia_new_years_2025/splash.kra Binary files differindex 691b8ea..691b8ea 100644 --- a/themes/miia_new_years_2025/splash.kra +++ b/themes/archive/miia_new_years_2025/splash.kra diff --git a/themes/miia_new_years_2025/splash.png b/themes/archive/miia_new_years_2025/splash.png Binary files differindex d0b1ab3..d0b1ab3 100644 --- a/themes/miia_new_years_2025/splash.png +++ b/themes/archive/miia_new_years_2025/splash.png diff --git a/themes/miia_new_years_2025/wallpaper.kra b/themes/archive/miia_new_years_2025/wallpaper.kra Binary files differindex 3d158bb..3d158bb 100644 --- a/themes/miia_new_years_2025/wallpaper.kra +++ b/themes/archive/miia_new_years_2025/wallpaper.kra diff --git a/themes/miia_new_years_2025/wallpaper.png b/themes/archive/miia_new_years_2025/wallpaper.png Binary files differindex 28af8ac..28af8ac 100644 --- a/themes/miia_new_years_2025/wallpaper.png +++ b/themes/archive/miia_new_years_2025/wallpaper.png diff --git a/themes/shipgirl_christmas/shipgirl_christmas.nix b/themes/archive/shipgirl_christmas/shipgirl_christmas.nix index 48cf428..48cf428 100644 --- a/themes/shipgirl_christmas/shipgirl_christmas.nix +++ b/themes/archive/shipgirl_christmas/shipgirl_christmas.nix diff --git a/themes/shipgirl_christmas/splash.kra b/themes/archive/shipgirl_christmas/splash.kra Binary files differindex 2e2a450..2e2a450 100644 --- a/themes/shipgirl_christmas/splash.kra +++ b/themes/archive/shipgirl_christmas/splash.kra diff --git a/themes/shipgirl_christmas/splash.png b/themes/archive/shipgirl_christmas/splash.png Binary files differindex e88f65b..e88f65b 100644 --- a/themes/shipgirl_christmas/splash.png +++ b/themes/archive/shipgirl_christmas/splash.png diff --git a/themes/shipgirl_christmas/wallpaper.kra b/themes/archive/shipgirl_christmas/wallpaper.kra Binary files differindex e2061a5..e2061a5 100644 --- a/themes/shipgirl_christmas/wallpaper.kra +++ b/themes/archive/shipgirl_christmas/wallpaper.kra diff --git a/themes/shipgirl_christmas/wallpaper.png b/themes/archive/shipgirl_christmas/wallpaper.png Binary files differindex 563c396..563c396 100644 --- a/themes/shipgirl_christmas/wallpaper.png +++ b/themes/archive/shipgirl_christmas/wallpaper.png diff --git a/themes/spring_2024/pixiv_i_112636094_media0.jpg b/themes/archive/spring_2024/pixiv_i_112636094_media0.jpg Binary files differindex bd0a823..bd0a823 100644 --- a/themes/spring_2024/pixiv_i_112636094_media0.jpg +++ b/themes/archive/spring_2024/pixiv_i_112636094_media0.jpg diff --git a/themes/spring_2024/sources.txt b/themes/archive/spring_2024/sources.txt index a489dc7..a489dc7 100644 --- a/themes/spring_2024/sources.txt +++ b/themes/archive/spring_2024/sources.txt diff --git a/themes/spring_2024/spring_2024.nix b/themes/archive/spring_2024/spring_2024.nix index 41ab0d0..41ab0d0 100644 --- a/themes/spring_2024/spring_2024.nix +++ b/themes/archive/spring_2024/spring_2024.nix diff --git a/themes/spring_2025/41632913_p0.jpg b/themes/archive/spring_2025/41632913_p0.jpg Binary files differindex bb05dab..bb05dab 100644 --- a/themes/spring_2025/41632913_p0.jpg +++ b/themes/archive/spring_2025/41632913_p0.jpg diff --git a/themes/spring_2025/4692826_p0.jpg b/themes/archive/spring_2025/4692826_p0.jpg Binary files differindex fcc7a50..fcc7a50 100644 --- a/themes/spring_2025/4692826_p0.jpg +++ b/themes/archive/spring_2025/4692826_p0.jpg diff --git a/themes/spring_2025/sources.txt b/themes/archive/spring_2025/sources.txt index a1872ca..a1872ca 100644 --- a/themes/spring_2025/sources.txt +++ b/themes/archive/spring_2025/sources.txt diff --git a/themes/spring_2025/splash1.png b/themes/archive/spring_2025/splash1.png Binary files differindex d34e35f..d34e35f 100644 --- a/themes/spring_2025/splash1.png +++ b/themes/archive/spring_2025/splash1.png diff --git a/themes/spring_2025/splash2.kra b/themes/archive/spring_2025/splash2.kra Binary files differindex a9958fb..a9958fb 100644 --- a/themes/spring_2025/splash2.kra +++ b/themes/archive/spring_2025/splash2.kra diff --git a/themes/spring_2025/splash2.png b/themes/archive/spring_2025/splash2.png Binary files differindex 53e126a..53e126a 100644 --- a/themes/spring_2025/splash2.png +++ b/themes/archive/spring_2025/splash2.png diff --git a/themes/spring_2025/spring_2025.nix b/themes/archive/spring_2025/spring_2025.nix index 16f12aa..16f12aa 100644 --- a/themes/spring_2025/spring_2025.nix +++ b/themes/archive/spring_2025/spring_2025.nix diff --git a/themes/spring_2025/wallpaper1.png b/themes/archive/spring_2025/wallpaper1.png Binary files differindex 3e3a7e0..3e3a7e0 100644 --- a/themes/spring_2025/wallpaper1.png +++ b/themes/archive/spring_2025/wallpaper1.png diff --git a/themes/street_fighter_summer/132342330_p0.png b/themes/archive/street_fighter_summer/132342330_p0.png Binary files differindex bbd4a2d..bbd4a2d 100644 --- a/themes/street_fighter_summer/132342330_p0.png +++ b/themes/archive/street_fighter_summer/132342330_p0.png diff --git a/themes/street_fighter_summer/Gu0m-MuWMAAUBXx.jpg b/themes/archive/street_fighter_summer/Gu0m-MuWMAAUBXx.jpg Binary files differindex 7e04659..7e04659 100644 --- a/themes/street_fighter_summer/Gu0m-MuWMAAUBXx.jpg +++ b/themes/archive/street_fighter_summer/Gu0m-MuWMAAUBXx.jpg diff --git a/themes/street_fighter_summer/GvAtjS4XcAAZyzB.jpg b/themes/archive/street_fighter_summer/GvAtjS4XcAAZyzB.jpg Binary files differindex d8135e9..d8135e9 100644 --- a/themes/street_fighter_summer/GvAtjS4XcAAZyzB.jpg +++ b/themes/archive/street_fighter_summer/GvAtjS4XcAAZyzB.jpg diff --git a/themes/street_fighter_summer/GvS-9TjWwAAGnzX.jpg b/themes/archive/street_fighter_summer/GvS-9TjWwAAGnzX.jpg Binary files differindex c119267..c119267 100644 --- a/themes/street_fighter_summer/GvS-9TjWwAAGnzX.jpg +++ b/themes/archive/street_fighter_summer/GvS-9TjWwAAGnzX.jpg diff --git a/themes/street_fighter_summer/GvS-9TjWwAAGnzX.kra b/themes/archive/street_fighter_summer/GvS-9TjWwAAGnzX.kra Binary files differindex d305978..d305978 100644 --- a/themes/street_fighter_summer/GvS-9TjWwAAGnzX.kra +++ b/themes/archive/street_fighter_summer/GvS-9TjWwAAGnzX.kra diff --git a/themes/street_fighter_summer/cammy_splash.png b/themes/archive/street_fighter_summer/cammy_splash.png Binary files differindex 1454ee1..1454ee1 100644 --- a/themes/street_fighter_summer/cammy_splash.png +++ b/themes/archive/street_fighter_summer/cammy_splash.png diff --git a/themes/street_fighter_summer/street_fighter_summer.nix b/themes/archive/street_fighter_summer/street_fighter_summer.nix index dd9a754..dd9a754 100644 --- a/themes/street_fighter_summer/street_fighter_summer.nix +++ b/themes/archive/street_fighter_summer/street_fighter_summer.nix diff --git a/themes/street_fighter_summer/wallpaper1.png b/themes/archive/street_fighter_summer/wallpaper1.png Binary files differindex 2731ad2..2731ad2 100644 --- a/themes/street_fighter_summer/wallpaper1.png +++ b/themes/archive/street_fighter_summer/wallpaper1.png diff --git a/themes/street_fighter_summer/wallpaper_vert1.png b/themes/archive/street_fighter_summer/wallpaper_vert1.png Binary files differindex cd84cd2..cd84cd2 100644 --- a/themes/street_fighter_summer/wallpaper_vert1.png +++ b/themes/archive/street_fighter_summer/wallpaper_vert1.png diff --git a/themes/street_fighter_summer/wallpaper_vert2.png b/themes/archive/street_fighter_summer/wallpaper_vert2.png Binary files differindex c1e3f4f..c1e3f4f 100644 --- a/themes/street_fighter_summer/wallpaper_vert2.png +++ b/themes/archive/street_fighter_summer/wallpaper_vert2.png diff --git a/themes/yoruichi/70077277_p2.png b/themes/archive/yoruichi/70077277_p2.png Binary files differindex f11ea34..f11ea34 100644 --- a/themes/yoruichi/70077277_p2.png +++ b/themes/archive/yoruichi/70077277_p2.png diff --git a/themes/yoruichi/Sk 227_P1_D1_Sui.jpg b/themes/archive/yoruichi/Sk 227_P1_D1_Sui.jpg Binary files differindex 1be99ae..1be99ae 100644 --- a/themes/yoruichi/Sk 227_P1_D1_Sui.jpg +++ b/themes/archive/yoruichi/Sk 227_P1_D1_Sui.jpg diff --git a/themes/yoruichi/pixiv_i_77762168_media0.png b/themes/archive/yoruichi/pixiv_i_77762168_media0.png Binary files differindex b6ad483..b6ad483 100644 --- a/themes/yoruichi/pixiv_i_77762168_media0.png +++ b/themes/archive/yoruichi/pixiv_i_77762168_media0.png diff --git a/themes/yoruichi/sources.txt b/themes/archive/yoruichi/sources.txt index 4d35c7b..4d35c7b 100644 --- a/themes/yoruichi/sources.txt +++ b/themes/archive/yoruichi/sources.txt diff --git a/themes/yoruichi/splash1.kra b/themes/archive/yoruichi/splash1.kra Binary files differindex c93e803..c93e803 100644 --- a/themes/yoruichi/splash1.kra +++ b/themes/archive/yoruichi/splash1.kra diff --git a/themes/yoruichi/splash1.png b/themes/archive/yoruichi/splash1.png Binary files differindex 2ec8009..2ec8009 100644 --- a/themes/yoruichi/splash1.png +++ b/themes/archive/yoruichi/splash1.png diff --git a/themes/yoruichi/splash2.kra b/themes/archive/yoruichi/splash2.kra Binary files differindex 55b83aa..55b83aa 100644 --- a/themes/yoruichi/splash2.kra +++ b/themes/archive/yoruichi/splash2.kra diff --git a/themes/yoruichi/splash2.png b/themes/archive/yoruichi/splash2.png Binary files differindex 02cfc9a..02cfc9a 100644 --- a/themes/yoruichi/splash2.png +++ b/themes/archive/yoruichi/splash2.png diff --git a/themes/yoruichi/yoruichi.kra b/themes/archive/yoruichi/yoruichi.kra Binary files differindex 587b85c..587b85c 100644 --- a/themes/yoruichi/yoruichi.kra +++ b/themes/archive/yoruichi/yoruichi.kra diff --git a/themes/yoruichi/yoruichi.nix b/themes/archive/yoruichi/yoruichi.nix index f32f190..f32f190 100644 --- a/themes/yoruichi/yoruichi.nix +++ b/themes/archive/yoruichi/yoruichi.nix diff --git a/themes/yoruichi/yoruichi.png b/themes/archive/yoruichi/yoruichi.png Binary files differindex 1cd64b0..1cd64b0 100644 --- a/themes/yoruichi/yoruichi.png +++ b/themes/archive/yoruichi/yoruichi.png diff --git a/themes/zelda_summer/FSpFDTrwjEjdgvQFDPAUYz2F.kra b/themes/archive/zelda_summer/FSpFDTrwjEjdgvQFDPAUYz2F.kra Binary files differindex ae1ec21..ae1ec21 100644 --- a/themes/zelda_summer/FSpFDTrwjEjdgvQFDPAUYz2F.kra +++ b/themes/archive/zelda_summer/FSpFDTrwjEjdgvQFDPAUYz2F.kra diff --git a/themes/zelda_summer/FSpFDTrwjEjdgvQFDPAUYz2F.png b/themes/archive/zelda_summer/FSpFDTrwjEjdgvQFDPAUYz2F.png Binary files differindex 3176e71..3176e71 100644 --- a/themes/zelda_summer/FSpFDTrwjEjdgvQFDPAUYz2F.png +++ b/themes/archive/zelda_summer/FSpFDTrwjEjdgvQFDPAUYz2F.png diff --git a/themes/zelda_summer/sources.txt b/themes/archive/zelda_summer/sources.txt index 9557828..9557828 100644 --- a/themes/zelda_summer/sources.txt +++ b/themes/archive/zelda_summer/sources.txt diff --git a/themes/zelda_summer/splash.png b/themes/archive/zelda_summer/splash.png Binary files differindex d3fda09..d3fda09 100644 --- a/themes/zelda_summer/splash.png +++ b/themes/archive/zelda_summer/splash.png diff --git a/themes/zelda_summer/splash_alt.png b/themes/archive/zelda_summer/splash_alt.png Binary files differindex 65cce82..65cce82 100644 --- a/themes/zelda_summer/splash_alt.png +++ b/themes/archive/zelda_summer/splash_alt.png diff --git a/themes/zelda_summer/tumblr_737d5279164aaa2b7324e6eac11dce6f_68b0dcca_2048.jpg b/themes/archive/zelda_summer/tumblr_737d5279164aaa2b7324e6eac11dce6f_68b0dcca_2048.jpg Binary files differindex e5a0308..e5a0308 100644 --- a/themes/zelda_summer/tumblr_737d5279164aaa2b7324e6eac11dce6f_68b0dcca_2048.jpg +++ b/themes/archive/zelda_summer/tumblr_737d5279164aaa2b7324e6eac11dce6f_68b0dcca_2048.jpg diff --git a/themes/zelda_summer/tumblr_737d5279164aaa2b7324e6eac11dce6f_68b0dcca_2048.kra b/themes/archive/zelda_summer/tumblr_737d5279164aaa2b7324e6eac11dce6f_68b0dcca_2048.kra Binary files differindex 0cf5341..0cf5341 100644 --- a/themes/zelda_summer/tumblr_737d5279164aaa2b7324e6eac11dce6f_68b0dcca_2048.kra +++ b/themes/archive/zelda_summer/tumblr_737d5279164aaa2b7324e6eac11dce6f_68b0dcca_2048.kra diff --git a/themes/zelda_summer/twitter_t_1670230247130923008_media0.kra b/themes/archive/zelda_summer/twitter_t_1670230247130923008_media0.kra Binary files differindex 0297ef3..0297ef3 100644 --- a/themes/zelda_summer/twitter_t_1670230247130923008_media0.kra +++ b/themes/archive/zelda_summer/twitter_t_1670230247130923008_media0.kra diff --git a/themes/zelda_summer/wallpaper1.png b/themes/archive/zelda_summer/wallpaper1.png Binary files differindex 701c99b..701c99b 100644 --- a/themes/zelda_summer/wallpaper1.png +++ b/themes/archive/zelda_summer/wallpaper1.png diff --git a/themes/zelda_summer/wallpaper_alt1.png b/themes/archive/zelda_summer/wallpaper_alt1.png Binary files differindex 41cff21..41cff21 100644 --- a/themes/zelda_summer/wallpaper_alt1.png +++ b/themes/archive/zelda_summer/wallpaper_alt1.png diff --git a/themes/zelda_summer/zelda_beach.jpg b/themes/archive/zelda_summer/zelda_beach.jpg Binary files differindex b4f210f..b4f210f 100644 --- a/themes/zelda_summer/zelda_beach.jpg +++ b/themes/archive/zelda_summer/zelda_beach.jpg diff --git a/themes/zelda_summer/zelda_beach.kra b/themes/archive/zelda_summer/zelda_beach.kra Binary files differindex dccd197..dccd197 100644 --- a/themes/zelda_summer/zelda_beach.kra +++ b/themes/archive/zelda_summer/zelda_beach.kra diff --git a/themes/zelda_summer/zelda_summer.nix b/themes/archive/zelda_summer/zelda_summer.nix index 71c39e0..71c39e0 100644 --- a/themes/zelda_summer/zelda_summer.nix +++ b/themes/archive/zelda_summer/zelda_summer.nix diff --git a/themes/outline.txt b/themes/colors.txt index be6e671..a7787f7 100644 --- a/themes/outline.txt +++ b/themes/colors.txt @@ -15,19 +15,3 @@ color12 # bright blue color13 # bright magenta color14 # bright cyan color15 # bright white - -== htop -Selected Tab = color2 -Inactive Tab = color4 -Highlighted Process, Other Highlights = color6 -Unknow User? = color5 -Top of CPU Bar = color3 - -== neofetch -color4 and color6 used in ascci -color6 for highlighted text -color4 for user@hostname - -== TODO: bash and nvim - -// vim: set syntax=asciidoc: diff --git a/themes/iroha/bemenu-colored b/themes/iroha/bemenu-colored new file mode 100755 index 0000000..f2be0a3 --- /dev/null +++ b/themes/iroha/bemenu-colored @@ -0,0 +1,8 @@ +#! /usr/bin/env sh +bemenu -C --single-instance -B 0 -M 0 --hp 6 \ + --fn "Liberation Mono 10" -H 20 \ + --cf "#eeeeee" --cb "#000000" \ + --hf "#000000" --hb "#ffaf00" \ + --nf "#eeeeee" --nb "#000000" \ + --ff "#eeeeee" --fb "#000000" \ + --af "#eeeeee" --ab "#000000" -p "" diff --git a/themes/iroha/colors.json b/themes/iroha/colors.json new file mode 100644 index 0000000..7cdb075 --- /dev/null +++ b/themes/iroha/colors.json @@ -0,0 +1,25 @@ +{ + "special": { + "background": "#000000", + "foreground": "#eeeeee" + }, + "colors": { + "color0": "#000000", + "color1": "#d75f00", + "color2": "#af5f00", + "color3": "#ffd75f", + "color4": "#005f5f", + "color5": "#ff5f87", + "color6": "#ffaf00", + "color7": "#eeeeee", + "color8": "#808080", + "color9": "#d78700", + "color10": "#af8700", + "color11": "#ffff5f", + "color12": "#00875f", + "color13": "#ff8787", + "color14": "#ffd700", + "color15": "#ffffff", + "ansi256": "0,166,130,221,23,204,214,255,8,172,136,227,29,210,220,231" + } +} diff --git a/themes/iroha/gtk/gtk3-dark.css b/themes/iroha/gtk/gtk3-dark.css new file mode 100644 index 0000000..134b7c0 --- /dev/null +++ b/themes/iroha/gtk/gtk3-dark.css @@ -0,0 +1,157 @@ +/* Peninsula-dark from adw-colors */ +@define-color window_bg_color #000000; +@define-color window_fg_color #eeeeee; +@define-color view_bg_color @window_bg_color; +@define-color view_fg_color @window_fg_color; +@define-color accent_bg_color #af5f00; +@define-color accent_fg_color white; +@define-color headerbar_bg_color @window_bg_color; +@define-color headerbar_fg_color @window_fg_color; +@define-color headerbar_backdrop_color @window_bg_color; +@define-color popover_bg_color @window_bg_color; +@define-color popover_fg_color @view_fg_color; +@define-color dialog_bg_color @window_bg_color; +@define-color dialog_fg_color @view_fg_color; +@define-color card_bg_color @window_bg_color; +@define-color card_fg_color @view_fg_color; +@define-color sidebar_bg_color @window_bg_color; +@define-color sidebar_fg_color @window_fg_color; +@define-color sidebar_backdrop_color @window_bg_color; +@define-color sidebar_shade_color rgba(0, 0, 0, 0.25); +@define-color sidebar_border_color rgba(0, 0, 0, 0.36); +@define-color destructive_bg_color #d75f00; +@define-color success_bg_color #005f5f; +@define-color warning_bg_color #ffd75f; +@define-color error_bg_color @destructive_bg_color; +decoration { + box-shadow: 0 3px 12px 1px rgba(0, 0, 0, 0.7), 0 0 0 1px mix(white, @window_bg_color, 0.82); +} +decoration:backdrop { + box-shadow: 0 3px 12px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.4), 0 0 0 1px mix(white, @window_bg_color, 0.95); +} +.tiled decoration, .tiled-top decoration, .tiled-bottom decoration, .tiled-right decoration, .tiled-left decoration { + box-shadow: 0 0 0 1px mix(white, @window_bg_color, 0.95), 0 0 0 20px transparent; +} +messagedialog.csd decoration, .csd.popup decoration, .maximized .csd.popup decoration { + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.8), 0 0 0 1px alpha(mix(white, @window_bg_color, 0.82), 0.9); +} +tooltip.csd decoration { + box-shadow: none; +} +.maximized decoration, .fullscreen decoration { + border-radius: 0; + box-shadow: none; +} +.ssd decoration { + box-shadow: 0 0 0 1px mix(white, @window_bg_color, 0.82); +} +.ssd decoration:backdrop { + box-shadow: 0 0 0 1px mix(white, @window_bg_color, 0.95); +} +.ssd.maximized decoration, .ssd.maximized decoration:backdrop { + box-shadow: none; +} +.solid-csd decoration { + box-shadow: inset 0 0 0 5px alpha(currentColor, 0.5), inset 0 0 0 4px @headerbar_bg_color, inset 0 0 0 1px alpha(currentColor, 0.5); +} +.solid-csd decoration:backdrop { + box-shadow: inset 0 0 0 3px @window_bg_color; +} + +button.titlebutton { + min-width: 18px; + min-height: 18px; + border-radius: 24px; + color: transparent; +} + +button.titlebutton { + margin: 0 4px; + border-width: 0; +} +button.titlebutton.close { + box-shadow: inset 0 0 0 6px @destructive_bg_color; +} +button.titlebutton.close:hover { + box-shadow: inset 0 0 0 8px mix(white, @destructive_bg_color, 0.7); +} +button.titlebutton.close:active { + background-color: mix(white, @destructive_bg_color, 0.5); + box-shadow: none; +} +button.titlebutton.maximize { + box-shadow: inset 0 0 0 6px @success_bg_color; +} +button.titlebutton.maximize:hover { + box-shadow: inset 0 0 0 4px mix(white, @success_bg_color, 0.7); +} +button.titlebutton.maximize:active { + background-color: mix(white, @success_bg_color, 0.5); + box-shadow: none; +} +button.titlebutton.minimize { + box-shadow: inset 0 0 0 6px @warning_bg_color; +} +button.titlebutton.minimize:hover { + box-shadow: inset 0 0 0 8px mix(white, @warning_bg_color, 0.7); +} +button.titlebutton.minimize:active { + background-color: mix(white, @warning_bg_color, 0.5); + box-shadow: none; +} + +.maximized button.titlebutton.maximize { + box-shadow: inset 0 0 0 6px @success_bg_color; +} +.maximized button.titlebutton.maximize:hover { + box-shadow: inset 0 0 0 8px mix(white, @success_bg_color, 0.7); +} +.maximized button.titlebutton.maximize:active { + background-color: mix(white, @success_bg_color, 0.5); + box-shadow: none; +} + +button.titlebutton:backdrop { + opacity: 0.5; +} +button.titlebutton:backdrop.close { + box-shadow: inset 0 0 0 6px alpha(@headerbar_fg_color, 0.15); +} +button.titlebutton:backdrop.close:hover { + box-shadow: inset 0 0 0 8px mix(white,@destructive_bg_color, 0.7); +} +button.titlebutton:backdrop.close:active { + background-color: mix(white, @destructive_bg_color, 0.5); + box-shadow: none; +} +button.titlebutton:backdrop.maximize { + box-shadow: inset 0 0 0 6px alpha(@headerbar_fg_color, 0.15); +} +button.titlebutton:backdrop.maximize:hover { + box-shadow: inset 0 0 0 4px mix(white,@success_bg_color, 0.7); +} +button.titlebutton:backdrop.maximize:active { + background-color: mix(white, @success_bg_color, 0.5); + box-shadow: none; +} +button.titlebutton:backdrop.minimize { + box-shadow: inset 0 0 0 6px alpha(@headerbar_fg_color, 0.15); +} +button.titlebutton:backdrop.minimize:hover { + box-shadow: inset 0 0 0 8px mix(white, @warning_bg_color, 0.7); +} +button.titlebutton:backdrop.minimize:active { + background-color: mix(white, @warning_bg_color, 0.5); + box-shadow: none; +} + +.maximized button.titlebutton:backdrop.maximize { + box-shadow: inset 0 0 0 6px alpha(@headerbar_fg_color, 0.15); +} +.maximized button.titlebutton:backdrop.maximize:hover { + box-shadow: inset 0 0 0 8px mix(white, @success_bg_color, 0.7); +} +.maximized button.titlebutton:backdrop.maximize:active { + background-color: mix(white, @success_bg_color, 0.5); + box-shadow: none; +} diff --git a/themes/iroha/gtk/gtk4-dark.css b/themes/iroha/gtk/gtk4-dark.css new file mode 100644 index 0000000..337a219 --- /dev/null +++ b/themes/iroha/gtk/gtk4-dark.css @@ -0,0 +1,168 @@ +/* Peninsula-dark from adw-colors */ +@define-color window_bg_color #000000; +@define-color window_fg_color #eeeeee; +@define-color view_bg_color @window_bg_color; +@define-color view_fg_color @window_fg_color; +@define-color accent_bg_color #af5f00; +@define-color accent_fg_color white; +@define-color headerbar_bg_color @window_bg_color; +@define-color headerbar_fg_color @window_fg_color; +@define-color headerbar_backdrop_color @window_bg_color; +@define-color popover_bg_color @window_bg_color; +@define-color popover_fg_color @view_fg_color; +@define-color dialog_bg_color @window_bg_color; +@define-color dialog_fg_color @view_fg_color; +@define-color card_bg_color @window_bg_color; +@define-color card_fg_color @view_fg_color; +@define-color sidebar_bg_color @window_bg_color; +@define-color sidebar_fg_color @window_fg_color; +@define-color sidebar_backdrop_color @window_bg_color; +@define-color sidebar_shade_color rgba(0, 0, 0, 0.25); +@define-color sidebar_border_color rgba(0, 0, 0, 0.36); +@define-color secondary_sidebar_bg_color @window_bg_color; +@define-color secondary_sidebar_fg_color @view_fg_color; +@define-color secondary_sidebar_backdrop_color @view_bg_color; +@define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.25); +@define-color secondary_sidebar_border_color rgba(0, 0, 0, 0.36); +@define-color destructive_bg_color #d75f00; +@define-color success_bg_color #005f5f; +@define-color warning_bg_color #ffd75f; +@define-color error_bg_color @destructive_bg_color; +:root { + --accent-blue: #007bff; + --accent-teal: #1180b2; + --accent-green: #3a944a; + --accent-yellow: #c88800; + --accent-orange: #ff806c; + --accent-red: #ff5555; + --accent-pink: #ad3da4; + --accent-purple: #9141ac; + --accent-slate: #6f8396; + --accent-bg-color: @accent_bg_color; + --accent-fg-color: @accent_fg_color; + --window-bg-color: @window_bg_color; + --window-fg-color: @window_fg_color; + --view-bg-color: @view_bg_color; + --view-fg-color: @view_fg_color; + --headerbar-bg-color: @headerbar_bg_color; + --headerbar-fg-color: @headerbar_fg_color; + --headerbar-backdrop-color: @headerbar_backdrop_color; + --sidebar-bg-color: @sidebar_bg_color; + --sidebar-fg-color: @sidebar_fg_color; + --sidebar-backdrop-color: @sidebar_backdrop_color; + --sidebar-shade-color: @sidebar_shade_color; + --sidebar-border-color: @sidebar_border_color; + --secondary-sidebar-bg-color: @secondary_sidebar_bg_color; + --secondary-sidebar-fg-color: @secondary_sidebar_fg_color; + --secondary-sidebar-backdrop-color: @secondary_sidebar_backdrop_color; + --secondary-sidebar-shade-color: @secondary_sidebar_shade_color; + --secondary-sidebar-border-color: @secondary_sidebar_border_color; + --card-bg-color: @card_bg_color; + --card-fg-color: @card_fg_color; + --dialog-bg-color: @dialog_bg_color; + --dialog-fg-color: @dialog_fg_color; + --popover-bg-color: @popover_bg_color; + --popover-fg-color: @popover_fg_color; + --destructive-bg-color: @destructive_bg_color; + --success-bg-color: @success_bg_color; + --warning-bg-color: @warning_bg_color; + --error-bg-color: @error_bg_color; +} + +windowcontrols > button > image { + min-width: 18px; + min-height: 18px; + border-radius: 24px; + color: transparent; +} + +windowcontrols > button { + min-width: 18px; + min-height: 18px; +} +windowcontrols > button > image { + padding: 0; +} +windowcontrols > button.close > image { + box-shadow: inset 0 0 0 6px @destructive_bg_color; +} +windowcontrols > button.close > image:hover { + box-shadow: inset 0 0 0 8px color-mix(in srgb, white 30%, @destructive_bg_color); +} +windowcontrols > button.close > image:active { + background-color: color-mix(in srgb, white 50%, @destructive_bg_color); + box-shadow: none; +} +windowcontrols > button.maximize > image { + box-shadow: inset 0 0 0 6px @success_bg_color; +} +windowcontrols > button.maximize > image:hover { + box-shadow: inset 0 0 0 4px color-mix(in srgb, white 30%, @success_bg_color); +} +windowcontrols > button.maximize > image:active { + background-color: color-mix(in srgb, white 50%, @success_bg_color); + box-shadow: none; +} +windowcontrols > button.minimize > image { + box-shadow: inset 0 0 0 6px @warning_bg_color; +} +windowcontrols > button.minimize > image:hover { + box-shadow: inset 0 0 0 8px color-mix(in srgb, white 30%, @warning_bg_color); +} +windowcontrols > button.minimize > image:active { + background-color: color-mix(in srgb, white 50%, @warning_bg_color); + box-shadow: none; +} + +.maximized windowcontrols > button.maximize > image { + box-shadow: inset 0 0 0 6px @success_bg_color; +} +.maximized windowcontrols > button.maximize > image:hover { + box-shadow: inset 0 0 0 8px color-mix(in srgb, white 30%, @success_bg_color); +} +.maximized windowcontrols > button.maximize > image:active { + background-color: color-mix(in srgb, white 50%, @success_bg_color); + box-shadow: none; +} + +windowcontrols > button:backdrop.close > image { + box-shadow: inset 0 0 0 6px color-mix(in srgb, var(--headerbar-fg-color) 15%, transparent); +} +windowcontrols > button:backdrop.close > image:hover { + box-shadow: inset 0 0 0 8px color-mix(in srgb, white 30%, @destructive_bg_color); +} +windowcontrols > button:backdrop.close > image:active { + background-color: color-mix(in srgb, white 50%, @destructive_bg_color); + box-shadow: none; +} +windowcontrols > button:backdrop.maximize > image { + box-shadow: inset 0 0 0 6px color-mix(in srgb, var(--headerbar-fg-color) 15%, transparent); +} +windowcontrols > button:backdrop.maximize > image:hover { + box-shadow: inset 0 0 0 4px color-mix(in srgb, white 30%, @success_bg_color); +} +windowcontrols > button:backdrop.maximize > image:active { + background-color: color-mix(in srgb, white 50%, @success_bg_color); + box-shadow: none; +} +windowcontrols > button:backdrop.minimize > image { + box-shadow: inset 0 0 0 6px color-mix(in srgb, var(--headerbar-fg-color) 15%, transparent); +} +windowcontrols > button:backdrop.minimize > image:hover { + box-shadow: inset 0 0 0 8px color-mix(in srgb, white 30%, @warning_bg_color); +} +windowcontrols > button:backdrop.minimize > image:active { + background-color: color-mix(in srgb, white 50%, @warning_bg_color); + box-shadow: none; +} + +.maximized windowcontrols > button:backdrop.maximize > image { + box-shadow: inset 0 0 0 6px color-mix(in srgb, var(--headerbar-fg-color) 15%, transparent); +} +.maximized windowcontrols > button:backdrop.maximize > image:hover { + box-shadow: inset 0 0 0 8px color-mix(in srgb, white 30%, @success_bg_color); +} +.maximized windowcontrols > button:backdrop.maximize > image:active { + background-color: color-mix(in srgb, white 50%, @success_bg_color); + box-shadow: none; +} diff --git a/themes/iroha/sway/theme b/themes/iroha/sway/theme new file mode 100644 index 0000000..2ce5c28 --- /dev/null +++ b/themes/iroha/sway/theme @@ -0,0 +1,18 @@ +set $mod4 Mod4 + +set $bg #000000 +set $fg #eeeeee +set $c1 #af5f00 +set $c1_light #af8700 +set $c2 #af8700 +set $urgent #d75f00 + +set $wallpaper1 "~/c/dotfiles/themes/iroha/wallpaper/wallpaper.png" +set $wallpaper2 "~/c/dotfiles/themes/iroha/wallpaper/wallpaper2.png" + +output "DP-1" { + bg $wallpaper1 fill +} + +bindsym --no-repeat $mod4+F1 output "DP-1" bg $wallpaper1 fill +bindsym --no-repeat $mod4+F2 output "DP-1" bg $wallpaper2 fill diff --git a/themes/iroha/wallpaper/18tp_bn.png b/themes/iroha/wallpaper/18tp_bn.png Binary files differnew file mode 100644 index 0000000..9d0c809 --- /dev/null +++ b/themes/iroha/wallpaper/18tp_bn.png diff --git a/themes/iroha/wallpaper/18tp_bn_mini_0.png b/themes/iroha/wallpaper/18tp_bn_mini_0.png Binary files differnew file mode 100644 index 0000000..322637f --- /dev/null +++ b/themes/iroha/wallpaper/18tp_bn_mini_0.png diff --git a/themes/iroha/wallpaper/18tp_bn_mini_1.png b/themes/iroha/wallpaper/18tp_bn_mini_1.png Binary files differnew file mode 100644 index 0000000..b525928 --- /dev/null +++ b/themes/iroha/wallpaper/18tp_bn_mini_1.png diff --git a/themes/iroha/wallpaper/18tp_bn_mini_2.png b/themes/iroha/wallpaper/18tp_bn_mini_2.png Binary files differnew file mode 100644 index 0000000..e650889 --- /dev/null +++ b/themes/iroha/wallpaper/18tp_bn_mini_2.png diff --git a/themes/iroha/wallpaper/18tp_bn_mini_3.png b/themes/iroha/wallpaper/18tp_bn_mini_3.png Binary files differnew file mode 100644 index 0000000..b0025ca --- /dev/null +++ b/themes/iroha/wallpaper/18tp_bn_mini_3.png diff --git a/themes/iroha/wallpaper/61635856_p0.png b/themes/iroha/wallpaper/61635856_p0.png Binary files differnew file mode 100644 index 0000000..2dbe0f7 --- /dev/null +++ b/themes/iroha/wallpaper/61635856_p0.png diff --git a/themes/iroha/wallpaper/links.txt b/themes/iroha/wallpaper/links.txt new file mode 100644 index 0000000..a244254 --- /dev/null +++ b/themes/iroha/wallpaper/links.txt @@ -0,0 +1,5 @@ +https://web.archive.org/web/20160406131257/http://www.konami.jp/bemani/bm2dx/bm2dx18/image/18tp_bn.png +https://web.archive.org/web/20160805050254/http://www.konami.jp/bemani/bm2dx/bm2dx18/image/18tp_bn_mini_3.png +https://web.archive.org/web/20160805033011/http://www.konami.jp/bemani/bm2dx/bm2dx18/image/18tp_bn_mini_2.png +https://web.archive.org/web/20160805153756/http://www.konami.jp/bemani/bm2dx/bm2dx18/image/18tp_bn_mini_1.png +https://web.archive.org/web/20160805164320/http://www.konami.jp/bemani/bm2dx/bm2dx18/image/18tp_bn_mini_0.png diff --git a/themes/iroha/wallpaper/wallpaper.png b/themes/iroha/wallpaper/wallpaper.png Binary files differnew file mode 100644 index 0000000..aa16301 --- /dev/null +++ b/themes/iroha/wallpaper/wallpaper.png diff --git a/themes/iroha/wallpaper/wallpaper.xcf b/themes/iroha/wallpaper/wallpaper.xcf Binary files differnew file mode 100644 index 0000000..dfbff43 --- /dev/null +++ b/themes/iroha/wallpaper/wallpaper.xcf diff --git a/themes/iroha/wallpaper/wallpaper2.png b/themes/iroha/wallpaper/wallpaper2.png Binary files differnew file mode 100644 index 0000000..edd57b2 --- /dev/null +++ b/themes/iroha/wallpaper/wallpaper2.png diff --git a/themes/iroha/wallpaper/wallpaper2.xcf b/themes/iroha/wallpaper/wallpaper2.xcf Binary files differnew file mode 100644 index 0000000..116b0f6 --- /dev/null +++ b/themes/iroha/wallpaper/wallpaper2.xcf |
