From 07f0cd2128bba7216bd4e67e76966a77f6f9117d Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Fri, 15 May 2026 20:33:55 -0700 Subject: [PATCH 1/4] remove cruft --- extras/dev.nix | 1 - users/tao.nix | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/extras/dev.nix b/extras/dev.nix index c075f0c..3fbfe42 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -15,7 +15,6 @@ # }; programs.qgroundcontrol.enable = true; environment.systemPackages = with pkgs; [ - chromium claude-code # keep-sorted start sticky_comments=no # act diff --git a/users/tao.nix b/users/tao.nix index 456a0c7..9795310 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -12,9 +12,6 @@ in { # oculante # https://nixpk.gs/pr-tracker.html?pr=502921 ]) ++ (with pkgs; [ - feedr - sniffnet - oculante # keep-sorted start sticky_comments=no # android-tools # bottles @@ -42,6 +39,7 @@ in { deluge discord element-desktop + feedr forgejo-cli freecad-wayland gocryptfs @@ -56,6 +54,7 @@ in { nushell nvd obs-studio + oculante onlyoffice-desktopeditors openscad pandoc @@ -70,6 +69,7 @@ in { signal-desktop slack snapper + sniffnet starship syncplay tinymist From 48f1796002b62d28e6798622c11cdacd47da64ed Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Fri, 15 May 2026 21:26:43 -0700 Subject: [PATCH 2/4] onlyoffice fonts workaround --- systems/BASED.nix | 37 +++++++++++++++++++++++++++++++++++++ users/tao.nix | 16 ---------------- users/vy.nix | 15 --------------- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/systems/BASED.nix b/systems/BASED.nix index aeeb1ae..88c0d0e 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -60,6 +60,43 @@ ]; programs.partition-manager.enable = lib.mkDefault true; + fonts.packages = with pkgs; [ + # keep-sorted start + cooper-hewitt + ibm-plex + inconsolata + iosevka + libertine + linux-libertine-g + nerd-fonts.fira-code + nerd-fonts.iosevka-term + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-color-emoji + # keep-sorted end + ]; + system.userActivationScripts = { + copy-fonts-local-share = { + text = '' + rm -rf ~/.local/share/fonts + mkdir -p ~/.local/share/fonts + cp ${pkgs.cooper-hewitt}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.ibm-plex}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.inconsolata}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.iosevka}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.libertine}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.linux-libertine-g}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.nerd-fonts.fira-code}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.nerd-fonts.iosevka-term}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.noto-fonts-cjk-sans}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.noto-fonts-cjk-serif}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.noto-fonts-color-emoji}/share/fonts/truetype/* ~/.local/share/fonts/ + chmod 544 ~/.local/share/fonts + chmod 444 ~/.local/share/fonts/* + ''; + }; + }; + hardware.graphics.enable = true; # hardware.opengl = { # enable = true; diff --git a/users/tao.nix b/users/tao.nix index 9795310..fd3e62b 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -94,22 +94,6 @@ in { environment.shells = with pkgs; [nushell]; - fonts.packages = with pkgs; [ - nerd-fonts.iosevka-term - iosevka - libertine - inconsolata - linux-libertine-g - # keep-sorted start - cooper-hewitt - ibm-plex - nerd-fonts.fira-code - noto-fonts-cjk-sans - noto-fonts-cjk-serif - noto-fonts-color-emoji - # keep-sorted end - ]; - documentation.enable = true; # virtualisation.libvirtd.enable = true; diff --git a/users/vy.nix b/users/vy.nix index 0658936..ccdcf81 100644 --- a/users/vy.nix +++ b/users/vy.nix @@ -28,21 +28,6 @@ in { ]); programs.kdeconnect.enable = true; - fonts.packages = with pkgs; [ - libertine - inconsolata - linux-libertine-g - adwaita-fonts - # keep-sorted start - cooper-hewitt - ibm-plex - nerd-fonts.fira-code - noto-fonts-cjk-sans - noto-fonts-cjk-serif - noto-fonts-color-emoji - # keep-sorted end - ]; - services.flatpak.enable = true; services.snapper.configs = { From c13f4a21914dd87e76d3aae7b641dbf37f972013 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Sat, 16 May 2026 18:03:46 -0700 Subject: [PATCH 3/4] fupd --- systems/BASED.nix | 2 ++ systems/NOlaptop.nix | 1 - users/tao.nix | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/systems/BASED.nix b/systems/BASED.nix index 88c0d0e..05554d0 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -6,6 +6,8 @@ modulesPath, ... }: { + services.fwupd.enable = true; + nixpkgs.overlays = [ (final: prev: { inherit diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 82860bb..95e5639 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -25,7 +25,6 @@ services.lact.enable = true; - services.fwupd.enable = true; services.tailscale.useRoutingFeatures = "client"; systemd.services."backlight@backlight:amdgpu_bl2".enable = false; diff --git a/users/tao.nix b/users/tao.nix index fd3e62b..72d4754 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -74,6 +74,7 @@ in { syncplay tinymist toastify + transmission_4-gtk typst typstyle usbutils From 2a72f94565e4e1833e6ebe012cd873aaab0bb074 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Mon, 25 May 2026 17:57:56 -0700 Subject: [PATCH 4/4] bump 2026-05-25 --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index e8620bb..d18e2d5 100644 --- a/flake.lock +++ b/flake.lock @@ -30,12 +30,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1778179392, - "narHash": "sha256-W6zorvjBYbzMNvqKIqCdpDF4rq3gj50Xximl56YM9/I=", - "rev": "efd54faa68be8cd777b5c28cab11e638998a0853", - "revCount": 416, + "lastModified": 1779475417, + "narHash": "sha256-7/U/+X66C7XmLnt5JVJVtpx8wVDRU//Awaeqkq9+NNc=", + "rev": "8a9c57ea6b458a40589df60f26200b7d305354d1", + "revCount": 417, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.416%2Brev-efd54faa68be8cd777b5c28cab11e638998a0853/019e03c3-8bbc-7443-bd6d-c787773c6154/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.417%2Brev-8a9c57ea6b458a40589df60f26200b7d305354d1/019e5102-f8d8-79f0-8541-a9816865d409/source.tar.gz?rev=8a9c57ea6b458a40589df60f26200b7d305354d1&revCount=417" }, "original": { "type": "tarball", @@ -45,37 +45,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-z4mCqKI3Qd6weuHrlfzGccJG0giym/VJhKv20ijRSs0=", + "narHash": "sha256-LNvx0qZsH8tbdgNfaig/x5Cf4r4UrXfU1m+0bO3D0E4=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-yW+VNepSRytzfanSssPMJPvwioCcmlZYaBX8++UFkAk=", + "narHash": "sha256-rKg7uVAEK8X3TTFGaWp8CVZuCAr3wHkMnuJOndhXJF0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-+L102C3Hhkd1GlXmRm2eLTLsZKBxEvooiQZFqQRlBf0=", + "narHash": "sha256-vBCUEVPfY4+nxGDM62evpxJYEVqLTqdBGbCkmZ2sQhk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" } }, "disko": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1779226674, - "narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=", + "lastModified": 1779699611, + "narHash": "sha256-EcCaSTKnmg2o4wLKaN1aqQFomwyhO7ik0bX9COdyCas=", "owner": "nix-community", "repo": "disko", - "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32", + "rev": "5ba0c9555c28685e57fa54c7a25e42c7efdbfc8d", "type": "github" }, "original": { @@ -190,11 +190,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1778551011, - "narHash": "sha256-woJV7tJwwzjR0xWDNuGpwMENe/OEMAdSGg+nqWs9tUE=", + "lastModified": 1779750197, + "narHash": "sha256-Fcr61O7zcnFPPb0X1JvpKBX7SAnWrzoK6h/w/XJnlkg=", "owner": "helix-editor", "repo": "helix", - "rev": "8c41b11607924f7584b77c8a6e6b16439a2f559f", + "rev": "0343e2e41c105cb093ffdf52b56a6e45b0046da5", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1779213149, - "narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=", + "lastModified": 1779726696, + "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd868f769a69d3b6091a1da68a75cb83a181033c", + "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", "type": "github" }, "original": { @@ -295,12 +295,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1778177425, - "narHash": "sha256-oyHvP5HDRe59opmjTrq2ED9lh+R9FrHyaCGPPNfBqWM=", - "rev": "f0ccb960d3ad5bff28acd9cabf8bdef885b5d52f", - "revCount": 25858, + "lastModified": 1779472733, + "narHash": "sha256-nV5OHwivEf392cB5MDwoVdDHSvy6Q+rRYZBHd9sePj4=", + "rev": "11f3aff904f84ae612e36e8bc578ac421fca74fa", + "revCount": 25967, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.20.0/019e03bc-3f83-7833-aba3-b691ef4956c7/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.0/019e50fb-8633-73d0-b673-b2e265950490/source.tar.gz" }, "original": { "type": "tarball", @@ -309,11 +309,11 @@ }, "nixos": { "locked": { - "lastModified": 1779102034, - "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", + "lastModified": 1779467186, + "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", + "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "type": "github" }, "original": { @@ -434,12 +434,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1777826146, - "narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=", - "rev": "73c703c22422b8951895a960959dbbaca7296492", - "revCount": 991389, + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "revCount": 998534, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.991389%2Brev-73c703c22422b8951895a960959dbbaca7296492/019df6c8-934b-7d40-b402-027bb5def30f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.998534%2Brev-d233902339c02a9c334e7e593de68855ad26c4cb/019e3efc-e09a-7ff1-b05f-0c8f85ba7441/source.tar.gz" }, "original": { "type": "tarball", @@ -448,11 +448,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -470,11 +470,11 @@ ] }, "locked": { - "lastModified": 1779470870, - "narHash": "sha256-h511LYfVIXNpTd8C/p1cMW2AVrFEjMy104XxPRIzrL0=", + "lastModified": 1779756131, + "narHash": "sha256-//XfHx8NJar3xenOBltnZ8UcxEca4d4CBSmeWXNj6iI=", "owner": "nix-community", "repo": "NUR", - "rev": "5ea6f8868ce8f1ed17ce6da66abe084dfe3501e0", + "rev": "bd1f99d01a6d100134d4e048819329bb013a4be2", "type": "github" }, "original": { @@ -544,11 +544,11 @@ ] }, "locked": { - "lastModified": 1779263007, - "narHash": "sha256-JkwxVCt7EHCrisHkzhMPKhfdaNAhpyyKuIdLoNYGuPI=", + "lastModified": 1779649538, + "narHash": "sha256-k256zgHyqJ/0siFdq5y4GSwJyYKhQnW83N9K8S7OMKo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6891eb4b5fbac054b9406da94525daeec71646e3", + "rev": "e8fbde26a92a8c078fb1355c9f7c8dba5f7eb9d6", "type": "github" }, "original": {