diff --git a/.helix/languages.toml b/.helix/languages.toml index aff50b2..0d90ee8 100644 --- a/.helix/languages.toml +++ b/.helix/languages.toml @@ -1,6 +1,6 @@ [[language]] name = "nix" -language-servers = ["nixd", "typos-lsp", "nil"] +language-servers = ["nixd", "typos-lsp"] [[language]] name = "markdown" diff --git a/flake.lock b/flake.lock index 8ceecae..0b642ae 100644 --- a/flake.lock +++ b/flake.lock @@ -89,18 +89,18 @@ }, "chaotic": { "inputs": { + "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750212424, - "narHash": "sha256-qVefRn4cmrH3nNjT3sP5U2I9dsCTJKWzl8uDhwfAGFw=", + "lastModified": 1749765011, + "narHash": "sha256-F/Hl8ZJNUdxV+Dw5/KEdS3BfXMZhYUSXMS06wyq/+tc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6725337207f86ac50a0ae4075718f47b5cb9174e", + "rev": "4825ae9d1980f8de8a90affd86e6f0564f813588", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1749975763, - "narHash": "sha256-27qcno2+7CHU6ssR4i8SDNxIoXO+pmM0932oxnjR+Qs=", + "lastModified": 1748747628, + "narHash": "sha256-GSdRsUdUt2RENE3mevSY8bTKZhXB4vdyC4jfgSZrS/k=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "c7fcf3fad955f7e028e16d00a274825737ad7cdf", + "rev": "729bb3b18d9f7efaaaef1244d16d4b033b0fb980", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1750040002, - "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", + "lastModified": 1749436314, + "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", "owner": "nix-community", "repo": "disko", - "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", + "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", "type": "github" }, "original": { @@ -176,6 +176,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1749623906, + "narHash": "sha256-QD7e5WNVj4aWS5mlJZZnLJ6Lg0h5RSyyEFo2I6xBUEQ=", + "owner": "nix-community", + "repo": "fenix", + "rev": "873cccc628f5e39407e319e6711f3b7d6d1f15cc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -390,14 +412,14 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750169866, - "narHash": "sha256-3gCFhONErZ13S0ixwLaQ4cfgaIOXOUHH2g/yzt3ZFg8=", + "lastModified": 1749738489, + "narHash": "sha256-qjal0TFAqArHqOVdf+Wicn1PIWOkOom+tonW0ou5cns=", "owner": "helix-editor", "repo": "helix", - "rev": "1491cbc8f3694e52a565d192eaef1a7bf200d33f", + "rev": "62f270e5d2fb34a77dd30a3b2e6b4c9fb6f1cfe1", "type": "github" }, "original": { @@ -415,11 +437,11 @@ ] }, "locked": { - "lastModified": 1750127463, - "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", + "lastModified": 1749649116, + "narHash": "sha256-pCuUfMkhlP+XqW+TXX5Tssk8IE4TpS3MbG7OQtvaQdM=", "owner": "nix-community", "repo": "home-manager", - "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", + "rev": "02040b7777f65342b96c7f826a5c6aef95585057", "type": "github" }, "original": { @@ -435,11 +457,11 @@ ] }, "locked": { - "lastModified": 1750127463, - "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", + "lastModified": 1749779443, + "narHash": "sha256-r6YTIMprNCYcJcA4oZ0x1wPaHPPHUxb8CnyEeMkhGks=", "owner": "nix-community", "repo": "home-manager", - "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", + "rev": "18f3a0d21c3739a242aafa17c04c5238bbab5a41", "type": "github" }, "original": { @@ -457,11 +479,11 @@ ] }, "locked": { - "lastModified": 1750172631, - "narHash": "sha256-XwqAqM1UmKahdCwzp2UQHTpjnY0b82/VTfA8VpZIR6g=", + "lastModified": 1749627191, + "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7de24ceed8c7693191b74a7bda6d89c91f94c8f5", + "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", "type": "github" }, "original": { @@ -522,11 +544,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750230031, - "narHash": "sha256-h1aDeX8j10N0pHqdvmVoLQsnTwj1TbxeTPos7x1wuZA=", + "lastModified": 1749754824, + "narHash": "sha256-4np99yTzIyosbx8hUvkOaaMoLuQpWIwNmkcYR2F8uXM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1fc50d02ad4fe47daa5c22f9fa116ca220ab5154", + "rev": "3308d82c470d2614530536b8a69169ebc61eb1b5", "type": "github" }, "original": { @@ -538,16 +560,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.02", "repo": "niri", "type": "github" } @@ -555,11 +577,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750225787, - "narHash": "sha256-7O/8CChaOhSBSu94McHE0vyH0o+J5R4exq2DDq4zHAg=", + "lastModified": 1749752245, + "narHash": "sha256-AOiLFwSsLC86GFPUZQJwW1ZsWKKtbR/G85SbmtkEuuk=", "owner": "YaLTeR", "repo": "niri", - "rev": "ed14e8da8476d5fde27b14d1dde03256a2f6e11b", + "rev": "97dfd2b1a00bcb9b765a8fa92ce39d2e0c79abc2", "type": "github" }, "original": { @@ -596,14 +618,14 @@ "flake-compat": "flake-compat_2", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1750244952, - "narHash": "sha256-678XeoTKUT1tEKSXaGA/rwHYQ2cBntr1I3Xw2D5Onew=", + "lastModified": 1749770917, + "narHash": "sha256-3jOhroFAAKg/vPmgmDnOKUGJp6GfLycUkhyMaJKZ7zg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "fd677bef9e0172bc0cea0daccae3d28a74be882c", + "rev": "f5d076cdc61fe2f268d624a34a3df52573620396", "type": "github" }, "original": { @@ -614,11 +636,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -630,11 +652,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -661,11 +683,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -677,11 +699,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1750151854, - "narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=", + "lastModified": 1749488106, + "narHash": "sha256-b9GIWdF/8jKpCC5JIMgDLZgwe8cEbty2fyTyo1eDFfI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244", + "rev": "8fe3e32e7f210522377c3bcff80931a3284ace6a", "type": "github" }, "original": { @@ -693,11 +715,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -709,11 +731,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -768,11 +790,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1750219402, - "narHash": "sha256-b3y7V7db0VwLGtpcLRmT1Aa9dpAKoHQdem55UhgB/fw=", + "lastModified": 1749701004, + "narHash": "sha256-KeZvDN/OgLsxf6y8jnyNuj3XvnPuBI3i58a4lcElddc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "a00ce73b626ed274fbfe9f51627861e140b08f6d", + "rev": "f70d23962d858c8996558ff30e3f0af205fe0f3a", "type": "gitlab" }, "original": { @@ -804,28 +826,24 @@ "treefmt-nix": "treefmt-nix_2" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, + "rust-analyzer-src": { + "flake": false, "locked": { - "lastModified": 1750127910, - "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", + "lastModified": 1749558764, + "narHash": "sha256-R9vQiqez6Gm0ARJKgbsAeLyX493vwIaexOUAz0vDhak=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "9c3476d225ccc90c081280c2a20e9f7d8a200325", "type": "github" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", "type": "github" } }, - "rust-overlay_2": { + "rust-overlay": { "inputs": { "nixpkgs": [ "helix", @@ -846,7 +864,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { "nixpkgs": [ "nixos-cosmic", @@ -854,11 +872,11 @@ ] }, "locked": { - "lastModified": 1750214276, - "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", + "lastModified": 1749695868, + "narHash": "sha256-debjTLOyqqsYOUuUGQsAHskFXH5+Kx2t3dOo/FCoNRA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", + "rev": "55f914d5228b5c8120e9e0f9698ed5b7214d09cd", "type": "github" }, "original": { @@ -874,11 +892,11 @@ ] }, "locked": { - "lastModified": 1750119275, - "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": { @@ -915,11 +933,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750205637, - "narHash": "sha256-49wV81h1jnHJky1XNHfgwxNA0oCwSTLMz4hhrtWCM8A=", + "lastModified": 1749767991, + "narHash": "sha256-tgKABKKmQMEU6Mlsi5fJ37AgWCQVnf8bQUd2Pv9x/sk=", "owner": "danth", "repo": "stylix", - "rev": "82323751bcd45579c8d3a5dd05531c3c2a78e347", + "rev": "343938594e57483635d6fb34d90c227e8dd46072", "type": "github" }, "original": { @@ -1082,16 +1100,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.6", + "ref": "v0.5.1", "repo": "xwayland-satellite", "type": "github" } diff --git a/flake/perSystem.nix b/flake/perSystem.nix index 5119c78..b13a179 100644 --- a/flake/perSystem.nix +++ b/flake/perSystem.nix @@ -23,7 +23,6 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ nixd - nil typos typos-lsp just diff --git a/home/modules/programs/firefox.nix b/home/modules/programs/firefox.nix index ce5d734..17f77dd 100644 --- a/home/modules/programs/firefox.nix +++ b/home/modules/programs/firefox.nix @@ -37,14 +37,6 @@ in { immersive-translate tridactyl ]; - settings = { - "sidebar.verticalTabs" = true; - "sidebar.visibility" = "expand-on-hover"; - "sidebar.main.tools" = "syncedtabs,history,bookmarks,aichat"; - "sidebar.animation.expand-on-hover.duration-ms" = 150; - "sidebar.revamp" = true; - "browser.tabs.closeTabByDblclick" = true; - }; search = { force = true; default = "ddg"; diff --git a/home/modules/programs/helix/default.nix b/home/modules/programs/helix/default.nix index ed41aef..4854b82 100644 --- a/home/modules/programs/helix/default.nix +++ b/home/modules/programs/helix/default.nix @@ -45,12 +45,6 @@ "start" ]; }; - ty = { - command = "ty"; - args = [ - "server" - ]; - }; }; language = [ { @@ -128,7 +122,6 @@ language-servers = [ "pyright" "ruff" - "ty" ]; } { diff --git a/home/modules/programs/zed.nix b/home/modules/programs/zed.nix index 11b7439..b8935d3 100644 --- a/home/modules/programs/zed.nix +++ b/home/modules/programs/zed.nix @@ -19,6 +19,7 @@ in { "asciidoc" "basher" "cargo-tom" + "codebook" "deno" "docker-compose" "dockerfile" @@ -45,41 +46,14 @@ in { "typst" "xml" "zig" - "typos" - "ty" - "ruff" ]; extraPackages = with pkgs; [ editor-runtime ]; userSettings = { - lsp = { - ty = { - binary = { - path = lib.getExe pkgs.ty; - arguments = ["server"]; - }; - }; - }; languages = { - Python = { - language_servers = ["ty" "ruff" "pyright"]; - formatter = [ - { - language_server = { - name = "ruff"; - }; - } - { - code_actions = { - "source.fixAll.ruff" = true; - "source.organizeImports.ruff" = true; - }; - } - ]; - }; Nix = { - language_servers = ["nixd" "nil"]; + language_servers = ["nixd" "!nil"]; formatter = { external = { command = "alejandra"; @@ -109,7 +83,7 @@ in { theme = "Gruvbox Dark Hard"; vim_mode = true; vim = { - # default_mode = "helix_normal"; + default_mode = "helix_normal"; }; }; }; diff --git a/home/modules/programs/zoxide.nix b/home/modules/programs/zoxide.nix index d52dcd6..1267b9c 100644 --- a/home/modules/programs/zoxide.nix +++ b/home/modules/programs/zoxide.nix @@ -4,25 +4,15 @@ ... }: let cfg = config.youthlic.programs.zoxide; - fish-cfg = config.youthlic.programs.fish; - bash-cfg = config.youthlic.programs.bash; in { options = { youthlic.programs.zoxide = { enable = lib.mkEnableOption "zoxide"; }; }; - config = lib.mkMerge [ - (lib.mkIf cfg.enable { - programs.zoxide = { - enable = true; - }; - }) - (lib.mkIf (cfg.enable && fish-cfg.enable) { - programs.zoxide.enableFishIntegration = true; - }) - (lib.mkIf (cfg.enable && bash-cfg.enable) { - programs.zoxide.enableBashIntegration = true; - }) - ]; + config = { + programs.zoxide = lib.mkIf cfg.enable { + enable = true; + }; + }; } diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index b728f54..82a74ec 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -114,7 +114,6 @@ nvidiaBusId = "PCI:1:0:0"; }; }; - nix = {settings = {system-features = ["gccarch-x86-64-v3"];};}; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/pkgs/editor-runtime.nix b/pkgs/editor-runtime.nix index a22e9f2..13ac950 100644 --- a/pkgs/editor-runtime.nix +++ b/pkgs/editor-runtime.nix @@ -31,12 +31,11 @@ delve, lldb, rust-analyzer, - nil, + # nil, haskell-language-server, neocmakelsp, jdt-language-server, zls, - ty, }: symlinkJoin { name = "editor-runtime"; @@ -72,13 +71,10 @@ symlinkJoin { delve lldb rust-analyzer - nil + # nil haskell-language-server neocmakelsp jdt-language-server zls - ty ]; - postBuild = '' - ''; }