Clean up duplicate keys

darwin/homebrew.nix

@@ -18,9 +18,11 @@
 
   homebrew = {
     enable = flake.inputs.homebrew-enabled.value;
-    onActivation.autoUpdate = true;
-    onActivation.upgrade = true;
-    onActivation.cleanup = "uninstall";
+    onActivation = {
+      autoUpdate = true;
+      upgrade = true;
+      cleanup = "uninstall";
+    };
     global.brewfile = true;
 
     taps = [ "homebrew/cask-versions" "homebrew/services" ];

home/extras/helix/auto-theme.nix

@@ -4,19 +4,21 @@ let
   tomlFormat = pkgs.formats.toml { };
 in {
   options.programs.helix = {
-    autoTheme.enable =
+    autoTheme = {
+      enable =
         lib.mkEnableOption "Automatically switch helix theme with night mode";
 
-    autoTheme.light = lib.mkOption {
+      light = lib.mkOption {
         type = lib.types.str;
         description = "Light mode theme";
       };
 
-    autoTheme.dark = lib.mkOption {
+      dark = lib.mkOption {
         type = lib.types.str;
         description = "Dark mode theme";
       };
     };
+  };
 
   config = lib.mkIf (cfg.enable && cfg.autoTheme.enable) {
     xdg.configFile = {

home/git.nix

@@ -20,6 +20,7 @@ in {
     ignores = [ ".DS_Store" ".direnv" "result" ];
 
     # enhanced diffs
+    # TODO: fix light colorscheme
     delta = {
       enable = true;
       options = {

home/kitty.nix

@@ -2,11 +2,12 @@
 let font = "Rec Mono Duotone";
 in {
   imports = [ ./extras/kitty/auto-theme.nix ./extras/kitty/nerd-font.nix ];
-  programs.kitty.enable = true;
+  programs.kitty = {
+    enable = true;
     # using kitty from homebrew
-  programs.kitty.package = pkgs.emptyDirectory;
+    package = pkgs.emptyDirectory;
 
-  programs.kitty.settings = {
+    settings = {
       font_family = font;
       bold_font = "${font} Bold";
       italic_font = "${font} Italic";
@@ -28,9 +29,20 @@ in {
 
       # shell integration is manually enabled for fish
       shell_integration = "disabled";
-  } // lib.optionalAttrs pkgs.stdenv.isDarwin { macos_option_as_alt = "both"; };
+    } // lib.optionalAttrs pkgs.stdenv.isDarwin {
+      macos_option_as_alt = "both";
+    };
 
-  programs.fish.interactiveShellInit = ''
+    useSymbolsFromNerdFont = "CaskaydiaCove Nerd Font";
+    colors = {
+      enable = true;
+      dark-name = "rose-pine";
+      light-name = "rose-pine-dawn";
+    };
+  };
+
+  programs.fish = {
+    interactiveShellInit = ''
       # Manually enable shell integration
       if set -q KITTY_INSTALLATION_DIR
         set --global KITTY_SHELL_INTEGRATION enabled
@@ -39,18 +51,12 @@ in {
       end
       set-term-colors
     '';
-  programs.fish.shellAliases = {
+    shellAliases = {
       s = "kitty +kitten ssh";
       e = "edit-in-kitty";
     };
 
-  programs.kitty.useSymbolsFromNerdFont = "CaskaydiaCove Nerd Font";
-  programs.kitty.colors = {
-    enable = true;
-    dark-name = "rose-pine";
-    light-name = "rose-pine-dawn";
-  };
-  programs.fish.functions.set-term-colors = {
+    functions.set-term-colors = {
       body = ''
         if test "$term_background" = light
           term-light
@@ -60,4 +66,5 @@ in {
       '';
       onVariable = "term_background";
     };
+  };
 }

home/services/tarsnap.nix

@@ -19,7 +19,7 @@
         --configfile ${config.home.homeDirectory}/.tarsnaprc \
         --keyfile ${config.xdg.configHome}/tarsnap/write-only.key \
         -f $(uname -n)-$date \
-        ${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents,Downloads}
+        ${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents}
     '';
   in {
     enable = true;

home/starship-symbols.nix

@@ -3,11 +3,13 @@ let inherit (lib) mkDefault;
 in {
   programs.starship.settings = {
     aws.symbol = mkDefault " ";
-    battery.full_symbol = mkDefault "";
-    battery.charging_symbol = mkDefault "";
-    battery.discharging_symbol = mkDefault "";
-    battery.unknown_symbol = mkDefault "";
-    battery.empty_symbol = mkDefault "";
+    battery = {
+      full_symbol = mkDefault "";
+      charging_symbol = mkDefault "";
+      discharging_symbol = mkDefault "";
+      unknown_symbol = mkDefault "";
+      empty_symbol = mkDefault "";
+    };
     cmake.symbol = mkDefault "△ ";
     conda.symbol = mkDefault " ";
     crystal.symbol = mkDefault " ";
@@ -21,17 +23,19 @@ in {
     gcloud.symbol = mkDefault " ";
     git_branch.symbol = mkDefault " ";
     git_commit.tag_symbol = mkDefault " ";
-    git_status.format = mkDefault "([$all_status$ahead_behind]($style) )";
-    git_status.conflicted = mkDefault " ";
-    git_status.ahead = mkDefault " ";
-    git_status.behind = mkDefault " ";
-    git_status.diverged = mkDefault " ";
-    git_status.untracked = mkDefault " ";
-    git_status.stashed = mkDefault " ";
-    git_status.modified = mkDefault " ";
-    git_status.staged = mkDefault " ";
-    git_status.renamed = mkDefault " ";
-    git_status.deleted = mkDefault " ";
+    git_status = {
+      format = mkDefault "([$all_status$ahead_behind]($style) )";
+      conflicted = mkDefault " ";
+      ahead = mkDefault " ";
+      behind = mkDefault " ";
+      diverged = mkDefault " ";
+      untracked = mkDefault " ";
+      stashed = mkDefault " ";
+      modified = mkDefault " ";
+      staged = mkDefault " ";
+      renamed = mkDefault " ";
+      deleted = mkDefault " ";
+    };
     golang.symbol = mkDefault " ";
     helm.symbol = mkDefault "⎈ ";
     hg_branch.symbol = mkDefault " ";
@@ -53,11 +57,13 @@ in {
     ruby.symbol = mkDefault " ";
     rust.symbol = mkDefault " ";
     shlvl.symbol = mkDefault " ";
-    status.symbol = mkDefault " ";
-    status.not_executable_symbol = mkDefault " ";
-    status.not_found_symbol = mkDefault " ";
-    status.sigint_symbol = mkDefault " ";
-    status.signal_symbol = mkDefault " ";
+    status = {
+      symbol = mkDefault " ";
+      not_executable_symbol = mkDefault " ";
+      not_found_symbol = mkDefault " ";
+      sigint_symbol = mkDefault " ";
+      signal_symbol = mkDefault " ";
+    };
     swift.symbol = mkDefault " ";
     terraform.symbol = mkDefault "𝗧 ";
     vagrant.symbol = mkDefault "𝗩 ";

statix.toml

@@ -1 +0,0 @@
-disabled = ["repeated_keys"]