From f8cab1db3401366e3fd611505fad737c26c98521 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 18 Oct 2025 23:10:53 +0800 Subject: [PATCH] chore: Change colorschemes --- home/david/modules/programs/ghostty.nix | 21 +----------- home/david/modules/programs/helix.nix | 2 +- home/david/modules/programs/zed.nix | 10 +++--- nixos/configurations/Tytonidae/stylix.nix | 2 +- pkgs/doom-emacs/config/config.el | 42 ++++++----------------- 5 files changed, 19 insertions(+), 58 deletions(-) diff --git a/home/david/modules/programs/ghostty.nix b/home/david/modules/programs/ghostty.nix index 10976b0..1ac54ad 100644 --- a/home/david/modules/programs/ghostty.nix +++ b/home/david/modules/programs/ghostty.nix @@ -20,25 +20,6 @@ enable = true; package = pkgs.ghostty; settings = { - # font-family = "FiraCode Nerd Font"; - # font-feature = [ - # "calt=1" - # "clig=1" - # "liga=1" - # "cv01" - # "cv02" - # "cv06" - # "zero" - # "onum" - # "cv17" - # "ss05" - # "ss03" - # "cv16" - # "cv31" - # "cv29" - # "cv30" - # ]; - # font-family = "Maple Mono NF CN"; font-feature = [ "calt" @@ -47,7 +28,7 @@ "ss08" ]; font-size = lib.mkForce 17; - # theme = "ayu"; + theme = lib.mkForce "Atom One Dark"; background-opacity = lib.mkForce 0.8; confirm-close-surface = "false"; }; diff --git a/home/david/modules/programs/helix.nix b/home/david/modules/programs/helix.nix index 41149af..94af43e 100644 --- a/home/david/modules/programs/helix.nix +++ b/home/david/modules/programs/helix.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { stylix.targets.helix.enable = false; programs.helix.settings = { - theme = "gruvbox_dark_hard"; + theme = "papercolor-light"; }; youthlic.programs.helix = { enable = true; diff --git a/home/david/modules/programs/zed.nix b/home/david/modules/programs/zed.nix index f3cd7d5..b0c5160 100644 --- a/home/david/modules/programs/zed.nix +++ b/home/david/modules/programs/zed.nix @@ -18,6 +18,7 @@ in programs.zed-editor = { enable = true; extensions = [ + "catppuccin" "asciidoc" "basher" "cargo-tom" @@ -52,6 +53,8 @@ in "ruff" "just" "just-ls" + "jj-lsp" + "org" ]; extraPackages = with pkgs; [ editor-runtime @@ -116,11 +119,8 @@ in "ss08" = true; }; ui_font_family = "Source Han Sans"; - theme = "Gruvbox Dark Hard"; - vim_mode = true; - vim = { - # default_mode = "helix_normal"; - }; + theme = "Catppuccin Latte"; + helix_mode = true; }; }; }; diff --git a/nixos/configurations/Tytonidae/stylix.nix b/nixos/configurations/Tytonidae/stylix.nix index 0a0383d..7afd390 100644 --- a/nixos/configurations/Tytonidae/stylix.nix +++ b/nixos/configurations/Tytonidae/stylix.nix @@ -8,7 +8,7 @@ enable = true; image = rootPath + "/assets/wallpaper/01.png"; polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest-dark-hard.yaml"; cursor = { package = pkgs.rose-pine-cursor; name = "BreezeX-RosePineDawn-Linux"; diff --git a/pkgs/doom-emacs/config/config.el b/pkgs/doom-emacs/config/config.el index 2c85921..76e61b1 100644 --- a/pkgs/doom-emacs/config/config.el +++ b/pkgs/doom-emacs/config/config.el @@ -12,7 +12,7 @@ (setq doom-font (font-spec :family "Maple Mono NF CN" :size 20)) -(setq doom-theme 'doom-gruvbox) +(setq doom-theme 'doom-one-light) ;;; Fix failure to locate 'Symbols Nerd Font Mono' font (setq nerd-icons-font-family "Maple Mono NF CN") @@ -42,26 +42,6 @@ (append exec-path my/emacs-deps-exec-path)))) -(advice-add #'telega-chatbuf-attach-clipboard - :override #'(lambda (doc-p) - (interactive "P") - (let* ((selection-coding-system 'no-conversion) ;for rawdata - (temporary-file-directory telega-temp-dir) - (tmpfile (telega-temp-name "clipboard" ".png")) - (coding-system-for-write 'binary)) - (if (eq system-type 'darwin) - (progn - ;; NOTE: On MacOS, try extracting clipboard using pngpaste - (unless (executable-find "pngpaste") - (error "Please install pngpaste to paste images")) - (unless (= 0 (telega-screenshot-with-pngpaste tmpfile)) - (error "No image in CLIPBOARD"))) - (let ((image-data (or (gui-get-selection 'CLIPBOARD 'image/png) - (gui-get-selection 'CLIPBOARD 'image/jpeg) - (error "No image in CLIPBOARD")))) - (write-region image-data nil tmpfile nil 'quiet))) - (telega-chatbuf-attach-media tmpfile (when doc-p 'preview))))) - (defun +telega-save-file-to-clipboard (msg) "Save file at point to clipboard. NOTE: wayland only." @@ -70,19 +50,19 @@ NOTE: wayland only." (unless file (user-error "No file associated with message")) (telega-file--download file - :priority 32 - :update-callback - (lambda (dfile) - (telega-msg-redisplay msg) - (message "Wait for downloading to finish…") - (when (telega-file--downloaded-p dfile) - (let* ((fpath (telega--tl-get dfile :local :path))) - (shell-command (format "wl-copy < \"%s\"" fpath)) - (message (format "File saved to clipboard: %s" fpath)))))))) + :priority 32 + :update-callback + (lambda (dfile) + (telega-msg-redisplay msg) + (message "Wait for downloading to finish…") + (when (telega-file--downloaded-p dfile) + (let* ((fpath (telega--tl-get dfile :local :path))) + (shell-command (format "wl-copy < \"%s\"" fpath)) + (message (format "File saved to clipboard: %s" fpath)))))))) (map! :map global-map "C-c n" - #'helm-nixos-options) + #'company-nixos-options) (with-eval-after-load 'evil (scroll-on-jump-advice-add evil-redo)