diff options
Diffstat (limited to 'hosts/iroha')
19 files changed, 31 insertions, 167 deletions
diff --git a/hosts/iroha/gentoo/make.conf b/hosts/iroha/gentoo/make.conf index 69995a2..9d57918 100644 --- a/hosts/iroha/gentoo/make.conf +++ b/hosts/iroha/gentoo/make.conf @@ -15,8 +15,8 @@ CGO_LDFLAGS="${LDFLAGS}" RUSTFLAGS="${RUSTFLAGS} -C target-cpu=znver3" -MAKEOPTS="-j28 -l30" -EMERGE_DEFAULT_OPTS="--jobs 2" +MAKEOPTS="-j18 -l24" +EMERGE_DEFAULT_OPTS="--jobs 1" RUBY_TARGETS="ruby33" diff --git a/hosts/iroha/gentoo/package.accept_keywords/gcc b/hosts/iroha/gentoo/package.accept_keywords/gcc new file mode 100644 index 0000000..87f3409 --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/gcc @@ -0,0 +1 @@ +sys-devel/gcc ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/libva-intel-media-driver b/hosts/iroha/gentoo/package.accept_keywords/libva-intel-media-driver index 9207c04..162fd96 100644 --- a/hosts/iroha/gentoo/package.accept_keywords/libva-intel-media-driver +++ b/hosts/iroha/gentoo/package.accept_keywords/libva-intel-media-driver @@ -1 +1,2 @@ media-libs/libva-intel-media-driver ~amd64 +media-libs/gmmlib ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/python b/hosts/iroha/gentoo/package.accept_keywords/python new file mode 100644 index 0000000..d79af1e --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/python @@ -0,0 +1 @@ +dev-lang/python ~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..f33b94e --- /dev/null +++ b/hosts/iroha/gentoo/package.accept_keywords/rpcs3 @@ -0,0 +1,2 @@ +games-emulation/rpcs3 ** +dev-libs/protobuf ~amd64 diff --git a/hosts/iroha/gentoo/package.accept_keywords/vim b/hosts/iroha/gentoo/package.accept_keywords/vim index e20e551..6fd0b56 100644 --- a/hosts/iroha/gentoo/package.accept_keywords/vim +++ b/hosts/iroha/gentoo/package.accept_keywords/vim @@ -1,3 +1,3 @@ -app-editors/vim ~amd64 -app-editors/vim-core ~amd64 +app-editors/vim ** ~amd64 +app-editors/vim-core ** ~amd64 dev-util/xxd ~amd64 diff --git a/hosts/iroha/gentoo/package.mask/python b/hosts/iroha/gentoo/package.mask/python index af9ebaf..1b14e53 100644 --- a/hosts/iroha/gentoo/package.mask/python +++ b/hosts/iroha/gentoo/package.mask/python @@ -1 +1 @@ ->=dev-lang/python-3.14.0 +>=dev-lang/python-3.15.0 diff --git a/hosts/iroha/gentoo/package.use/audacity b/hosts/iroha/gentoo/package.use/audacity index 3a01bf6..1f50fa8 100644 --- a/hosts/iroha/gentoo/package.use/audacity +++ b/hosts/iroha/gentoo/package.use/audacity @@ -1,4 +1,4 @@ -media-sound/audacity alsa +media-sound/audacity alsa -lv2 -ladspa -portmixer media-libs/portaudio alsa media-libs/flac cxx x11-libs/wxGTK X diff --git a/hosts/iroha/gentoo/package.use/cubeb b/hosts/iroha/gentoo/package.use/cubeb new file mode 100644 index 0000000..3cbcc25 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/cubeb @@ -0,0 +1 @@ +media-libs/cubeb pulseaudio diff --git a/hosts/iroha/gentoo/package.use/eclean-kernel b/hosts/iroha/gentoo/package.use/eclean-kernel new file mode 100644 index 0000000..d9b4e61 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/eclean-kernel @@ -0,0 +1 @@ +app-admin/eclean-kernel zstd diff --git a/hosts/iroha/gentoo/package.use/imagemagick b/hosts/iroha/gentoo/package.use/imagemagick new file mode 100644 index 0000000..3aa4cd7 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/imagemagick @@ -0,0 +1 @@ +media-gfx/imagemagick jpeg svg tiff webp xml diff --git a/hosts/iroha/gentoo/package.use/python b/hosts/iroha/gentoo/package.use/python index 2ed6d28..3023d9d 100644 --- a/hosts/iroha/gentoo/package.use/python +++ b/hosts/iroha/gentoo/package.use/python @@ -1,3 +1,3 @@ -dev-lang/python sqlite -bluetooth -*/* PYTHON_TARGETS: -* python3_13 -*/* PYTHON_SINGLE_TARGET: -* python3_13 +dev-lang/python sqlite tail-call-interp -bluetooth +*/* PYTHON_TARGETS: -* python3_14 +*/* PYTHON_SINGLE_TARGET: -* python3_14 diff --git a/hosts/iroha/gentoo/package.use/unzip b/hosts/iroha/gentoo/package.use/unzip new file mode 100644 index 0000000..5d64957 --- /dev/null +++ b/hosts/iroha/gentoo/package.use/unzip @@ -0,0 +1 @@ +app-arch/unzip natspec diff --git a/hosts/iroha/gentoo/patches/media-gfx/gimp/accumulate_scroll_zoom.diff b/hosts/iroha/gentoo/patches/media-gfx/gimp/accumulate_scroll_zoom.diff deleted file mode 100644 index 6667cb9..0000000 --- a/hosts/iroha/gentoo/patches/media-gfx/gimp/accumulate_scroll_zoom.diff +++ /dev/null @@ -1,154 +0,0 @@ -diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c -index 6327b7f1ec..a22aa0f4ca 100644 ---- a/app/display/gimpdisplayshell-scale.c -+++ b/app/display/gimpdisplayshell-scale.c -@@ -48,6 +48,8 @@ - #define SCALE_EPSILON 0.0001 - #define ALMOST_CENTERED_THRESHOLD 2 - -+#define SCALE_UPDATE_INTERVAL (1000 / 90) -+ - #define SCALE_EQUALS(a,b) (fabs ((a) - (b)) < SCALE_EPSILON) - - -@@ -494,43 +496,20 @@ gimp_display_shell_scale_update (GimpDisplayShell *shell) - } - } - --/** -- * gimp_display_shell_scale: -- * @shell: the #GimpDisplayShell -- * @zoom_type: whether to zoom in, out or to a specific scale -- * @scale: ignored unless @zoom_type == %GIMP_ZOOM_TO -- * -- * This function figures out the context of the zoom and behaves -- * appropriately thereafter. -- * -- **/ --void --gimp_display_shell_scale (GimpDisplayShell *shell, -- GimpZoomType zoom_type, -- gdouble new_scale, -- GimpZoomFocus zoom_focus) -+static gboolean -+gimp_display_shell_delayed_scale (GimpDisplayShell *shell) - { - GimpDisplayConfig *config; - gdouble current_scale; -- gdouble delta = 0.0; -+ gdouble new_scale; - gboolean resize_window; -+ GimpZoomFocus zoom_focus = shell->scale_pending_zoom_focus; - -- g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); -- g_return_if_fail (shell->canvas != NULL); -+ shell->scale_delay_timer = 0; - - current_scale = gimp_zoom_model_get_factor (shell->zoom); -- -- if (zoom_type == GIMP_ZOOM_SMOOTH) -- delta = -new_scale; -- -- if (zoom_type == GIMP_ZOOM_PINCH) -- delta = new_scale; -- -- if (zoom_type != GIMP_ZOOM_TO) -- new_scale = gimp_zoom_model_zoom_step (zoom_type, current_scale, delta); -- -- if (SCALE_EQUALS (new_scale, current_scale)) -- return; -+ new_scale = shell->scale_pending; -+ shell->scale_pending = 0.0; - - config = shell->display->config; - -@@ -609,6 +588,61 @@ gimp_display_shell_scale (GimpDisplayShell *shell, - image_center_almost_centered_vert)); - } - } -+ -+ return G_SOURCE_REMOVE; -+} -+ -+/** -+ * gimp_display_shell_scale: -+ * @shell: the #GimpDisplayShell -+ * @zoom_type: whether to zoom in, out or to a specific scale -+ * @scale: ignored unless @zoom_type == %GIMP_ZOOM_TO -+ * -+ * This function figures out the context of the zoom and behaves -+ * appropriately thereafter. -+ * -+ **/ -+void -+gimp_display_shell_scale (GimpDisplayShell *shell, -+ GimpZoomType zoom_type, -+ gdouble new_scale, -+ GimpZoomFocus zoom_focus) -+{ -+ gdouble current_scale; -+ gdouble delta = 0.0; -+ -+ g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); -+ g_return_if_fail (shell->canvas != NULL); -+ -+ if (shell->scale_delay_timer) -+ { -+ current_scale = shell->scale_pending; -+ } -+ else -+ { -+ current_scale = gimp_zoom_model_get_factor (shell->zoom); -+ } -+ -+ if (zoom_type == GIMP_ZOOM_SMOOTH) -+ delta = -new_scale; -+ -+ if (zoom_type == GIMP_ZOOM_PINCH) -+ delta = new_scale; -+ -+ if (zoom_type != GIMP_ZOOM_TO) -+ new_scale = gimp_zoom_model_zoom_step (zoom_type, current_scale, delta); -+ -+ if (SCALE_EQUALS (new_scale, current_scale)) -+ return; -+ -+ shell->scale_pending = new_scale; -+ shell->scale_pending_zoom_focus = zoom_focus; -+ -+ if (!shell->scale_delay_timer) -+ { -+ shell->scale_delay_timer = -+ g_timeout_add(SCALE_UPDATE_INTERVAL, (GSourceFunc) gimp_display_shell_delayed_scale, shell); -+ } - } - - /** -diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c -index 358ef3dbfe..7e8ca0ffdf 100644 ---- a/app/display/gimpdisplayshell.c -+++ b/app/display/gimpdisplayshell.c -@@ -388,6 +388,8 @@ gimp_display_shell_init (GimpDisplayShell *shell) - shell->near_layer_vertical2 = NULL; - shell->drawn = FALSE; - -+ shell->scale_delay_timer = 0; -+ - env = g_getenv ("GIMP_DISPLAY_RENDER_BUF_SIZE"); - - if (env) -diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h -index c5b345e485..aa1b26dfef 100644 ---- a/app/display/gimpdisplayshell.h -+++ b/app/display/gimpdisplayshell.h -@@ -226,6 +226,10 @@ struct _GimpDisplayShell - gpointer scroll_info; - GimpLayer *picked_layer; - -+ gint scale_delay_timer; -+ gdouble scale_pending; -+ GimpZoomFocus scale_pending_zoom_focus; -+ - GeglBuffer *mask; - gint mask_offset_x; - gint mask_offset_y; diff --git a/hosts/iroha/gentoo/repos.conf/eselect-repo.conf b/hosts/iroha/gentoo/repos.conf/eselect-repo.conf index bcfb263..06bbe13 100644 --- a/hosts/iroha/gentoo/repos.conf/eselect-repo.conf +++ b/hosts/iroha/gentoo/repos.conf/eselect-repo.conf @@ -18,3 +18,8 @@ location = /var/db/repos/localrepo location = /var/db/repos/tatsh-overlay sync-type = git sync-uri = https://github.com/Tatsh/tatsh-overlay.git + +[gentoo] +location = /var/db/repos/gentoo +sync-type = git +sync-uri = https://github.com/gentoo-mirror/gentoo diff --git a/hosts/iroha/gentoo/repos.conf/gentoo.conf b/hosts/iroha/gentoo/repos.conf/gentoo.conf index c5fa1f0..94c6905 120000..100644 --- a/hosts/iroha/gentoo/repos.conf/gentoo.conf +++ b/hosts/iroha/gentoo/repos.conf/gentoo.conf @@ -1 +1,3 @@ -/usr/share/portage/config/repos.conf
\ No newline at end of file +[DEFAULT] +main-repo = gentoo + diff --git a/hosts/iroha/scripts/disable-rgb b/hosts/iroha/scripts/disable-rgb index a36eaab..bc05f79 100755 --- a/hosts/iroha/scripts/disable-rgb +++ b/hosts/iroha/scripts/disable-rgb @@ -1,2 +1,3 @@ #! /usr/bin/env sh -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' +#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' +su -c 'modprobe i2c-dev && openrgb -d 0 -m off && openrgb -d 1 -m off' diff --git a/hosts/iroha/scripts/emaint-sync b/hosts/iroha/scripts/emaint-sync index c45fae4..008cc57 100755 --- a/hosts/iroha/scripts/emaint-sync +++ b/hosts/iroha/scripts/emaint-sync @@ -1,5 +1,6 @@ #! /usr/bin/env sh -doas emaint sync -r guru && \ +doas emaint sync -r gentoo && \ + doas emaint sync -r guru && \ doas emaint sync -r steam-overlay && \ doas emaint sync -r nix-guix && \ doas emaint sync -r tatsh-overlay diff --git a/hosts/iroha/sway_input_output b/hosts/iroha/sway_input_output index f17c1fb..ce992ae 100644 --- a/hosts/iroha/sway_input_output +++ b/hosts/iroha/sway_input_output @@ -66,7 +66,7 @@ output $monitor2 { # position 0 1000 # allow_tearing yes # max_render_time off -# render_bit_depth 10 +# #render_bit_depth 10 #} bindsym $mod4+r exec swaymsg -- output $monitor1 transform 90 |