diff --git a/extras/dev.nix b/extras/dev.nix index e0f60bf..b5af484 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -13,10 +13,6 @@ # }; programs.qgroundcontrol.enable = true; environment.systemPackages = with pkgs; [ - docker-compose - bun - ngrok - # keep-sorted start sticky_comments=no # act # asm-lsp @@ -116,7 +112,6 @@ cargo-expand cargo-feature cargo-generate - cargo-nextest cargo-update cargo-watch dioxus-cli @@ -128,7 +123,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 651d116..8bd3d2f 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -132,7 +132,6 @@ fcitx5-gtk fcitx5-mozc fcitx5-rime - rime-ice ]; }; diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index b4519d5..1cc72a8 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 bd4d5b9..758bcbf 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -6,8 +6,6 @@ ... }: { users.users.tao.packages = with pkgs; [ - forgejo-cli - grayjay # keep-sorted start sticky_comments=no # android-tools # boxxy @@ -38,6 +36,7 @@ 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 new file mode 100644 index 0000000..c8908ee --- /dev/null +++ b/users/tao/autostart/org.keepassxc.KeePassXC.desktop @@ -0,0 +1,16 @@ +[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 d39ccfc..68a736d 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 lsp.display-inlay-hints"; + i = "@:toggle las.display-inlay-hints"; t = { r = "@mip:reflow"; s = "@:sort"; @@ -192,13 +192,6 @@ unit = "\t"; }; } - { - name = "microcad"; - scope = "source.microcad"; - file-types = ["µcad" "mcad" "ucad"]; - language-servers = ["microcad-lsp"]; - comment-tokens = "//"; - } { name = "nix"; auto-format = true; @@ -245,9 +238,6 @@ # 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 8befcb3..b4854e2 100644 --- a/users/tao/nushell/extras/alias.nu +++ b/users/tao/nushell/extras/alias.nu @@ -15,13 +15,10 @@ alias cringe = sudo bootctl set-oneshot auto-windows def h [query?: path] { (if ($query != null) {sk -1 -q ($query | path basename)} else {sk -1}) - | if ($in != "") { - hx $in - } - # | complete - # | if $in.exit_code == 0 { - # $in.stdout | str trim | hx $in - # } + | complete + | if $in.exit_code == 0 { + $in.stdout | str trim | hx $in + } } def srg [] { @@ -39,7 +36,6 @@ 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 0a9aa9c..e1ae7dc 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 a97f17b..9372e75 100644 --- a/users/vy.nix +++ b/users/vy.nix @@ -11,6 +11,7 @@ audacity cosmic-store jellyfin-media-player + keepassxc onlyoffice-desktopeditors signal-desktop snapper