terminal refactor, move packages to default, inline btop theme

home/terminal/btop.nix

@@ -4,7 +4,9 @@
   ...
 }:
 let
-  btop-colors = with config.scheme.withHashtag; ''
+  btop-colors-file = pkgs.writeTextFile {
+    name = "btop-colors";
+    text = with config.scheme.withHashtag; ''
       # Credit to https://github.com/catppuccin/btop
       # Main background, empty for terminal default, need to be empty if you want transparent background
       theme[main_bg]="${base00}"
@@ -90,21 +92,17 @@ let
       theme[process_mid]="${base07}"
       theme[process_end]="${base0E}"
     '';
-
-  btop-colors-file = pkgs.writeTextFile {
-    name = "btop-colors";
-    text = btop-colors;
     destination = "/nixos.theme";
   };
 
-  mergedConfig = pkgs.runCommand "mergedConfig" { } ''
+  batConfigDir = pkgs.runCommand "mergedConfig" { } ''
     mkdir -p $out/themes
     cp -r ${btop-colors-file}/nixos.theme $out/themes/nixos.theme
   '';
 in
 {
   home.file.".config/btop" = {
-    source = mergedConfig;
+    source = batConfigDir;
     recursive = true;
   };
 }

home/terminal/default.nix

@@ -28,6 +28,9 @@
     browsh
     mosh
     gh
+    kdePackages.qttools
+    eza
+    pigz
 
     # development & tooling
     jdk21_headless
@@ -42,9 +45,19 @@
     flaresolverr
     nerd-fonts.fira-mono
     ffmpeg-full
+
+    # formatters
+    kdePackages.qtdeclarative
+    prettier
+    prettierd
+    nixfmt
+    stylua
+    black
+    clang-tools
   ];
 
-  programs.git = {
+  programs = {
+    git = {
       enable = true;
       settings = {
         user = {
@@ -55,4 +68,14 @@
         commit.gpgsign = true;
       };
     };
+    bat = {
+      enable = true;
+      config.style = "numbers,changes";
+    };
+    lazygit = {
+      enable = true;
+      enableFishIntegration = true;
+    };
+    lazysql.enable = true;
+  };
 }

home/terminal/fish.nix

@@ -1,16 +1,9 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 {
-  home.packages = with pkgs; [
-    kdePackages.qttools
-    eza
-    pigz
-  ];
-
   programs.fish = {
     enable = true;
     shellAliases = {

home/terminal/kitty.nix

@@ -128,14 +128,5 @@ in
         macos_titlebar_color = "system";
       };
     };
-    bat = {
-      enable = true;
-      # config.theme = "Catppuccin ${config.catppuccinUpper.flavor}";
-    };
-    lazygit = {
-      enable = true;
-      enableFishIntegration = true;
-    };
-    lazysql.enable = true;
   };
 }

home/terminal/neovim.nix

@@ -7,16 +7,6 @@
 {
   home.sessionVariables.EDITOR = lib.mkForce "kitty nvim";
 
-  home.packages = with pkgs; [
-    kdePackages.qtdeclarative
-    prettier
-    prettierd
-    nixfmt
-    stylua
-    black
-    clang-tools
-  ];
-
   programs.nixvim = {
     enable = true;
     enablePrintInit = true;