From d41d67a8586be732d5c41541008485d11b83aa2a Mon Sep 17 00:00:00 2001 From: chem Date: Mon, 25 Aug 2025 21:51:56 -0600 Subject: [PATCH 1/7] hotfixes --- README.md | 2 +- home/modules/baseline.nix | 3 +- home/modules/default.nix | 4 -- home/modules/gpg.nix | 61 ------------------- home/modules/terminal/kitty.conf.nix | 2 +- home/platforms/chem@yuki/default.nix | 4 -- pkgs/default.nix | 3 +- sys/modules/default.nix | 1 - sys/platforms/yuki/hardware-configuration.nix | 42 +++++++------ 9 files changed, 29 insertions(+), 93 deletions(-) delete mode 100644 home/modules/gpg.nix diff --git a/README.md b/README.md index 7059e84..c7518bf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Unified nix configuration -Update whole flake: `nix flake update --commit-lock-file` +Update whole flake (clean working directory 1st): `nix flake update --commit-lock-file` Switch current machine: `sudo nixos-rebuild switch --flake . --show-trace` diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix index faa45f2..1d4f0b1 100644 --- a/home/modules/baseline.nix +++ b/home/modules/baseline.nix @@ -33,7 +33,8 @@ in { vim zip ]; - keyboard = { #TODO switch to normal people variant + keyboard = { + #TODO switch to normal people variant layout = "us"; variant = "altgr-intl"; }; diff --git a/home/modules/default.nix b/home/modules/default.nix index c4c29ba..ff1ad56 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -9,14 +9,10 @@ ./neovim.nix ./baseline.nix ./gaming.nix - ./yubikey.nix ./firefox.nix ./gui ./zsh ./defaultDesktopPack.nix - ./accounts.nix - ./syncthing.nix - ./deepState.nix ./mapping.nix ]; } diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix deleted file mode 100644 index 9da6e11..0000000 --- a/home/modules/gpg.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.local.services.gpg; -in { - options.local.services.gpg = { - enable = mkEnableOption "gpg settings"; - defaultKey = mkOption { - type = types.str; - description = "fingerprint of default public key to be used in gpg, git, email, etc."; - example = "7AA277E604A4173916BBB4E91FFAC35E1798174F"; - }; - }; - config = mkIf cfg.enable { - programs.gpg = { - enable = true; - settings = { - default-key = config.local.services.gpg.defaultKey; - }; - }; - - services.gpg-agent = { - enable = true; - - enableZshIntegration = true; - enableBashIntegration = true; - - enableExtraSocket = true; - enableSshSupport = true; - - defaultCacheTtl = 3600 * 3; - defaultCacheTtlSsh = 3600 * 3; - - maxCacheTtl = 3600 * 6; - maxCacheTtlSsh = 3600 * 6; - - pinentry.package = pkgs.pinentry-emacs; - }; - - accounts.email.accounts = { - "fabian@posixlycorrect.com" = { - gpg = { - encryptByDefault = true; - signByDefault = true; - key = config.local.services.gpg.defaultKey; - }; - }; - }; - - programs.git = { - signing = { - key = config.local.services.gpg.defaultKey; - signByDefault = true; - }; - }; - }; -} diff --git a/home/modules/terminal/kitty.conf.nix b/home/modules/terminal/kitty.conf.nix index 21f5a60..82904a9 100644 --- a/home/modules/terminal/kitty.conf.nix +++ b/home/modules/terminal/kitty.conf.nix @@ -5,7 +5,7 @@ italic_font JetBrains Mono Italic bold_italic_font JetBrains Mono Bold Italic - font_size 10 + font_size 15 disable_ligatures cursor initial_window_width 1200 diff --git a/home/platforms/chem@yuki/default.nix b/home/platforms/chem@yuki/default.nix index a9d47b6..c51f8ae 100644 --- a/home/platforms/chem@yuki/default.nix +++ b/home/platforms/chem@yuki/default.nix @@ -28,10 +28,6 @@ enable = true; prompt = "%B[%~] \${vcs_info_msg_0_}%b"; }; - gpg = { #TODO finish setup gpg - enable = false; - defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F"; - }; }; apps = { diff --git a/pkgs/default.nix b/pkgs/default.nix index daef071..97d428c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -7,7 +7,8 @@ with prev.lib; let inherit (final) callPackage fetchpatch; in { override = - {# add python modules here to make them available in all versions + { + # add python modules here to make them available in all versions } // ( let diff --git a/sys/modules/default.nix b/sys/modules/default.nix index 00f03d1..c8df074 100644 --- a/sys/modules/default.nix +++ b/sys/modules/default.nix @@ -6,7 +6,6 @@ }: { imports = [ ./baseline.nix - ./yubikey.nix ./audio.nix ./graphics.nix ./virtualisation.nix diff --git a/sys/platforms/yuki/hardware-configuration.nix b/sys/platforms/yuki/hardware-configuration.nix index 21935d7..a6bb41e 100644 --- a/sys/platforms/yuki/hardware-configuration.nix +++ b/sys/platforms/yuki/hardware-configuration.nix @@ -1,30 +1,34 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/b925ebc0-f717-4f0d-83ca-a9a29990b8e2"; - fsType = "btrfs"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/b925ebc0-f717-4f0d-83ca-a9a29990b8e2"; + fsType = "btrfs"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/EC62-0FDF"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/EC62-0FDF"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 7b5c19a19a8c4ba27aadcc42c7bdbdd3c635334e Mon Sep 17 00:00:00 2001 From: chem Date: Wed, 27 Aug 2025 18:51:00 -0600 Subject: [PATCH 2/7] add zedditor --- home/modules/default.nix | 1 + home/modules/zed.nix | 32 ++++++++++++++++++++++++++++ home/platforms/chem@yuki/default.nix | 1 + 3 files changed, 34 insertions(+) create mode 100644 home/modules/zed.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index ff1ad56..646a3f6 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -9,6 +9,7 @@ ./neovim.nix ./baseline.nix ./gaming.nix + ./zed.nix ./firefox.nix ./gui ./zsh diff --git a/home/modules/zed.nix b/home/modules/zed.nix new file mode 100644 index 0000000..b6b5b3c --- /dev/null +++ b/home/modules/zed.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.local.apps.zed; +in { + options.local.apps.zed = { + enable = mkEnableOption "zed settings"; + }; + + config = mkIf cfg.enable = { + programs.zed-editor = { + enable = true; + userSettings = { + features = { + copilot = false; + }; + telemetry = { + metrics = false; + }; + vim_mode = false; + ui_font_size = 16; + buffer_font_size = 16; + base_keymap = "VSCode" + }; + }; + }; + +} diff --git a/home/platforms/chem@yuki/default.nix b/home/platforms/chem@yuki/default.nix index c51f8ae..5c9c372 100644 --- a/home/platforms/chem@yuki/default.nix +++ b/home/platforms/chem@yuki/default.nix @@ -36,6 +36,7 @@ gaming.enable = true; defaultDesktopPack.enable = true; firefox.enable = true; + zed.enable = true; mapping.enable = true; }; From e5df34d7e21364fe8eeeba78bf2c654afed22ad3 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Tue, 26 Aug 2025 14:23:09 -0600 Subject: [PATCH 3/7] sway: add a more visible color to focused windows' titlebar --- home/modules/gui/sway.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix index 7f92cf2..11a6334 100644 --- a/home/modules/gui/sway.nix +++ b/home/modules/gui/sway.nix @@ -97,7 +97,7 @@ in { colors = { background = "#141414"; focused = { - border = "#1c1c1c"; + border = "#444444"; background = "#000000"; text = "#eaeaea"; indicator = "#000000"; From b89521fb7b9d6f7633dc5ba1af0dfb201aa7647a Mon Sep 17 00:00:00 2001 From: chem Date: Wed, 27 Aug 2025 21:29:46 -0600 Subject: [PATCH 4/7] fix zedditor fuckup and redo font size kitteh --- home/modules/terminal/kitty.conf.nix | 2 +- home/modules/zed.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/modules/terminal/kitty.conf.nix b/home/modules/terminal/kitty.conf.nix index 82904a9..21f5a60 100644 --- a/home/modules/terminal/kitty.conf.nix +++ b/home/modules/terminal/kitty.conf.nix @@ -5,7 +5,7 @@ italic_font JetBrains Mono Italic bold_italic_font JetBrains Mono Bold Italic - font_size 15 + font_size 10 disable_ligatures cursor initial_window_width 1200 diff --git a/home/modules/zed.nix b/home/modules/zed.nix index b6b5b3c..bf3d95a 100644 --- a/home/modules/zed.nix +++ b/home/modules/zed.nix @@ -11,7 +11,7 @@ in { enable = mkEnableOption "zed settings"; }; - config = mkIf cfg.enable = { + config = mkIf cfg.enable { programs.zed-editor = { enable = true; userSettings = { @@ -24,7 +24,7 @@ in { vim_mode = false; ui_font_size = 16; buffer_font_size = 16; - base_keymap = "VSCode" + base_keymap = "VSCode"; }; }; }; From 3e9486099d8f3e86d2d684d261ca4f2062b58439 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Tue, 26 Aug 2025 19:01:54 -0600 Subject: [PATCH 5/7] config: replace kitty with foot --- home/modules/default.nix | 2 +- home/modules/gui/default.nix | 2 +- home/modules/gui/sway.nix | 2 +- home/modules/terminal.nix | 117 +++++++++++++++++++++++++++ home/modules/terminal/default.nix | 55 ------------- home/modules/terminal/kitty.conf.nix | 87 -------------------- home/platforms/chem@yuki/default.nix | 1 + 7 files changed, 121 insertions(+), 145 deletions(-) create mode 100644 home/modules/terminal.nix delete mode 100644 home/modules/terminal/default.nix delete mode 100644 home/modules/terminal/kitty.conf.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index 646a3f6..3453cf7 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -5,7 +5,7 @@ ... }: { imports = [ - ./terminal + ./terminal.nix ./neovim.nix ./baseline.nix ./gaming.nix diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix index 3b505a5..110a835 100644 --- a/home/modules/gui/default.nix +++ b/home/modules/gui/default.nix @@ -62,7 +62,7 @@ in { enable = true; defaultApplications = { "application/pdf" = with pkgs; ["qpdfview"]; - "x-scheme-handler/file" = with pkgs; ["kitty"]; + "x-scheme-handler/file" = with pkgs; ["foot"]; }; }; }; diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix index 11a6334..90e0109 100644 --- a/home/modules/gui/sway.nix +++ b/home/modules/gui/sway.nix @@ -143,7 +143,7 @@ in { "${mod}+c" = "focus child"; "${mod}+d" = "exec ${bemenuCommand}"; "${mod}+l" = "exec ${getExe pkgs.gtklock} -d"; - "${mod}+Return" = "exec ${lib.getExe pkgs.kitty} ${lib.getExe pkgs.tmux}"; + "${mod}+Return" = "exec ${lib.getExe pkgs.foot} ${lib.getExe pkgs.tmux}"; "${mod}+Shift+s" = "exec ${grimshot} copy area"; "${mod}+Shift+a" = "exec ${grimshot} copy output"; "${mod}+Tab" = "focus right"; diff --git a/home/modules/terminal.nix b/home/modules/terminal.nix new file mode 100644 index 0000000..bc6b553 --- /dev/null +++ b/home/modules/terminal.nix @@ -0,0 +1,117 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.local.apps.terminal; +in { + options.local.apps.terminal.enable = mkEnableOption "terminal emulator settings"; + config = mkIf cfg.enable { + programs = { + foot = { + enable = true; + settings = { + main = { + term = "xterm-256color"; + font = "JetBrains Mono:style=Medium:size=15"; + font-bold = "JetBrains Mono:style=Bold:size=15"; + font-italic = "JetBrains Mono:style=Italic:size=15"; + font-bold-italic = "JetBrains Mono:style=Bold Italic:size=15"; + dpi-aware = "yes"; + initial-window-size-pixels = "1200x600"; + }; + + cursor = { + style = "block"; + blink = "yes"; + }; + + colors = { + background = "000000"; + regular0 = "616161"; + regular1 = "ff4d51"; + regular2 = "35d450"; + regular3 = "e9e836"; + regular4 = "5dc5f8"; + regular5 = "feabf2"; + regular6 = "24dfc4"; + regular7 = "ffffff"; + }; + + bell = { + system = "no"; + urgent = "no"; + notify = "no"; + visual = "no"; + command-focused = "no"; + }; + + mouse = { + hide-when-typing = "no"; + }; + + key-bindings = { + clipboard-copy = "Control+Shift+c"; + clipboard-paste = "Control+Shift+v"; + font-increase = "Control+Shift+equal"; + font-decrease = "Control+Shift+minus"; + font-reset = "Control+Shift+BackSpace"; + }; + + mouse-bindings = { + scrollback-up-mouse = "BTN_WHEEL_BACK"; + scrollback-down-mouse = "BTN_WHEEL_FORWARD"; + font-increase = "Control+BTN_WHEEL_BACK"; + font-decrease = "Control+BTN_WHEEL_FORWARD"; + select-begin = "BTN_LEFT"; + select-begin-block = "Control+BTN_LEFT"; + select-extend = "BTN_RIGHT"; + select-extend-character-wise = "Control+BTN_RIGHT"; + select-word = "BTN_LEFT-2"; + select-word-whitespace = "Control+BTN_LEFT-2"; + select-quote = " BTN_LEFT-3"; + select-row = "BTN_LEFT-4"; + }; + }; + }; + + tmux = { + enable = true; + aggressiveResize = true; + clock24 = true; + escapeTime = 10; + terminal = "xterm-256color"; + keyMode = "emacs"; + mouse = true; + + extraConfig = '' + set -ga update-environment " LIFT_PID" + set -g set-titles on + set -g renumber-windows on + set -sa terminal-overrides ',xterm-termite:RGB' + + set -g status-style bg=default,fg=colour250 + set -g pane-border-style fg=colour236 + set -g pane-active-border-style fg=colour240 + set -g window-status-format " #I:#W " + set -g window-status-style bg=default,fg=colour244 + set -g window-status-current-format " #I:#W " + set -g window-status-current-style bg=colour236,fg=white,bold + set -g status-position bottom + set -g status-left-length 20 + set -g status-right-length 60 + set -g status-left "" + set -g window-status-separator "" + set -g status-justify left + ''; + }; + }; + home = { + sessionVariables = { + "TERMINAL" = "foot"; + }; + }; + }; +} diff --git a/home/modules/terminal/default.nix b/home/modules/terminal/default.nix deleted file mode 100644 index adc9b93..0000000 --- a/home/modules/terminal/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.local.apps.terminal; -in { - options.local.apps.terminal.enable = mkEnableOption "terminal emulator settings"; - config = mkIf cfg.enable { - programs = { - kitty = { - enable = true; - extraConfig = import ./kitty.conf.nix; - }; - - tmux = { - enable = true; - aggressiveResize = true; - clock24 = true; - escapeTime = 10; - terminal = "xterm-256color"; - keyMode = "emacs"; - mouse = true; - - extraConfig = '' - set -ga update-environment " LIFT_PID" - set -g set-titles on - set -g renumber-windows on - set -sa terminal-overrides ',xterm-termite:RGB' - - set -g status-style bg=default,fg=colour250 - set -g pane-border-style fg=colour236 - set -g pane-active-border-style fg=colour240 - set -g window-status-format " #I:#W " - set -g window-status-style bg=default,fg=colour244 - set -g window-status-current-format " #I:#W " - set -g window-status-current-style bg=colour236,fg=white,bold - set -g status-position bottom - set -g status-left-length 20 - set -g status-right-length 60 - set -g status-left "" - set -g window-status-separator "" - set -g status-justify left - ''; - }; - }; - home = { - sessionVariables = { - "TERMINAL" = "kitty"; - }; - }; - }; -} diff --git a/home/modules/terminal/kitty.conf.nix b/home/modules/terminal/kitty.conf.nix deleted file mode 100644 index 21f5a60..0000000 --- a/home/modules/terminal/kitty.conf.nix +++ /dev/null @@ -1,87 +0,0 @@ -'' - # Fonts - font_family JetBrains Mono Medium - bold_font JetBrains Mono Bold - italic_font JetBrains Mono Italic - bold_italic_font JetBrains Mono Bold Italic - - font_size 10 - disable_ligatures cursor - - initial_window_width 1200 - initial_window_height 600 - - # Cursor - cursor_shape beam - cursor_beam_thickness 1.9 - cursor_stop_blinking_after 0 - - # Audio - enable_audio_bell no - - # Tabs - tab_bar_style separator - tab_separator " | " - tab_title_template "{index}: {title}" - - # Color - # special - foreground #ffffff - foreground_bold #ffffff - cursor #ffffff - background #000000 - background_opacity 1 - - # Shortcuts - map ctrl+shift+c copy_to_clipboard - map ctrl+shift+v paste_from_clipboard - map ctrl+shift+s paste_from_selection - map shift+insert paste_from_selection - - map ctrl+shift+up scroll_line_up - map ctrl+shift+down scroll_line_down - map ctrl+shift+page_up scroll_page_up - map ctrl+shift+page_down scroll_page_down - map ctrl+shift+home scroll_home - map ctrl+shift+end scroll_end - - map ctrl+shift+enter new_window - map ctrl+alt+enter launch --cwd=current - map ctrl+shift+w close_window - map ctrl+shift+] next_window - map ctrl+shift+[ previous_window - map ctrl+shift+1 first_window - map ctrl+shift+2 second_window - map ctrl+shift+3 third_window - map ctrl+shift+4 fourth_window - map ctrl+shift+5 fifth_window - map ctrl+shift+6 sixth_window - map ctrl+shift+7 seventh_window - map ctrl+shift+8 eighth_window - map ctrl+shift+9 ninth_window - map ctrl+shift+0 tenth_window - - map ctrl+shift+right next_tab - map ctrl+shift+left previous_tab - map ctrl+shift+t new_tab - map ctrl+shift+q close_tab - map ctrl+shift+. move_tab_forward - map ctrl+shift+, move_tab_backward - map ctrl+shift+alt+t set_tab_title - map ctrl+alt+1 goto_tab 1 - map ctrl+alt+2 goto_tab 2 - map ctrl+alt+3 goto_tab 3 - map ctrl+alt+4 goto_tab 4 - map ctrl+alt+5 goto_tab 5 - map ctrl+alt+6 goto_tab 6 - map ctrl+alt+7 goto_tab 7 - map ctrl+alt+8 goto_tab 8 - map ctrl+alt+9 goto_tab 9 - map ctrl+alt+0 goto_tab 10 - - map ctrl+shift+equal change_font_size all +1.0 - map ctrl+shift+minus change_font_size all -1.0 - map ctrl+shift+backspace change_font_size all 0 - - map ctrl+shift+delete clear_terminal reset active -'' diff --git a/home/platforms/chem@yuki/default.nix b/home/platforms/chem@yuki/default.nix index 5c9c372..92cd527 100644 --- a/home/platforms/chem@yuki/default.nix +++ b/home/platforms/chem@yuki/default.nix @@ -31,6 +31,7 @@ }; apps = { + #todo move some of this to defaultDesktop pack? terminal.enable = true; neovim.enable = true; gaming.enable = true; From 8024a1ed64eaef5b0d79117594b8eb3705631305 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Tue, 26 Aug 2025 19:02:42 -0600 Subject: [PATCH 6/7] config: add zed editor --- home/modules/default.nix | 2 +- home/modules/zed.nix | 97 ++++++++++++++++++++++------ home/platforms/chem@yuki/default.nix | 2 +- 3 files changed, 81 insertions(+), 20 deletions(-) diff --git a/home/modules/default.nix b/home/modules/default.nix index 3453cf7..c9a4816 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -9,11 +9,11 @@ ./neovim.nix ./baseline.nix ./gaming.nix - ./zed.nix ./firefox.nix ./gui ./zsh ./defaultDesktopPack.nix ./mapping.nix + ./zed.nix ]; } diff --git a/home/modules/zed.nix b/home/modules/zed.nix index bf3d95a..ff80633 100644 --- a/home/modules/zed.nix +++ b/home/modules/zed.nix @@ -7,26 +7,87 @@ with lib; let cfg = config.local.apps.zed; in { - options.local.apps.zed = { - enable = mkEnableOption "zed settings"; - }; - + options.local.apps.zed.enable = mkEnableOption "zed editor settings"; config = mkIf cfg.enable { - programs.zed-editor = { - enable = true; - userSettings = { - features = { - copilot = false; - }; - telemetry = { - metrics = false; - }; - vim_mode = false; - ui_font_size = 16; - buffer_font_size = 16; - base_keymap = "VSCode"; + programs.zed-editor = { + enable = true; + extensions = [ + "nix" + "codebook" + "vscode-dark-high-contrast" + "catppuccin-icons" + ]; + extraPackages = with pkgs; [ + nixd + ]; + userSettings = { + disable_ai = true; + theme = { + dark = "VSCode Dark High Contrast"; + light = "VSCode Dark High Contrast"; }; + icon_theme = { + dark = "Catppuccin Latte"; + light = "Catppuccin Latte"; + }; + file_icons = true; + rulers = [80 120]; + preferred_line_length = 120; + scroll_past_end = true; + cursor = { + blink_interval = 600; + smooth_scroll = true; + }; + autosave = "on_focus_change"; + auto_update = false; + buffer_font_family = "JetBrains Mono"; + buffer_font_size = 22; + hide_mouse = "never"; + minimap.show = "auto"; + tabs = { + file_icons = true; + git_status = true; + activate_on_close = "neighbour"; + show_close_button = "always"; + }; + toolbar = { + breadcrumbs = true; + quick_actions = true; + selections_menu = true; + agent_review = false; + code_actions = false; + }; + format_on_save = "off"; + use_autoclose = false; + git = { + git_gutter = "tracked_files"; + inline_blame = { + enabled = true; + delay_ms = 5000; + }; + }; + indent_guides = { + enabled = true; + line_width = 1; + active_line_width = 1; + coloring = "fixed"; + background_coloring = "disabled"; + }; + hour_format = "hour24"; + remove_trailing_whitespace_on_save = true; + use_smartcase_search = true; + soft_wrap = "editor_width"; + tab_size = 2; + telemetry = { + diagnostics = false; + metrics = false; + }; + auto_fold_dirs = false; + scrollbar = { + show = "always"; + }; + unnecessary_code_fade = 0.0; }; + }; }; - } diff --git a/home/platforms/chem@yuki/default.nix b/home/platforms/chem@yuki/default.nix index 92cd527..a9096ea 100644 --- a/home/platforms/chem@yuki/default.nix +++ b/home/platforms/chem@yuki/default.nix @@ -37,8 +37,8 @@ gaming.enable = true; defaultDesktopPack.enable = true; firefox.enable = true; - zed.enable = true; mapping.enable = true; + zed.enable = true; }; gui = { From d7bc9b85a0771350d7d236b0ea42057c2e7bf0aa Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Tue, 26 Aug 2025 22:01:46 -0600 Subject: [PATCH 7/7] zed: turn off whitespace removal on save --- home/modules/zed.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/zed.nix b/home/modules/zed.nix index ff80633..1b79e2a 100644 --- a/home/modules/zed.nix +++ b/home/modules/zed.nix @@ -74,7 +74,7 @@ in { background_coloring = "disabled"; }; hour_format = "hour24"; - remove_trailing_whitespace_on_save = true; + remove_trailing_whitespace_on_save = false; use_smartcase_search = true; soft_wrap = "editor_width"; tab_size = 2;