summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2025-05-07 15:42:25 -0400
committerAndrew Opalach <andrew@akon.city> 2025-05-07 15:42:25 -0400
commitf94b0f1370d4633cba8397642e809bc39d4461f8 (patch)
treeb8dd8ed889d8c7d4f7383490ee86fb87e04deffc
parent4366ae6eb9a4f3db04a3ea5323eb2f18bedef630 (diff)
downloaddotfiles-f94b0f1370d4633cba8397642e809bc39d4461f8.tar.gz
dotfiles-f94b0f1370d4633cba8397642e809bc39d4461f8.tar.bz2
dotfiles-f94b0f1370d4633cba8397642e809bc39d4461f8.zip
Add some gentoo host files
-rw-r--r--NOTES.txt4
-rw-r--r--files/nixpkgs-patches/399384.diff21
-rw-r--r--files/nixpkgs-patches/399388.diff43
-rw-r--r--files/nixpkgs-patches/adw-gtk3-patch.diff13
-rw-r--r--files/nixpkgs-patches/adw-gtk3-update.diff40
-rw-r--r--flake.lock32
-rw-r--r--flake.nix16
-rw-r--r--hosts/iroha/kernel_config69
-rw-r--r--hosts/iroha/modprobe.d/amdgpu_before_nvidia.conf1
-rw-r--r--hosts/iroha/modprobe.d/intel_before_nvidia.conf1
-rw-r--r--hosts/iroha/modprobe.d/kvm_amd.conf2
-rw-r--r--hosts/moyo/container.nix1
-rw-r--r--hosts/moyo/kernel_config77
-rw-r--r--hosts/moyo/samba/smb.conf23
-rw-r--r--hosts/sofue/configuration.nix1
-rw-r--r--hosts/sofue/incus.yaml656
-rw-r--r--nix/gaming.nix6
-rw-r--r--nix/programs/kitty.nix6
-rw-r--r--nix/programs/nvim.nix2
-rw-r--r--nix/programs/sway.nix24
-rw-r--r--nix/user.nix1
21 files changed, 943 insertions, 96 deletions
diff --git a/NOTES.txt b/NOTES.txt
index 1b7f3de..6007dda 100644
--- a/NOTES.txt
+++ b/NOTES.txt
@@ -33,4 +33,8 @@ yashinoki
* https://stackoverflow.com/questions/3822604/setuid0-with-cap-setuid
* https://github.com/containers/bubblewrap/issues/380
+= Kernel Config
+ * https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/blob/main/config?ref_type=heads
+ * https://lore.kernel.org/lkml/20250505110946.1095363-15-mingo@kernel.org/
+
// vim: set syntax=asciidoc:
diff --git a/files/nixpkgs-patches/399384.diff b/files/nixpkgs-patches/399384.diff
deleted file mode 100644
index f5737f5..0000000
--- a/files/nixpkgs-patches/399384.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
-index 496f74440aad98..91624d6d4bfc03 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.3";
-+ version = "25.0.4";
-
- src = fetchFromGitLab {
- domain = "gitlab.freedesktop.org";
- owner = "mesa";
- repo = "mesa";
- rev = "mesa-${version}";
-- hash = "sha256-OM/T6pkq4vgEYZ7TlLRVsyMknLxQC9L+iOPF20ToZi8=";
-+ hash = "sha256-TiMd1YVQxOlrmdwDQDoTFh6nbVMfnW75ISfzoUQgKHU=";
- };
-
- meta = {
diff --git a/files/nixpkgs-patches/399388.diff b/files/nixpkgs-patches/399388.diff
index 41f6ebe..4815efe 100644
--- a/files/nixpkgs-patches/399388.diff
+++ b/files/nixpkgs-patches/399388.diff
@@ -1,29 +1,37 @@
diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
-index 91624d6d4bfc03..0332e1a5b22bb6 100644
+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.4";
-+ version = "25.1.0-rc1";
+- version = "25.0.5";
++ version = "25.1.0-rc3";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = "mesa";
rev = "mesa-${version}";
-- hash = "sha256-TiMd1YVQxOlrmdwDQDoTFh6nbVMfnW75ISfzoUQgKHU=";
-+ hash = "sha256-vQrTGGhIfy41uaCQ4rg+ZlCp43qI1wMK6QIrGKr4+Ts=";
+- 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 255cda5a742372..4994c83e680676 100644
+index f691f2d3bf8cbb..00a4d7964ed27e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
-@@ -103,8 +103,10 @@
+@@ -16,6 +16,7 @@
+ libdrm,
+ libgbm,
+ libglvnd,
++ libpng,
+ libunwind,
+ libva-minimal,
+ libvdpau,
+@@ -103,8 +104,10 @@
],
vulkanLayers ? [
"device-select"
@@ -35,7 +43,7 @@ index 255cda5a742372..4994c83e680676 100644
],
mesa,
mesa-gl-headers,
-@@ -161,7 +163,6 @@ stdenv.mkDerivation {
+@@ -161,7 +164,6 @@ stdenv.mkDerivation {
patches = [
./opencl.patch
@@ -43,7 +51,7 @@ index 255cda5a742372..4994c83e680676 100644
];
postPatch = ''
-@@ -223,7 +224,6 @@ stdenv.mkDerivation {
+@@ -223,7 +225,6 @@ stdenv.mkDerivation {
(lib.mesonBool "libgbm-external" true)
(lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK
@@ -51,6 +59,23 @@ index 255cda5a742372..4994c83e680676 100644
# 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
diff --git a/files/nixpkgs-patches/adw-gtk3-patch.diff b/files/nixpkgs-patches/adw-gtk3-patch.diff
new file mode 100644
index 0000000..90ab11c
--- /dev/null
+++ b/files/nixpkgs-patches/adw-gtk3-patch.diff
@@ -0,0 +1,13 @@
+diff --git a/src/sass/gtk4/libadwaita-tweaks.scss b/src/sass/gtk4/libadwaita-tweaks.scss
+index 8750a89..fe9308e 100644
+--- a/src/sass/gtk4/libadwaita-tweaks.scss
++++ b/src/sass/gtk4/libadwaita-tweaks.scss
+@@ -19,7 +19,7 @@
+ --accent-purple: #9141ac;
+ --accent-slate: #6f8396;
+
+- --accent-bg-color: var(--accent-blue);
++ --accent-bg-color: @accent_bg_color;
+ --accent-fg-color: @accent_fg_color;
+
+ --window-bg-color: @window_bg_color;
diff --git a/files/nixpkgs-patches/adw-gtk3-update.diff b/files/nixpkgs-patches/adw-gtk3-update.diff
new file mode 100644
index 0000000..0ea2bd0
--- /dev/null
+++ b/files/nixpkgs-patches/adw-gtk3-update.diff
@@ -0,0 +1,40 @@
+diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix
+index 7511b9524..6cb3054cd 100644
+--- a/pkgs/by-name/ad/adw-gtk3/package.nix
++++ b/pkgs/by-name/ad/adw-gtk3/package.nix
+@@ -5,29 +5,29 @@
+ nix-update-script,
+ meson,
+ ninja,
+- sassc,
++ dart-sass,
+ }:
+
+ stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "adw-gtk3";
+- version = "5.10";
++ version = "6.1";
+
+ src = fetchFromGitHub {
+ owner = "lassekongo83";
+ repo = "adw-gtk3";
+ tag = "v${finalAttrs.version}";
+- hash = "sha256-0OZk27b0kujzWtRX5uvelTMivL19g6sNB1IY6BsrO10=";
++ hash = "sha256-fY5z7KQXygGhkai1N3iMsnC1ZFjIAoBndjsPcv58kXg=";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+- sassc
++ dart-sass
+ ];
+
+ postPatch = ''
+- chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh
+- patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh
++ chmod +x scripts/render-assets.sh
++ patchShebangs +x scripts/render-assets.sh
+ '';
+
+ passthru = {
diff --git a/flake.lock b/flake.lock
index 2692bd6..12603f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -14,11 +14,11 @@
]
},
"locked": {
- "lastModified": 1745695466,
- "narHash": "sha256-i8LY+i7taSJAbxG4xWWz04MgR/fbPBLzsM5C2Wa45hg=",
+ "lastModified": 1746049328,
+ "narHash": "sha256-COSI6NCQMtAI74QnyAWbjY+GOomy+A+7ZX1Z9YEhRtM=",
"ref": "refs/heads/master",
- "rev": "61492af23ecc5dd9ab4956a84a7c0451deb8b84b",
- "revCount": 118,
+ "rev": "2ce402fa41508d45e2d30b56502c00ef92efff7b",
+ "revCount": 122,
"type": "git",
"url": "https://git.akon.city/camu"
},
@@ -88,11 +88,11 @@
]
},
"locked": {
- "lastModified": 1745782215,
- "narHash": "sha256-mx27J2HYQT+nGXTyUWKrUuxRzpr1FVVr59ZH4oNzOyw=",
+ "lastModified": 1746632058,
+ "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "7b2aae3fb39928aecc5e41c10a9c87c4881614d5",
+ "rev": "708074ae6db9e0468e4f48477f856e8c2d059795",
"type": "github"
},
"original": {
@@ -124,11 +124,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1745503349,
- "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
+ "lastModified": 1746621361,
+ "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
+ "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5",
"type": "github"
},
"original": {
@@ -176,11 +176,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1745526057,
- "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+ "lastModified": 1746461020,
+ "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+ "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
"type": "github"
},
"original": {
@@ -199,11 +199,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1745797545,
- "narHash": "sha256-jEUl2noKTuzlAqvdo4QahWEgHcidf0ivkx2RTX2rkic=",
+ "lastModified": 1746633060,
+ "narHash": "sha256-4Lo5Lh7f0NPs34VIB6Zlmn2lrkGZNMSGJgz2jsckTXs=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "3ed4e03568fd73b2bc355205bde2d2fa93f394bc",
+ "rev": "ac39352ab723f760aabda5051f919ddfbca1c477",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 2f8fbc7..495b7dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -128,6 +128,7 @@
patches = [
./files/nixpkgs-patches/399388.diff
./files/nixpkgs-patches/minus_screenshot.diff
+ ./files/nixpkgs-patches/adw-gtk3-update.diff
];
};
nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix");
@@ -160,6 +161,13 @@
});
})
(self: super: {
+ adw-gtk3 = super.adw-gtk3.overrideAttrs (old: {
+ patches = [
+ ./files/nixpkgs-patches/adw-gtk3-patch.diff
+ ];
+ });
+ })
+ (self: super: {
neovim-unwrapped = (optimizeWithFlags super.neovim-unwrapped "-O3 -march=znver2 -mtune=znver2 -fno-semantic-interposition -flto");
})
(self: super: {
@@ -235,6 +243,7 @@
name = "nixpkgs-patched";
src = nixpkgs;
patches = [
+ ./files/nixpkgs-patches/adw-gtk3-update.diff
];
};
nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix");
@@ -262,6 +271,13 @@
});
})
(self: super: {
+ adw-gtk3 = super.adw-gtk3.overrideAttrs (old: {
+ patches = [
+ ./files/nixpkgs-patches/adw-gtk3-patch.diff
+ ];
+ });
+ })
+ (self: super: {
vimPlugins = super.vimPlugins.extend (final: prev: {
mini-nvim = prev.mini-nvim.overrideAttrs (old: {
patches = [
diff --git a/hosts/iroha/kernel_config b/hosts/iroha/kernel_config
index 8742801..d7c66c2 100644
--- a/hosts/iroha/kernel_config
+++ b/hosts/iroha/kernel_config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.14.4-gentoo Kernel Configuration
+# Linux/x86 6.14.5-gentoo Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Gentoo 15.1.0 p55) 15.1.0"
CONFIG_CC_IS_GCC=y
@@ -58,7 +58,7 @@ CONFIG_SYSVIPC_SYSCTL=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_WATCH_QUEUE is not set
+CONFIG_WATCH_QUEUE=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_USELIB=y
CONFIG_AUDIT=y
@@ -138,7 +138,7 @@ CONFIG_PREEMPT=y
CONFIG_PREEMPT_COUNT=y
CONFIG_PREEMPTION=y
CONFIG_PREEMPT_DYNAMIC=y
-# CONFIG_SCHED_CORE is not set
+CONFIG_SCHED_CORE=y
CONFIG_SCHED_CLASS_EXT=y
#
@@ -147,9 +147,10 @@ CONFIG_SCHED_CLASS_EXT=y
CONFIG_VIRT_CPU_ACCOUNTING=y
# CONFIG_TICK_CPU_ACCOUNTING is not set
CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_SCHED_AVG_IRQ=y
CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
@@ -185,7 +186,8 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
-# CONFIG_UCLAMP_TASK is not set
+CONFIG_UCLAMP_TASK=y
+CONFIG_UCLAMP_BUCKETS_COUNT=5
# CONFIG_SCHED_ALT is not set
# end of Scheduler features
@@ -209,13 +211,14 @@ CONFIG_CGROUP_WRITEBACK=y
CONFIG_CGROUP_SCHED=y
CONFIG_GROUP_SCHED_WEIGHT=y
CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
+CONFIG_CFS_BANDWIDTH=y
# CONFIG_RT_GROUP_SCHED is not set
CONFIG_EXT_GROUP_SCHED=y
CONFIG_SCHED_MM_CID=y
+CONFIG_UCLAMP_TASK_GROUP=y
CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set
-# CONFIG_CGROUP_DMEM is not set
+CONFIG_CGROUP_DMEM=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_HUGETLB=y
CONFIG_CPUSETS=y
@@ -236,7 +239,7 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_CHECKPOINT_RESTORE=y
-# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_SCHED_AUTOGROUP=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
@@ -1021,8 +1024,27 @@ CONFIG_COREDUMP=y
#
# Memory Management options
#
+CONFIG_ZPOOL=y
CONFIG_SWAP=y
-# CONFIG_ZSWAP is not set
+CONFIG_ZSWAP=y
+CONFIG_ZSWAP_DEFAULT_ON=y
+CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd"
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc"
+# CONFIG_ZBUD is not set
+# CONFIG_Z3FOLD_DEPRECATED is not set
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
#
# Slab allocator options
@@ -1076,8 +1098,8 @@ CONFIG_CONTIG_ALLOC=y
CONFIG_PCP_BATCH_SCALE_MAX=5
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_MEMORY_FAILURE is not set
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
@@ -1099,7 +1121,8 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y
# CONFIG_MEM_SOFT_DIRTY is not set
CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_IDLE_PAGE_TRACKING=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
CONFIG_ARCH_HAS_PTE_DEVMAP=y
@@ -1124,8 +1147,11 @@ CONFIG_VM_EVENT_COUNTERS=y
CONFIG_ARCH_HAS_PTE_SPECIAL=y
CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
-# CONFIG_ANON_VMA_NAME is not set
-# CONFIG_USERFAULTFD is not set
+CONFIG_ANON_VMA_NAME=y
+CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
+CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
+CONFIG_USERFAULTFD=y
+CONFIG_PTE_MARKER_UFFD_WP=y
CONFIG_LRU_GEN=y
CONFIG_LRU_GEN_ENABLED=y
# CONFIG_LRU_GEN_STATS is not set
@@ -5603,6 +5629,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_ENCRYPTED_KEYS=y
# CONFIG_USER_DECRYPTED_DATA is not set
CONFIG_KEY_DH_OPERATIONS=y
+# CONFIG_KEY_NOTIFICATIONS is not set
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_PROC_MEM_ALWAYS_FORCE=y
# CONFIG_PROC_MEM_FORCE_PTRACE is not set
@@ -5812,7 +5839,7 @@ CONFIG_CRYPTO_LZO=y
# CONFIG_CRYPTO_842 is not set
# CONFIG_CRYPTO_LZ4 is not set
# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=y
# end of Compression
#
@@ -5946,16 +5973,19 @@ CONFIG_CRYPTO_LIB_ARC4=y
CONFIG_CRYPTO_LIB_GF128MUL=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA_INTERNAL=m
CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=y
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519_INTERNAL=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305_INTERNAL=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA1=y
@@ -5985,6 +6015,7 @@ CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_DECOMPRESS=y
CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
CONFIG_ZSTD_DECOMPRESS=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_X86=y
diff --git a/hosts/iroha/modprobe.d/amdgpu_before_nvidia.conf b/hosts/iroha/modprobe.d/amdgpu_before_nvidia.conf
new file mode 100644
index 0000000..7ee76d0
--- /dev/null
+++ b/hosts/iroha/modprobe.d/amdgpu_before_nvidia.conf
@@ -0,0 +1 @@
+softdep nvidia pre: amdgpu
diff --git a/hosts/iroha/modprobe.d/intel_before_nvidia.conf b/hosts/iroha/modprobe.d/intel_before_nvidia.conf
new file mode 100644
index 0000000..2cd8a96
--- /dev/null
+++ b/hosts/iroha/modprobe.d/intel_before_nvidia.conf
@@ -0,0 +1 @@
+softdep nvidia pre: i915 xe
diff --git a/hosts/iroha/modprobe.d/kvm_amd.conf b/hosts/iroha/modprobe.d/kvm_amd.conf
new file mode 100644
index 0000000..ab80c86
--- /dev/null
+++ b/hosts/iroha/modprobe.d/kvm_amd.conf
@@ -0,0 +1,2 @@
+options kvm_amd nested=1
+options kvm ignore_msrs=1 report_ignored_msrs=0
diff --git a/hosts/moyo/container.nix b/hosts/moyo/container.nix
index d00e460..23e7b02 100644
--- a/hosts/moyo/container.nix
+++ b/hosts/moyo/container.nix
@@ -73,6 +73,7 @@
git # flakes
kitty.terminfo
htop
+ jq
((vim-full.override {
features = "small";
guiSupport = "off";
diff --git a/hosts/moyo/kernel_config b/hosts/moyo/kernel_config
index 5350360..25a3dd3 100644
--- a/hosts/moyo/kernel_config
+++ b/hosts/moyo/kernel_config
@@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24400
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24400
CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=108401
-CONFIG_RUSTC_LLVM_VERSION=190105
+CONFIG_RUSTC_VERSION=108501
+CONFIG_RUSTC_LLVM_VERSION=190107
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -55,7 +55,7 @@ CONFIG_SYSVIPC_SYSCTL=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_WATCH_QUEUE is not set
+CONFIG_WATCH_QUEUE=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_USELIB=y
CONFIG_AUDIT=y
@@ -125,13 +125,13 @@ CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# end of BPF subsystem
CONFIG_PREEMPT_BUILD=y
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
CONFIG_PREEMPT_COUNT=y
CONFIG_PREEMPTION=y
CONFIG_PREEMPT_DYNAMIC=y
-# CONFIG_SCHED_CORE is not set
+CONFIG_SCHED_CORE=y
#
# CPU/Task time and stats accounting
@@ -139,9 +139,10 @@ CONFIG_PREEMPT_DYNAMIC=y
CONFIG_VIRT_CPU_ACCOUNTING=y
# CONFIG_TICK_CPU_ACCOUNTING is not set
CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_SCHED_AVG_IRQ=y
CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
@@ -177,7 +178,8 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
# Scheduler features
#
-# CONFIG_UCLAMP_TASK is not set
+CONFIG_UCLAMP_TASK=y
+CONFIG_UCLAMP_BUCKETS_COUNT=5
# CONFIG_SCHED_ALT is not set
# end of Scheduler features
@@ -201,9 +203,10 @@ CONFIG_CGROUP_WRITEBACK=y
CONFIG_CGROUP_SCHED=y
CONFIG_GROUP_SCHED_WEIGHT=y
CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
+CONFIG_CFS_BANDWIDTH=y
# CONFIG_RT_GROUP_SCHED is not set
CONFIG_SCHED_MM_CID=y
+CONFIG_UCLAMP_TASK_GROUP=y
CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_FREEZER=y
@@ -225,7 +228,7 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_CHECKPOINT_RESTORE=y
-# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_SCHED_AUTOGROUP=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
@@ -811,6 +814,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
CONFIG_HAVE_ARCH_HUGE_VMAP=y
CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_PMD_MKWRITE=y
CONFIG_HAVE_ARCH_SOFT_DIRTY=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_MODULES_USE_ELF_RELA=y
@@ -989,8 +993,27 @@ CONFIG_COREDUMP=y
#
# Memory Management options
#
+CONFIG_ZPOOL=y
CONFIG_SWAP=y
-# CONFIG_ZSWAP is not set
+CONFIG_ZSWAP=y
+CONFIG_ZSWAP_DEFAULT_ON=y
+CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd"
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc"
+# CONFIG_ZBUD is not set
+# CONFIG_Z3FOLD_DEPRECATED is not set
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
#
# Slab allocator options
@@ -1035,18 +1058,27 @@ CONFIG_PAGE_REPORTING=y
CONFIG_MIGRATION=y
CONFIG_DEVICE_MIGRATION=y
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
CONFIG_CONTIG_ALLOC=y
CONFIG_PCP_BATCH_SCALE_MAX=5
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_MEMORY_FAILURE is not set
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_ARCH_WANTS_THP_SWAP=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
+CONFIG_THP_SWAP=y
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PUD_PFNMAP=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -1054,7 +1086,8 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y
# CONFIG_MEM_SOFT_DIRTY is not set
CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_IDLE_PAGE_TRACKING=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
CONFIG_ARCH_HAS_PTE_DEVMAP=y
@@ -1077,8 +1110,11 @@ CONFIG_VM_EVENT_COUNTERS=y
CONFIG_ARCH_HAS_PTE_SPECIAL=y
CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
-# CONFIG_ANON_VMA_NAME is not set
-# CONFIG_USERFAULTFD is not set
+CONFIG_ANON_VMA_NAME=y
+CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
+CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
+CONFIG_USERFAULTFD=y
+CONFIG_PTE_MARKER_UFFD_WP=y
CONFIG_LRU_GEN=y
CONFIG_LRU_GEN_ENABLED=y
# CONFIG_LRU_GEN_STATS is not set
@@ -4451,6 +4487,7 @@ CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_KEYS=y
# CONFIG_NVDIMM_SECURITY_TEST is not set
CONFIG_DAX=y
+# CONFIG_DEV_DAX is not set
CONFIG_NVMEM=y
# CONFIG_NVMEM_SYSFS is not set
# CONFIG_NVMEM_LAYOUTS is not set
@@ -4760,6 +4797,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_ENCRYPTED_KEYS=y
# CONFIG_USER_DECRYPTED_DATA is not set
CONFIG_KEY_DH_OPERATIONS=y
+# CONFIG_KEY_NOTIFICATIONS is not set
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_PROC_MEM_ALWAYS_FORCE=y
# CONFIG_PROC_MEM_FORCE_PTRACE is not set
@@ -4970,7 +5008,7 @@ CONFIG_CRYPTO_LZO=y
# CONFIG_CRYPTO_842 is not set
# CONFIG_CRYPTO_LZ4 is not set
# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=y
# end of Compression
#
@@ -5144,6 +5182,7 @@ CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_DECOMPRESS=y
CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
CONFIG_ZSTD_DECOMPRESS=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_X86=y
diff --git a/hosts/moyo/samba/smb.conf b/hosts/moyo/samba/smb.conf
new file mode 100644
index 0000000..6716277
--- /dev/null
+++ b/hosts/moyo/samba/smb.conf
@@ -0,0 +1,23 @@
+[global]
+ workgroup = AKONCITY
+ map to guest = Bad User
+ server string = Local Samba Server
+ server role = standalone server
+ hosts allow = 192.168.1. 127.
+ log file = /var/log/samba/log.%m
+ max log size = 50
+ passdb backend = tdbsam
+ allow insecure wide links = yes
+ kernel oplocks = yes
+ acl allow execute always = yes
+
+[code]
+ comment = code
+ path = /srv/nfs/c
+ valid users = andrew
+ guest ok = no
+ browseable = yes
+ writable = yes
+ public = no
+ follow symlinks = yes
+ wide links = yes
diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix
index b346322..a05ccf4 100644
--- a/hosts/sofue/configuration.nix
+++ b/hosts/sofue/configuration.nix
@@ -21,7 +21,6 @@ in rec {
../../nix/programs/kitty.nix
../../nix/programs/firefox.nix
../../nix/programs/obs.nix
- ../../nix/programs/waydroid.nix
../../nix/programs/kdeconnect.nix
../../nix/programs/docker.nix
./programs.nix
diff --git a/hosts/sofue/incus.yaml b/hosts/sofue/incus.yaml
new file mode 100644
index 0000000..b01d237
--- /dev/null
+++ b/hosts/sofue/incus.yaml
@@ -0,0 +1,656 @@
+container:
+ architecture: x86_64
+ config:
+ image.architecture: amd64
+ image.description: Nixos unstable amd64 (20240402_02:18)
+ image.os: Nixos
+ image.release: unstable
+ image.requirements.secureboot: "false"
+ image.serial: "20240402_02:18"
+ image.type: squashfs
+ image.variant: default
+ limits.kernel.memlock: unlimited
+ limits.kernel.nice: "-11"
+ limits.kernel.nofile: "1048576"
+ limits.kernel.rtprio: "99"
+ raw.lxc: |-
+ lxc.mount.auto = proc:rw sys:rw cgroup:rw:force
+ lxc.cgroup2.devices.allow = c 7:* rwm
+ lxc.cgroup2.devices.allow = c 10:* rwm
+ lxc.cgroup2.devices.allow = c 13:* rwm
+ lxc.cgroup2.devices.allow = c 116:* rwm
+ lxc.cgroup2.devices.allow = c 189:* rwm
+ lxc.cgroup2.devices.allow = c 226:0 rwm
+ lxc.cgroup2.devices.allow = c 226:128 rwm
+ lxc.cgroup2.devices.allow = c 247:* rwm
+ security.nesting: "true"
+ security.privileged: "false"
+ security.syscalls.intercept.bpf: "true"
+ security.syscalls.intercept.bpf.devices: "true"
+ security.syscalls.intercept.mknod: "true"
+ security.syscalls.intercept.mount: "true"
+ security.syscalls.intercept.mount.allowed: ext4,fat32,ntfs
+ security.syscalls.intercept.mount.shift: "true"
+ security.syscalls.intercept.sched_setscheduler: "true"
+ security.syscalls.intercept.setxattr: "true"
+ security.syscalls.intercept.sysinfo: "true"
+ volatile.base_image: b57963b527b192cbd262777b137333def448e7dc21fbf954e75a51f1b8acef5c
+ volatile.cloud-init.instance-id: 8d938ed8-c204-48e1-9670-f3aea059fd57
+ volatile.eth0.host_name: veth4220df45
+ volatile.eth0.hwaddr: 00:16:3e:c3:79:59
+ volatile.idmap.base: "0"
+ volatile.idmap.current: '[{"Isuid":true,"Isgid":false,"Hostid":1000000,"Nsid":0,"Maprange":1000},{"Isuid":true,"Isgid":false,"Hostid":1000,"Nsid":1000,"Maprange":1},{"Isuid":true,"Isgid":false,"Hostid":1001001,"Nsid":1001,"Maprange":999998999},{"Isuid":false,"Isgid":true,"Hostid":1000000,"Nsid":0,"Maprange":17},{"Isuid":false,"Isgid":true,"Hostid":18,"Nsid":17,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000018,"Nsid":18,"Maprange":82},{"Isuid":false,"Isgid":true,"Hostid":100,"Nsid":100,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000101,"Nsid":101,"Maprange":73},{"Isuid":false,"Isgid":true,"Hostid":97,"Nsid":174,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000175,"Nsid":175,"Maprange":999999825}]'
+ volatile.idmap.next: '[{"Isuid":true,"Isgid":false,"Hostid":1000000,"Nsid":0,"Maprange":1000},{"Isuid":true,"Isgid":false,"Hostid":1000,"Nsid":1000,"Maprange":1},{"Isuid":true,"Isgid":false,"Hostid":1001001,"Nsid":1001,"Maprange":999998999},{"Isuid":false,"Isgid":true,"Hostid":1000000,"Nsid":0,"Maprange":17},{"Isuid":false,"Isgid":true,"Hostid":18,"Nsid":17,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000018,"Nsid":18,"Maprange":82},{"Isuid":false,"Isgid":true,"Hostid":100,"Nsid":100,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000101,"Nsid":101,"Maprange":73},{"Isuid":false,"Isgid":true,"Hostid":97,"Nsid":174,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000175,"Nsid":175,"Maprange":999999825}]'
+ volatile.last_state.idmap: '[]'
+ volatile.last_state.power: RUNNING
+ volatile.last_state.ready: "false"
+ volatile.uuid: 85cd7ef4-2e99-4d9b-ad55-a0b311d3a7d0
+ volatile.uuid.generation: 85cd7ef4-2e99-4d9b-ad55-a0b311d3a7d0
+ devices:
+ PipewireSocket1:
+ bind: container
+ connect: unix:/run/user/1000/pipewire-0
+ gid: "100"
+ listen: unix:/tmp/pipewire-0
+ mode: "0666"
+ security.gid: "100"
+ security.uid: "1000"
+ type: proxy
+ uid: "1000"
+ PipewireSocket2:
+ bind: container
+ connect: unix:/run/user/1000/pipewire-0-manager
+ gid: "100"
+ listen: unix:/tmp/pipewire-0-manager
+ mode: "0666"
+ security.gid: "100"
+ security.uid: "1000"
+ type: proxy
+ uid: "1000"
+ PulseSocket1:
+ bind: container
+ connect: unix:/run/user/1000/pulse/native
+ gid: "100"
+ listen: unix:/home/andrew/.pulsewire-native-socket
+ mode: "0666"
+ security.gid: "100"
+ security.uid: "1000"
+ type: proxy
+ uid: "1000"
+ binder:
+ mode: "0666"
+ path: /dev/binder
+ source: /dev/binder
+ type: unix-char
+ bluraydrive:
+ mode: "0666"
+ path: /dev/sr0
+ source: /dev/sr0
+ type: unix-block
+ code:
+ path: /home/andrew/c
+ source: /home/andrew/c
+ type: disk
+ data:
+ path: /mnt/data
+ source: /mnt/data
+ type: disk
+ devshm:
+ path: /dev/shm2
+ source: /dev/shm
+ type: disk
+ duckyone:
+ gid: "97"
+ mode: "0666"
+ productid: "0201"
+ type: unix-hotplug
+ vendorid: 04d9
+ googlepixel:
+ mode: "0666"
+ productid: 4ee7
+ type: unix-hotplug
+ vendorid: 18d1
+ hdd:
+ path: /mnt/hdd
+ source: /mnt/hdd
+ type: disk
+ hhkb:
+ gid: "97"
+ mode: "0666"
+ productid: "0021"
+ type: unix-hotplug
+ vendorid: 04fe
+ hidraw0:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw0
+ required: "false"
+ source: /dev/hidraw0
+ type: unix-char
+ hidraw1:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw1
+ required: "false"
+ source: /dev/hidraw1
+ type: unix-char
+ hidraw2:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw2
+ required: "false"
+ source: /dev/hidraw2
+ type: unix-char
+ hidraw3:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw3
+ required: "false"
+ source: /dev/hidraw3
+ type: unix-char
+ hidraw4:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw4
+ required: "false"
+ source: /dev/hidraw4
+ type: unix-char
+ hostportcamu:
+ connect: tcp:127.0.0.1:14356
+ listen: tcp:0.0.0.0:14356
+ type: proxy
+ hwbinder:
+ mode: "0666"
+ path: /dev/hwbinder
+ source: /dev/hwbinder
+ type: unix-char
+ lazermouse:
+ gid: "97"
+ mode: "0666"
+ productid: "2510"
+ type: unix-hotplug
+ vendorid: 093a
+ logibolt:
+ gid: "97"
+ mode: "0666"
+ productid: c548
+ type: unix-hotplug
+ vendorid: 046d
+ loop0:
+ mode: "0666"
+ path: /dev/loop0
+ source: /dev/loop0
+ type: unix-block
+ loop1:
+ mode: "0666"
+ path: /dev/loop1
+ source: /dev/loop1
+ type: unix-block
+ loopcontrol:
+ mode: "0666"
+ path: /dev/loop-control
+ source: /dev/loop-control
+ type: unix-char
+ mayflashgc:
+ gid: "97"
+ mode: "0666"
+ productid: "0337"
+ type: unix-hotplug
+ vendorid: 057e
+ ntsync:
+ mode: "0666"
+ path: /dev/ntsync
+ source: /dev/ntsync
+ type: unix-char
+ pcie4slotgpu:
+ mode: "0666"
+ pci: 0000:0f:00.0
+ type: gpu
+ pics:
+ path: /home/andrew/pics
+ source: /home/andrew/pics
+ type: disk
+ ssd:
+ path: /mnt/ssd
+ source: /mnt/ssd
+ type: disk
+ store:
+ path: /mnt/store
+ source: /mnt/store
+ type: disk
+ torrents:
+ path: /mnt/store/files/ext/torrents
+ source: /mnt/store/files/ext/torrents
+ type: disk
+ tty:
+ mode: "0666"
+ path: /dev/tty
+ source: /dev/tty
+ type: unix-char
+ tty0:
+ mode: "0666"
+ path: /dev/tty0
+ source: /dev/tty0
+ type: unix-char
+ tty3:
+ mode: "0666"
+ path: /dev/tty3
+ source: /dev/tty3
+ type: unix-char
+ tty4:
+ mode: "0666"
+ path: /dev/tty4
+ source: /dev/tty4
+ type: unix-char
+ udevdata:
+ path: /tmp/udev/data
+ readonly: "true"
+ source: /run/udev/data
+ type: disk
+ uinput:
+ gid: "97"
+ mode: "0666"
+ path: /dev/uinput
+ source: /dev/uinput
+ type: unix-char
+ video0:
+ mode: "0666"
+ path: /dev/video0
+ source: /dev/video0
+ type: unix-char
+ video1:
+ mode: "0666"
+ path: /dev/video1
+ required: "false"
+ source: /dev/video1
+ type: unix-char
+ vndbinder:
+ mode: "0666"
+ path: /dev/vndbinder
+ source: /dev/vndbinder
+ type: unix-char
+ wacom:
+ gid: "97"
+ mode: "0666"
+ productid: 037a
+ type: unix-hotplug
+ vendorid: 056a
+ xbox360controller:
+ gid: "97"
+ mode: "0666"
+ productid: 028e
+ type: unix-hotplug
+ vendorid: 045e
+ xboxonecontroller:
+ gid: "97"
+ mode: "0666"
+ productid: "02e6"
+ type: unix-hotplug
+ vendorid: 045e
+ zowiemouse:
+ gid: "97"
+ mode: "0666"
+ productid: "8001"
+ type: unix-hotplug
+ vendorid: 04a5
+ ephemeral: false
+ profiles:
+ - default
+ stateful: false
+ description: ""
+ created_at: 2024-04-03T13:10:43.339168029Z
+ expanded_config:
+ boot.autostart: "false"
+ image.architecture: amd64
+ image.description: Nixos unstable amd64 (20240402_02:18)
+ image.os: Nixos
+ image.release: unstable
+ image.requirements.secureboot: "false"
+ image.serial: "20240402_02:18"
+ image.type: squashfs
+ image.variant: default
+ limits.kernel.memlock: unlimited
+ limits.kernel.nice: "-11"
+ limits.kernel.nofile: "1048576"
+ limits.kernel.rtprio: "99"
+ raw.idmap: |-
+ uid 1000 1000
+ gid 100 100
+ gid 18 17
+ gid 97 174
+ raw.lxc: |-
+ lxc.mount.auto = proc:rw sys:rw cgroup:rw:force
+ lxc.cgroup2.devices.allow = c 7:* rwm
+ lxc.cgroup2.devices.allow = c 10:* rwm
+ lxc.cgroup2.devices.allow = c 13:* rwm
+ lxc.cgroup2.devices.allow = c 116:* rwm
+ lxc.cgroup2.devices.allow = c 189:* rwm
+ lxc.cgroup2.devices.allow = c 226:0 rwm
+ lxc.cgroup2.devices.allow = c 226:128 rwm
+ lxc.cgroup2.devices.allow = c 247:* rwm
+ security.nesting: "true"
+ security.privileged: "false"
+ security.syscalls.intercept.bpf: "true"
+ security.syscalls.intercept.bpf.devices: "true"
+ security.syscalls.intercept.mknod: "true"
+ security.syscalls.intercept.mount: "true"
+ security.syscalls.intercept.mount.allowed: ext4,fat32,ntfs
+ security.syscalls.intercept.mount.shift: "true"
+ security.syscalls.intercept.sched_setscheduler: "true"
+ security.syscalls.intercept.setxattr: "true"
+ security.syscalls.intercept.sysinfo: "true"
+ volatile.base_image: b57963b527b192cbd262777b137333def448e7dc21fbf954e75a51f1b8acef5c
+ volatile.cloud-init.instance-id: 8d938ed8-c204-48e1-9670-f3aea059fd57
+ volatile.eth0.host_name: veth4220df45
+ volatile.eth0.hwaddr: 00:16:3e:c3:79:59
+ volatile.idmap.base: "0"
+ volatile.idmap.current: '[{"Isuid":true,"Isgid":false,"Hostid":1000000,"Nsid":0,"Maprange":1000},{"Isuid":true,"Isgid":false,"Hostid":1000,"Nsid":1000,"Maprange":1},{"Isuid":true,"Isgid":false,"Hostid":1001001,"Nsid":1001,"Maprange":999998999},{"Isuid":false,"Isgid":true,"Hostid":1000000,"Nsid":0,"Maprange":17},{"Isuid":false,"Isgid":true,"Hostid":18,"Nsid":17,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000018,"Nsid":18,"Maprange":82},{"Isuid":false,"Isgid":true,"Hostid":100,"Nsid":100,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000101,"Nsid":101,"Maprange":73},{"Isuid":false,"Isgid":true,"Hostid":97,"Nsid":174,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000175,"Nsid":175,"Maprange":999999825}]'
+ volatile.idmap.next: '[{"Isuid":true,"Isgid":false,"Hostid":1000000,"Nsid":0,"Maprange":1000},{"Isuid":true,"Isgid":false,"Hostid":1000,"Nsid":1000,"Maprange":1},{"Isuid":true,"Isgid":false,"Hostid":1001001,"Nsid":1001,"Maprange":999998999},{"Isuid":false,"Isgid":true,"Hostid":1000000,"Nsid":0,"Maprange":17},{"Isuid":false,"Isgid":true,"Hostid":18,"Nsid":17,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000018,"Nsid":18,"Maprange":82},{"Isuid":false,"Isgid":true,"Hostid":100,"Nsid":100,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000101,"Nsid":101,"Maprange":73},{"Isuid":false,"Isgid":true,"Hostid":97,"Nsid":174,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000175,"Nsid":175,"Maprange":999999825}]'
+ volatile.last_state.idmap: '[]'
+ volatile.last_state.power: RUNNING
+ volatile.last_state.ready: "false"
+ volatile.uuid: 85cd7ef4-2e99-4d9b-ad55-a0b311d3a7d0
+ volatile.uuid.generation: 85cd7ef4-2e99-4d9b-ad55-a0b311d3a7d0
+ expanded_devices:
+ PipewireSocket1:
+ bind: container
+ connect: unix:/run/user/1000/pipewire-0
+ gid: "100"
+ listen: unix:/tmp/pipewire-0
+ mode: "0666"
+ security.gid: "100"
+ security.uid: "1000"
+ type: proxy
+ uid: "1000"
+ PipewireSocket2:
+ bind: container
+ connect: unix:/run/user/1000/pipewire-0-manager
+ gid: "100"
+ listen: unix:/tmp/pipewire-0-manager
+ mode: "0666"
+ security.gid: "100"
+ security.uid: "1000"
+ type: proxy
+ uid: "1000"
+ PulseSocket1:
+ bind: container
+ connect: unix:/run/user/1000/pulse/native
+ gid: "100"
+ listen: unix:/home/andrew/.pulsewire-native-socket
+ mode: "0666"
+ security.gid: "100"
+ security.uid: "1000"
+ type: proxy
+ uid: "1000"
+ binder:
+ mode: "0666"
+ path: /dev/binder
+ source: /dev/binder
+ type: unix-char
+ bluraydrive:
+ mode: "0666"
+ path: /dev/sr0
+ source: /dev/sr0
+ type: unix-block
+ code:
+ path: /home/andrew/c
+ source: /home/andrew/c
+ type: disk
+ data:
+ path: /mnt/data
+ source: /mnt/data
+ type: disk
+ devshm:
+ path: /dev/shm2
+ source: /dev/shm
+ type: disk
+ duckyone:
+ gid: "97"
+ mode: "0666"
+ productid: "0201"
+ type: unix-hotplug
+ vendorid: 04d9
+ eth0:
+ name: eth0
+ network: incusbr0
+ type: nic
+ googlepixel:
+ mode: "0666"
+ productid: 4ee7
+ type: unix-hotplug
+ vendorid: 18d1
+ hdd:
+ path: /mnt/hdd
+ source: /mnt/hdd
+ type: disk
+ hhkb:
+ gid: "97"
+ mode: "0666"
+ productid: "0021"
+ type: unix-hotplug
+ vendorid: 04fe
+ hidraw0:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw0
+ required: "false"
+ source: /dev/hidraw0
+ type: unix-char
+ hidraw1:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw1
+ required: "false"
+ source: /dev/hidraw1
+ type: unix-char
+ hidraw2:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw2
+ required: "false"
+ source: /dev/hidraw2
+ type: unix-char
+ hidraw3:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw3
+ required: "false"
+ source: /dev/hidraw3
+ type: unix-char
+ hidraw4:
+ gid: "97"
+ mode: "0666"
+ path: /dev/hidraw4
+ required: "false"
+ source: /dev/hidraw4
+ type: unix-char
+ hostportcamu:
+ connect: tcp:127.0.0.1:14356
+ listen: tcp:0.0.0.0:14356
+ type: proxy
+ hwbinder:
+ mode: "0666"
+ path: /dev/hwbinder
+ source: /dev/hwbinder
+ type: unix-char
+ lazermouse:
+ gid: "97"
+ mode: "0666"
+ productid: "2510"
+ type: unix-hotplug
+ vendorid: 093a
+ logibolt:
+ gid: "97"
+ mode: "0666"
+ productid: c548
+ type: unix-hotplug
+ vendorid: 046d
+ loop0:
+ mode: "0666"
+ path: /dev/loop0
+ source: /dev/loop0
+ type: unix-block
+ loop1:
+ mode: "0666"
+ path: /dev/loop1
+ source: /dev/loop1
+ type: unix-block
+ loopcontrol:
+ mode: "0666"
+ path: /dev/loop-control
+ source: /dev/loop-control
+ type: unix-char
+ mayflashgc:
+ gid: "97"
+ mode: "0666"
+ productid: "0337"
+ type: unix-hotplug
+ vendorid: 057e
+ ntsync:
+ mode: "0666"
+ path: /dev/ntsync
+ source: /dev/ntsync
+ type: unix-char
+ pcie4slotgpu:
+ mode: "0666"
+ pci: 0000:0f:00.0
+ type: gpu
+ pics:
+ path: /home/andrew/pics
+ source: /home/andrew/pics
+ type: disk
+ root:
+ path: /
+ pool: default
+ type: disk
+ ssd:
+ path: /mnt/ssd
+ source: /mnt/ssd
+ type: disk
+ store:
+ path: /mnt/store
+ source: /mnt/store
+ type: disk
+ torrents:
+ path: /mnt/store/files/ext/torrents
+ source: /mnt/store/files/ext/torrents
+ type: disk
+ tty:
+ mode: "0666"
+ path: /dev/tty
+ source: /dev/tty
+ type: unix-char
+ tty0:
+ mode: "0666"
+ path: /dev/tty0
+ source: /dev/tty0
+ type: unix-char
+ tty3:
+ mode: "0666"
+ path: /dev/tty3
+ source: /dev/tty3
+ type: unix-char
+ tty4:
+ mode: "0666"
+ path: /dev/tty4
+ source: /dev/tty4
+ type: unix-char
+ udevdata:
+ path: /tmp/udev/data
+ readonly: "true"
+ source: /run/udev/data
+ type: disk
+ uinput:
+ gid: "97"
+ mode: "0666"
+ path: /dev/uinput
+ source: /dev/uinput
+ type: unix-char
+ video0:
+ mode: "0666"
+ path: /dev/video0
+ source: /dev/video0
+ type: unix-char
+ video1:
+ mode: "0666"
+ path: /dev/video1
+ required: "false"
+ source: /dev/video1
+ type: unix-char
+ vndbinder:
+ mode: "0666"
+ path: /dev/vndbinder
+ source: /dev/vndbinder
+ type: unix-char
+ wacom:
+ gid: "97"
+ mode: "0666"
+ productid: 037a
+ type: unix-hotplug
+ vendorid: 056a
+ xbox360controller:
+ gid: "97"
+ mode: "0666"
+ productid: 028e
+ type: unix-hotplug
+ vendorid: 045e
+ xboxonecontroller:
+ gid: "97"
+ mode: "0666"
+ productid: "02e6"
+ type: unix-hotplug
+ vendorid: 045e
+ zowiemouse:
+ gid: "97"
+ mode: "0666"
+ productid: "8001"
+ type: unix-hotplug
+ vendorid: 04a5
+ name: sofue
+ status: Running
+ status_code: 103
+ last_used_at: 2025-05-02T10:45:55.80642907Z
+ location: none
+ type: container
+ project: iroha
+pool:
+ config:
+ source: /var/lib/incus/storage-pools/default
+ description: ""
+ name: default
+ driver: dir
+ used_by: []
+ status: Created
+ locations:
+ - none
+profiles:
+- config:
+ boot.autostart: "false"
+ raw.idmap: |-
+ uid 1000 1000
+ gid 100 100
+ gid 18 17
+ gid 97 174
+ description: Incus profile for iroha
+ devices:
+ eth0:
+ name: eth0
+ network: incusbr0
+ type: nic
+ root:
+ path: /
+ pool: default
+ type: disk
+ name: default
+ used_by: []
+ project: iroha
+volume:
+ config: {}
+ description: ""
+ name: sofue
+ type: container
+ used_by: []
+ location: none
+ content_type: filesystem
+ project: iroha
+ created_at: 2024-04-03T13:10:43.339168029Z
diff --git a/nix/gaming.nix b/nix/gaming.nix
index f43a21f..2b52aa2 100644
--- a/nix/gaming.nix
+++ b/nix/gaming.nix
@@ -6,7 +6,6 @@ in {
extraGroups = [ "gamemode" ];
};
environment.systemPackages = with pkgs; lib.lists.flatten [
- mangohud
(asNeeded "gamepad-tool" ["gamepad-tool"])
(asNeeded "sdl-jstest" ["sdl-jstest" "sdl2-jstest"])
(asNeeded "protontricks" ["protontricks" "protontricks-launch"])
@@ -38,7 +37,8 @@ in {
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=1 gamemoderun "$@"
+ #exec env --unset=SDL_VIDEODRIVER --unset=SDL_VIDEO_DRIVER mangohud gamemoderun "$@"
+ exec env mangohud gamemoderun "$@"
'')
];
#hardware.xone.enable = true;
@@ -116,6 +116,7 @@ in {
programs.mangohud = {
enable = true;
enableSessionWide = false;
+ package = (pkgs.mangohud.override { nvidiaSupport = false; });
settings = {
gamemode = true;
cpu_temp = true;
@@ -133,6 +134,7 @@ in {
engine_version = true;
wine = true;
winesync = true;
+ display_server = true;
present_mode = true;
table_columns = 4;
cellpadding_y = -0.100;
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index 624c0b0..0e2ad0b 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -37,9 +37,9 @@ in {
cursor_shape block
#cursor_blink_interval -1 linear ease-out
#cursor_stop_blinking_after 20.0
- cursor_trail 50
- cursor_trail_decay 0.1 0.5
- cursor_trail_start_threshold 2
+ cursor_trail 2
+ cursor_trail_decay 0.075 0.425
+ cursor_trail_start_threshold 3
foreground #${colo.foreground}
background #${colo.background}
color0 #${colo.color0}
diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix
index d60b752..5c70f35 100644
--- a/nix/programs/nvim.nix
+++ b/nix/programs/nvim.nix
@@ -57,7 +57,7 @@ let
hi FloatShadowThrough guibg=#${colo.color6} blend=100
hi Folded guifg=#${colo.color5} guibg=#${colo.background}
hi LineNr guifg=#${colo.color6}
- hi MatchParen guibg=#${colo.color6} gui=bold
+ hi MatchParen guifg=#${colo.color6} guibg=#${colo.background} gui=bold
hi ModeMsg guifg=#${colo.color4}
hi MoreMsg guifg=#${colo.color2}
hi NonText guifg=#${colo.color6}
diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix
index 33660bc..eb30595 100644
--- a/nix/programs/sway.nix
+++ b/nix/programs/sway.nix
@@ -51,6 +51,11 @@ in {
# };
# };
# };
+ qt = {
+ enable = true;
+ platformTheme = "qt5ct"; # Also selects qt6ct.
+ style = "adwaita";
+ };
home-manager.users.andrew = {
home.sessionVariables = {
XDG_CURRENT_DESKTOP = "sway";
@@ -84,6 +89,8 @@ in {
gtk = let
# *_shade_color is adjusted from black by default.
extraCss3 = ''
+ @define-color shade_color #${colo.background};
+ @define-color scrollbar_outline_color #${colo.foreground};
@define-color window_bg_color #${colo.background};
@define-color window_fg_color #${colo.foreground};
@define-color view_bg_color #${colo.background};
@@ -112,6 +119,11 @@ in {
@define-color sidebar_bg_color #${colo.background};
@define-color sidebar_fg_color #${colo.foreground};
@define-color sidebar_backdrop_color #${colo.background};
+ @define-color sidebar_border_color #${colo.color5};
+ @define-color secondary_sidebar_bg_color #${colo.background};
+ @define-color secondary_sidebar_fg_color #${colo.foreground};
+ @define-color secondary_sidebar_backdrop_color #${colo.background};
+ @define-color secondary_sidebar_border_color #${colo.color6};
@define-color warning_bg_color #${colo.color4};
@define-color warning_fg_color #${colo.foreground};
@define-color warning_color #${colo.color4};
@@ -326,11 +338,13 @@ in {
};
services.mako = {
enable = true;
- defaultTimeout = 14000;
- font = "${loc.font.name} ${toString loc.ui-font.size}";
- backgroundColor = "#${colo.background}";
- textColor = "#${colo.foreground}";
- borderColor = "#${colo.color6}";
+ settings = {
+ defaultTimeout = 14000;
+ font = "${loc.font.name} ${toString loc.ui-font.size}";
+ backgroundColor = "#${colo.background}";
+ textColor = "#${colo.foreground}";
+ borderColor = "#${colo.color6}";
+ };
};
};
}
diff --git a/nix/user.nix b/nix/user.nix
index d81e6c2..a7b71a8 100644
--- a/nix/user.nix
+++ b/nix/user.nix
@@ -30,6 +30,7 @@ in {
nanum-gothic-coding
iosevka-comfy.comfy
dina-font
+ freefont_ttf # FreeMono
];
fontconfig = {
enable = true;