diff --git a/homes/me/default.nix b/homes/me/default.nix index 6998e63..9e436a3 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -24,7 +24,7 @@ #../modules/wm/hypr/hypridle.nix ../modules/wm/hypr/hyprlock.nix ../modules/kanshi.nix - ../modules/ags + # ../modules/ags ../modules/mako.nix ]; diff --git a/homes/modules/editor/helix.nix b/homes/modules/editor/helix.nix index 8d6e22c..30dad17 100755 --- a/homes/modules/editor/helix.nix +++ b/homes/modules/editor/helix.nix @@ -142,6 +142,16 @@ formatter.command = "${pkgs.ormolu}/bin/ormolu"; language-servers = ["haskell-language-server"]; } + { + name = "rust"; + indent = { + tab-width = 2; + unit = " "; + }; + auto-format = true; + formatter.command = "${pkgs.rustfmt}/bin/rustfmt"; + language-servers = ["rust-analyzer"]; + } # { # name = "c-sharp"; # source = "source.cs"; @@ -176,6 +186,10 @@ command = "${pkgs.haskell-language-server}/bin/haskell-language-server-wrapper"; }; + rust-analyzer = { + command = "${pkgs.rust-analyzer}/bin/rust-analyzer"; + }; + # C# language services OmniSharp = { command = "${pkgs.omnisharp-roslyn}/bin/OmniSharp"; diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 93bce3b..3c88d97 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -8,7 +8,7 @@ }: let home-manager = builtins.fetchTarball { url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; - sha256 = "1y919cqrlmq0k44rgnacaq4zq37jj4rdh6f2swp6y2jiz28xb0iq"; + sha256 = "07pk5m6mxi666dclaxdwf7xrinifv01vvgxn49bjr8rsbh31syaq"; }; in { imports = [ @@ -32,6 +32,7 @@ in { nix.settings.experimental-features = [ "nix-command" "flakes" + "pipe-operators" ]; nixpkgs.config.allowUnfreePredicate = let @@ -232,9 +233,7 @@ in { home-manager = { users.me = import ../../homes/me; extraSpecialArgs = {inherit inputs pkgs pkgs-unstable;}; - sharedModules = [ - inputs.ags.homeManagerModules.default - ]; + # sharedModules = [ ]; }; # ---- ENVIRONMENT VARIABLES ---- @@ -274,6 +273,7 @@ in { # Shell bash fish + elvish # reference for crysh development shellcheck grc # colorise command outputs moreutils @@ -301,6 +301,8 @@ in { # Rust cargo rustc + rustfmt + rust-analyzer # Go go # Nim @@ -319,6 +321,7 @@ in { nixd # lsp for nix nix-prefetch-git nix-index + deploy-rs # Python python312 # I use 3.12 since it's in a pretty stable state now