3 files changed, 36 insertions, 30 deletions
diff --git a/home/cargo/default.nix b/home/cargo/default.nix
index b63fcc8..b01ff1a 100644
--- a/home/cargo/default.nix
+++ b/home/cargo/default.nix
@@ -1,30 +1,37 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 {
-  xdg.configFile."/home/petri/.cargo/config.toml".text = ''
-    [registry]
-    global-credential-providers = ["cargo:token"]
-
-    [registries.crates-io]
-    protocol = "sparse"  # The protocol to use to access crates.io.
-
-    [registries.relesoft]
-    index = "sparse+https://git.relesoft.io/api/packages/relesoft/cargo/"
-
-    [unstable]
-    gc = true
-
-    [future-incompat-report]
-    frequency = 'always' # when to display a notification about a future incompat report
-
-    [cache]
-    auto-clean-frequency = "1 day"   # How often to perform automatic cache cleaning
-
-    [term]
-    color = 'auto'
-    hyperlinks = true                # whether cargo inserts links into output
-    unicode = true                   # whether cargo can render output using non-ASCII unicode characters
-    progress.when = 'auto'           # whether cargo shows progress bar
-    progress.width = 80              # width of progress bar
-    progress.term-integration = true # whether cargo reports progress to terminal emulator
-  '';
+  xdg.configFile."/home/petri/.cargo/config.toml".source =
+    (pkgs.formats.toml { }).generate "cargo-config"
+      {
+        registry = {
+          "global-credential-providers" = [ "cargo:token" ];
+        };
+        registries = {
+          "crates-io" = {
+            protocol = "sparse"; # The protocol to use to access crates.io.
+          };
+          relesoft = {
+            index = "sparse+https://git.relesoft.io/api/packages/relesoft/cargo/";
+          };
+        };
+        unstable = {
+          gc = true;
+        };
+        "future-incompat-report" = {
+          frequency = "always"; # when to display a notification about a future incompat report
+        };
+        cache = {
+          "auto-clean-frequency" = "1 day"; # How often to perform automatic cache cleaning
+        };
+        term = {
+          color = "auto";
+          hyperlinks = true; # whether cargo inserts links into output
+          unicode = true; # whether cargo can render output using non-ASCII unicode characters
+          progress = {
+            when = "auto"; # whether cargo shows progress bar
+            width = 80; # width of progress bar
+            "term-integration" = true; # whether cargo reports progress to terminal emulator
+          };
+        };
+      };
 }
diff --git a/home/fish/default.nix b/home/fish/default.nix
index 565682b..c02a848 100644
--- a/home/fish/default.nix
+++ b/home/fish/default.nix
@@ -108,7 +108,6 @@
       set -g __fish_git_prompt_color_cleanstate green --bold
 
       set fish_greeting
-      ${pkgs.carapace} _carapace | source
       ${pkgs.fastfetch}/bin/fastfetch
     '';
   };
diff --git a/home/mpv/default.nix b/home/mpv/default.nix
index 4cdb3e9..0c403a7 100644
--- a/home/mpv/default.nix
+++ b/home/mpv/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 {
   programs.mpv = {
     enable = true;