darwin/homebrew.nix

@@ -54,6 +54,7 @@ in
     "bbedit"
     # "discord"
     # "element"
+    "ferdium"
     "firefox"
     "jitsi-meet"
     "knockknock"
@@ -62,13 +63,10 @@ in
     "logi-options-plus"
     "lulu"
     "macsvg"
-    "messenger"
     "miniforge"
     "mullvadvpn"
     # "obsidian"
-    "qflipper"
     "rectangle"
-    "remarkable"
     "secretive"
     "shortcat"
     "signal"

templates/default.nix

@@ -1,7 +1,4 @@
-let
+{
-  mkTemplates = builtins.mapAttrs (name: attrs: attrs // { path = ./. + "/${name}"; });
-in
-mkTemplates {
   rust = {
     description = "A rust flake template based on flake.parts";
     welcomeText = ''
@@ -9,5 +6,6 @@ mkTemplates {
 
       run `direnv allow` and `cargo init` to start a new project
     '';
+    path = ./templates/rust;
   };
 }

templates/rust/flake.nix

@@ -10,8 +10,8 @@
     pre-commit.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs@{ self, flake-parts, crane, pre-commit, ... }:
+  outputs = { self, flake-parts, crane, pre-commit, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
+    flake-parts.lib.mkFlake { inherit self; } {
       imports = [ pre-commit.flakeModule ];
       systems = [
         "aarch64-darwin"
@@ -24,7 +24,7 @@
           crane-lib = crane.lib.${system};
           package = crane-lib.buildPackage {
             src = crane-lib.cleanCargoSource ./.;
-            nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
+            nativeBuildInputs = [ pkgs.libiconv ];
           };
         in
         {
@@ -43,19 +43,15 @@
             inputsFrom = builtins.attrValues self.checks;
 
             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
-            nativeBuildInputs = builtins.attrValues {
+            nativeBuildInputs = with pkgs; [
-              inherit (pkgs)
               cargo
               rustc
-                ;
+            ];
-            };
+            buildInputs = with pkgs; [
-            buildInputs = builtins.attrValues {
-              inherit (pkgs)
               rust-analyzer
               rustfmt
               clippy
-                ;
+            ];
-            };
           };
         };
     };