diff --git a/flake.lock b/flake.lock index b9b9cca..f88e60c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,31 +20,14 @@ "type": "github" } }, - "all-cabal-json": { - "flake": false, - "locked": { - "lastModified": 1665552503, - "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=", - "owner": "nix-community", - "repo": "all-cabal-json", - "rev": "d7c0434eebffb305071404edcf9d5cd99703878e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "hackage", - "repo": "all-cabal-json", - "type": "github" - } - }, "crane": { "flake": false, "locked": { - "lastModified": 1661875961, - "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", + "lastModified": 1654444508, + "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=", "owner": "ipetkov", "repo": "crane", - "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", + "rev": "db5482bf225acc3160899124a1df5a617cfa27b5", "type": "github" }, "original": { @@ -83,11 +66,11 @@ ] }, "locked": { - "lastModified": 1666548262, - "narHash": "sha256-4DyN4KXqQQsCw0vCXkMThw4b5Q4/q87ZZgRb4st8COc=", + "lastModified": 1667210711, + "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", "owner": "numtide", "repo": "devshell", - "rev": "c8ce8ed81726079c398f5f29c4b68a7d6a3c2fa2", + "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", "type": "github" }, "original": { @@ -99,11 +82,11 @@ "devshell_2": { "flake": false, "locked": { - "lastModified": 1667210711, - "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", + "lastModified": 1655976588, + "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=", "owner": "numtide", "repo": "devshell", - "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", + "rev": "899ca4629020592a13a46783587f6e674179d1db", "type": "github" }, "original": { @@ -169,7 +152,6 @@ "nixCargoIntegration", "nixpkgs" ], - "all-cabal-json": "all-cabal-json", "crane": "crane", "devshell": [ "helix", @@ -181,7 +163,6 @@ "nixCargoIntegration", "nixpkgs" ], - "ghc-utils": "ghc-utils", "gomod2nix": [ "helix", "nixCargoIntegration", @@ -197,6 +178,11 @@ "nixCargoIntegration", "nixpkgs" ], + "node2nix": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], "poetry2nix": [ "helix", "nixCargoIntegration", @@ -209,11 +195,11 @@ ] }, "locked": { - "lastModified": 1667251335, - "narHash": "sha256-nb2H2lsHQt8BQkX/uILJbJ2H80v+Dd9HbkYgWlASqdk=", + "lastModified": 1655975833, + "narHash": "sha256-g8sdfuglIZ24oWVbntVzniNTJW+Z3n9DNL9w9Tt+UCE=", "owner": "nix-community", "repo": "dream2nix", - "rev": "4b3a139c506582f40ce733eb4a91988242e17358", + "rev": "4e75e665ec3a1cddae5266bed0dd72fce0b74a23", "type": "github" }, "original": { @@ -225,11 +211,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1666298449, - "narHash": "sha256-y1SRRRK2eTVuh/HRCxwDSInMwGv0d5cPIp4YDlbcM30=", + "lastModified": 1666900021, + "narHash": "sha256-KEDx6LhRMxEdLXL1jF1LNIm+QCtOCcKcFmTJrA/iU3E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b8e24cec99ff68f8a875b6f842a10b6b2ab398d3", + "rev": "b3f81bcbda84bf2ef957cfff6cf89aedbdfa2be9", "type": "github" }, "original": { @@ -383,11 +369,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -398,11 +384,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -428,11 +414,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -488,22 +474,6 @@ "type": "github" } }, - "ghc-utils": { - "flake": false, - "locked": { - "lastModified": 1662774800, - "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=", - "ref": "refs/heads/master", - "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea", - "revCount": 1072, - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - }, - "original": { - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - } - }, "helix": { "inputs": { "nixCargoIntegration": "nixCargoIntegration", @@ -532,11 +502,11 @@ ] }, "locked": { - "lastModified": 1665996265, - "narHash": "sha256-/k9og6LDBQwT+f/tJ5ClcWiUl8kCX5m6ognhsAxOiCY=", + "lastModified": 1667299227, + "narHash": "sha256-vAJPFSDYUq3DdCL8OzTg4xObRNW+yA1Pt+NzbhGu1f8=", "owner": "nix-community", "repo": "home-manager", - "rev": "b81e128fc053ab3159d7b464d9b7dedc9d6a6891", + "rev": "f0ecd4b1db5e15103e955b18cb94bea4296e5c45", "type": "github" }, "original": { @@ -583,11 +553,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1666867875, - "narHash": "sha256-3nD7iQXd/J6KjkT8IjozTuA5p8qjiLKTxvOUmH+AzNM=", + "lastModified": 1667318659, + "narHash": "sha256-mRXqCdlnxPgm3Wk7mNAOanl7B3Q3U5scYTEiyYmNEOE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c132d0837dfb9035701dcd8fc91786c605c855c3", + "rev": "b3a8f7ed267e0a7ed100eb7d716c9137ff120fe3", "type": "github" }, "original": { @@ -629,11 +599,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1666731850, - "narHash": "sha256-yyCrh5vPqxJNj+2wt4IxHAk7blnYxwC/zkSKw/y0hg8=", + "lastModified": 1667054602, + "narHash": "sha256-U3Q3opq5mGaHZijdwbM+GUziELb31LJKW6/dvO9yzRQ=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "17673891a41c747d485b9407cb3b50b3156395ee", + "rev": "e9a0c496d813c79857e38511708eefc80ea1f4fe", "type": "github" }, "original": { @@ -672,11 +642,11 @@ ] }, "locked": { - "lastModified": 1667369867, - "narHash": "sha256-G7SyCunGnO+pWSJJDJP+RtF653Fz+B3jhX9Murd9JEY=", + "lastModified": 1656453541, + "narHash": "sha256-ZCPVnS6zJOZJvIlwU3rKR8MBVm6A3F4/0mA7G1lQ3D0=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "b89e3d7b0f7e2d0301891586456267435fc54aaa", + "rev": "9eb74345b30cd2e536d9dac9d4435d3c475605c7", "type": "github" }, "original": { @@ -687,11 +657,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1666873549, - "narHash": "sha256-a6Eu1Qv/EndjepSMja5SvcG+4vM5Rl2gzJD7xscRHss=", + "lastModified": 1667283320, + "narHash": "sha256-qHvB/6XBKVjjJJCUM+z6/t9HzUC7J55wdY3KJ/ZWSHo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "419dcc0ec767803182ed01a326f134230578bf60", + "rev": "18934557eeba8fa2e575b0fd4ab95186e2e3bde3", "type": "github" }, "original": { @@ -703,11 +673,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667231093, - "narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=", + "lastModified": 1655624069, + "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458", + "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa", "type": "github" }, "original": { @@ -797,11 +767,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1666258795, - "narHash": "sha256-k2FbWk4OJKZbih3pTvJYxkaXuauWsuaXXthV54UFqCM=", + "lastModified": 1666586252, + "narHash": "sha256-cwYEMnsv8kreTPKslM2yz59I4zm331w4WU4OHGzcslc=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "98cae03b7d9a612334d5ea461e73ac0b37b0285d", + "rev": "48b237d9e21a4edf528d4bd1ed99d1f3757e4931", "type": "github" }, "original": { @@ -939,11 +909,11 @@ ] }, "locked": { - "lastModified": 1667184938, - "narHash": "sha256-/kuCiXuAxiD0c0zrfDvJ1Yba3FuVdRk/ROfb393AeX4=", + "lastModified": 1655779671, + "narHash": "sha256-6feeiGa6fb7ZPVHR71uswkmN1701TAJpwYQA8QffmRk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8f81faec35508647ced65c44fd3e8648a5518afb", + "rev": "8159585609a772b041cce6019d5c21d240709244", "type": "github" }, "original": { diff --git a/home/modules/helix/config/languages.toml b/home/modules/helix/config/languages.toml index 0777ac4..e69de29 100644 --- a/home/modules/helix/config/languages.toml +++ b/home/modules/helix/config/languages.toml @@ -1,6 +0,0 @@ -[[language]] -name = "rust" - -[[language]] -name = "nix" -formatter = "nixpkgs-fmt" \ No newline at end of file diff --git a/home/modules/helix/default.nix b/home/modules/helix/default.nix index a95f9f1..3ce4fce 100644 --- a/home/modules/helix/default.nix +++ b/home/modules/helix/default.nix @@ -14,6 +14,9 @@ in config = lib.mkIf cfg.enable { home.file.".config/helix".source = ./config; - home.packages = [ cfg.package ]; + home.packages = [ + cfg.package + pkgs.rnix-lsp + ]; }; } diff --git a/nixos/configurations.nix b/nixos/configurations.nix index f692226..01a0094 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -41,7 +41,7 @@ in home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [ - { dadada.home.helix.package = builtins.trace helix.packages.${system} helix.packages.${system}.helix; } + { dadada.home.helix.package = helix.packages.${system}.helix; } { manual.manpages.enable = false; } ]; home-manager.users.dadada = import ../home/home;