Merge pull request #40 from massix/chore/system-update

massix · web-flow · commit a221654e5d3b · 2025-11-23T19:52:17.000+01:00
System Update
diff --git a/devshells/ansible-dev.nix b/devshells/ansible-dev.nix
@@ -139,7 +139,7 @@ mkShell {
         python-memcached
         linode
         linode-api
-        PyGithub
+        pygithub
         jinja2
         lxml
         semantic-version
diff --git a/devshells/default.nix b/devshells/default.nix
@@ -171,7 +171,7 @@ with pkgs;
   typst = mkShell {
     packages = [
       tinymist
-      typstfmt
+      typstyle
     ];
   };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/home/aiwendil/default.nix b/home/aiwendil/default.nix
@@ -25,7 +25,7 @@ in
       typefonts = false;
     };
 
-    gleeter.enable = true;
+    gleeter.enable = false;
 
     kitty = {
       enable = true;
@@ -36,7 +36,7 @@ in
         packages = with pkgs; [
           comic-mono
           _0xproto
-          noto-fonts-emoji
+          noto-fonts-color-emoji
         ];
       };
     };
diff --git a/home/elendil/default.nix b/home/elendil/default.nix
@@ -53,7 +53,7 @@ in
       };
     };
 
-    gleeter.enable = true;
+    gleeter.enable = false;
 
     fish = {
       enable = true;
@@ -155,7 +155,7 @@ in
         };
         extraPackages = with pkgs; [
           _0xproto
-          noto-fonts-emoji
+          noto-fonts-color-emoji
           maple-mono.truetype
         ];
       };
diff --git a/home/modules/fish.nix b/home/modules/fish.nix
@@ -117,7 +117,7 @@ in
       dogdns # Modern Unix `dig`
       dua # Modern Unix `du`
       duf # Modern Unix `df`
-      du-dust # Modern Unix `du`
+      dust # Modern Unix `du`
       entr # Modern Unix `watch`
       eza # Modern Unix `ls`
       fd # Modern Unix `find`
diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix
@@ -56,7 +56,7 @@ in
           google-fonts
           noto-fonts
           noto-fonts-cjk-sans
-          noto-fonts-emoji
+          noto-fonts-color-emoji
         ]);
       default-fonts = with pkgs; [
         cantarell-fonts
diff --git a/home/modules/im.nix b/home/modules/im.nix
@@ -10,7 +10,7 @@ in
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
-      webcord
+      # webcord
       zapzap /* whatsapp client */
       telegram-desktop
     ];
diff --git a/home/modules/neovim/files/plugins/coding.lua b/home/modules/neovim/files/plugins/coding.lua
@@ -815,19 +815,20 @@ return {
         },
       },
       formatters_by_ft = {
+        fish = { "fish_indent" },
         gleam = { "gleam" },
+        go = { "gofumpt" },
+        hcl = { "packer_fmt" },
+        java = { "google-java-format" },
+        javascript = { "prettier" },
         lua = { "stylua" },
         nix = { "nixpkgs_fmt" },
         purescript = { "purstidy" },
-        fish = { "fish_indent" },
-        java = { "google-java-format" },
+        python = { "ruff_format" },
         rust = { "rustfmt" },
-        go = { "gofumpt" },
-        yaml = { "yamlfmt" },
         typescript = { "prettier" },
-        javascript = { "prettier" },
-        python = { "ruff_format" },
-        hcl = { "packer_fmt" },
+        typst = { "typstyle" },
+        yaml = { "yamlfmt" },
         -- FIXME: This does not seem to work
         -- nu = { "nufmt" },
       },
diff --git a/home/modules/neovim/languages/default.nix b/home/modules/neovim/languages/default.nix
@@ -74,7 +74,7 @@ let
     nodePackages.prettier
     (stylua.override { features = [ "lua54" "luau" ]; })
     yamlfmt
-    typstfmt
+    typstyle
     rustfmt
     ruff
     nufmt
diff --git a/home/work-darwin/default.nix b/home/work-darwin/default.nix
@@ -145,7 +145,7 @@ in
         };
         extraPackages = with pkgs; [
           _0xproto
-          noto-fonts-emoji
+          noto-fonts-color-emoji
           maple-mono.truetype
         ];
       };
@@ -158,7 +158,7 @@ in
         size = 12;
         packages = with pkgs; [
           _0xproto
-          noto-fonts-emoji
+          noto-fonts-color-emoji
         ];
       };
       extraSettings = {
@@ -200,7 +200,7 @@ in
         colored = true;
       };
     };
-    gleeter.enable = true;
+    gleeter.enable = false;
     taskwarrior = {
       enable = true;
       withJira = true;
@@ -259,7 +259,6 @@ in
       # This does not come installed by default on MacOS
       gcc
       load-ssh-key
-      gleeter
       docker
       limaWithGuests
       (colima.override {
diff --git a/pkgs/onedriver/default.nix b/pkgs/onedriver/default.nix
@@ -28,7 +28,7 @@ buildGoModule {
     pkg-config
     git
     installShellFiles
-    wrapGAppsHook
+    wrapGAppsHook3
   ];
 
   buildInputs = with pkgs; [ webkitgtk_4_1 glib fuse gtk3 glib-networking ];
diff --git a/pkgs/tanzu/default.nix b/pkgs/tanzu/default.nix
@@ -4,6 +4,7 @@ let
     x86-64_linux = "linux-amd64";
     aarch64-darwin = "darwin-arm64";
   };
+  inherit (pkgs) stdenv;
   fetchPkg = version: system: hash:
     let
       s = systemsMap.${system};
@@ -16,15 +17,15 @@ let
   pname = "tanzu";
   version = "1.5.3";
   src =
-    if pkgs.hostPlatform.isLinux then
+    if stdenv.hostPlatform.isLinux then
       (fetchPkg version "x86-64_linux" "sha256:1rgqvx589p7xb1b5i51f0z1w7p9psxllnd82scnqngn9r7qmx1jv")
     else
       (fetchPkg version "aarch64-darwin" "sha256:13p2dbknhzhqg4981h41px1ijp8ybc13hiyxqsp78bh9a38nnfqw");
 in
 pkgs.stdenv.mkDerivation {
   inherit pname version src;
 
-  nativeBuildInputs = with pkgs; if pkgs.hostPlatform.isLinux then [
+  nativeBuildInputs = with pkgs; if stdenv.hostPlatform.isLinux then [
     stdenv.cc.cc.lib
     installShellFiles
     autoPatchelfHook
diff --git a/pkgs/tridentctl/default.nix b/pkgs/tridentctl/default.nix
diff --git a/system/elendil/configuration.nix b/system/elendil/configuration.nix

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ with pkgs;`
`171`	`171`	`typst = mkShell {`
`172`	`172`	`packages = [`
`173`	`173`	`tinymist`
`174`		`- typstfmt`
	`174`	`+ typstyle`
`175`	`175`	`];`
`176`	`176`	`};`
`177`	`177`	`}`