Compare commits

...

4 Commits

3 changed files with 7 additions and 6 deletions

View File

@@ -50,8 +50,8 @@
ninja ninja
]; ];
default-python-pkgs = with pkgs; [ default-python-pkgs = with pkgs; [
python python312
pythonPackages.black python312Packages.black
pyright pyright
]; ];
doom-path-pkgs = doom-path-pkgs =
@@ -59,6 +59,7 @@
++ lib.optionals cfg.withShellPkgs (cfg.overrideShellPkgs default-shell-pkgs) ++ lib.optionals cfg.withShellPkgs (cfg.overrideShellPkgs default-shell-pkgs)
++ lib.optionals cfg.withNixPkgs (cfg.overrideNixPkgs default-nix-pkgs) ++ lib.optionals cfg.withNixPkgs (cfg.overrideNixPkgs default-nix-pkgs)
++ lib.optionals cfg.withCXXPkgs (cfg.overrideCXXPkgs default-cxx-pkgs) ++ lib.optionals cfg.withCXXPkgs (cfg.overrideCXXPkgs default-cxx-pkgs)
++ lib.optionals cfg.withPythonPkgs (cfg.overridePythonPkgs default-python-pkgs)
++ lib.optional cfg.enableCopilot pkgs.unstable.copilot-language-server ++ lib.optional cfg.enableCopilot pkgs.unstable.copilot-language-server
++ default-core-pkgs; ++ default-core-pkgs;
doom-socket-name = "main"; doom-socket-name = "main";

View File

@@ -34,7 +34,7 @@
;; There are two ways to load a theme. Both assume the theme is installed and ;; There are two ways to load a theme. Both assume the theme is installed and
;; available. You can either set `doom-theme' or manually load a theme with the ;; available. You can either set `doom-theme' or manually load a theme with the
;; `load-theme' function. This is the default: ;; `load-theme' function. This is the default:
(setq doom-theme 'doom-monokai-classic) (setq doom-theme 'doom-gruvbox)
(custom-set-faces! `(font-lock-operator-face :foreground ,(doom-color 'operators))) (custom-set-faces! `(font-lock-operator-face :foreground ,(doom-color 'operators)))
;; This determines the style of line numbers in effect. If set to `nil', line ;; This determines the style of line numbers in effect. If set to `nil', line

View File

@@ -24,10 +24,10 @@ in {
enable = true; enable = true;
settings = { settings = {
user = lib.optionalAttrs cfg.followGit { user = lib.optionalAttrs cfg.followGit {
name = config.programs.git.userName; name = config.programs.git.settings.user.name;
email = config.programs.git.userEmail; email = config.programs.git.settings.user.email;
}; };
ui = lib.optionalAttrs (cfg.followGit && config.programs.git.difftastic.enable) { ui = lib.optionalAttrs (cfg.followGit && config.programs.difftastic.enable) {
diff-formatter = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"]; diff-formatter = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];
}; };
}; };