darwin/homebrew.nix

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

home/extras/helix/auto-theme.nix

@@ -4,21 +4,19 @@ let
   tomlFormat = pkgs.formats.toml { };
 in {
   options.programs.helix = {
-    autoTheme = {
+    autoTheme.enable =
-      enable =
       lib.mkEnableOption "Automatically switch helix theme with night mode";
 
-      light = lib.mkOption {
+    autoTheme.light = lib.mkOption {
       type = lib.types.str;
       description = "Light mode theme";
     };
 
-      dark = lib.mkOption {
+    autoTheme.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,7 +20,6 @@ in {
     ignores = [ ".DS_Store" ".direnv" "result" ];
 
     # enhanced diffs
-    # TODO: fix light colorscheme
     delta = {
       enable = true;
       options = {

home/kitty.nix

@@ -2,12 +2,11 @@
 let font = "Rec Mono Duotone";
 in {
   imports = [ ./extras/kitty/auto-theme.nix ./extras/kitty/nerd-font.nix ];
-  programs.kitty = {
+  programs.kitty.enable = true;
-    enable = true;
   # using kitty from homebrew
-    package = pkgs.emptyDirectory;
+  programs.kitty.package = pkgs.emptyDirectory;
 
-    settings = {
+  programs.kitty.settings = {
     font_family = font;
     bold_font = "${font} Bold";
     italic_font = "${font} Italic";
@@ -29,20 +28,9 @@ in {
 
     # shell integration is manually enabled for fish
     shell_integration = "disabled";
-    } // lib.optionalAttrs pkgs.stdenv.isDarwin {
+  } // lib.optionalAttrs pkgs.stdenv.isDarwin { macos_option_as_alt = "both"; };
-      macos_option_as_alt = "both";
-    };
 
-    useSymbolsFromNerdFont = "CaskaydiaCove Nerd Font";
+  programs.fish.interactiveShellInit = ''
-    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
@@ -51,12 +39,18 @@ in {
     end
     set-term-colors
   '';
-    shellAliases = {
+  programs.fish.shellAliases = {
     s = "kitty +kitten ssh";
     e = "edit-in-kitty";
   };
 
-    functions.set-term-colors = {
+  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 = {
     body = ''
       if test "$term_background" = light
         term-light
@@ -66,5 +60,4 @@ 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}
+        ${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents,Downloads}
     '';
   in {
     enable = true;

home/starship-symbols.nix

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

statix.toml

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