From ad083cc62c8b52b3e4840278dac7aff5a322f677 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Wed, 11 Feb 2026 00:09:56 -0800 Subject: [PATCH 1/2] stuf --- extras/dev.nix | 3 ++- systems/BASED.nix | 1 + systems/NOcomputer.nix | 2 +- users/tao.nix | 2 +- .../autostart/org.keepassxc.KeePassXC.desktop | 16 ---------------- users/tao/helix.nix | 12 +++++++++++- users/tao/nushell/extras/alias.nu | 12 ++++++++---- users/tao/nushell/extras/nix.nu | 4 ++-- users/vy.nix | 1 - 9 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 users/tao/autostart/org.keepassxc.KeePassXC.desktop diff --git a/extras/dev.nix b/extras/dev.nix index b5af484..80ffeb1 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -112,6 +112,7 @@ cargo-expand cargo-feature cargo-generate + cargo-nextest cargo-update cargo-watch dioxus-cli @@ -123,7 +124,7 @@ rustup rusty-man sccache - spacetimedb + # spacetimedb trunk wasm-bindgen-cli # keep-sorted end diff --git a/systems/BASED.nix b/systems/BASED.nix index 8bd3d2f..651d116 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -132,6 +132,7 @@ fcitx5-gtk fcitx5-mozc fcitx5-rime + rime-ice ]; }; diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 1cc72a8..b4519d5 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -19,7 +19,7 @@ environment.sessionVariables = { # # wayland chromium workaround - # NIXOS_OZONE_WL = "1"; + NIXOS_OZONE_WL = "1"; # firefox nvidia-vaapi-driver # MOZ_DISABLE_RDD_SANDBOX = "1"; diff --git a/users/tao.nix b/users/tao.nix index 758bcbf..75456b6 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -6,6 +6,7 @@ ... }: { users.users.tao.packages = with pkgs; [ + grayjay # keep-sorted start sticky_comments=no # android-tools # boxxy @@ -36,7 +37,6 @@ element-desktop gocryptfs jellyfin-mpv-shim - keepassxc man-pages man-pages-posix miniserve diff --git a/users/tao/autostart/org.keepassxc.KeePassXC.desktop b/users/tao/autostart/org.keepassxc.KeePassXC.desktop deleted file mode 100644 index c8908ee..0000000 --- a/users/tao/autostart/org.keepassxc.KeePassXC.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Categories=Utility;Security;Qt; -Comment=Community-driven port of the Windows application “KeePass Password Safe” -Exec=keepassxc %f -GenericName=Password Manager -Icon=keepassxc -MimeType=application/x-keepass2; -Name=KeePassXC -SingleMainWindow=true -StartupNotify=true -StartupWMClass=keepassxc -Terminal=false -TryExec=keepassxc -Type=Application -Version=1.5 -X-GNOME-SingleWindow=true diff --git a/users/tao/helix.nix b/users/tao/helix.nix index 68a736d..d39ccfc 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -69,7 +69,7 @@ j = "jump_view_up"; k = "jump_view_down"; }; - i = "@:toggle las.display-inlay-hints"; + i = "@:toggle lsp.display-inlay-hints"; t = { r = "@mip:reflow"; s = "@:sort"; @@ -192,6 +192,13 @@ unit = "\t"; }; } + { + name = "microcad"; + scope = "source.microcad"; + file-types = ["µcad" "mcad" "ucad"]; + language-servers = ["microcad-lsp"]; + comment-tokens = "//"; + } { name = "nix"; auto-format = true; @@ -238,6 +245,9 @@ # lspmux = { # command = "lspmux"; # }; + microcad-lsp = { + command = "microcad-lsp"; + }; basedpyright = { command = "basedpyright-langserver"; diff --git a/users/tao/nushell/extras/alias.nu b/users/tao/nushell/extras/alias.nu index b4854e2..8befcb3 100644 --- a/users/tao/nushell/extras/alias.nu +++ b/users/tao/nushell/extras/alias.nu @@ -15,10 +15,13 @@ alias cringe = sudo bootctl set-oneshot auto-windows def h [query?: path] { (if ($query != null) {sk -1 -q ($query | path basename)} else {sk -1}) - | complete - | if $in.exit_code == 0 { - $in.stdout | str trim | hx $in - } + | if ($in != "") { + hx $in + } + # | complete + # | if $in.exit_code == 0 { + # $in.stdout | str trim | hx $in + # } } def srg [] { @@ -36,6 +39,7 @@ alias jp = jj git push alias js = jj status alias jw = jj workspace update-stale alias jt = jj log -r @ -T `description` +alias jn = jj next --edit def jm --wrapped [-r: string = "@", ...rest] { mut r = $r diff --git a/users/tao/nushell/extras/nix.nu b/users/tao/nushell/extras/nix.nu index e1ae7dc..0a9aa9c 100644 --- a/users/tao/nushell/extras/nix.nu +++ b/users/tao/nushell/extras/nix.nu @@ -67,9 +67,9 @@ def bump [...rest] { } let r = jj log -r @ --no-pager --no-graph --template 'change_id' sudo nix flake update - let curr_gen = get_gen() + let curr_gen = get_gen let build_status = rebuild boot - let new_gen = get_gen() + let new_gen = get_gen if ($build_status and ($curr_gen == $new_gen)) { jj desc -r $r -m $"bump (date now | format date "%Y-%m-%d")" jj bookmark set main -r $r diff --git a/users/vy.nix b/users/vy.nix index 9372e75..a97f17b 100644 --- a/users/vy.nix +++ b/users/vy.nix @@ -11,7 +11,6 @@ audacity cosmic-store jellyfin-media-player - keepassxc onlyoffice-desktopeditors signal-desktop snapper From 70cf54d8240abb516e3bd4aa41da872972e0a801 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Thu, 19 Feb 2026 23:18:35 -0800 Subject: [PATCH 2/2] stufe --- extras/dev.nix | 4 ++++ users/tao.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/extras/dev.nix b/extras/dev.nix index 80ffeb1..e0f60bf 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -13,6 +13,10 @@ # }; programs.qgroundcontrol.enable = true; environment.systemPackages = with pkgs; [ + docker-compose + bun + ngrok + # keep-sorted start sticky_comments=no # act # asm-lsp diff --git a/users/tao.nix b/users/tao.nix index 75456b6..bd4d5b9 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -6,6 +6,7 @@ ... }: { users.users.tao.packages = with pkgs; [ + forgejo-cli grayjay # keep-sorted start sticky_comments=no # android-tools