random stuff

2 files changed, 18 insertions, 17 deletions

diff --git a/modules/terminal/hjem/programs/git.nix b/modules/terminal/hjem/programs/git.nix
index 85db4ab..5a9fbbf 100644
--- a/modules/terminal/hjem/programs/git.nix
+++ b/modules/terminal/hjem/programs/git.nix
@@ -17,7 +17,10 @@
         unstage = "restore --staged";
       };
       init.defaultBranch = "main";
+
+      # automatic remote config
       push.autoSetupRemote = true;
+      checkout.defaultRemote = "origin";
     }
     (lib.mkIf cfg.installKey {
       # commit signing
diff --git a/modules/terminal/hjem/programs/helix.nix b/modules/terminal/hjem/programs/helix.nix
index db6beba..0df7de4 100644
--- a/modules/terminal/hjem/programs/helix.nix
+++ b/modules/terminal/hjem/programs/helix.nix
@@ -8,26 +8,24 @@
 
   languages = {
     language-server = {
-      rust-analyzer.command = let
-        env = pkgs.stdenv.mkDerivation {
-          name = "rust-analyzer-env";
-          src = ./.;
+      # rust-analyzer.command = let
+      #   env = pkgs.stdenv.mkDerivation {
+      #     name = "rust-analyzer-env";
+      #     src = ./.;
 
-          nativeBuildInputs = [pkgs.makeWrapper];
-          buildInputs = [pkgs.rust-analyzer];
-          installPhase = ''
-            mkdir -p $out/bin
-            makeWrapper ${pkgs.rust-analyzer}/bin/rust-analyzer $out/bin/rust-analyzer \
-              --prefix PATH : ${lib.makeBinPath (with pkgs; [rustc cargo])}
-          '';
-        };
-      in "${env}/bin/rust-analyzer";
+      #     nativeBuildInputs = [pkgs.makeWrapper];
+      #     buildInputs = [pkgs.rust-analyzer];
+      #     installPhase = ''
+      #       mkdir -p $out/bin
+      #       makeWrapper ${pkgs.rust-analyzer}/bin/rust-analyzer $out/bin/rust-analyzer \
+      #         --prefix PATH : ${lib.makeBinPath (with pkgs; [rustc cargo])}
+      #     '';
+      #   };
+      # in "${env}/bin/rust-analyzer";
 
       nil = {
         command = "${pkgs.nil}/bin/nil";
-        config = {
-          nil.nix.flake.autoArchive = true;
-        };
+        config.nil.nix.flake.autoArchive = true;
       };
       superhtml = {
         command = "${pkgs.superhtml}/bin/superhtml";
@@ -57,7 +55,7 @@
         name = "html";
         file-types = ["html"];
         language-servers = ["superhtml"];
-        auto-format = true;
+        auto-format = false;
       }
     ];
   };