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/homes/modules/git.nix b/homes/modules/git.nix index fdf6afb..6751849 100755 --- a/homes/modules/git.nix +++ b/homes/modules/git.nix @@ -27,7 +27,7 @@ defaultBranch = "main"; }; url = { - "https://github.com/" = { + "git@github.com:" = { insteadOf = [ "gh:" "github:" @@ -39,6 +39,24 @@ "gitlab:" ]; }; + "git@github.com:/Agribit/" = { + insteadOf = [ + "agri:" + "Agri:" + "agribit:" + "Agribit:" + ]; + }; + "ssh://forgejo@forge.imbored.dev:2222/" = { + insteadOf = [ + "forge" + ]; + }; + "ssh://forgejo@forge.imbored.dev:2222/emileclarkb/" = { + insteadOf = [ + "cry" + ]; + }; }; }; diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index be32da0..1c9c270 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 = [ @@ -25,13 +25,14 @@ in { ../modules/obsidian.nix ../modules/angryoxide.nix - ../modules/flipperzero.nix - ../modules/chameleonultragui.nix + # ../modules/flipperzero.nix + # ../modules/chameleonultragui.nix ]; nix.settings.experimental-features = [ "nix-command" "flakes" + "pipe-operators" ]; nixpkgs.config.allowUnfreePredicate = let @@ -170,6 +171,7 @@ in { # With backwards compatability for alsa/pulseaudio/jack pipewire = { enable = true; + audio.enable = true; wireplumber.enable = true; alsa.enable = true; @@ -259,6 +261,8 @@ in { ani-cli bluetui wl-clipboard # clipboard for wayland + hyprpicker # color picker + hyprshot # screenshot utility qbittorrent # torrenting signal-desktop @@ -269,6 +273,7 @@ in { # Shell bash fish + elvish # reference for crysh development shellcheck grc # colorise command outputs moreutils @@ -296,6 +301,8 @@ in { # Rust cargo rustc + rustfmt + rust-analyzer # Go go # Nim @@ -314,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 @@ -380,6 +388,8 @@ in { # Games prismlauncher # minecraft + pkgs-unstable.olympus # celeste + discord ]; programs = { diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 47e8169..aecd7ce 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -254,7 +254,7 @@ in { ani-cli bluetui wl-clipboard # clipboard for wayland - hyprpicker + hyprpicker # color picker hyprshot # screenshot utility qbittorrent signal-desktop