2023-08-23

10 files changed, 49 insertions, 48 deletions

diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix
index b044535..96538ec 100644
--- a/darwinConfigurations/mairon/default.nix
+++ b/darwinConfigurations/mairon/default.nix
@@ -17,10 +17,14 @@ with lib; {
       {name = "kreuzwerker/homebrew-taps";}
     ];
     brews = [
+      {name = "carthage";}
       {name = "m1-terraform-provider-helper";}
+      {name = "sourcery";}
+      {name = "xcodegen";}
     ];
     casks = [
       {name = "burp-suite";}
+      {name = "cocoapods";}
       {name = "docker";}
       {name = "jetbrains-toolbox";}
       {name = "obs";}
diff --git a/flake.lock b/flake.lock
index 0935ec3..e10b306 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691501936,
-        "narHash": "sha256-Jicm6Rt3Xb1CDCHK2BDbl8zdXaL6FbdDJmbvGIC3S+E=",
+        "lastModified": 1691919538,
+        "narHash": "sha256-Er7hGXFZit1VLy8yfEaTCfx0p6RqfMrK+GGT0tixWQM=",
         "owner": "dwarfmaster",
         "repo": "arkenfox-nixos",
-        "rev": "21c41b4d117d2203feaa9bb74cedc3be10c9b45b",
+        "rev": "9183705626ae64a61f489ffa199d4f825eeaa5fe",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691640097,
-        "narHash": "sha256-6vPsJYjtt2hs4mkiR46yt8c/Spdm/UiUKoSCIlc7iJw=",
+        "lastModified": 1692248770,
+        "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "426d38710b656b0a31f8eaae6e0002206a3b96d7",
+        "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691856649,
-        "narHash": "sha256-1/KYCwNyOPpUoyno9Yj3zMHITQaW+wPzVlJFPOPPCo4=",
+        "lastModified": 1692720545,
+        "narHash": "sha256-DQDremUH7lRxiZEIVh6C6kQusuPe1vUKtiVl29nmP0E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "406d34d919e9e8b831b531782cf5ef6995188566",
+        "rev": "8eb8c212e50e2fd95af5849585a2eb819add0a1e",
         "type": "github"
       },
       "original": {
@@ -346,11 +346,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691716319,
-        "narHash": "sha256-6584FXTWXJPNjoJLVEkz55ZP9wN7o2WZckWAD77Of4c=",
+        "lastModified": 1692666842,
+        "narHash": "sha256-0ulu9R7V8qqtu8U6O/MeYUqH7GkBIkOvEyzUJrsCfwI=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "8311dc7407b1d5c02f2e324d9f505d914105e948",
+        "rev": "7aaee05358d9d4f19bb7a8435d6d7a45773939a6",
         "type": "github"
       },
       "original": {
@@ -373,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691802891,
-        "narHash": "sha256-TNFzbVtQjb4b81dGutBqkhPmD9nx9laVDRCqft//WL4=",
+        "lastModified": 1692672597,
+        "narHash": "sha256-Jj5HRXOaH6mXPwc2uG3X8EnZDy7LQNkm36nwYPDscD4=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "293f9601486b181404f3e79bd74f8f8d8aaf999e",
+        "rev": "b8d9bd5161f4de34a62519b36bcd7a9e8dd08467",
         "type": "github"
       },
       "original": {
@@ -389,11 +389,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1691871742,
-        "narHash": "sha256-6yDNjfbAMpwzWL4y75fxs6beXHRANfYX8BNSPjYehck=",
+        "lastModified": 1692373088,
+        "narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "430a56dd16fe583a812b2df44dca002acab2f4f6",
+        "rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969",
         "type": "github"
       },
       "original": {
@@ -405,11 +405,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1691853136,
-        "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=",
+        "lastModified": 1692557222,
+        "narHash": "sha256-TCOtZaioLf/jTEgfa+nyg0Nwq5Uc610Z+OFV75yUgGw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f0451844bbdf545f696f029d1448de4906c7f753",
+        "rev": "0b07d4957ee1bd7fd3bdfd12db5f361bd70175a6",
         "type": "github"
       },
       "original": {
@@ -421,11 +421,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1691876031,
-        "narHash": "sha256-gJzlllm8PEf6ADvRke0jSxIiFc/qdlBkMy49UXg7ZdU=",
+        "lastModified": 1692742407,
+        "narHash": "sha256-faLzZ2u3Wki8h9ykEfzQr19B464eyADP3Ux7A/vjKIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72918e0eaaaec7033d57245aeba9ccded33b87b5",
+        "rev": "a2eca347ae1e542af3f818274c38305c1e00604c",
         "type": "github"
       },
       "original": {
@@ -437,11 +437,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1691874659,
-        "narHash": "sha256-qgmixg0c/CRNT2p9Ad35kaC7NzYVZ6GRooErYI7OGJM=",
+        "lastModified": 1692735708,
+        "narHash": "sha256-3HO7FbIF5YM+EgmlJbmQZqE0PpIS4gVlrPTTdXvX6DQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "efeed708ece1a9f4ae0506ae4a4d7da264a74102",
+        "rev": "26260b170c16b4ae0f092754a33430cb361b2bda",
         "type": "github"
       },
       "original": {
@@ -465,11 +465,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691848837,
-        "narHash": "sha256-8INogxAETA+Q7NS74WivpTqrPKWkvKCa4Sauy8wZ0ZQ=",
+        "lastModified": 1692739558,
+        "narHash": "sha256-wEiSSoozftaoGCORrfPpAjjm1dKihFfMhynMHPDIk6g=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "764a6a86665dc0185e0c16235a10b8d4d915e220",
+        "rev": "00016841c996eebcf3f673f8bc3223680d4825df",
         "type": "github"
       },
       "original": {
@@ -515,11 +515,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1691871985,
-        "narHash": "sha256-xSuUcMfHQO/GlZsGXHcJpi/22XsrRmw99usQx53bdCw=",
+        "lastModified": 1692737112,
+        "narHash": "sha256-DHOEzu+U+mAOr1aQIZ+AOETO4yR24IEk5pm6Am7yqL4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "107240729dc0fdd4afa1728aaa03d1df0d70a2e8",
+        "rev": "2f14a3d24e9ddd7bf68bddc585708fc5342ddf33",
         "type": "github"
       },
       "original": {
@@ -606,11 +606,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691747570,
-        "narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=",
+        "lastModified": 1692274144,
+        "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a",
+        "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
         "type": "github"
       },
       "original": {
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
         ];
diff --git a/modules/nixos/profiles/headful.nix b/modules/nixos/profiles/headful.nix
index ac1a735..e1480b0 100644
--- a/modules/nixos/profiles/headful.nix
+++ b/modules/nixos/profiles/headful.nix
@@ -23,9 +23,9 @@ in {
     hm = {
       home.packages = with pkgs; [
         calibre
+        element-desktop
         imv
         mumble
-        neochat
         tdesktop
         tor-browser
       ];