diff options
46 files changed, 89 insertions, 244 deletions
diff --git a/files/gdbinit b/files/gdbinit index 53c7be0..782b0b8 100644 --- a/files/gdbinit +++ b/files/gdbinit @@ -1,2 +1,3 @@ set auto-load safe-path / set pagination off +set style emoji off diff --git a/files/vim/colors/lil_pablo.vim b/files/vim/colors/lil_pablo.vim index fcf2d93..ac9ccb7 100644 --- a/files/vim/colors/lil_pablo.vim +++ b/files/vim/colors/lil_pablo.vim @@ -52,7 +52,7 @@ 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=15 guifg=#ffffff ctermbg=NONE guibg=NONE cterm=NONE +hi MatchParen ctermfg=14 guifg=#ffd700 ctermbg=NONE guibg=NONE 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 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 diff --git a/hosts/moyo/gentoo/env/eix-extra-econf.conf b/hosts/moyo/gentoo/env/eix-extra-econf.conf deleted file mode 100644 index ffd867b..0000000 --- a/hosts/moyo/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/moyo/gentoo/env/gcc.conf b/hosts/moyo/gentoo/env/gcc.conf deleted file mode 100644 index 1c90660..0000000 --- a/hosts/moyo/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/moyo/gentoo/env/notmpfs.conf b/hosts/moyo/gentoo/env/notmpfs.conf deleted file mode 100644 index b8a96f4..0000000 --- a/hosts/moyo/gentoo/env/notmpfs.conf +++ /dev/null @@ -1 +0,0 @@ -PORTAGE_TMPDIR="/var/tmp/notmpfs" diff --git a/hosts/moyo/gentoo/env/single-thread.conf b/hosts/moyo/gentoo/env/single-thread.conf deleted file mode 100644 index 1b43095..0000000 --- a/hosts/moyo/gentoo/env/single-thread.conf +++ /dev/null @@ -1 +0,0 @@ -MAKEOPTS="-j1" diff --git a/hosts/moyo/gentoo/package.env/eix b/hosts/moyo/gentoo/package.env/eix deleted file mode 100644 index 6b1be34..0000000 --- a/hosts/moyo/gentoo/package.env/eix +++ /dev/null @@ -1 +0,0 @@ -app-portage/eix eix-extra-econf.conf diff --git a/hosts/moyo/gentoo/package.env/gcc b/hosts/moyo/gentoo/package.env/gcc deleted file mode 100644 index ce6a990..0000000 --- a/hosts/moyo/gentoo/package.env/gcc +++ /dev/null @@ -1 +0,0 @@ -sys-devel/gcc notmpfs.conf gcc.conf diff --git a/hosts/moyo/gentoo/package.env/libvirt-python b/hosts/moyo/gentoo/package.env/libvirt-python deleted file mode 100644 index 967a860..0000000 --- a/hosts/moyo/gentoo/package.env/libvirt-python +++ /dev/null @@ -1 +0,0 @@ -dev-python/libvirt-python single-thread.conf diff --git a/hosts/moyo/gentoo/package.env/rust b/hosts/moyo/gentoo/package.env/rust deleted file mode 100644 index 018d177..0000000 --- a/hosts/moyo/gentoo/package.env/rust +++ /dev/null @@ -1 +0,0 @@ -dev-lang/rust notmpfs.conf diff --git a/hosts/moyo/gentoo/package.use/HTTP-CookieJar b/hosts/moyo/gentoo/package.use/HTTP-CookieJar deleted file mode 100644 index 534881d..0000000 --- a/hosts/moyo/gentoo/package.use/HTTP-CookieJar +++ /dev/null @@ -1 +0,0 @@ -dev-perl/HTTP-CookieJar minimal diff --git a/hosts/moyo/gentoo/package.use/Net-HTTP b/hosts/moyo/gentoo/package.use/Net-HTTP deleted file mode 100644 index d2a50dc..0000000 --- a/hosts/moyo/gentoo/package.use/Net-HTTP +++ /dev/null @@ -1 +0,0 @@ -dev-perl/Net-HTTP minimal diff --git a/hosts/moyo/gentoo/package.use/Net-SSLeay b/hosts/moyo/gentoo/package.use/Net-SSLeay deleted file mode 100644 index 4f5f12b..0000000 --- a/hosts/moyo/gentoo/package.use/Net-SSLeay +++ /dev/null @@ -1 +0,0 @@ -dev-perl/Net-SSLeay minimal diff --git a/hosts/moyo/gentoo/package.use/Try-Tiny b/hosts/moyo/gentoo/package.use/Try-Tiny deleted file mode 100644 index 95e2e1a..0000000 --- a/hosts/moyo/gentoo/package.use/Try-Tiny +++ /dev/null @@ -1 +0,0 @@ -dev-perl/Try-Tiny minimal diff --git a/hosts/moyo/gentoo/package.use/binutils b/hosts/moyo/gentoo/package.use/binutils new file mode 100644 index 0000000..cfb09df --- /dev/null +++ b/hosts/moyo/gentoo/package.use/binutils @@ -0,0 +1 @@ +sys-devel/binutils -debuginfod diff --git a/hosts/moyo/gentoo/package.use/eclean-kernel b/hosts/moyo/gentoo/package.use/eclean-kernel new file mode 100644 index 0000000..d9b4e61 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/eclean-kernel @@ -0,0 +1 @@ +app-admin/eclean-kernel zstd diff --git a/hosts/moyo/gentoo/package.use/elfutils b/hosts/moyo/gentoo/package.use/elfutils index 1c494f6..8ddc184 100644 --- a/hosts/moyo/gentoo/package.use/elfutils +++ b/hosts/moyo/gentoo/package.use/elfutils @@ -1 +1 @@ -dev-libs/elfutils zstd +dev-libs/elfutils zstd -debuginfod diff --git a/hosts/moyo/gentoo/package.use/kbd b/hosts/moyo/gentoo/package.use/kbd new file mode 100644 index 0000000..781738c --- /dev/null +++ b/hosts/moyo/gentoo/package.use/kbd @@ -0,0 +1 @@ +sys-apps/kbd zstd -bzip2 -zlib diff --git a/hosts/moyo/gentoo/package.use/ngtcp2 b/hosts/moyo/gentoo/package.use/ngtcp2 new file mode 100644 index 0000000..b965780 --- /dev/null +++ b/hosts/moyo/gentoo/package.use/ngtcp2 @@ -0,0 +1 @@ +net-libs/ngtcp2 gnutls diff --git a/hosts/moyo/gentoo/package.use/perl b/hosts/moyo/gentoo/package.use/perl index 4cf9387..3e1d2fc 100644 --- a/hosts/moyo/gentoo/package.use/perl +++ b/hosts/moyo/gentoo/package.use/perl @@ -1 +1,7 @@ dev-lang/perl minimal +dev-perl/HTTP-CookieJar minimal +dev-perl/Net-HTTP minimal +dev-perl/Net-SSLeay minimal +dev-perl/Try-Tiny minimal +dev-perl/YAML-Tiny minimal +dev-perl/JSON -xs diff --git a/hosts/moyo/gentoo/package.use/zlib b/hosts/moyo/gentoo/package.use/zlib deleted file mode 100644 index e7c562a..0000000 --- a/hosts/moyo/gentoo/package.use/zlib +++ /dev/null @@ -1,14 +0,0 @@ -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/nix_archive/flake.lock b/nix_archive/flake.lock index e6f1be2..7cd61bd 100644 --- a/nix_archive/flake.lock +++ b/nix_archive/flake.lock @@ -15,11 +15,11 @@ ] }, "locked": { - "lastModified": 1764556831, - "narHash": "sha256-NpWFhJxtanGiIYjaNNztIHesByn+MhxHX0kS45Jnv+Q=", + "lastModified": 1776119159, + "narHash": "sha256-9HiqDiptdmTUM5NoJ6h0wnneXUrnVXyflC2mymBcGRQ=", "ref": "refs/heads/master", - "rev": "20617b9c80cf8d8051ecdb53a2c22f68c012f21b", - "revCount": 160, + "rev": "22d3be9264087ed80d034df0e805bd8101a7d381", + "revCount": 165, "type": "git", "url": "https://git.akon.city/camu" }, @@ -31,11 +31,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1775900011, - "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=", + "lastModified": 1779202205, + "narHash": "sha256-UFt7q51IIhBzo1L+4MqNNljIrMOtrrjiT4vrOmz+wDA=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e", + "rev": "16663cb13826d6aa519fb8c622460e3ce2a04dc1", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1779099457, + "narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "8792fab9d4a6454a9201675f01326f827ce35ead", "type": "github" }, "original": { @@ -164,11 +164,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764072830, - "narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=", + "lastModified": 1774972752, + "narHash": "sha256-DnLIpFxznohpLkIFs390uZ0gxwkVyhtknhKNu+lQJK8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "c7832dd786175e20f2697179e0e03efadffe4201", + "rev": "d97e078f4788cddb8d11c3c99f72a4bb9ddec221", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1775915587, - "narHash": "sha256-PqdaOIG8DuUoIp/pp0nPf60IEsaQE62DLCuxYtOHaSQ=", + "lastModified": 1779198268, + "narHash": "sha256-v83Ri37cD4f4cfYuXm9XhUavcp7UJmOiypAafi64/NA=", "owner": "nix-community", "repo": "NUR", - "rev": "78a0c668489f23b75253fdef25d844533ac0ef8b", + "rev": "25413609751dd974d5c21c74241a9309b892d0ec", "type": "github" }, "original": { diff --git a/nix_archive/hosts/palm/hardware-configuration.nix b/nix_archive/hosts/palm/hardware-configuration.nix index fe5e08d..20e1c20 100644 --- a/nix_archive/hosts/palm/hardware-configuration.nix +++ b/nix_archive/hosts/palm/hardware-configuration.nix @@ -21,7 +21,6 @@ boot.initrd.luks.devices."home" = { device = "/dev/yashinoki-vg0/home"; - preLVM = false; }; fileSystems."/home/andrew" = diff --git a/nix_archive/hosts/palm/programs.nix b/nix_archive/hosts/palm/programs.nix index c3161b3..ad49365 100644 --- a/nix_archive/hosts/palm/programs.nix +++ b/nix_archive/hosts/palm/programs.nix @@ -8,9 +8,9 @@ (asNeeded "mpv" ["mpv"]) (asNeeded "steam-run" ["steam-run"]) (asNeeded "moonlight-qt" ["moonlight-qt"]) -# camu -# camu-devshell -# mauri + camu + camu-devshell + mauri ]; local.scripts.imports = [ "battery" diff --git a/nix_archive/nix/programs/nvim.nix b/nix_archive/nix/programs/nvim.nix index 2d36e64..c15ca1a 100644 --- a/nix_archive/nix/programs/nvim.nix +++ b/nix_archive/nix/programs/nvim.nix @@ -184,17 +184,17 @@ in { header = '${s.header}', footer = '${s.footer}', footer_offset = ${toString s.footer-offset}, - picture = { - path = '${s.picture}', - kitty = os.getenv('TERM') == 'xterm-kitty', - width = ${toString s.width}, - position = '${s.position}', - padding = { - top = ${toString s.padding.top}, - left = ${toString s.padding.left}, - text = ${toString s.padding.text} - } - } + --picture = { + -- path = '${s.picture}', + -- kitty = os.getenv('TERM') == 'xterm-kitty', + -- width = ${toString s.width}, + -- position = '${s.position}', + -- padding = { + -- top = ${toString s.padding.top}, + -- left = ${toString s.padding.left}, + -- text = ${toString s.padding.text} + -- } + --} }) EOF '' + builtins.readFile(../../files/nvim/init.vim); @@ -216,7 +216,7 @@ in { # meta.homepage = ""; #}) withRuby = false; - withPython = false; + withPython3 = false; plugins = with pkgs.vimPlugins; [ local-nvim wal diff --git a/scripts/desktop/shift-jis-zip b/scripts/desktop/shift-jis-zip index 30dab2e..2caf57d 100755 --- a/scripts/desktop/shift-jis-zip +++ b/scripts/desktop/shift-jis-zip @@ -1,2 +1,3 @@ #! /usr/bin/env sh +#unzip -O cp932 "$1" unzip -O shift-jis "$1" diff --git a/themes/iroha/sway/theme b/themes/iroha/sway/theme index 6b9e661..6092cd7 100644 --- a/themes/iroha/sway/theme +++ b/themes/iroha/sway/theme @@ -14,13 +14,13 @@ set $wallpaperV "~/c/dotfiles/themes/iroha/wallpaper/wallpaper_vert.png" include ../monitors output $monitor1 { -#bg $wallpaper1 fill - bg $c1 solid_color + bg $wallpaper1 fill + #bg $c1 solid_color } output $monitor2 { -#bg $wallpaperV fill - bg $c1 solid_color + bg $wallpaperV fill + #bg $c1 solid_color } bindsym --no-repeat $mod4+F1 output $monitor1 bg $wallpaper1 fill |