diff options
| author | 2025-05-25 11:58:19 -0400 | |
|---|---|---|
| committer | 2025-05-25 11:58:19 -0400 | |
| commit | 75ad6c3fcad1f19c4f4f5c345fbb43ce80d9c461 (patch) | |
| tree | 974406a41ab5aeece938bc68889c136a5cfe69ea | |
| parent | f94b0f1370d4633cba8397642e809bc39d4461f8 (diff) | |
| download | dotfiles-75ad6c3fcad1f19c4f4f5c345fbb43ce80d9c461.tar.gz dotfiles-75ad6c3fcad1f19c4f4f5c345fbb43ce80d9c461.tar.bz2 dotfiles-75ad6c3fcad1f19c4f4f5c345fbb43ce80d9c461.zip | |
Add older Windows stuff + Updates
| -rw-r--r-- | NOTES.txt | 15 | ||||
| -rw-r--r-- | TODO.txt | 12 | ||||
| -rw-r--r-- | files/firefox/user-overrides.js | 3 | ||||
| -rw-r--r-- | files/nixpkgs-patches/30720.diff | 106 | ||||
| -rw-r--r-- | files/nixpkgs-patches/399388.diff | 294 | ||||
| -rw-r--r-- | files/nixpkgs-patches/minus_screenshot.diff | 12 | ||||
| -rw-r--r-- | flake.lock | 38 | ||||
| -rw-r--r-- | flake.nix | 41 | ||||
| -rw-r--r-- | hosts/corpa/windows_dev_setup.txt | 14 | ||||
| -rw-r--r-- | hosts/moyo/samba/smb.conf | 9 | ||||
| -rw-r--r-- | hosts/sofue/configuration.nix | 37 | ||||
| -rw-r--r-- | hosts/xp/iso_checksums.txt | 20 | ||||
| -rw-r--r-- | hosts/xp/pfp61.png | bin | 0 -> 96824 bytes | |||
| -rw-r--r-- | hosts/xp/products.sha | 229 | ||||
| -rw-r--r-- | hosts/yashinoki/configuration.nix | 1 | ||||
| -rw-r--r-- | nix/amdgpu.nix | 2 | ||||
| -rw-r--r-- | nix/gaming.nix | 54 | ||||
| -rw-r--r-- | nix/programs/firefox.nix | 4 | ||||
| -rw-r--r-- | nix/programs/kitty.nix | 25 | ||||
| -rw-r--r-- | nix/programs/sway.nix | 2 | ||||
| -rw-r--r-- | nix/steam.nix | 48 | ||||
| -rw-r--r-- | nix/user.nix | 7 | ||||
| -rwxr-xr-x | scripts/sp | 6 | ||||
| -rwxr-xr-x | scripts/spell | 2 | ||||
| -rw-r--r-- | themes/year_of_snake/snake.nix | 2 |
25 files changed, 448 insertions, 535 deletions
@@ -1,12 +1,15 @@ -= Hosts +== Hosts iroha sofue + soy + corpa + xp moyo denpa <-> rod ^ the-p yashinoki -= Resources +== 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 @@ -14,7 +17,7 @@ yashinoki * https://github.com/NixOS/nixpkgs/blob/1e0561d78a3d3cd84bac45ab474af82e32802120/lib/systems/examples.nix * https://gist.github.com/Kron4ek/af1bbc1353302751a0941308294ec24a -= Examples +== 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 @@ -22,18 +25,18 @@ yashinoki * 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 +=- Aux * https://gist.github.com/pshchelo/6ffabbffaedc46456b39c037d16e1d8c * https://github.com/ValveSoftware/Proton/wiki/Using-a-NTFS-disk-with-Linux-and-Windows -= Issues +== 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 +== 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/ diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 0000000..caf7986 --- /dev/null +++ b/TODO.txt @@ -0,0 +1,12 @@ +== TODO +- [x] Update moyo kernel config. +- [x] https://github.com/flightlessmango/MangoHud?tab=readme-ov-file#environment-variables + - display_server +- [ ] Finally add email server config. +- [ ] Sync pipewire between iroha and sofue. +- [ ] Diff iroha and moyo kernel configs. + +== At Some Point +- [ ] New Gentoo desktop. + +// vim: set syntax=asciidoc: diff --git a/files/firefox/user-overrides.js b/files/firefox/user-overrides.js index f168fa7..3a73f4f 100644 --- a/files/firefox/user-overrides.js +++ b/files/firefox/user-overrides.js @@ -70,6 +70,9 @@ user_pref("gfx.webrender.all", true); // Hardware accelerated video decoding user_pref("media.ffmpeg.vaapi.enabled", true); +// ForkServer +user_pref("dom.ipc.forkserver.enable", true); + // Disable pop-up when using mic user_pref("privacy.webrtc.legacyGlobalIndicator", false); diff --git a/files/nixpkgs-patches/30720.diff b/files/nixpkgs-patches/30720.diff deleted file mode 100644 index 4c80212..0000000 --- a/files/nixpkgs-patches/30720.diff +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/src/amd/compiler/aco_scheduler.cpp b/src/amd/compiler/aco_scheduler.cpp -index 0bfce41101e5a1a3d84632fee58f99ae398cdcc9..f3c1555c1e749b00080dfaf882a59f7ae42357d6 100644 ---- a/src/amd/compiler/aco_scheduler.cpp -+++ b/src/amd/compiler/aco_scheduler.cpp -@@ -12,17 +12,17 @@ - #include <algorithm> - #include <vector> - --#define SMEM_WINDOW_SIZE (350 - ctx.num_waves * 35) --#define VMEM_WINDOW_SIZE (1024 - ctx.num_waves * 64) -+#define SMEM_WINDOW_SIZE (256 - ctx.occupancy_factor * 16) -+#define VMEM_WINDOW_SIZE (1024 - ctx.occupancy_factor * 64) - #define LDS_WINDOW_SIZE 64 - #define POS_EXP_WINDOW_SIZE 512 --#define SMEM_MAX_MOVES (64 - ctx.num_waves * 4) --#define VMEM_MAX_MOVES (256 - ctx.num_waves * 16) -+#define SMEM_MAX_MOVES (128 - ctx.occupancy_factor * 8) -+#define VMEM_MAX_MOVES (256 - ctx.occupancy_factor * 16) - #define LDSDIR_MAX_MOVES 10 - #define LDS_MAX_MOVES 32 - /* creating clauses decreases def-use distances, so make it less aggressive the lower num_waves is */ --#define VMEM_CLAUSE_MAX_GRAB_DIST (ctx.num_waves * 2) --#define VMEM_STORE_CLAUSE_MAX_GRAB_DIST (ctx.num_waves * 4) -+#define VMEM_CLAUSE_MAX_GRAB_DIST (ctx.occupancy_factor * 2) -+#define VMEM_STORE_CLAUSE_MAX_GRAB_DIST (ctx.occupancy_factor * 4) - #define POS_EXP_MAX_MOVES 512 - - namespace aco { -@@ -115,7 +115,7 @@ struct MoveState { - - struct sched_ctx { - amd_gfx_level gfx_level; -- int16_t num_waves; -+ int16_t occupancy_factor; - int16_t last_SMEM_stall; - int last_SMEM_dep_idx; - MoveState mv; -@@ -745,7 +745,7 @@ schedule_SMEM(sched_ctx& ctx, Block* block, Instruction* current, int idx) - /* only move VMEM instructions below descriptor loads. be more aggressive at higher num_waves - * to help create more vmem clauses */ - if ((candidate->isVMEM() || candidate->isFlatLike()) && -- (cursor.insert_idx - cursor.source_idx > (ctx.num_waves * 4) || -+ (cursor.insert_idx - cursor.source_idx > (ctx.occupancy_factor * 4) || - current->operands[0].size() == 4)) - break; - /* don't move descriptor loads below buffer loads */ -@@ -847,7 +847,7 @@ schedule_SMEM(sched_ctx& ctx, Block* block, Instruction* current, int idx) - } - - ctx.last_SMEM_dep_idx = found_dependency ? up_cursor.insert_idx : 0; -- ctx.last_SMEM_stall = 10 - ctx.num_waves - k; -+ ctx.last_SMEM_stall = 10 - ctx.occupancy_factor - k; - } - - void -@@ -1247,35 +1247,30 @@ schedule_program(Program* program) - RegisterDemand demand; - for (Block& block : program->blocks) - demand.update(block.register_demand); -- demand.vgpr += program->config->num_shared_vgprs / 2; - - sched_ctx ctx; - ctx.gfx_level = program->gfx_level; - ctx.mv.depends_on.resize(program->peekAllocationId()); - ctx.mv.RAR_dependencies.resize(program->peekAllocationId()); - ctx.mv.RAR_dependencies_clause.resize(program->peekAllocationId()); -- /* Allowing the scheduler to reduce the number of waves to as low as 5 -- * improves performance of Thrones of Britannia significantly and doesn't -- * seem to hurt anything else. */ -- unsigned wave_fac = program->dev.physical_vgprs / 256; -- if (program->num_waves <= 5 * wave_fac) -- ctx.num_waves = program->num_waves; -- else if (demand.vgpr >= 29) -- ctx.num_waves = 5 * wave_fac; -- else if (demand.vgpr >= 25) -- ctx.num_waves = 6 * wave_fac; -- else -- ctx.num_waves = 7 * wave_fac; -- ctx.num_waves = std::max<uint16_t>(ctx.num_waves, program->min_waves); -- ctx.num_waves = std::min<uint16_t>(ctx.num_waves, program->num_waves); -- ctx.num_waves = max_suitable_waves(program, ctx.num_waves); -- -- assert(ctx.num_waves >= program->min_waves); -- ctx.mv.max_registers = get_addr_regs_from_waves(program, ctx.num_waves); -+ -+ const int wave_factor = program->gfx_level >= GFX10 ? 2 : 1; -+ const float reg_file_multiple = program->dev.physical_vgprs / (256.0 * wave_factor); -+ const int wave_minimum = std::max<int>(program->min_waves, 4 * wave_factor * reg_file_multiple); -+ -+ /* If we already have less waves than the minimum, don't reduce them further. -+ * Otherwise, sacrifice some waves and use more VGPRs, in order to improve scheduling. -+ */ -+ int vpgr_demand = std::max<int>(24, demand.vgpr) + 12 * reg_file_multiple; -+ int target_waves = std::max(wave_minimum, program->dev.physical_vgprs / vpgr_demand); -+ target_waves = max_suitable_waves(program, std::min<int>(program->num_waves, target_waves)); -+ assert(target_waves >= program->min_waves); -+ -+ ctx.mv.max_registers = get_addr_regs_from_waves(program, target_waves); - ctx.mv.max_registers.vgpr -= 2; - - /* VMEM_MAX_MOVES and such assume pre-GFX10 wave count */ -- ctx.num_waves = std::max<uint16_t>(ctx.num_waves / wave_fac, 1); -+ ctx.occupancy_factor = target_waves / wave_factor; - - /* NGG culling shaders are very sensitive to position export scheduling. - * Schedule less aggressively when early primitive export is used, and diff --git a/files/nixpkgs-patches/399388.diff b/files/nixpkgs-patches/399388.diff deleted file mode 100644 index 4815efe..0000000 --- a/files/nixpkgs-patches/399388.diff +++ /dev/null @@ -1,294 +0,0 @@ -diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix -index adfbe426cc00de..471080fd75a071 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.0.5"; -+ version = "25.1.0-rc3"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "mesa"; - rev = "mesa-${version}"; -- hash = "sha256-zYZgvuRnqhPbVmxmdmq4rLng20gMiAvJYD0o4jN5McI="; -+ hash = "sha256-X1T4dqQSHhnoRXXjjyWrRu4u8RJ5h+PFBQYf/gUInm4="; - }; - - meta = { -diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix -index f691f2d3bf8cbb..00a4d7964ed27e 100644 ---- a/pkgs/development/libraries/mesa/default.nix -+++ b/pkgs/development/libraries/mesa/default.nix -@@ -16,6 +16,7 @@ - libdrm, - libgbm, - libglvnd, -+ libpng, - libunwind, - libva-minimal, - libvdpau, -@@ -103,8 +104,10 @@ - ], - vulkanLayers ? [ - "device-select" -- "overlay" - "intel-nullhw" -+ "overlay" -+ "screenshot" -+ "vram-report-limit" - ], - mesa, - mesa-gl-headers, -@@ -161,7 +164,6 @@ stdenv.mkDerivation { - - patches = [ - ./opencl.patch -- ./system-gbm.patch - ]; - - postPatch = '' -@@ -223,7 +225,6 @@ stdenv.mkDerivation { - (lib.mesonBool "libgbm-external" true) - - (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK -- (lib.mesonBool "osmesa" false) # deprecated upstream - - # 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. -@@ -277,6 +278,7 @@ stdenv.mkDerivation { - libdrm - libgbm - libglvnd -+ libpng - libunwind - libva-minimal - libvdpau -@@ -350,7 +352,7 @@ stdenv.mkDerivation { - postInstall = '' - moveToOutput bin/intel_clc $cross_tools - moveToOutput bin/mesa_clc $cross_tools -- moveToOutput bin/vtn_bindgen $cross_tools -+ moveToOutput bin/vtn_bindgen2 $cross_tools - - moveToOutput "lib/lib*OpenCL*" $opencl - # Construct our own .icd file that contains an absolute path. -diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch -index 8444237d3d5418..9d40da82f85649 100644 ---- a/pkgs/development/libraries/mesa/opencl.patch -+++ b/pkgs/development/libraries/mesa/opencl.patch -@@ -13,8 +13,8 @@ index c150bff74ff..37fa7f0531b 100644 - - diff --git a/meson_options.txt b/meson_options.txt - index 82324617884..4bde97a8568 100644 ----- a/meson_options.txt --+++ b/meson_options.txt -+--- a/meson.options -++++ b/meson.options - @@ -738,3 +738,10 @@ option( - 'none', 'dri2' - ], -diff --git a/pkgs/development/libraries/mesa/system-gbm.patch b/pkgs/development/libraries/mesa/system-gbm.patch -deleted file mode 100644 -index 7f16ff7469c757..00000000000000 ---- a/pkgs/development/libraries/mesa/system-gbm.patch -+++ /dev/null -@@ -1,195 +0,0 @@ --commit 69914d79c3d86b0aee80665c51074cf8cc55f660 --Author: K900 <me@0upti.me> --Date: 2025-03-05 13:14:02 +0300 -- -- meson: support building with system libgbm -- -- This is the next step towards making libgbm just a loader. -- --diff --git a/meson.build b/meson.build --index 4766ce838ba..300a6bb0cc8 100644 ----- a/meson.build --+++ b/meson.build --@@ -2377,7 +2377,7 @@ summary(egl_summary, section: 'EGL', bool_yn: true, list_sep: ' ') -- -- gbm_summary = {'Enabled': with_gbm} -- if with_gbm --- gbm_summary += {'Backends path': gbm_backends_path} --+ gbm_summary += {'External libgbm': get_option('libgbm-external'), 'Backends path': gbm_backends_path} -- endif -- summary(gbm_summary, section: 'GBM', bool_yn: true, list_sep: ' ') -- --diff --git a/meson_options.txt b/meson_options.txt --index 2622cf1d235..7bf8ae8a1c5 100644 ----- a/meson_options.txt --+++ b/meson_options.txt --@@ -329,6 +329,13 @@ option( -- description : 'Build support for gbm platform' -- ) -- --+option( --+ 'libgbm-external', --+ type: 'boolean', --+ value: false, --+ description: 'Whether to use external libgbm (default: use in-tree copy)' --+) --+ -- option( -- 'gbm-backends-path', -- type : 'string', --diff --git a/src/egl/meson.build b/src/egl/meson.build --index a02b83419c4..ae4b0c5e063 100644 ----- a/src/egl/meson.build --+++ b/src/egl/meson.build --@@ -108,9 +108,8 @@ if with_dri -- endif -- if with_gbm and not with_platform_android -- files_egl += files('drivers/dri2/platform_drm.c') --- link_for_egl += libgbm --- incs_for_egl += [inc_gbm, include_directories('../gbm/main')] --- deps_for_egl += dep_libdrm --+ incs_for_egl += [include_directories('../gbm/backends/dri')] --+ deps_for_egl += [dep_libdrm, dep_gbm] -- endif -- if with_platform_wayland -- deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers] --diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c --index 339e9376c3d..f1a0bb18ed8 100644 ----- a/src/gallium/targets/dril/dril_target.c --+++ b/src/gallium/targets/dril/dril_target.c --@@ -25,7 +25,7 @@ -- #include <dlfcn.h> -- #include <EGL/egl.h> -- #include <EGL/eglext.h> ---#include "gbm/main/gbm.h" --+#include <gbm.h> -- #include "drm-uapi/drm_fourcc.h" -- -- #define EGL_PLATFORM_GBM_MESA 0x31D7 --diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build --index 7cfa982ffe1..22b955b9074 100644 ----- a/src/gallium/targets/dril/meson.build --+++ b/src/gallium/targets/dril/meson.build --@@ -51,10 +51,10 @@ dril_dri = shared_library( -- link_depends : dril_link_depends, -- link_with : [ -- libgallium, --- libgbm, -- ], -- dependencies : [ -- idep_mesautil, --+ dep_gbm, -- ], -- # Will be deleted during installation, see install_megadrivers.py -- install : true, --diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c --index a51e3cb3b8d..f1a5e0f7649 100644 ----- a/src/gbm/backends/dri/gbm_dri.c --+++ b/src/gbm/backends/dri/gbm_dri.c --@@ -43,7 +43,7 @@ -- -- #include "mesa_interface.h" -- #include "gbm_driint.h" ---#include "gbmint.h" --+#include <gbm_backend_abi.h> -- #include "loader_dri_helper.h" -- #include "kopper_interface.h" -- #include "loader.h" --diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h --index 9b324aeaf12..9c7588e5726 100644 ----- a/src/gbm/backends/dri/gbm_driint.h --+++ b/src/gbm/backends/dri/gbm_driint.h --@@ -31,7 +31,7 @@ -- #include <xf86drm.h> -- #include <string.h> -- #include <sys/mman.h> ---#include "gbmint.h" --+#include <gbm_backend_abi.h> -- #include "c11/threads.h" -- -- #include <GL/gl.h> /* mesa_interface needs GL types */ --diff --git a/src/gbm/backends/dri/meson.build b/src/gbm/backends/dri/meson.build --index 9b5d13e9db8..84a40656980 100644 ----- a/src/gbm/backends/dri/meson.build --+++ b/src/gbm/backends/dri/meson.build --@@ -11,10 +11,10 @@ endif -- shared_library( -- 'dri_gbm', -- files('gbm_dri.c', 'gbm_driint.h'), --- include_directories : [incs_gbm, incs_gbm_dri, inc_st_dri, inc_gallium_aux], --+ include_directories : [inc_gallium, incs_gbm_dri, inc_loader, inc_st_dri, inc_gallium_aux], -- link_args : [ld_args_gc_sections], -- link_with : [libloader, libgallium_dri], --- dependencies : [deps_gbm_dri, dep_dl, dep_libdrm, idep_mesautil, idep_xmlconfig], --+ dependencies : [deps_gbm_dri, dep_dl, dep_gbm, dep_libdrm, idep_mesautil, idep_xmlconfig], -- gnu_symbol_visibility : 'hidden', -- install : true, -- install_dir: join_paths(get_option('libdir'), 'gbm'), --diff --git a/src/gbm/meson.build b/src/gbm/meson.build --index eaed028d049..97e8d5fa044 100644 ----- a/src/gbm/meson.build --+++ b/src/gbm/meson.build --@@ -15,10 +15,6 @@ args_gbm = [ -- ] -- incs_gbm = [include_directories('main'), inc_loader, inc_gallium] -- ---if with_dri2 --- subdir('backends/dri') ---endif --- -- libgbm_name = 'gbm' -- -- if with_platform_android and get_option('platform-sdk-version') >= 30 --@@ -43,7 +39,7 @@ if with_tests -- test('gbm-abi-check', abi_check, suite : ['gbm']) -- endif -- ---install_headers('main/gbm.h') --+install_headers('main/gbm.h', 'main/gbm_backend_abi.h') -- -- pkg.generate( -- name : 'gbm', --@@ -67,3 +63,8 @@ if with_symbols_check -- suite : ['gbm'], -- ) -- endif --+ --+dep_gbm = declare_dependency( --+ link_with : libgbm, --+ include_directories : inc_gbm, --+) --diff --git a/src/meson.build b/src/meson.build --index d443d2b41bb..74250ed2148 100644 ----- a/src/meson.build --+++ b/src/meson.build --@@ -127,11 +127,17 @@ endif -- if with_glx == 'dri' -- subdir('glx') -- endif --+ -- if with_gbm --- subdir('gbm') --+ if get_option('libgbm-external') --+ dep_gbm = dependency('gbm') --+ else --+ subdir('gbm') --+ endif -- else --- inc_gbm = [] --+ dep_gbm = null_dep -- endif --+ -- if with_egl -- subdir('egl') -- endif --@@ -141,6 +147,10 @@ if with_gallium and with_gbm -- endif -- endif -- --+if with_gbm and with_dri2 --+ subdir('gbm/backends/dri') --+endif --+ -- # This must be after at least mesa, glx, and gallium, since libgl will be -- # defined in one of those subdirs depending on the glx provider. -- if with_glx != 'disabled' and not with_glvnd diff --git a/files/nixpkgs-patches/minus_screenshot.diff b/files/nixpkgs-patches/minus_screenshot.diff deleted file mode 100644 index 1c014d9..0000000 --- a/files/nixpkgs-patches/minus_screenshot.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix -index d113b66cb..ea7f072c8 100644 ---- a/pkgs/development/libraries/mesa/default.nix -+++ b/pkgs/development/libraries/mesa/default.nix -@@ -105,7 +105,6 @@ - "device-select" - "intel-nullhw" - "overlay" -- "screenshot" - "vram-report-limit" - ], - mesa, @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1746049328, - "narHash": "sha256-COSI6NCQMtAI74QnyAWbjY+GOomy+A+7ZX1Z9YEhRtM=", + "lastModified": 1746723111, + "narHash": "sha256-hgN/VKry/B58P3Zv7H3zjqKVXs98jin4lfFO7WN+ghY=", "ref": "refs/heads/master", - "rev": "2ce402fa41508d45e2d30b56502c00ef92efff7b", - "revCount": 122, + "rev": "bbdc4ed66aa171f89f675aa1c82316477d5fd47e", + "revCount": 127, "type": "git", "url": "https://git.akon.city/camu" }, @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1746632058, - "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "708074ae6db9e0468e4f48477f856e8c2d059795", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746621361, - "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744290088, - "narHash": "sha256-/X9XVEl0EiyisNbF5srrxXRSVoRqdwExuqyspYqqEjQ=", + "lastModified": 1746453552, + "narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "60b4904a1390ac4c89e93d95f6ed928975e525ed", + "rev": "be618645aa0adf461f778500172b6896d5ab2d01", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746633060, - "narHash": "sha256-4Lo5Lh7f0NPs34VIB6Zlmn2lrkGZNMSGJgz2jsckTXs=", + "lastModified": 1748115910, + "narHash": "sha256-XrtByWu6NjrGq1nysW4XsliVLslZXXKzCKHSC6QM5dY=", "owner": "nix-community", "repo": "NUR", - "rev": "ac39352ab723f760aabda5051f919ddfbca1c477", + "rev": "24dcce023477b994838e387ae042c6b93a749288", "type": "github" }, "original": { @@ -14,6 +14,9 @@ url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; +# chaotic = { +# url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; +# }; camu = { url = "git+https://git.akon.city/camu"; inputs.nixpkgs.follows = "nixpkgs"; @@ -126,8 +129,6 @@ name = "nixpkgs-patched"; src = nixpkgs; patches = [ - ./files/nixpkgs-patches/399388.diff - ./files/nixpkgs-patches/minus_screenshot.diff ./files/nixpkgs-patches/adw-gtk3-update.diff ]; }; @@ -155,13 +156,13 @@ mpv-unwrapped = super.mpv-unwrapped.override { cddaSupport = true; }; }) (self: super: { - kitty = (optimizeWithFlags super.kitty "-O3 -march=znver2 -mtune=znver2 -fno-semantic-interposition").overrideAttrs (old: { - patches = old.patches ++ [ + kitty = (optimizeWithFlags super.kitty "-O3 -march=znver2 -mtune=znver2 -fno-semantic-interposition").overrideAttrs (oldAttrs: { + patches = oldAttrs.patches ++ [ ]; }); }) (self: super: { - adw-gtk3 = super.adw-gtk3.overrideAttrs (old: { + adw-gtk3 = super.adw-gtk3.overrideAttrs (oldAttrs: { patches = [ ./files/nixpkgs-patches/adw-gtk3-patch.diff ]; @@ -171,15 +172,15 @@ neovim-unwrapped = (optimizeWithFlags super.neovim-unwrapped "-O3 -march=znver2 -mtune=znver2 -fno-semantic-interposition -flto"); }) (self: super: { - sway-unwrapped = super.sway-unwrapped.overrideAttrs (old: { - patches = old.patches ++ [ + sway-unwrapped = super.sway-unwrapped.overrideAttrs (oldAttrs: { + patches = oldAttrs.patches ++ [ ./files/sway_background_covered.diff ]; }); }) (self: super: { - gamescope = super.gamescope.overrideAttrs (old: { - patches = old.patches ++ [ + gamescope = super.gamescope.overrideAttrs (oldAttrs: { + patches = oldAttrs.patches ++ [ ./files/gamescope_drm.diff ]; }); @@ -192,13 +193,13 @@ }) (self: super: { vimPlugins = super.vimPlugins.extend (final: prev: { - mini-nvim = prev.mini-nvim.overrideAttrs (old: { + mini-nvim = prev.mini-nvim.overrideAttrs (oldAttrs: { patches = [ ./files/nvim/mini_starter_picture.diff ./files/nvim/mini_completion_no_title.diff ]; }); - fzf-vim = prev.fzf-vim.overrideAttrs (old: { + fzf-vim = prev.fzf-vim.overrideAttrs (oldAttrs: { patches = [ ./files/nvim/fzf_no_linenum.diff ]; @@ -206,14 +207,13 @@ }); }) (self: super: { - mesa = super.mesa.overrideAttrs (old: { - patches = old.patches ++ [ - ./files/nixpkgs-patches/30720.diff + mesa = super.mesa.overrideAttrs (oldAttrs: { + patches = oldAttrs.patches ++ [ ]; }); }) (self: super: { - dia = super.dia.overrideAttrs (old: { + dia = super.dia.overrideAttrs (oldAttrs: { nativeBuildInputs = with super; [ gobject-introspection python3.pkgs.wrapPython @@ -232,6 +232,7 @@ home-manager.useUserPackages = true; } nur.modules.nixos.default + #chaotic.nixosModules.default ./hosts/sofue/configuration.nix ]; }; @@ -266,12 +267,12 @@ camu-devshell = camu.packages.${system}.shellWrapper; }) (self: super: { - sway-unwrapped = super.sway-unwrapped.overrideAttrs (old: { - patches = old.patches ++ []; + sway-unwrapped = super.sway-unwrapped.overrideAttrs (oldAttrs: { + patches = oldAttrs.patches ++ []; }); }) (self: super: { - adw-gtk3 = super.adw-gtk3.overrideAttrs (old: { + adw-gtk3 = super.adw-gtk3.overrideAttrs (oldAttrs: { patches = [ ./files/nixpkgs-patches/adw-gtk3-patch.diff ]; @@ -279,13 +280,13 @@ }) (self: super: { vimPlugins = super.vimPlugins.extend (final: prev: { - mini-nvim = prev.mini-nvim.overrideAttrs (old: { + mini-nvim = prev.mini-nvim.overrideAttrs (oldAttrs: { patches = [ ./files/nvim/mini_starter_picture.diff ./files/nvim/mini_completion_no_title.diff ]; }); - fzf-vim = prev.fzf-vim.overrideAttrs (old: { + fzf-vim = prev.fzf-vim.overrideAttrs (oldAttrs: { patches = [ ./files/nvim/fzf_no_linenum.diff ]; diff --git a/hosts/corpa/windows_dev_setup.txt b/hosts/corpa/windows_dev_setup.txt new file mode 100644 index 0000000..bdf0ef6 --- /dev/null +++ b/hosts/corpa/windows_dev_setup.txt @@ -0,0 +1,14 @@ +Windows 10 LTSC IoT +Visual Studio Community +Msys2 +DirectX June 2010 +WSL +https://github.com/pal1000/mesa-dist-win + +Group Policy: +Computer Configuration > Administrative Templates > Windows Components > Microsoft Defender Antivirus + - Turn off Microsoft Defender Antivirus = Enabled + +https://superuser.com/a/1256574 +User Configuration > Administrative Templates > Windows Components > Attachment Manager + - Inclusion list for moderate risk file types = "*.exe;" diff --git a/hosts/moyo/samba/smb.conf b/hosts/moyo/samba/smb.conf index 6716277..1ca1afa 100644 --- a/hosts/moyo/samba/smb.conf +++ b/hosts/moyo/samba/smb.conf @@ -1,5 +1,8 @@ [global] workgroup = AKONCITY + server min protocol = NT1 + lanman auth = yes + ntlm auth = yes map to guest = Bad User server string = Local Samba Server server role = standalone server @@ -8,8 +11,12 @@ max log size = 50 passdb backend = tdbsam allow insecure wide links = yes - kernel oplocks = yes + kernel oplocks = no + socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=32768 SO_SNDBUF=32768 + getwd cache = true acl allow execute always = yes + ea support = yes + store dos attributes = yes [code] comment = code diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix index a05ccf4..572034e 100644 --- a/hosts/sofue/configuration.nix +++ b/hosts/sofue/configuration.nix @@ -12,7 +12,9 @@ in rec { ../../nix/bluetooth.nix ../../nix/email.nix ../../nix/amdgpu.nix + #../../nix/intel.nix ../../nix/gaming.nix + ../../nix/steam.nix ../../nix/virtualisation.nix ../../nix/scripts.nix ../../nix/programs/bash.nix @@ -22,7 +24,7 @@ in rec { ../../nix/programs/firefox.nix ../../nix/programs/obs.nix ../../nix/programs/kdeconnect.nix - ../../nix/programs/docker.nix + #../../nix/programs/docker.nix ./programs.nix ]; @@ -57,12 +59,12 @@ in rec { footer-offset = 0; }; monitors = { + #monitor1 = "DP-1"; + #monitor2 = "HDMI-A-1"; + #monitor3 = "HDMI-A-3"; monitor1 = "DP-1"; - monitor2 = "HDMI-A-1"; - monitor3 = "HDMI-A-3"; - #monitor1 = "DP-2"; - #monitor2 = "DP-1"; - #monitor3 = ""; + monitor2 = "DP-2"; + monitor3 = "HDMI-A-1"; }; }; @@ -174,8 +176,8 @@ in rec { output = { "${monitor1}" = { mode = "2560x1440@144.000Hz"; - #position = "3000 200"; - position = "1080 200"; + position = "3000 200"; + #position = "1080 200"; allow_tearing = "yes"; max_render_time = "off"; adaptive_sync = "on"; @@ -185,20 +187,21 @@ in rec { "${monitor2}" = { mode = "1920x1080@60.000Hz"; transform = "270"; - #position = "1920 0"; - position = "0 0"; + position = "1920 0"; + #position = "0 0"; allow_tearing = "no"; max_render_time = "7"; render_bit_depth = "10"; bg = "#${colo.background-alt} solid_color"; }; - #"${monitor3}" = { - # mode = "1920x1080@60.000Hz"; - # position = "0 1000"; - # max_render_time = "6"; - # render_bit_depth = "10"; - # bg = "#${colo.background-alt} solid_color"; - #}; + "${monitor3}" = { + mode = "1920x1080@60.000Hz"; + position = "0 1000"; + max_render_time = "7"; + render_bit_depth = "10"; + allow_tearing = "no"; + bg = "#${colo.background-alt} solid_color"; + }; }; workspaceOutputAssign = [ { workspace = "1"; output = "${monitor1}"; } diff --git a/hosts/xp/iso_checksums.txt b/hosts/xp/iso_checksums.txt new file mode 100644 index 0000000..dbb32b6 --- /dev/null +++ b/hosts/xp/iso_checksums.txt @@ -0,0 +1,20 @@ +https://archive.org/details/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428 +en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso +md5: f424a52153e6e5ed4c0d44235cf545d5 +sha1: 1c735b38931bf57fb14ebd9a9ba253ceb443d459 +sha256: 62b6c91563bad6cd12a352aa018627c314cfc5162d8e9f8af0756a642e602a46 +sha512: 4cbecbdce1091e79445678595a1d9606651f2a81b1853d36877319102f4e9c2d6cc0ad3b8247b5ebd305571a39c2608d41459d8d782afc1b76a10d195de10a88 + +== Research +https://pastebin.com/ufJkDPwe +https://gist.github.com/ivanagui2/6b8be4d8d2e618f8341937f67f243532 +https://forums.mydigitallife.net/threads/hashes-for-old-windows-sha-1-or-md5.26899/ +https://forums.mydigitallife.net/threads/windows-98-se-hash.9222/page-4 + +https://awuctl.github.io/mvs/ + +https://archive.org/details/windows-98-se-retail-english +https://archive.org/details/ENWIN2000PROSP4 +https://archive.org/details/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332_202006 + +// vim: set syntax=asciidoc: diff --git a/hosts/xp/pfp61.png b/hosts/xp/pfp61.png Binary files differnew file mode 100644 index 0000000..df61b58 --- /dev/null +++ b/hosts/xp/pfp61.png diff --git a/hosts/xp/products.sha b/hosts/xp/products.sha new file mode 100644 index 0000000..fce430a --- /dev/null +++ b/hosts/xp/products.sha @@ -0,0 +1,229 @@ +# Windows XP Media Center 2005 Update Rollup 2 [265] +be923dbf4887facc2ad8a42baa1749cd8b95e779 *de_winxp_mce_2005_update2.iso +59bd8c23730b78167a23d913c2c8818b891278bf *en_winxp_mce_2005_update2.iso +d20626ac9fe6aec2248209894ab72040ff29ce61 *fr_winxp_mce_2005_update2.iso +0f6e63312b604ccbb9eff3917336ceb2a64a50c0 *it_winxp_mce_2005_update2.iso +2674552c5987ff6ddb7fd21e2b0895cd6d0257ae *jp_winxp_mce_2005_update2.iso +7df06eb37a222c40e65ffbe1587c204369375a5a *ko_winxp_mce_2005_update2.iso +b7c99ef5fdcc632f82a914bedd4c29fdf85d1d6a *nl_winxp_mce_2005_update2.iso +1c52ff0c7a672f6beb2b043ea5269945c15507f9 *sc_winxp_mce_2005_update2.iso + +# Windows 7 Ultimate with Service Pack 1 [1241] +25565487abef877ebc6688c20a65e1c670b1f92d *ar_windows_7_ultimate_with_sp1_x64_dvd_u_677345.iso +302dfd114e2bf89ee69efb3b6ce9c982f84c9f91 *ar_windows_7_ultimate_with_sp1_x86_dvd_u_677448.iso +f408a16822a0445b68db294707a06cbe874704ec *bg_windows_7_ultimate_with_sp1_x64_dvd_u_677363.iso +94885a1482db7fcc00eed5460ec32b75b4db0a86 *bg_windows_7_ultimate_with_sp1_x86_dvd_u_677450.iso +2ce0b2db34d76ed3f697ce148cb7594432405e23 *cn_windows_7_ultimate_with_sp1_x64_dvd_u_677408.iso +b92119f5b732ece1c0850eda30134536e18ccce7 *cn_windows_7_ultimate_with_sp1_x86_dvd_u_677486.iso +ccf08ed048978ff7f902b76a19288d3b6f7fa901 *cs_windows_7_ultimate_with_sp1_x64_dvd_u_677376.iso +7b9488356ad3ac0444c421326d6c69fa96abb2f1 *cs_windows_7_ultimate_with_sp1_x86_dvd_u_677452.iso +324c85b0d952ec267b2ddb5a9760ede1497e775c *da_windows_7_ultimate_with_sp1_x64_dvd_u_677294.iso +8b0a1d5a5de47f5d508807db5893b97b1a4e78b4 *da_windows_7_ultimate_with_sp1_x86_dvd_u_677454.iso +0388de83934b51f44447e1435ca0ff5eb99d20b6 *de_windows_7_ultimate_with_sp1_x64_dvd_u_677306.iso +4de8a4198529b60d57e17e377efabb42b7b4f3a9 *de_windows_7_ultimate_with_sp1_x86_dvd_u_677456.iso +88fa98c86c9b919501f71bbbc559c8565d808832 *el_windows_7_ultimate_with_sp1_x64_dvd_u_677318.iso +3f08ce8a74e0cccaee7f946dcf250dc0712c2b1b *el_windows_7_ultimate_with_sp1_x86_dvd_u_677458.iso +36ae90defbad9d9539e649b193ae573b77a71c83 *en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso +65fce0f445d9bf7e78e43f17e441e08c63722657 *en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso +af4b835557b5f15b574a3a643eecaf922fc1236c *es_windows_7_ultimate_with_sp1_x64_dvd_u_677350.iso +5c1d3e8cfdc70dc44dc5ac1cb89cacc3c515b1e8 *es_windows_7_ultimate_with_sp1_x86_dvd_u_677462.iso +a276277be05b62154965e9be2c80665cab91e213 *et_windows_7_ultimate_with_sp1_x64_dvd_u_677368.iso +a8b00577f1370b7411e821e4a1f65aaf7fb2b15c *et_windows_7_ultimate_with_sp1_x86_dvd_u_677464.iso +23c57b632d12e5de40543334be3dc56cdc4f9fd9 *fi_windows_7_ultimate_with_sp1_x64_dvd_u_677378.iso +593ab48ed74d7fb3ac85168ed488af2743934ee9 *fi_windows_7_ultimate_with_sp1_x86_dvd_u_677466.iso +5370bb44f497e1b19114c7cf70f5cdef9f3a2582 *fr_windows_7_ultimate_with_sp1_x64_dvd_u_677299.iso +6a4d873e82698f7bf157c67a69c2db9bce6c769e *fr_windows_7_ultimate_with_sp1_x86_dvd_u_677434.iso +e0f821d1d24504747f725950aa6ff5db706d3767 *he_windows_7_ultimate_with_sp1_x64_dvd_u_677312.iso +548e0937927193cc6e336e41c429cf401c4ef9e3 *he_windows_7_ultimate_with_sp1_x86_dvd_u_677436.iso +7dc2db86f2c2304f4f71bc651da49add77076dc6 *hk_windows_7_ultimate_with_sp1_x64_dvd_u_677411.iso +66cd3d00631df7ede1d94331a49b842e1c2d37ef *hk_windows_7_ultimate_with_sp1_x86_dvd_u_677487.iso +f725ea9bc7f63c504ef88abf40958fe7111d8e10 *hr_windows_7_ultimate_with_sp1_x64_dvd_u_677324.iso +2809bcef53fcf04fe410c16f5dd6be33c29cf1c9 *hr_windows_7_ultimate_with_sp1_x86_dvd_u_677438.iso +28249fc2426245c4bb43649091614ccfb294d2ed *hu_windows_7_ultimate_with_sp1_x64_dvd_u_677338.iso +bb1e5b2055511861196cbb4526d04b15a7e3ebe6 *hu_windows_7_ultimate_with_sp1_x86_dvd_u_677441.iso +9af84e5a557c30f9d0c10bdc5fed339a7159f830 *it_windows_7_ultimate_with_sp1_x64_dvd_u_677356.iso +3378d4bfdbab850407ab6047b68fa9cbb2275b75 *it_windows_7_ultimate_with_sp1_x86_dvd_u_677443.iso +643f7d12ff4b412e40c35bbb17b5bc11379e8c73 *ja_windows_7_ultimate_with_sp1_x64_dvd_u_677372.iso +19e0b9f78165731fc862eacca7f1801d6eca7980 *ja_windows_7_ultimate_with_sp1_x86_dvd_u_677445.iso +7bbf0f48937f4fcbbca63dce2cf2945cec1d6bc5 *lt_windows_7_ultimate_with_sp1_x64_dvd_u_677379.iso +a49b13daeaf462b05756e0d6d45aa29da0bd142c *lt_windows_7_ultimate_with_sp1_x86_dvd_u_677447.iso +436af00fcf6e026ba7ef9861b74d67643269c2e5 *lv_windows_7_ultimate_with_sp1_x64_dvd_u_677302.iso +32d05111a894cf4dcaab8ad4359cd4e1f6b54799 *lv_windows_7_ultimate_with_sp1_x86_dvd_u_677449.iso +8ea95845447abcc0a7bccee6df5142779e19fa58 *nl_windows_7_ultimate_with_sp1_x64_dvd_u_677325.iso +730e312b1a27deaed174841d9d4b562e3d81fcd7 *nl_windows_7_ultimate_with_sp1_x86_dvd_u_677453.iso +6f487f2a523c3de8e2d9c9d113b42c56ae7a10dc *no_windows_7_ultimate_with_sp1_x64_dvd_u_677314.iso +2add96c938e93c40fdab7154748befed18ab35e5 *no_windows_7_ultimate_with_sp1_x86_dvd_u_677451.iso +c6620ae85d42fca40c202b68c0e7124bc0eda7c2 *pl_windows_7_ultimate_with_sp1_x64_dvd_u_677341.iso +38dc423de68dd73fae600096ab82a1c5b63fa0ca *pl_windows_7_ultimate_with_sp1_x86_dvd_u_677455.iso +03686f4e838102220aa9925c3f2c067a6c7dc46e *pp_windows_7_ultimate_with_sp1_x64_dvd_u_677373.iso +8bd12c1a0925d77b3ef8c0dbf966f5b0b22a8a9e *pp_windows_7_ultimate_with_sp1_x86_dvd_u_677459.iso +2a015945685da102c2601af463b474a343985ef7 *pt_windows_7_ultimate_with_sp1_x64_dvd_u_677358.iso +95c625d1c6a80cd8f4a188bc8547a436a108efce *pt_windows_7_ultimate_with_sp1_x86_dvd_u_677457.iso +3d52a0b34af2f8151a40aedcb967d0e088f51c94 *ro_windows_7_ultimate_with_sp1_x64_dvd_u_677380.iso +142ce0e9af47753629a1060ed377472587f54fe7 *ro_windows_7_ultimate_with_sp1_x86_dvd_u_677461.iso +106caf0695318ad0d82e441a54be8460bf099b09 *ru_windows_7_ultimate_with_sp1_x64_dvd_u_677391.iso +d224888cfa62847faa3505630a206bdcd10a9930 *ru_windows_7_ultimate_with_sp1_x86_dvd_u_677463.iso +d096a8aa881d90e65be9a57d49c23dfb16ac01b1 *sk_windows_7_ultimate_with_sp1_x64_dvd_u_677393.iso +5234ecee1bbe1b60b91a75795388ca73ea300337 *sk_windows_7_ultimate_with_sp1_x86_dvd_u_677465.iso +b9e29e1905335a7109234f339b860109e954e172 *sl_windows_7_ultimate_with_sp1_x64_dvd_u_677396.iso +eb1a70a198e97c5d3fce1efb8fe684ad9b6af873 *sl_windows_7_ultimate_with_sp1_x86_dvd_u_677467.iso +a11551e1306b90208c5f703b1c229843c5fa0daf *sr_windows_7_ultimate_with_sp1_x64_dvd_u_677398.iso +4a343bdab5298b3467eacf571bf91aa8c2eae04c *sr_windows_7_ultimate_with_sp1_x86_dvd_u_677468.iso +839c4132d5169cfa2cfca76f1e71d92f5cfc6117 *sv_windows_7_ultimate_with_sp1_x64_dvd_u_677400.iso +cd875f8f0f72d8e6a2c9c617461990a67faeddbd *sv_windows_7_ultimate_with_sp1_x86_dvd_u_677482.iso +6e409e5174bbf83e62a5dfe91b952d11c8a078a3 *th_windows_7_ultimate_with_sp1_x64_dvd_u_677402.iso +aa9b3c5ddf2196cdaf002bb5dc2a1459dadfb041 *th_windows_7_ultimate_with_sp1_x86_dvd_u_677483.iso +86a6b3b55e7fc2cec798806a80263ca59b77a992 *tr_windows_7_ultimate_with_sp1_x64_dvd_u_677404.iso +c352f8b7071a7893edecacc02af1421f1cb6bf32 *tr_windows_7_ultimate_with_sp1_x86_dvd_u_677484.iso +c580ad0ffcb4c08e4f8c1b1ed8ce22675977bc05 *tw_windows_7_ultimate_with_sp1_x64_dvd_u_677414.iso +c281631b915aa24b93c37f6d5d586aa7b51211d8 *tw_windows_7_ultimate_with_sp1_x86_dvd_u_677488.iso +9fe311e57d626901e4a6205e345ebaa5ff9c2c5f *uk_windows_7_ultimate_with_sp1_x64_dvd_u_677406.iso +15c8de9014c9ec511878fb9bd4704a54d81a4d4f *uk_windows_7_ultimate_with_sp1_x86_dvd_u_677485.iso + +# Windows Vista with Service Pack 2 [1257] +b284c32290d619d6dc3afee60f462b25c55f436a *ar_windows_vista_with_sp2_x64_dvd_x15-36318.iso +caaa08290a55a17df9c15bd82960fbcbb179aea3 *ar_windows_vista_with_sp2_x86_dvd_x15-36282.iso +563261102ce9c012ba2b8dc44816c4bc726b057f *bg_windows_vista_with_sp2_x64_dvd_x15-36321.iso +f4af9b66b6b16a2e3253ec0302c4783783a68080 *bg_windows_vista_with_sp2_x86_dvd_x15-36284.iso +a1689c254fb3bd67807ee493ee7d4896bca39887 *cn_windows_vista_with_sp2_x64_dvd_x15-36322.iso +da7f7bdc841ddffabff7ddab6b1158873bf1246d *cn_windows_vista_with_sp2_x86_dvd_x15-36285.iso +d686d03e6e2985b87fb92b8f901f7253a28da7dc *cs_windows_vista_with_sp2_x64_dvd_x15-36327.iso +877237900943650852773fa8005c205775df81ec *cs_windows_vista_with_sp2_x86_dvd_x15-36289.iso +ceca9de5065828822720b3df0207076a0cb9574d *da_windows_vista_with_sp2_x64_dvd_x15-36329.iso +40a85490fb24f29b21c085af9a7f83586be460b8 *da_windows_vista_with_sp2_x86_dvd_x15-36290.iso +d3c6e5d3d01a13576af15533ec40f74abbddce9b *de_windows_vista_sp2_x64_dvd_342287.iso +bfb0973b0c2cfbb37e65d9e670910f080493c7c1 *de_windows_vista_sp2_x86_dvd_342286.iso +1136b9202aae3d5ba5d4d6d2714eaf3445e9ab55 *el_windows_vista_with_sp2_x64_dvd_x15-36343.iso +de27f554306fce123be27d6d3f543a757a361ae9 *el_windows_vista_with_sp2_x86_dvd_x15-36297.iso +aaee3c04533899f9f8c4ae0c4250ef5fafbe29a3 *en_windows_vista_sp2_x64_dvd_342267.iso +25ad9a776503e6a583bec07879dbcc5dfd20cd6e *en_windows_vista_with_sp2_x86_dvd_342266.iso +bb03bb83e82338c43296884b11588fdf987593a1 *es_windows_vista_sp2_x64_dvd_342309.iso +1c6f6b5041a7556bb8e3aa636d856aa206b99d3c *es_windows_vista_sp2_x86_dvd_342308.iso +e318595e9dae52966bdce60ba3e55356efaedbf8 *et_windows_vista_with_sp2_x64_dvd_x15-36335.iso +b598f56fd0b8394766db8fc4e2857afcc9a5b1b3 *et_windows_vista_with_sp2_x86_dvd_x15-36293.iso +8c4b4878333a4ec1decff67eaf360b2fcbc95b82 *fi_windows_vista_with_sp2_x64_dvd_x15-36337.iso +8f5e5807e208c70d0150362f995b50c5c915fd6e *fi_windows_vista_with_sp2_x86_dvd_x15-36294.iso +b8d697f8e9a21d25c5ef04ae80982d4f22673a6a *fr_windows_vista_sp2_x64_dvd_342277.iso +c5a0a891f15082b45e987fd583900591babd118c *fr_windows_vista_sp2_x86_dvd_342276.iso +92d9b4c4acaeab4006bec38aad73ef4bf70fdac5 *he_windows_vista_with_sp2_x64_dvd_x15-36344.iso +6fe8c70fa8aa9f4b849312ccd8125ec55665818f *he_windows_vista_with_sp2_x86_dvd_x15-36298.iso +be2b4e2be0d75182210e8084909483f177f5af03 *hk_windows_vista_with_sp2_x64_dvd_x15-36324.iso +c88aa86345083f482410ec7ed9e15de2c174ce4f *hk_windows_vista_with_sp2_x86_dvd_x15-36287.iso +35abf8d7ff2a01b77a64f808f0296c2946748d82 *hr_windows_vista_with_sp2_x64_dvd_x15-36325.iso +f0e298cd7f4e3804bea1f51bb911168f3e259c84 *hr_windows_vista_with_sp2_x86_dvd_x15-36288.iso +50e67aca9489f0ac34406d87d910d341dc38e226 *hu_windows_vista_with_sp2_x64_dvd_x15-36346.iso +57ff0ec21f1fd2df43c28174119f426cac697454 *hu_windows_vista_with_sp2_x86_dvd_x15-36299.iso +137fc1d51dd0f025e9e489e22d5cf8cc9cb0d8bf *it_windows_vista_with_sp2_x64_dvd_x15-36348.iso +25601d6333ef9966adf6c100ebc0d453a08823bb *it_windows_vista_with_sp2_x86_dvd_x15-36300.iso +a221c018638a5c0cf008b1feb57418178ae64815 *ja_windows_vista_sp2_x64_dvd_342298.iso +2561ca265260d98b687f6b896eabe89234a9cb27 *ja_windows_vista_sp2_x86_dvd_342296.iso +4664ddee58a9cb8a1fc7dd31d9c484cc176b8569 *lt_windows_vista_with_sp2_x64_dvd_x15-36355.iso +51eea18c696004630817de7d094bc55e441852b9 *lt_windows_vista_with_sp2_x86_dvd_x15-36304.iso +2602317b7e6a0da5b7b3b333f35d646ef703d9e3 *lv_windows_vista_with_sp2_x64_dvd_x15-36353.iso +bccf6135beb6932844f8366bcbfec49f59de042e *lv_windows_vista_with_sp2_x86_dvd_x15-36303.iso +959882845cfc5978e301266b47aa1430c5284d40 *nl_windows_vista_with_sp2_x64_dvd_x15-36331.iso +d0e07434493f063a7d6a13a67be36cb923598114 *nl_windows_vista_with_sp2_x86_dvd_x15-36291.iso +03e4b8dd2e69f62dd28cae7b37f79e3c722ddccb *no_windows_vista_with_sp2_x64_dvd_x15-36357.iso +3e6c07b6baccc2b69dadf652184465b291040d1e *no_windows_vista_with_sp2_x86_dvd_x15-36305.iso +15aa9ee504f937b3c32780f791e7af13729b9c17 *pl_windows_vista_with_sp2_x64_dvd_x15-36359.iso +3d086afce629b24463145409a182d3c9c9a75737 *pl_windows_vista_with_sp2_x86_dvd_x15-36306.iso +aea8a1cfbfc74be53833d22ee17ac044bca28c4b *pp_windows_vista_with_sp2_x64_dvd_x15-36361.iso +af873f67d68a1d426a7a7fd23a480be749e2614c *pp_windows_vista_with_sp2_x86_dvd_x15-36307.iso +4d61447f037e5ef925be200a8919604411f638b8 *pt_windows_vista_with_sp2_x64_dvd_x15-36319.iso +597eeac876033ba1df279acfa310f2e4fd56e7df *pt_windows_vista_with_sp2_x86_dvd_x15-36283.iso +5f75fb171bdb5c4a59540767ba0fd2163360d74e *ro_windows_vista_with_sp2_x64_dvd_x15-36363.iso +da86c65d91b6b4dd110e99e0bc61466040b54788 *ro_windows_vista_with_sp2_x86_dvd_x15-36308.iso +8b7ec16e567f3f2c113e8a229bbcd1215b97b4b8 *ru_windows_vista_with_sp2_x64_dvd_x15-36364.iso +5f80659031cfbfb702e1670a3698eee698fe0261 *ru_windows_vista_with_sp2_x86_dvd_x15-36309.iso +6bb704df605799b72222073802298eafc8fa0062 *sk_windows_vista_with_sp2_x64_dvd_x15-36367.iso +a3bd712c92736fe450d68407c59560416985ab68 *sk_windows_vista_with_sp2_x86_dvd_x15-36311.iso +fbb021df12783cc7ee40d7cfc0e2ad8f675e550b *sl_windows_vista_with_sp2_x64_dvd_x15-36369.iso +f3c9eab2193f9a73eeb56890c6b429b67d3bdf26 *sl_windows_vista_with_sp2_x86_dvd_x15-36312.iso +fee952fded3a3e403fc2fdd320babaf7c2f741f1 *sr_windows_vista_with_sp2_x64_dvd_x15-36365.iso +f05eb36aa6a6f58b1617290c9ca153a736e6c216 *sr_windows_vista_with_sp2_x86_dvd_x15-36310.iso +40b5dec573ae3aba12b2137ede23e0175ef061f6 *sv_windows_vista_with_sp2_x64_dvd_x15-36373.iso +64767dfe48be253be4c414eca9204ecc06310074 *sv_windows_vista_with_sp2_x86_dvd_x15-36314.iso +18be06d3183012e908997d4ef21d23ee040de796 *th_windows_vista_with_sp2_x64_dvd_x15-36374.iso +a114b8e05a97fed56eac63f38939c61a36dbfbbe *th_windows_vista_with_sp2_x86_dvd_x15-36315.iso +6ce6f528763a326e0da4b2d19c7687f4a008f64e *tr_windows_vista_with_sp2_x64_dvd_x15-36375.iso +74354142af15cb154ebbf76379e5b30f6fffb6e0 *tr_windows_vista_with_sp2_x86_dvd_x15-36316.iso +3888577027c9fe93aea0b6663937f364ed8147d4 *tw_windows_vista_with_sp2_x64_dvd_x15-36323.iso +bc116de2effd4daea5a331c6f2e209ab4cf5f99c *tw_windows_vista_with_sp2_x86_dvd_x15-36286.iso +fe63d62e8d9c62296a1eabb20124e7373884e749 *uk_windows_vista_with_sp2_x64_dvd_x15-36376.iso +cff5df9c964d7627ba99081ba5998180a0478d3e *uk_windows_vista_with_sp2_x86_dvd_x15-36317.iso + +# Windows XP Media Center 2005 [7180] +520d1abf754d63dbc394c91bb8593b4ac6d7bea8 *de_winxp_mce_2005_cd1.iso +9f0e3517426e87331e6ebff03231362757350040 *de_winxp_mce_2005_cd2.iso +263e59a41559bdb988304f033ea8116efc500456 *en_winxp_mce_2005_cd1.iso +4efc488f9ed6b746cec11e8b1cdc5241c50fa490 *en_winxp_mce_2005_cd2.iso +05504416dbc759479331abc82066a425f191d66d *fr_winxp_mce_2005_cd1.iso +c3d5f92ec313aeff20b962ff627c269340452ef8 *fr_winxp_mce_2005_cd2.iso +418fa8ff08602e7d0a738deec3ff823fd70b88ed *it_winxp_mce_2005_cd1.iso +a7859e72b3bcf1e76e86dd52941755688f4cf252 *it_winxp_mce_2005_cd2.iso +361479fdaa23708b090e73129023e2a7d760449c *ja_winxp_mce_2005_cd2.iso +0651ef452ba28467fcaea9fa1c1977ed03496e86 *jp_winxp_mce_2005_cd1.iso +6c905d3435f4575d1e68a14c0e924b0edbbb34c5 *ko_winxp_mce_2005_cd1.iso +f05d750f2fa15c2573e11f4ad20c8ce452a38c0c *ko_winxp_mce_2005_cd2.iso +4b75453c6841192e02e7a2630ac0d6d975c09431 *nl_winxp_mce_2005_cd1.iso +376a1fe3164b4787e1eff3fb091cd21101ca70e2 *nl_winxp_mce_2005_cd2.iso +8d6a1aa1871c49314cb9df4899e025ca63058fc0 *sc_winxp_mce_2005_cd1.iso +01b8242ac47bc04d1940869d5b06fdff30b370c6 *sc_winxp_mce_2005_cd2.iso + +# Windows XP Media Center 2005 Localization Pack [7184] +caf3c67fada58f12b8fb7da3d5629ec5da94fe51 *cht_winxp_mce_2005_locpack.iso +2a8ebb591e8835cdda270a8e04a5434e472d947e *cz_winxp_mce_2005_locpack.iso +a1a9b40dd628f20ccdd9308408f27a26812c43cd *da_winxp_mce_2005_locpack.iso +5c91fb60ce8f29aea3d16fa3f1db6277a219d164 *es_winxp_mce_2005_locpack.iso +d88adef74c5594fcefeb8419933115336cf4357d *fi_winxp_mce_2005_locpack.iso +e19ebad1a8ae918754d8d2f3d829ef02b97268ba *hk_winxp_mce_2005_locpack.iso +168209f3f4b44e5388ebf87516ff04515ab0740e *no_winxp_mce_2005_locpack.iso +50b8ea28f69ddd7a8f48216bc7b6c00d4b26cd03 *po_winxp_mce_2005_locpack.iso +8affd56c0588336d8306d3fb25874d3888637f82 *pt_winxp_mce_2005_locpack.iso +b3456382d646413e1ff61b09e0708bf0e25f687e *ru_winxp_mce_2005_locpack.iso +a735aec6b85cea32ca881a70325e51d8c5c8a296 *sv_winxp_mce_2005_locpack.iso +7476748aa58ce02311927028848212cf7a1d27b2 *tk_winxp_mce_2005_locpack.iso + +# Windows XP Professional with Service Pack 3 [7630] +22ae37b8f860d8ff7b30a82878e15931e41d1725 *ar_windows_xp_professional_with_service_pack_3_x86_cd_x14-80396.iso +9f4201afa36ae9f31ceaf4fc642e9764fcb5f536 *cs_windows_xp_professional_with_service_pack_3_x86_cd_x14-80416.iso +9a6c10040e4c5ce1f8a2d60c7e0319edf8dceb92 *da_windows_xp_professional_with_service_pack_3_x86_cd_x14-80420.iso +543b4a7c6779002a63614f09e5218056ee220af6 *de_windows_xp_professional_with_service_pack_3_x86_cd_x14-80444.iso +254a501babf9716f9b3c9c73cadc4900a21fb73c *el_windows_xp_professional_with_service_pack_3_x86_cd_x14-80448.iso +1c735b38931bf57fb14ebd9a9ba253ceb443d459 *en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso +11ffce4604bbf627c5695e30c2238266e214c5db *es_windows_xp_professional_with_service_pack_3_x86_cd_x14-80488.iso +ce9bf0c9dc49efeba3b868e72baccb7f07ce63f9 *fi_windows_xp_professional_with_service_pack_3_x86_cd_x14-80436.iso +ffba78eb8e5a965a178ebd0cf354e9dd67dd5064 *fr_windows_xp_professional_with_service_pack_3_x86_cd_x14-80440.iso +be5790b582368c5c3c7170760d2b578f22da76cb *he_windows_xp_professional_with_service_pack_3_x86_cd_x14-80452.iso +90476edef22543d7e56c7d924b4c54a0aa86303b *hu_windows_xp_professional_with_service_pack_3_x86_cd_x14-80456.iso +2ba80aa9de48c34b2ab488afda9666ba7f4aa963 *it_windows_xp_professional_with_service_pack_3_x86_cd_x14-80460.iso +3125aaed8f40a5d8a10dbb959a03e39acc0d9fcb *ja_windows_xp_professional_with_service_pack_3_x86_dvd_x14-80464.iso +ab323d40a96471675d12dde87bafd6fe0adc7141 *nl_windows_xp_professional_with_service_pack_3_x86_cd_x14-80424.iso +b5dac6d279e55b434c41ba8d5f9697a65affdc09 *no_windows_xp_professional_with_service_pack_3_x86_cd_x14-80472.iso +595ca475f4a80b42704ae2fca9fb9042c37d5c49 *pl_windows_xp_professional_with_service_pack_3_x86_cd_x14-80476.iso +32f376c2252849c81e1aa704838b01210c09ba96 *pt-br_windows_xp_professional_with_service_pack_3_x86_cd_x14-80400.iso +b8d34a720cbe3533ec45c870d1432fc568599e97 *pt-pt_windows_xp_professional_with_service_pack_3_x86_cd_x14-80480.iso +3686da63d3d3e8402eb43fe4bf29a58486eca6b3 *ru_windows_xp_professional_with_service_pack_3_x86_cd_x14-80484.iso +5060d593c8eac1d9875f5fd6f23691706abc5460 *sv_windows_xp_professional_with_service_pack_3_x86_cd_x14-80492.iso +ca1d57347afe6f9297e00381e0ae849fab8bc4f9 *tr_windows_xp_professional_with_service_pack_3_x86_cd_x14-80496.iso +69dbf131116760932dcf132ade111d6b45778098 *zh-hans_windows_xp_professional_with_service_pack_3_x86_cd_x14-80404.iso +48ac651e487a7368be50163263c4a3927fb4e869 *zh-hk_windows_xp_professional_with_service_pack_3_x86_cd_x14-80412.iso +ce63c1b72e058e121db9d58f81623da3e7401fbf *zh-tw_windows_xp_professional_with_service_pack_3_x86_cd_x14-80408.iso + +# Windows Vista Ultimate with Service Pack 2 Debug-Checked [7641] +4b0be4a155dceea5ce8069f9806fd505f63fdbbc *en_windows_vista_ultimate_sp2_checked_build_x64_dvd_342433.iso +3617756d54dffc47b803b30a530ff389a15dc3d3 *en_windows_vista_ultimate_sp2_checked_build_x86_dvd_342432.iso + +# Windows 10 IoT Enterprise LTSC 2021 [8166] +d265df49b30a1477d010c79185a7bc88591a1be4b3eb690c994bed828ea17c00 *en-us_windows_10_iot_enterprise_ltsc_2021_arm64_dvd_e8d4fc46.iso +a0334f31ea7a3e6932b9ad7206608248f0bd40698bfb8fc65f14fc5e4976c160 *en-us_windows_10_iot_enterprise_ltsc_2021_x64_dvd_257ad90f.iso + +# Windows Vista Media Center Software Development Kit (SDK) Version 5.3 [8402] +3aac262d8ca5205b197a8378f3d66a4f1d2399dd *en_windows_vista_media_center_sdk_v5.3_x86_cd_x14-28827.iso + +# Windows Vista Media Center Software Development Kit (SDK) Version 5.2 [8403] +f54ea53d96e4b2558be56931a3f339649bf973c8 *en_windows_vista_media_center_software_development_kit_v5.2_cd_x14-07889.iso + +# Windows Vista Media Center Software Development Kit (SDK) Refresh [8404] +d6486e9b3e8bc9be3858e78287befba1605b603e *en_windows_vista_media_center_sdk_refresh_dvd_x13-77439.iso + diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix index 6f2aeca..06a6700 100644 --- a/hosts/yashinoki/configuration.nix +++ b/hosts/yashinoki/configuration.nix @@ -12,6 +12,7 @@ in { ../../nix/bluetooth.nix ../../nix/email.nix ../../nix/intel.nix + ../../nix/gaming.nix ../../nix/virtualisation.nix ../../nix/scripts.nix ../../nix/programs/bash.nix diff --git a/nix/amdgpu.nix b/nix/amdgpu.nix index 9c25608..5cb89c0 100644 --- a/nix/amdgpu.nix +++ b/nix/amdgpu.nix @@ -24,7 +24,7 @@ }; }; # https://github.com/sibradzic/amdgpu-clocks -# TODO: Fetch and patch scripts from the git repo. +# @TODO: Fetch and patch scripts from the git repo. # environment.etc = { # XFX RX 6600 # "default/amdgpu-custom-states.card0".text = '' # OD_VDDGFX_OFFSET: diff --git a/nix/gaming.nix b/nix/gaming.nix index 2b52aa2..4a7d25a 100644 --- a/nix/gaming.nix +++ b/nix/gaming.nix @@ -8,38 +8,17 @@ in { environment.systemPackages = with pkgs; lib.lists.flatten [ (asNeeded "gamepad-tool" ["gamepad-tool"]) (asNeeded "sdl-jstest" ["sdl-jstest" "sdl2-jstest"]) - (asNeeded "protontricks" ["protontricks" "protontricks-launch"]) + (asNeeded "parsec-bin" ["parsecd"]) (asNeeded "[lutris umu-launcher]" ["lutris"]) - (asNeeded "prismlauncher" ["prismlauncher"]) - (asNeeded "retroarch" ["retroarch"]) + (asNeeded "(retroarch.withCores (cores: with cores; [ mesen bsnes ]))" ["retroarch"]) (asNeeded "dolphin-emu" ["dolphin-emu"]) + (asNeeded "cemu" ["cemu"]) + (asNeeded "ryujinx" ["ryujinx"]) (asNeeded "pcsx2" ["pcsx2-qt"]) (asNeeded "(ppsspp.override { enableQt = true; })" ["ppsspp"]) - (asNeeded "cemu" ["cemu"]) (asNeeded "rpcs3" ["rpcs3"]) - (asNeeded "ryujinx" ["ryujinx"]) + (asNeeded "prismlauncher" ["prismlauncher"]) (asNeeded "osu-lazer-bin" ["osu!"]) - (asNeeded "parsec-bin" ["parsecd"]) - (writeShellScriptBin "run-steam-gamescope" '' - export TTY=/dev/tty4 - export XDG_VTNR=4 - cd $HOME - exec ${pkgs.kbd}/bin/openvt --switch --login --console 4 -f -- steam-gamescope - '') - (writeShellScriptBin "proton-env" '' - 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_CONFIG=dxr - export VKD3D_DEBUG=none - export VKD3D_SHADER_DEBUG=none - export mesa_glthread=true - xrandr --output ${loc.monitors.monitor1} --primary - #exec env --unset=SDL_VIDEODRIVER --unset=SDL_VIDEO_DRIVER mangohud gamemoderun "$@" - exec env mangohud gamemoderun "$@" - '') ]; #hardware.xone.enable = true; #hardware.opentabletdriver.enable = true; @@ -62,33 +41,12 @@ in { #}; }; }; - programs.steam = { - enable = true; - gamescopeSession = let - width = "2560"; - height = "1440"; - in { - enable = true; - args = [ - "-W ${width}" "-H ${height}" - "-w ${width}" "-h ${height}" - "-r 144" - "-O ${loc.monitors.monitor1}" - "--rt" - "-f" - "-e" -# "-o 10" - "--adaptive-sync" -# "--force-grab-cursor" - "--mangoapp" - ]; - }; - }; programs.gamescope = { enable = true; package = pkgs.gamescope; capSysNice = true; }; +# chaotic.mesa-git.enable = true; # services.ananicy = { # enable = true; # # package = pkgs.ananicy-cpp; diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix index 6ee2751..fd10f99 100644 --- a/nix/programs/firefox.nix +++ b/nix/programs/firefox.nix @@ -19,8 +19,8 @@ in { source = (pkgs.fetchFromGitHub { owner = "rafaelmardojai"; repo = "firefox-gnome-theme"; - rev = "59e3de00f01e5adb851d824cf7911bd90c31083a"; - hash = "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4="; + rev = "6b2061ac6faf5dfb52d5b41dca98fa0c022b2b91"; + hash = "sha256-c3oiw6RysUVxRqkv39gxhiO1WjfvuEzZw4PemN0C7Kk="; }); }; home.file."customChrome.css" = { diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix index 0e2ad0b..c070871 100644 --- a/nix/programs/kitty.nix +++ b/nix/programs/kitty.nix @@ -17,6 +17,7 @@ in { mode = "enabled"; enableBashIntegration = true; }; + # @TODO: https://sw.kovidgoyal.net/kitty/conf/#opt-kitty.active_tab_title_template extraConfig = '' shell ${pkgs.bashInteractive}/bin/bash --login update_check_interval 0 @@ -33,13 +34,14 @@ in { paste_actions confirm,confirm-if-large disable_ligatures always modify_font baseline ${toString loc.font.baseline} - cursor #${colo.foreground} 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 #${colo.foreground} + cursor_text_color background foreground #${colo.foreground} background #${colo.background} color0 #${colo.color0} @@ -67,8 +69,27 @@ in { 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} + url_color #${colo.color5} + enabled_layouts splits,stack ''; }; + home.file.".config/kitty/quick-access-terminal.conf".text = '' + lines 18 + background_opacity 0.925 + kitty_override startup_session=quick-access-session.conf + kitty_override placement_strategy=bottom-right + kitty_override window_padding_width=0 12 8 0 + ''; + home.file.".config/kitty/quick-access-session.conf".text = '' + output_name ${loc.monitors.monitor1} + layout splits + launch --var window=main + launch --location=vsplit --bias=17.1 /home/andrew/dl/tmp/clock/a.out + focus_matching_window var:window=first + ''; wayland.windowManager.sway = { config = rec { terminal = "${pkgs.kitty}/bin/kitty -1"; @@ -76,7 +97,7 @@ in { mod1 = "Mod1"; in { "${mod1}+Return" = "exec ${terminal}"; - "${mod1}+backslash" = "exec ${terminal} --class=\"kitty-popup\""; + "${mod1}+backslash" = "exec ${pkgs.kitty}/bin/kitten quick-access-terminal"; }; }; }; diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix index eb30595..5e9cb08 100644 --- a/nix/programs/sway.nix +++ b/nix/programs/sway.nix @@ -282,12 +282,12 @@ in { titlebar = false; commands = [ { command = "move to scratchpad"; criteria.app_id = "kitty-server"; } - { command = "floating enable; allow_tearing yes"; criteria.app_id = "kitty-popup"; } { command = "allow_tearing yes"; criteria.app_id = "kitty"; } { command = "inhibit_idle fullscreen; floating enable; allow_tearing yes"; criteria.app_id = "cmv"; } { command = "floating enable"; criteria.class = "cmv.exe"; } { command = "floating enable"; criteria.app_id = "mauri"; } { command = "inhibit_idle fullscreen"; criteria.title = "Parsec"; } + { command = "inhibit_idle fullscreen"; criteria.class = "streaming_client"; } { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = "steam_app_.*"; } { command = "inhibit_idle fullscreen; allow_tearing yes; floating enable"; criteria.app_id = "gamescope"; } { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = ".gamescope-wrapped"; } diff --git a/nix/steam.nix b/nix/steam.nix new file mode 100644 index 0000000..9ecb21f --- /dev/null +++ b/nix/steam.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, ... }: let + loc = config.local; +in { + environment.systemPackages = with pkgs; lib.lists.flatten [ + (asNeeded "protontricks" ["protontricks" "protontricks-launch"]) + (writeShellScriptBin "run-steam-gamescope" '' + export TTY=/dev/tty4 + export XDG_VTNR=4 + cd $HOME + exec ${pkgs.kbd}/bin/openvt --switch --login --console 4 -f -- steam-gamescope + '') + (writeShellScriptBin "proton-env" '' + 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_CONFIG=dxr + export VKD3D_DEBUG=none + export VKD3D_SHADER_DEBUG=none + export mesa_glthread=true + xrandr --output ${loc.monitors.monitor1} --primary + exec env --unset=SDL_VIDEODRIVER --unset=SDL_VIDEO_DRIVER mangohud gamemoderun "$@" + '') + ]; + programs.steam = { + enable = true; + gamescopeSession = let + width = "2560"; + height = "1440"; + in { + enable = true; + args = [ + "-W ${width}" "-H ${height}" + "-w ${width}" "-h ${height}" + "-r 144" + "-O ${loc.monitors.monitor1}" + "--rt" + "-f" + "-e" +# "-o 10" + "--adaptive-sync" +# "--force-grab-cursor" + "--mangoapp" + ]; + }; + }; +} diff --git a/nix/user.nix b/nix/user.nix index a7b71a8..0050182 100644 --- a/nix/user.nix +++ b/nix/user.nix @@ -59,7 +59,7 @@ in { file bc screen - sloccount + loccount (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ])) rsync (python3.withPackages (python-pkgs: [ python-pkgs.requests python-pkgs.beautifulsoup4 ])) @@ -67,6 +67,7 @@ in { neofetch (asNeeded "cmatrix" ["cmatrix"]) hdparm + dcfldd usbutils cryptsetup (asNeeded "nix-index" ["nix-channel-index" "nix-index" "nix-locate"]) @@ -74,7 +75,7 @@ in { (asNeeded "optipng" ["optipng"]) (asNeeded "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"]) (asNeeded "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"]) - perlPackages.ArchiveZip + perlPackages.ArchiveZip # For crc32. b3sum libfaketime cpulimit @@ -103,7 +104,7 @@ in { local.scripts.imports = [ "install-as-needed" "cpu-vulns" - "spell" + "sp" # spell "ts-date" "term-font-size" "shift-jis-zip" diff --git a/scripts/sp b/scripts/sp new file mode 100755 index 0000000..19d38a1 --- /dev/null +++ b/scripts/sp @@ -0,0 +1,6 @@ +#! /usr/bin/env sh +if [ $# -eq 0 ]; then + wl-paste | aspell -a +else + echo "$@" | aspell -a +fi diff --git a/scripts/spell b/scripts/spell deleted file mode 100755 index 42e1f99..0000000 --- a/scripts/spell +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env sh -echo "$@" | aspell -a diff --git a/themes/year_of_snake/snake.nix b/themes/year_of_snake/snake.nix index c2a9d01..a764487 100644 --- a/themes/year_of_snake/snake.nix +++ b/themes/year_of_snake/snake.nix @@ -19,5 +19,5 @@ rec { color13 = "${color5}"; color14 = "${color6}"; color15 = "${color7}"; - alpha = 0.96; + alpha = 0.985; } |