diff --git a/extras/dev.nix b/extras/dev.nix index a4b9db6..5a1570d 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -15,7 +15,6 @@ # }; programs.qgroundcontrol.enable = true; environment.systemPackages = with pkgs; [ - claude-code # keep-sorted start sticky_comments=no # act # asm-lsp @@ -70,7 +69,6 @@ bun docker-compose ngrok - deno # # databases # sqlite diff --git a/flake.lock b/flake.lock index 6d7e911..212fcba 100644 --- a/flake.lock +++ b/flake.lock @@ -30,12 +30,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1772669230, - "narHash": "sha256-y5euTOVqJ4YlooZbpi6F/LW9PqZZ+PjNquIses9ODy4=", - "rev": "dc4d71b197a9bce053178291da2ead757cdf93bc", - "revCount": 406, + "lastModified": 1770325739, + "narHash": "sha256-TPDWnhzKW/1+FPMiagZ9mZiQN0aKcGC09yYSUBuv8Mo=", + "rev": "1b3259b71c81508ffd409114525df6a55c0f337f", + "revCount": 396, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.406%2Brev-dc4d71b197a9bce053178291da2ead757cdf93bc/019cbb54-8bf8-7fef-8486-009ae169c68d/source.tar.gz?rev=dc4d71b197a9bce053178291da2ead757cdf93bc&revCount=406" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.396%2Brev-1b3259b71c81508ffd409114525df6a55c0f337f/019c2fa5-ad5e-7a71-9782-a0dbaf02e1c4/source.tar.gz" }, "original": { "type": "tarball", @@ -45,37 +45,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-4psYG30Pl0R1zAHXDHfjR39ybe/QEfcA8C5h0eEKVx8=", + "narHash": "sha256-zK2dgNHh/p92rk5jN+Y1LOMn0HEdTsS+7XXwb2g52oM=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-a++ZpOrqzWsBHNR2K8H3B48LoFKIvK5VfodJgXSlsFE=", + "narHash": "sha256-ckvZP0zFcbzLXWYOJUqYXkKBt0b2IZcQEr7YjEVtwOI=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-Q+SViaRHSg0FR6x26qCpqc3n6vJZ6PHpdHWV8XZ4ih0=", + "narHash": "sha256-8dLtm8FJrpyBmrNpspJj30/6I5HGEfjjXuFqURcZ8pk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/x86_64-linux" } }, "disko": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1773025010, - "narHash": "sha256-khlHllTsovXgT2GZ0WxT4+RvuMjNeR5OW0UYeEHPYQo=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "7b9f7f88ab3b339f8142dc246445abb3c370d3d3", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1772653894, - "narHash": "sha256-/8hQLVH3X7I6Rr62V2cL01NkLYh3YHJ6kZB2fY6IysE=", + "lastModified": 1770596905, + "narHash": "sha256-ramJSHL39uTmfpY2O3zFd0IUiVPDNR1edCq0nIHEcAs=", "owner": "helix-editor", "repo": "helix", - "rev": "51ec572a27a8c1267afbc07e6c1583585c6363dc", + "rev": "066dded21b7c520bfa114780907265eda801004b", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1773093840, - "narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=", + "lastModified": 1770654520, + "narHash": "sha256-mg5WZMIPGsFu9MxSrUcuJUPMbfMsF77el5yb/7rc10k=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb014746edb2a98d975abde4dd40fa240de4cf86", + "rev": "6c4fdbe1ad198fac36c320fd45c5957324a80b8e", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", + "lastModified": 1769872935, + "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "owner": "nix-community", "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", + "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "type": "github" }, "original": { @@ -274,12 +274,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1772664055, - "narHash": "sha256-RtKKd4aefzHEzV9sKa8bQdZIY67GJMV0nRS1QZ2E94g=", - "rev": "3a96d5668a8df84c2c8d006a04212c17839b977f", - "revCount": 24783, + "lastModified": 1768960381, + "narHash": "sha256-32oMe1y+kwvIJNiJsIvozTuSmDxcwST06i+0ak+L4AU=", + "rev": "45ce621408cb8c9a724193d5fe858eb839662db8", + "revCount": 24453, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.17.0/019cbb2e-8d12-7212-a98f-73fd1f2342a2/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.2/019bde75-b4ee-74b2-a812-28dc2ee83d58/source.tar.gz" }, "original": { "type": "tarball", @@ -288,11 +288,11 @@ }, "nixos": { "locked": { - "lastModified": 1772822230, - "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1772972630, - "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=", + "lastModified": 1770631810, + "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72", + "rev": "2889685785848de940375bf7fea5e7c5a3c8d502", "type": "github" }, "original": { @@ -397,12 +397,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772479524, - "narHash": "sha256-u7nCaNiMjqvKpE+uZz9hE7pgXXTmm5yvdtFaqzSzUQI=", - "rev": "4215e62dc2cd3bc705b0a423b9719ff6be378a43", - "revCount": 957146, + "lastModified": 1768783163, + "narHash": "sha256-tLj4KcRDLakrlpvboTJDKsrp6z2XLwyQ4Zmo+w8KsY4=", + "rev": "bde09022887110deb780067364a0818e89258968", + "revCount": 930106, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.957146%2Brev-4215e62dc2cd3bc705b0a423b9719ff6be378a43/019cb23c-bcc0-7c8e-9772-0f9ff50d72f3/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.930106%2Brev-bde09022887110deb780067364a0818e89258968/019bd9ed-5f0b-7074-afb0-8bb5e13a7598/source.tar.gz" }, "original": { "type": "tarball", @@ -411,11 +411,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -484,11 +484,11 @@ ] }, "locked": { - "lastModified": 1772945022, - "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=", + "lastModified": 1770568363, + "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc", + "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", "type": "github" }, "original": { diff --git a/systems/BASED.nix b/systems/BASED.nix index 9a98fe2..651d116 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -173,14 +173,7 @@ boot.loader.timeout = lib.mkForce 1; # boot.supportedFilesystems = ["ntfs" "btrfs"]; hardware.enableAllFirmware = true; - hardware.bluetooth = { - enable = lib.mkDefault true; - settings.General = { - # ControllerMode = "bredr"; # Fix frequent Bluetooth audio dropouts - Experimental = true; - FastConnectable = true; - }; - }; + hardware.bluetooth.enable = lib.mkDefault true; # hardware.bluetooth.settings.General.Experimental = true; imports = [(modulesPath + "/installer/scan/not-detected.nix")]; diff --git a/users/tao.nix b/users/tao.nix index bb2c6fd..bd4d5b9 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -131,19 +131,13 @@ ''; services.ratbagd.enable = true; - # boot = { - # extraModulePackages = with config.boot.kernelPackages; [ - # v4l2loopback - # ]; - # extraModprobeConfig = '' - # options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 - # ''; - # }; - # security.polkit.enable = true; - programs.obs-studio = { - enable = true; - enableVirtualCamera = true; - package = pkgs.obs-studio.override {cudaSupport = true;}; + boot = { + extraModulePackages = with config.boot.kernelPackages; [ + v4l2loopback + ]; + extraModprobeConfig = '' + options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 + ''; }; users.users.tao = { diff --git a/users/tao/helix.nix b/users/tao/helix.nix index 000c023..d39ccfc 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -191,7 +191,6 @@ tab-width = 4; unit = "\t"; }; - language-servers = ["deno-lsp"]; } { name = "microcad"; @@ -232,13 +231,6 @@ name = "toml"; auto-format = true; } - { - name = "typescript"; - roots = ["deno.json" "deno.jsonc" "package.json"]; - file-types = ["ts" "tsx"]; - auto-format = true; - language-servers = ["deno-lsp"]; - } { name = "typst"; language-servers = ["tinymist"]; @@ -250,11 +242,6 @@ # keep-sorted end ]; language-server = { - deno-lsp = { - command = "deno"; - args = ["lsp"]; - config.deno.enable = true; - }; # lspmux = { # command = "lspmux"; # }; diff --git a/users/tao/nushell/extras/nix.nu b/users/tao/nushell/extras/nix.nu index 540560a..0a9aa9c 100644 --- a/users/tao/nushell/extras/nix.nu +++ b/users/tao/nushell/extras/nix.nu @@ -73,7 +73,7 @@ def bump [...rest] { 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 - jj git push --allow-empty-description + jj git push } else { jj desc -r $r -m "bump (failed)" }