mirror of
https://github.com/Jokiller230/puzzlevision.git
synced 2025-12-19 13:48:48 +00:00
♻️ Move Zed and Ghostty user config to correct location
This commit is contained in:
parent
99459402d2
commit
b35c6547da
4 changed files with 52 additions and 39 deletions
4
homes/x86_64-linux/jo/apps/ghostty/default.nix
Normal file
4
homes/x86_64-linux/jo/apps/ghostty/default.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
programs.ghostty.enable = true;
|
||||||
|
}
|
||||||
9
homes/x86_64-linux/jo/apps/zed/default.nix
Normal file
9
homes/x86_64-linux/jo/apps/zed/default.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
puzzlevision.apps.zed = {
|
||||||
|
enable = true;
|
||||||
|
enable-nix = true;
|
||||||
|
enable-php = true;
|
||||||
|
enable-python = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -9,23 +9,15 @@
|
||||||
./apps/firefox
|
./apps/firefox
|
||||||
./apps/vicinae
|
./apps/vicinae
|
||||||
./apps/packettracer
|
./apps/packettracer
|
||||||
|
./apps/ghostty
|
||||||
|
./apps/zed
|
||||||
|
|
||||||
./desktop/gnome
|
./desktop/gnome
|
||||||
];
|
];
|
||||||
|
|
||||||
puzzlevision = {
|
puzzlevision = {
|
||||||
themes.catppuccin.enable = true;
|
themes.catppuccin.enable = true;
|
||||||
apps = {
|
cli.direnv.enable = true;
|
||||||
zed.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
cli = {
|
|
||||||
direnv.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs = {
|
|
||||||
ghostty.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
sops.secrets.wakatime-cfg = {
|
sops.secrets.wakatime-cfg = {
|
||||||
|
|
@ -36,12 +28,11 @@
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
## GENERAL
|
## GENERAL
|
||||||
teams-for-linux
|
|
||||||
enpass
|
enpass
|
||||||
youtube-music
|
youtube-music
|
||||||
|
teams-for-linux
|
||||||
|
|
||||||
## EDITORS
|
## EDITORS
|
||||||
apostrophe
|
|
||||||
jetbrains.phpstorm
|
jetbrains.phpstorm
|
||||||
obsidian
|
obsidian
|
||||||
|
|
||||||
|
|
@ -55,5 +46,5 @@
|
||||||
shopware-cli
|
shopware-cli
|
||||||
];
|
];
|
||||||
|
|
||||||
home.stateVersion = "25.05";
|
home.stateVersion = "25.11";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,10 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.${namespace}.apps.zed = {
|
options.${namespace}.apps.zed = {
|
||||||
enable = mkEnableOption "zed, the graphical editor from the future";
|
enable = mkEnableOption "Zed, the graphical editor from the future, with a sane base configuration.";
|
||||||
|
enable-nix = mkEnableOption "support for the Nix language, based on nixd, in Zed.";
|
||||||
|
enable-php = mkEnableOption "support for the PHP language, based on phpactor and pretty-php, in Zed.";
|
||||||
|
enable-python = mkEnableOption "support for the Python language, based on pylsp, in Zed.";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
@ -21,6 +24,19 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
|
### Disable telemetry
|
||||||
|
telemetry = {
|
||||||
|
diagnostics = false;
|
||||||
|
metrics = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
### Disable collaborative features
|
||||||
|
show_call_status_icon = false;
|
||||||
|
collaboration_panel.button = false;
|
||||||
|
|
||||||
|
### Disable AI features
|
||||||
|
disable_ai = true;
|
||||||
|
|
||||||
### Theme settings
|
### Theme settings
|
||||||
icon_theme = mkForce {
|
icon_theme = mkForce {
|
||||||
dark = mkIf config.catppuccin.enable "Catppuccin Macchiato";
|
dark = mkIf config.catppuccin.enable "Catppuccin Macchiato";
|
||||||
|
|
@ -32,19 +48,6 @@ in
|
||||||
light = mkIf config.catppuccin.enable "Catppuccin Latte (blue)";
|
light = mkIf config.catppuccin.enable "Catppuccin Latte (blue)";
|
||||||
};
|
};
|
||||||
|
|
||||||
### Disable telemetry
|
|
||||||
telemetry = {
|
|
||||||
diagnostics = false;
|
|
||||||
metrics = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
### Remove useless features and stuff
|
|
||||||
show_call_status_icon = false;
|
|
||||||
collaboration_panel.button = false;
|
|
||||||
|
|
||||||
### Disable AI features entirely
|
|
||||||
disable_ai = true;
|
|
||||||
|
|
||||||
### Formatting and saving settings
|
### Formatting and saving settings
|
||||||
formatter = "language_server";
|
formatter = "language_server";
|
||||||
format_on_save = "on";
|
format_on_save = "on";
|
||||||
|
|
@ -63,7 +66,7 @@ in
|
||||||
|
|
||||||
### Language specific configurations
|
### Language specific configurations
|
||||||
languages = {
|
languages = {
|
||||||
Nix = {
|
Nix = mkIf cfg.enable-nix {
|
||||||
language_servers = [
|
language_servers = [
|
||||||
"nixd"
|
"nixd"
|
||||||
"!nil"
|
"!nil"
|
||||||
|
|
@ -77,7 +80,7 @@ in
|
||||||
|
|
||||||
tab_size = 2;
|
tab_size = 2;
|
||||||
};
|
};
|
||||||
PHP = {
|
PHP = mkIf cfg.enable-php {
|
||||||
language_servers = [
|
language_servers = [
|
||||||
"phpactor"
|
"phpactor"
|
||||||
"!intelephense"
|
"!intelephense"
|
||||||
|
|
@ -101,11 +104,11 @@ in
|
||||||
oxc = true;
|
oxc = true;
|
||||||
|
|
||||||
# Languages
|
# Languages
|
||||||
nix = true;
|
nix = mkIf cfg.enable-nix true;
|
||||||
php = true;
|
php = mkIf cfg.enable-php true;
|
||||||
sql = true;
|
sql = true;
|
||||||
toml = true;
|
toml = true;
|
||||||
pylsp = true; # Python
|
pylsp = mkIf cfg.enable-python true; # Python
|
||||||
fish = true;
|
fish = true;
|
||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
|
|
@ -134,16 +137,22 @@ in
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
### Nix
|
### Nix
|
||||||
nixd
|
(mkIf cfg.enable-nix [
|
||||||
nixfmt-rfc-style
|
nixd
|
||||||
|
nixfmt-rfc-style
|
||||||
|
])
|
||||||
|
|
||||||
### Python
|
### Python
|
||||||
python3Packages.python-lsp-server
|
(mkIf cfg.enable-python [
|
||||||
|
python3Packages.python-lsp-server
|
||||||
|
])
|
||||||
|
|
||||||
### PHP
|
### PHP
|
||||||
php
|
(mkIf cfg.enable-php [
|
||||||
phpPackages.composer
|
php
|
||||||
pretty-php
|
phpPackages.composer
|
||||||
|
pretty-php
|
||||||
|
])
|
||||||
|
|
||||||
### TypeScript/JavaScript
|
### TypeScript/JavaScript
|
||||||
oxlint
|
oxlint
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue