works again, mostly done, now we can start with server
This commit is contained in:
parent
784f214fb7
commit
270e1a0be4
38 changed files with 623 additions and 381 deletions
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
./git.nix
|
||||
./editor.nix
|
||||
./godot.nix
|
||||
./languages.nix
|
||||
|
|
|
|||
|
|
@ -11,44 +11,54 @@
|
|||
editor = {
|
||||
vscodium.enable = lib.mkEnableOption "enable vscodium";
|
||||
emacs.enable = lib.mkEnableOption "enable emacs";
|
||||
default = "vscodium";
|
||||
default = lib.mkOption {
|
||||
default = "vscodium";
|
||||
description = "default editor";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
environment.systemPackages = with pkgs; [
|
||||
(lib.mkIf config.development.editor.vscodium.enable vscodium)
|
||||
nixfmt
|
||||
];
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[
|
||||
nixfmt
|
||||
]
|
||||
++ (if config.development.editor.vscodium.enable then [ vscodium ] else [ ]);
|
||||
|
||||
programs = {
|
||||
vscode = lib.mkIf config.development.editor.vscodium.enable {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
defaultEditor = lib.mkIf (config.development.editor.default == "vscodium") true;
|
||||
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||
catppuccin.catppuccin-vsc
|
||||
catppuccin.catppuccin-vsc-icons
|
||||
jnoortheen.nix-ide
|
||||
alefragnani.project-manager
|
||||
naumovs.color-highlight
|
||||
geequlim.godot-tools
|
||||
stylelint.vscode-stylelint
|
||||
ecmel.vscode-html-css
|
||||
esbenp.prettier-vscode
|
||||
];
|
||||
};
|
||||
vscode =
|
||||
if config.development.editor.vscodium.enable then
|
||||
{
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
defaultEditor = if (config.development.editor.default == "vscodium") then true else false;
|
||||
# profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||
# catppuccin.catppuccin-vsc
|
||||
# catppuccin.catppuccin-vsc-icons
|
||||
# jnoortheen.nix-ide
|
||||
# alefragnani.project-manager
|
||||
# naumovs.color-highlight
|
||||
# geequlim.godot-tools
|
||||
# stylelint.vscode-stylelint
|
||||
# ecmel.vscode-html-css
|
||||
# esbenp.prettier-vscode
|
||||
# ];
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
services = {
|
||||
emacs = lib.mkIf config.development.editor.emacs.enable {
|
||||
enable = true;
|
||||
install = true;
|
||||
defaultEditor = lib.mkIf (config.development.editor.default == "emacs") true;
|
||||
};
|
||||
};
|
||||
home.sessionVariables = {
|
||||
EDITOR = lib.mkDefault "codium";
|
||||
emacs =
|
||||
if config.development.editor.emacs.enable then
|
||||
{
|
||||
enable = true;
|
||||
install = true;
|
||||
defaultEditor = if (config.development.editor.default == "emacs") then true else false;
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
config = {
|
||||
programs = {
|
||||
git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
user = {
|
||||
email = "${config.user.email}";
|
||||
name = "${config.user.userName}";
|
||||
};
|
||||
push = {
|
||||
autoSetupRemote = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -12,9 +12,14 @@
|
|||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.apps.development.godot.enable {
|
||||
systemPackages = with pkgs; [
|
||||
godot
|
||||
];
|
||||
config = {
|
||||
environment.systemPackages =
|
||||
if config.apps.development.godot.enable then
|
||||
with pkgs;
|
||||
[
|
||||
godot
|
||||
]
|
||||
else
|
||||
[ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,15 @@
|
|||
{
|
||||
options = {
|
||||
apps.development.languages = {
|
||||
python = lib.mkEnableOption "enable python";
|
||||
python.enable = lib.mkEnableOption "enable python";
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
environment.systemPackages = with pkgs; [
|
||||
(lib.mkIf lib.mkIf config.development.languages.python.enable virtualenv)
|
||||
];
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[
|
||||
]
|
||||
++ (if config.apps.development.languages.python.enable then [ virtualenv ] else [ ]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue