From 1de356fc7a85025e830f6d3afb218e40bb74b5f6 Mon Sep 17 00:00:00 2001 From: Luna Simons Date: Fri, 26 Jul 2024 11:40:04 +0200 Subject: [PATCH] feat: steel stuff --- flake.lock | 99 ++++++++++++++++---------------- flake.nix | 4 +- modules/home/helix/languages.nix | 9 +++ modules/home/steel/default.nix | 9 ++- 4 files changed, 65 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index 0dac553..701e444 100644 --- a/flake.lock +++ b/flake.lock @@ -265,34 +265,34 @@ "type": "github" } }, - "flake-utils": { + "flake-parts_3": { "inputs": { - "systems": "systems" + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "flake-utils_2": { + "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -469,6 +469,27 @@ "type": "github" } }, + "nix-steel": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721912865, + "narHash": "sha256-ahRPA4JRK5UdQuccu35hbniSsgPqH8TA7zvtkXLiS5o=", + "owner": "bddvlpr", + "repo": "nix-steel", + "rev": "6b69b9de5665959bea73ac739ab0c98c7d9f8417", + "type": "github" + }, + "original": { + "owner": "bddvlpr", + "repo": "nix-steel", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1721743106, @@ -509,6 +530,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, + "nixpkgs-lib_3": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, "root": { "inputs": { "aagl-gtk-on-nix": "aagl-gtk-on-nix", @@ -522,9 +555,9 @@ "lemonake": "lemonake", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", + "nix-steel": "nix-steel", "nixpkgs": "nixpkgs", "snippets-ls": "snippets-ls", - "steel": "steel", "stylix": "stylix" } }, @@ -590,27 +623,6 @@ "type": "github" } }, - "steel": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721623911, - "narHash": "sha256-35ZepMM0d/EsbiQ1/7x2DicybeXfZI5O37l6Okzc4Xk=", - "owner": "mattwparas", - "repo": "steel", - "rev": "1eb4d9b4242cae9627466d73ddf681a39443357a", - "type": "github" - }, - "original": { - "owner": "mattwparas", - "repo": "steel", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -657,21 +669,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d354917..1628827 100644 --- a/flake.nix +++ b/flake.nix @@ -38,8 +38,8 @@ aagl-gtk-on-nix.url = "github:ezkea/aagl-gtk-on-nix"; aagl-gtk-on-nix.inputs.nixpkgs.follows = "nixpkgs"; - steel.url = "github:mattwparas/steel"; - steel.inputs.nixpkgs.follows = "nixpkgs"; + nix-steel.url = "github:bddvlpr/nix-steel"; + nix-steel.inputs.nixpkgs.follows = "nixpkgs"; helix-steel.url = "github:mattwparas/helix?ref=steel-event-system"; helix-steel.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/home/helix/languages.nix b/modules/home/helix/languages.nix index 4711b84..d3df239 100644 --- a/modules/home/helix/languages.nix +++ b/modules/home/helix/languages.nix @@ -7,6 +7,7 @@ inherit (lib) getExe; inherit (pkgs) alejandra; inherit (pkgs.nodePackages) prettier; + inherit (inputs.nix-steel.packages.${pkgs.system}) steel-language-server; inherit (inputs.snippets-ls.packages.${pkgs.system}) snippets-ls; mkPrettier = { @@ -65,6 +66,10 @@ in { name = "toml"; auto-format = true; } + { + name = "scheme"; + language-servers = ["steel-language-server"]; + } ]; language-server = { @@ -72,5 +77,9 @@ in { command = getExe snippets-ls; args = ["-config" ./snippets.json]; }; + steel-language-server = { + command = getExe steel-language-server; + args = []; + }; }; } diff --git a/modules/home/steel/default.nix b/modules/home/steel/default.nix index e2e9b46..a195f4c 100644 --- a/modules/home/steel/default.nix +++ b/modules/home/steel/default.nix @@ -6,20 +6,23 @@ ... }: let inherit (lib) mkIf mkOption types; - inherit (inputs.steel.packages.${pkgs.system}) steel; + inherit (inputs.nix-steel.packages.${pkgs.system}) steel; cfg = config.sysc.steel; in { options.sysc.steel = { enable = mkOption { type = types.bool; - default = false; + default = true; description = "Whether to enable steel."; }; }; config = mkIf cfg.enable { home.packages = [steel]; - home.sessionVariables.STEEL_HOME = "${steel}/lib"; + home.sessionVariables = { + STEEL_HOME = "${steel}/home"; + STEEL_LSP_HOME = "/home/bddvlpr/temp-lsp"; + }; }; }