-
Notifications
You must be signed in to change notification settings - Fork 0
Update package configurations and fix Zsh settings #345
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
150e3e8
9cf7564
79009ee
44ae1b0
2d6fa68
a43a9da
f42211d
24d8ab1
f59109a
ae56d67
f606a83
1d100b3
d962580
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,9 @@ | |
| pkgs, | ||
| inputs, | ||
| }: | ||
| let | ||
| isCI = builtins.getEnv "CI" != ""; | ||
| in | ||
| with pkgs; | ||
| [ | ||
| inputs.agenix.packages.${stdenv.hostPlatform.system}.default | ||
|
|
@@ -13,8 +16,8 @@ with pkgs; | |
| argocd | ||
| ast-grep | ||
| bat | ||
| btop | ||
| bun | ||
| clipse | ||
| cloudflared | ||
| curl | ||
| curlie | ||
|
|
@@ -31,6 +34,7 @@ with pkgs; | |
| fzf-make | ||
| gh | ||
| git | ||
| gnumake | ||
| goose-cli | ||
| grc | ||
| htop | ||
|
|
@@ -69,12 +73,21 @@ with pkgs; | |
| ++ lib.optionals stdenv.isLinux [ | ||
| atop | ||
| below | ||
| claude-code | ||
| codex | ||
| collectd | ||
| docker | ||
| docker-compose | ||
| ffmpeg | ||
| gemini-cli | ||
| kubernetes-helm | ||
| powertop | ||
| ] | ||
| ++ lib.optionals (stdenv.isLinux && !isCI) [ | ||
| blueberry | ||
| chromium | ||
| claude-code | ||
| codex | ||
| github-desktop | ||
| opencode | ||
|
Comment on lines
+82
to
90
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| signal-desktop | ||
| vlc | ||
| ] | ||
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,69 @@ | ||||||||||
| { | ||||||||||
| # From: https://github.com/henrysipp/omarchy-nix/blob/308e0f85a0deb820c01cfbe1b4faee1daab4da12/modules/home-manager/btop.nix | ||||||||||
| programs.btop = { | ||||||||||
| enable = true; | ||||||||||
| settings = { | ||||||||||
| theme_background = false; | ||||||||||
| truecolor = true; | ||||||||||
| force_tty = false; | ||||||||||
| vim_keys = true; | ||||||||||
| rounded_corners = true; | ||||||||||
| graph_symbol = "braille"; | ||||||||||
| graph_symbol_cpu = "default"; | ||||||||||
| graph_symbol_mem = "default"; | ||||||||||
| graph_symbol_net = "default"; | ||||||||||
| graph_symbol_proc = "default"; | ||||||||||
| shown_boxes = "cpu mem net proc"; | ||||||||||
| update_ms = 2000; | ||||||||||
| proc_sorting = "cpu lazy"; | ||||||||||
| proc_reversed = false; | ||||||||||
| proc_tree = false; | ||||||||||
| proc_colors = true; | ||||||||||
| proc_gradient = false; | ||||||||||
| proc_per_core = false; | ||||||||||
| proc_mem_bytes = true; | ||||||||||
| proc_cpu_graphs = true; | ||||||||||
| proc_info_smaps = false; | ||||||||||
| proc_left = false; | ||||||||||
| cpu_graph_upper = "total"; | ||||||||||
| cpu_graph_lower = "total"; | ||||||||||
| cpu_invert_lower = true; | ||||||||||
| cpu_single_graph = false; | ||||||||||
| cpu_bottom = false; | ||||||||||
| show_uptime = true; | ||||||||||
| check_temp = true; | ||||||||||
| cpu_sensor = "Auto"; | ||||||||||
| show_coretemp = true; | ||||||||||
| cpu_core_map = ""; | ||||||||||
| temp_scale = "celsius"; | ||||||||||
| base_10_sizes = false; | ||||||||||
| show_cpu_freq = true; | ||||||||||
| clock_format = "%X"; | ||||||||||
| background_update = true; | ||||||||||
| custom_cpu_name = "; | ||||||||||
|
||||||||||
| custom_cpu_name = "; | |
| custom_cpu_name = ""; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The string literal here is missing its closing quote, so the Nix module will fail to parse. Please close the string.
Prompt for AI agents
Address the following comment on home-manager/programs/btop/default.nix at line 43:
<comment>The string literal here is missing its closing quote, so the Nix module will fail to parse. Please close the string.</comment>
<file context>
@@ -0,0 +1,69 @@
+ show_cpu_freq = true;
+ clock_format = "%X";
+ background_update = true;
+ custom_cpu_name = ";
+ disks_filter = ";
+ mem_graphs = true;
</file context>
| custom_cpu_name = "; | |
| custom_cpu_name = ""; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix unterminated string literals in btop settings
The new btop module sets several options to "; (custom_cpu_name, disks_filter, io_graph_speeds, net_iface). Each is missing the closing quote for an empty string, so the file will not parse and Home Manager evaluation fails before any configuration can be applied. Replace them with valid string values such as ""; or remove the lines.
Useful? React with 👍 / 👎.
Copilot
AI
Nov 14, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Syntax error: The string value is not properly closed. This line should be:
disks_filter = "";| disks_filter = "; | |
| disks_filter = ""; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix malformed string literals - missing opening quotes.
Several string settings have syntax errors with only a closing quote and semicolon. These will cause Nix evaluation to fail.
Apply this diff to fix the malformed strings:
clock_format = "%X";
background_update = true;
- custom_cpu_name = ";
- disks_filter = ";
+ custom_cpu_name = "";
+ disks_filter = "";
mem_graphs = true; io_mode = false;
io_graph_combined = false;
- io_graph_speeds = ";
+ io_graph_speeds = "";
net_download = 100; net_auto = true;
net_sync = true;
- net_iface = ";
+ net_iface = "";
show_battery = true;Also applies to: 58-58, 63-63
🤖 Prompt for AI Agents
In home-manager/programs/btop/default.nix around lines 43-44 (and also lines 58
and 63), several string assignments are malformed: they only have a closing
quote and semicolon (e.g. custom_cpu_name = ";). Fix each by providing the
missing opening quote and a valid string value (or an empty string ""), ensuring
the assignment uses proper Nix string syntax: key = "value";; update
custom_cpu_name, disks_filter, and the settings at lines 58 and 63 to use
complete quotes and valid values.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This assignment is missing the closing quote, leaving the string unterminated and breaking the configuration. Close the string literal.
Prompt for AI agents
Address the following comment on home-manager/programs/btop/default.nix at line 44:
<comment>This assignment is missing the closing quote, leaving the string unterminated and breaking the configuration. Close the string literal.</comment>
<file context>
@@ -0,0 +1,69 @@
+ clock_format = "%X";
+ background_update = true;
+ custom_cpu_name = ";
+ disks_filter = ";
+ mem_graphs = true;
+ mem_below_net = false;
</file context>
| disks_filter = "; | |
| disks_filter = ""; |
Copilot
AI
Nov 14, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Syntax error: The string value is not properly closed. This line should be:
io_graph_speeds = "";| io_graph_speeds = "; | |
| io_graph_speeds = ""; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new io_graph_speeds value is missing the terminating quote, so the configuration will not parse. Close the string literal.
Prompt for AI agents
Address the following comment on home-manager/programs/btop/default.nix at line 58:
<comment>The new `io_graph_speeds` value is missing the terminating quote, so the configuration will not parse. Close the string literal.</comment>
<file context>
@@ -0,0 +1,69 @@
+ show_io_stat = true;
+ io_mode = false;
+ io_graph_combined = false;
+ io_graph_speeds = ";
+ net_download = 100;
+ net_upload = 100;
</file context>
| io_graph_speeds = "; | |
| io_graph_speeds = ""; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are several syntax errors in this block. The string values for custom_cpu_name, disks_filter, io_graph_speeds, and net_iface are incorrectly terminated with a semicolon (;) instead of a double quote ("). This will cause the Nix evaluation to fail.
custom_cpu_name = "";
disks_filter = "";
mem_graphs = true;
mem_below_net = false;
zfs_arc_cached = true;
show_swap = true;
swap_disk = true;
show_disks = true;
only_physical = true;
use_fstab = true;
zfs_hide_datasets = false;
disk_free_priv = false;
show_io_stat = true;
io_mode = false;
io_graph_combined = false;
io_graph_speeds = "";
net_download = 100;
net_upload = 100;
net_auto = true;
net_sync = true;
net_iface = "";
Copilot
AI
Nov 14, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Syntax error: The string value is not properly closed. This line should be:
net_iface = "";| net_iface = "; | |
| net_iface = ""; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The net_iface assignment is missing the closing quote; as written it will break the module. Close the string literal.
Prompt for AI agents
Address the following comment on home-manager/programs/btop/default.nix at line 63:
<comment>The `net_iface` assignment is missing the closing quote; as written it will break the module. Close the string literal.</comment>
<file context>
@@ -0,0 +1,69 @@
+ net_upload = 100;
+ net_auto = true;
+ net_sync = true;
+ net_iface = ";
+ show_battery = true;
+ selected_battery = "Auto";
</file context>
| net_iface = "; | |
| net_iface = ""; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❓ Verification inconclusive
Consider verifying btop configuration options.
The btop configuration contains extensive settings copied from a reference repository. While the structure looks correct (aside from the string literal issues), you may want to verify these settings match your preferred btop behavior.
Run this script to check the btop package and review available configuration options:
🏁 Script executed:
#!/bin/bash
# Description: Verify btop is available in nixpkgs and check for documentation
# Check if btop exists in nixpkgs
nix-env -qaP -A nixpkgs.btop
# Look for btop home-manager module documentation
fd -e nix btop | head -20Length of output: 45
I'll search for documentation on Nix syntax to verify the string literal issues are indeed errors:
Fix critical syntax errors in btop configuration.
The btop settings contain unclosed string literals that will cause Nix evaluation to fail. In Nix, strings are enclosed between double quotes, and each of the following assignments is missing the opening quote:
custom_cpu_name = ";(should becustom_cpu_name = "";)disks_filter = ";(should bedisks_filter = "";)io_graph_speeds = ";(should beio_graph_speeds = "";)net_iface = ";(should benet_iface = "";)
These errors will prevent the module from loading. If these settings should have specific values, provide them; otherwise, use empty strings as shown above.
🤖 Prompt for AI Agents
In home-manager/programs/btop/default.nix around lines 1 to 68, several btop
string assignments have unclosed/missing quotes (custom_cpu_name, disks_filter,
io_graph_speeds, net_iface) which will break Nix evaluation; fix by closing the
string literals—either set them to proper values or to empty strings (e.g., ""),
ensuring each assignment uses a valid quoted string.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| { | ||
| programs.direnv = { | ||
| enable = true; | ||
| enableBashIntegration = true; | ||
| # enableFishIntegration = true; | ||
| enableZshIntegration = true; | ||
| nix-direnv.enable = true; | ||
|
Comment on lines
+4
to
+7
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Enabling |
||
| }; | ||
| } | ||
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |||||||||
| { lib, pkgs, ... }: | ||||||||||
| { | ||||||||||
| programs.zsh = { | ||||||||||
| enable = false; | ||||||||||
| enable = true; | ||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Enabling Zsh alongside Fish (which is already extensively configured with functions, completions, and shell integrations) creates potential conflicts. Multiple enabled shells can cause login shell priority issues, conflicting shell integrations, and environment variable initialization order problems. Consider clarifying which shell is primary or documenting if this is a migration path from Fish to Zsh. |
||||||||||
| enableCompletion = true; | ||||||||||
| autosuggestion.enable = true; | ||||||||||
| syntaxHighlighting.enable = true; | ||||||||||
|
|
@@ -17,7 +17,7 @@ | |||||||||
| extended = true; | ||||||||||
| }; | ||||||||||
|
|
||||||||||
| initExtra = '' | ||||||||||
| initContent = '' | ||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||||||||||
| initContent = '' | |
| initExtra = '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Incorrect attribute name - should be initExtra, not initContent.
The standard home-manager Zsh module attribute for shell initialization is initExtra, not initContent. This will cause the configuration to fail.
Apply this diff to fix the attribute name:
- initContent = ''
+ initExtra = ''📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| initContent = '' | |
| initExtra = '' |
🤖 Prompt for AI Agents
In home-manager/programs/zsh/default.nix around line 20, the attribute is
incorrectly named initContent; change this attribute to initExtra so it uses the
standard home-manager Zsh module option. Update the attribute key from
initContent to initExtra and ensure any surrounding quoting/indenting remains
consistent with the file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The initContent option does not exist in Home Manager's programs.zsh module. This should be initExtra. Home Manager's zsh module only supports initExtra for custom initialization code, not initContent. This change will cause a configuration build error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using initContent overwrites the default Zsh setup provided by Home Manager, which breaks the automatic integration for other programs. The integrations for direnv, atuin, and lsd will stop working. You should use initExtra to append to the configuration instead of replacing it.
Prompt for AI agents
Address the following comment on home-manager/programs/zsh/default.nix at line 20:
<comment>Using `initContent` overwrites the default Zsh setup provided by Home Manager, which breaks the automatic integration for other programs. The integrations for `direnv`, `atuin`, and `lsd` will stop working. You should use `initExtra` to append to the configuration instead of replacing it.</comment>
<file context>
@@ -17,7 +17,7 @@
};
- initExtra = ''
+ initContent = ''
# Initialize Starship
eval "$(starship init zsh)"
</file context>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Avoid impure
builtins.getEnvfor environment-dependent logic.Using
builtins.getEnvbreaks Nix's reproducibility guarantees because it reads from the environment at evaluation time. This can cause:Consider passing
isCIas a function parameter instead:Then pass the value from the calling module based on your build context. This maintains purity while achieving the same goal.
🤖 Prompt for AI Agents