Updated system + trying zed

This commit is contained in:
Emmet 2025-10-24 15:18:40 -05:00
parent e15e4d817e
commit 6f6d16dff1
10 changed files with 166 additions and 84 deletions

View file

@ -8,7 +8,7 @@ in {
userSettings.editor = lib.mkOption {
default = "vscodium";
description = "Default editor";
type = lib.types.enum [ "emacs" "kate" "vscodium" ];
type = lib.types.enum [ "emacs" "kate" "vscodium" "zed"];
# TODO add more editors
#type = lib.types.enum [ "emacs" "vim" "nvim" "neovide" "nano" "micro" "vscodium" "kate" "pulsar" ];
};
@ -19,6 +19,7 @@ in {
};
config = {
userSettings.zed.enable = lib.mkIf (config.userSettings.editor == "zed") true;
userSettings.emacs.enable = lib.mkIf (config.userSettings.editor == "emacs") true;
userSettings.vscodium.enable = lib.mkIf (config.userSettings.editor == "vscodium") true;
home.packages = with pkgs;

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, pkgs-stable, ... }:
let
cfg = config.userSettings.emacs;
@ -15,10 +15,10 @@ in {
};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
home.packages = with pkgs-stable; [
(pkgs.emacsWithPackagesFromUsePackage {
config = ./init.el;
package = pkgs.emacs-git-pgtk;
package = pkgs-stable.emacs-pgtk;
alwaysEnsure = false;
extraEmacsPackages = epkgs: with epkgs; [
org-modern olivetti

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, pkgs-stable, ... }:
let
cfg = config.userSettings.office;
@ -26,6 +26,7 @@ in {
];
services.syncthing.enable = true;
services.nextcloud-client = {
package = pkgs-stable.nextcloud-client;
enable = true;
startInBackground = true;
};

View file

@ -34,7 +34,7 @@ in
# TODO abstract fonts into an option
monospace = {
name = "Fira Code Nerd Font";
package = pkgs.fira-code-nerdfont;
package = pkgs.nerd-fonts.fira-code;
};
serif = {
name = "Fira";

View file

@ -37,6 +37,5 @@ in {
};
xdg.mime.enable = true;
xdg.mimeApps.enable = true;
home.file.External.source = config.lib.file.mkOutOfStoreSymlink "/run/media/" + config.home.username;
};
}

View file

@ -0,0 +1,19 @@
{ config, lib, pkgs, ... }:
let
cfg = config.userSettings.zed;
in {
options = {
userSettings.zed = {
enable = lib.mkEnableOption "Enable zed editor";
};
};
config = lib.mkIf cfg.enable {
programs.zed-editor.enable = true;
programs.zed-editor.extensions = [
"nix"
"gdscript"
];
};
}