2023-08-23

7 files changed, 8 insertions, 11 deletions

diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix
index 29d6b2d..e516500 100644
--- a/modules/common/common/nix/default.nix
+++ b/modules/common/common/nix/default.nix
@@ -97,8 +97,6 @@ with lib; {
           patches = final.patches ++ [./patches/tdesktop-no-ads.patch];
         });
 
-        inherit (pkgsPr 246555 "sha256-GQJ0hFyQIKQXekdDX59v5y65AYxiU8W2y+dktXEsN/g=") qzdl;
-
         inherit (pkgsPr 245433 "sha256-7duAw2pGwXrX4cgUioNSypmuiNR/hCUVywhKL6jW3qE=") openmw;
       }
       // (let
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index 5499d48..9589e65 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -77,7 +77,6 @@ in {
                     cmake-format # :lang cc :editor format
                     cmigemo # :lang japanese
                     css-language-server # :lang (web +lsp)
-                    dhall-language-server # :lang (dhall +lsp)
                     dockerfile-language-server # :tools (docker +lsp)
                     editorconfig # :tools editorconfig
                     fd # doom!
@@ -211,7 +210,7 @@ in {
 
       programs.emacs = {
         enable = true;
-        package = pkgs.emacs28; # Pin to avoid surprises.
+        package = pkgs.emacs29; # Pin to avoid surprises.
       };
     };
   };
diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index d726406..b6b39e5 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -188,6 +188,3 @@
 
 (use-package! kubernetes-evil
   :after kubernetes-overview)
-
-(use-package! kubernetes-tramp
-  :defer t)
diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el
index b0a7f4a..76c14fe 100644
--- a/modules/common/emacs/doom/init.el
+++ b/modules/common/emacs/doom/init.el
@@ -79,7 +79,7 @@
        (common-lisp +lsp +tree-sitter)
        (csharp +lsp +tree-sitter)
        data
-       (dhall +lsp +tree-sitter)
+       ;; (dhall +lsp +tree-sitter)
        (emacs-lisp +lsp +tree-sitter)
        (go +lsp +tree-sitter)
        ;; graphql
diff --git a/modules/common/emacs/doom/packages.el b/modules/common/emacs/doom/packages.el
index 033932c..61ac680 100644
--- a/modules/common/emacs/doom/packages.el
+++ b/modules/common/emacs/doom/packages.el
@@ -13,4 +13,3 @@
 
 (package! kubernetes)
 (package! kubernetes-evil)
-(package! kubernetes-tramp)
diff --git a/modules/common/git.nix b/modules/common/git.nix
index 2e5c834..7f06676 100644
--- a/modules/common/git.nix
+++ b/modules/common/git.nix
@@ -32,7 +32,11 @@ in {
     };
 
     hm = {
-      home.packages = with pkgs; [glab hut];
+      home.packages = with pkgs; [
+        git-extras
+        glab
+        hut
+      ];
 
       programs = {
         git = {
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index 7ec9d42..09bfad0 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -38,7 +38,7 @@ in {
           comma
           fd
           ripgrep
-          ripgrep-all
+          # ripgrep-all # FIXME https://github.com/NixOS/nixpkgs/issues/250306
           sd
           tldr
         ];