Compare commits

...

4 commits

3 changed files with 22 additions and 5 deletions

View file

@ -24,7 +24,7 @@
#../modules/wm/hypr/hypridle.nix #../modules/wm/hypr/hypridle.nix
../modules/wm/hypr/hyprlock.nix ../modules/wm/hypr/hyprlock.nix
../modules/kanshi.nix ../modules/kanshi.nix
../modules/ags # ../modules/ags
../modules/mako.nix ../modules/mako.nix
]; ];

View file

@ -142,6 +142,16 @@
formatter.command = "${pkgs.ormolu}/bin/ormolu"; formatter.command = "${pkgs.ormolu}/bin/ormolu";
language-servers = ["haskell-language-server"]; 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"; # name = "c-sharp";
# source = "source.cs"; # source = "source.cs";
@ -176,6 +186,10 @@
command = "${pkgs.haskell-language-server}/bin/haskell-language-server-wrapper"; command = "${pkgs.haskell-language-server}/bin/haskell-language-server-wrapper";
}; };
rust-analyzer = {
command = "${pkgs.rust-analyzer}/bin/rust-analyzer";
};
# C# language services # C# language services
OmniSharp = { OmniSharp = {
command = "${pkgs.omnisharp-roslyn}/bin/OmniSharp"; command = "${pkgs.omnisharp-roslyn}/bin/OmniSharp";

View file

@ -8,7 +8,7 @@
}: let }: let
home-manager = builtins.fetchTarball { home-manager = builtins.fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
sha256 = "1y919cqrlmq0k44rgnacaq4zq37jj4rdh6f2swp6y2jiz28xb0iq"; sha256 = "07pk5m6mxi666dclaxdwf7xrinifv01vvgxn49bjr8rsbh31syaq";
}; };
in { in {
imports = [ imports = [
@ -32,6 +32,7 @@ in {
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
"pipe-operators"
]; ];
nixpkgs.config.allowUnfreePredicate = let nixpkgs.config.allowUnfreePredicate = let
@ -232,9 +233,7 @@ in {
home-manager = { home-manager = {
users.me = import ../../homes/me; users.me = import ../../homes/me;
extraSpecialArgs = {inherit inputs pkgs pkgs-unstable;}; extraSpecialArgs = {inherit inputs pkgs pkgs-unstable;};
sharedModules = [ # sharedModules = [ ];
inputs.ags.homeManagerModules.default
];
}; };
# ---- ENVIRONMENT VARIABLES ---- # ---- ENVIRONMENT VARIABLES ----
@ -274,6 +273,7 @@ in {
# Shell # Shell
bash bash
fish fish
elvish # reference for crysh development
shellcheck shellcheck
grc # colorise command outputs grc # colorise command outputs
moreutils moreutils
@ -301,6 +301,8 @@ in {
# Rust # Rust
cargo cargo
rustc rustc
rustfmt
rust-analyzer
# Go # Go
go go
# Nim # Nim
@ -319,6 +321,7 @@ in {
nixd # lsp for nix nixd # lsp for nix
nix-prefetch-git nix-prefetch-git
nix-index nix-index
deploy-rs
# Python # Python
python312 # I use 3.12 since it's in a pretty stable state now python312 # I use 3.12 since it's in a pretty stable state now