From 5b77289525f36007ed0f9040ed68fa7e28129bde Mon Sep 17 00:00:00 2001 From: Veneficium <85629831+veneficium42@users.noreply.github.com> Date: Sun, 29 Dec 2024 23:25:45 +0100 Subject: [PATCH] format stuff --- .vscode/tasks.json | 40 ++++---- .../home/cliPrograms/fastfetch/config.jsonc | 82 ++++++++--------- modules/home/cliPrograms/helix/config.toml | 1 + .../desktopPrograms/vscodium/settings.json | 60 ++++++------ .../home/desktopPrograms/wezterm/wezterm.lua | 10 +- .../home/desktopPrograms/zed/settings.json | 92 +++++++++---------- modules/home/niri/swaylock.json | 2 +- modules/home/niri/waybar.json | 34 ++----- 8 files changed, 149 insertions(+), 172 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2e3e8df..bfcaf38 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,21 +1,21 @@ { - "version": "2.0.0", - "tasks": [ - { - "label": "Rebuild", - "type": "shell", - "command": "./scripts/rebuild.sh", - "presentation": { - "reveal": "always", - "panel": "new", - "focus": true, - "showReuseMessage": false - }, - "problemMatcher": [], - "group": { - "kind": "build", - "isDefault": true - } - } - ] -} \ No newline at end of file + "version": "2.0.0", + "tasks": [ + { + "label": "Rebuild", + "type": "shell", + "command": "./scripts/rebuild.sh", + "presentation": { + "reveal": "always", + "panel": "new", + "focus": true, + "showReuseMessage": false + }, + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} diff --git a/modules/home/cliPrograms/fastfetch/config.jsonc b/modules/home/cliPrograms/fastfetch/config.jsonc index 8891d84..7b737c2 100644 --- a/modules/home/cliPrograms/fastfetch/config.jsonc +++ b/modules/home/cliPrograms/fastfetch/config.jsonc @@ -1,42 +1,42 @@ { - "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", - "logo": { - "padding": { - "top": 2 - } - }, - "modules": [ - "title", - "separator", - "os", - "host", - "kernel", - "uptime", - "packages", - "shell", - "editor", - "wm", - "theme", - "font", - "terminal", - { - "type": "display" - }, - { - "type": "cpu", - "showPeCoreCount": true - }, - { - "type": "gpu", - "driverSpecific": true - }, - "memory", - "physicalmemory", - "poweradapter", - "player", - "bluetooth", - "gamepad", - "break", - "colors" - ] -} \ No newline at end of file + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "padding": { + "top": 2 + } + }, + "modules": [ + "title", + "separator", + "os", + "host", + "kernel", + "uptime", + "packages", + "shell", + "editor", + "wm", + "theme", + "font", + "terminal", + { + "type": "display" + }, + { + "type": "cpu", + "showPeCoreCount": true + }, + { + "type": "gpu", + "driverSpecific": true + }, + "memory", + "physicalmemory", + "poweradapter", + "player", + "bluetooth", + "gamepad", + "break", + "colors" + ] +} diff --git a/modules/home/cliPrograms/helix/config.toml b/modules/home/cliPrograms/helix/config.toml index e69de29..8b13789 100644 --- a/modules/home/cliPrograms/helix/config.toml +++ b/modules/home/cliPrograms/helix/config.toml @@ -0,0 +1 @@ + diff --git a/modules/home/desktopPrograms/vscodium/settings.json b/modules/home/desktopPrograms/vscodium/settings.json index f2dae4e..9409ebd 100644 --- a/modules/home/desktopPrograms/vscodium/settings.json +++ b/modules/home/desktopPrograms/vscodium/settings.json @@ -1,32 +1,30 @@ { - "update.mode": "none", - "extensions.autoCheckUpdates": false, - "workbench.iconTheme": "material-icon-theme", - "workbench.productIconTheme": "material-product-icons", - "editor.fontLigatures": true, - "terminal.integrated.fontLigatures": true, - - "workbench.sideBar.location": "right", - "workbench.startupEditor": "welcomePageInEmptyWorkbench", - "editor.formatOnSave": true, - "C_Cpp.clang_format_fallbackStyle": "LLVM", - "nix.enableLanguageServer": true, - "nix.serverPath": "nixd", - "nix.serverSettings": { - "nixd": { - "formatting": { - "command": [ - "nixfmt" - ] - }, - "options": { - "home-manager": { - "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").homeConfigurations.fedfer.options" - }, - "nixos": { - "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options" - } - } - } - } -} \ No newline at end of file + "update.mode": "none", + "extensions.autoCheckUpdates": false, + "workbench.iconTheme": "material-icon-theme", + "workbench.productIconTheme": "material-product-icons", + "editor.fontLigatures": true, + "terminal.integrated.fontLigatures": true, + + "workbench.sideBar.location": "right", + "workbench.startupEditor": "welcomePageInEmptyWorkbench", + "editor.formatOnSave": true, + "C_Cpp.clang_format_fallbackStyle": "LLVM", + "nix.enableLanguageServer": true, + "nix.serverPath": "nixd", + "nix.serverSettings": { + "nixd": { + "formatting": { + "command": ["nixfmt"] + }, + "options": { + "home-manager": { + "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").homeConfigurations.fedfer.options" + }, + "nixos": { + "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options" + } + } + } + } +} diff --git a/modules/home/desktopPrograms/wezterm/wezterm.lua b/modules/home/desktopPrograms/wezterm/wezterm.lua index a61fccf..15a4974 100644 --- a/modules/home/desktopPrograms/wezterm/wezterm.lua +++ b/modules/home/desktopPrograms/wezterm/wezterm.lua @@ -1,6 +1,6 @@ return { - front_end = "WebGpu"; - integrated_title_button_style = "Gnome"; - window_decorations = "TITLE | RESIZE"; - -- nix-replace -} \ No newline at end of file + front_end = "WebGpu", + integrated_title_button_style = "Gnome", + window_decorations = "TITLE | RESIZE", + -- nix-replace +} diff --git a/modules/home/desktopPrograms/zed/settings.json b/modules/home/desktopPrograms/zed/settings.json index fbc6191..8c07e06 100644 --- a/modules/home/desktopPrograms/zed/settings.json +++ b/modules/home/desktopPrograms/zed/settings.json @@ -1,48 +1,48 @@ { - "telemetry": { - "diagnostics": false, - "metrics": false - }, - "auto_update": false, - "project_panel": { - "dock": "right" - }, - "terminal": { - "font_family": "FiraCode Nerd Font Mono", - "env": { - "TERM": "xterm-256color" - } - }, - "features": { - "inline_completion_provider": "none" - }, - "assistant": { - "enabled": false, - "version": "2" - }, - "lsp": { - "rust-analyzer": { - "binary": { - "path": "/home/fedfer/.nix-profile/bin/rust-analyzer" - } - }, - "nixd": { - "formatting": { - "command": ["nixfmt"] - }, - "options": { - "home-manager": { - "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").homeConfigurations.fedfer.options" - }, - "nixos": { - "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options" - } - } - } - }, - "languages": { - "Nix": { - "language_servers": ["nixd", "!nil"] - } - } + "telemetry": { + "diagnostics": false, + "metrics": false + }, + "auto_update": false, + "project_panel": { + "dock": "right" + }, + "terminal": { + "font_family": "FiraCode Nerd Font Mono", + "env": { + "TERM": "xterm-256color" + } + }, + "features": { + "inline_completion_provider": "none" + }, + "assistant": { + "enabled": false, + "version": "2" + }, + "lsp": { + "rust-analyzer": { + "binary": { + "path": "/home/fedfer/.nix-profile/bin/rust-analyzer" + } + }, + "nixd": { + "formatting": { + "command": ["nixfmt"] + }, + "options": { + "home-manager": { + "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").homeConfigurations.fedfer.options" + }, + "nixos": { + "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options" + } + } + } + }, + "languages": { + "Nix": { + "language_servers": ["nixd", "!nil"] + } + } } diff --git a/modules/home/niri/swaylock.json b/modules/home/niri/swaylock.json index 9e26dfe..0967ef4 100644 --- a/modules/home/niri/swaylock.json +++ b/modules/home/niri/swaylock.json @@ -1 +1 @@ -{} \ No newline at end of file +{} diff --git a/modules/home/niri/waybar.json b/modules/home/niri/waybar.json index 4e63381..b933db1 100644 --- a/modules/home/niri/waybar.json +++ b/modules/home/niri/waybar.json @@ -2,22 +2,9 @@ "layer": "top", "position": "top", "spacing": 10, - "modules-left": [ - "niri/workspaces" - ], - "modules-center": [ - "clock#1", - "clock#2", - "clock#3" - ], - "modules-right": [ - "pulseaudio", - "memory", - "cpu", - "battery", - "disk", - "tray" - ], + "modules-left": ["niri/workspaces"], + "modules-center": ["clock#1", "clock#2", "clock#3"], + "modules-right": ["pulseaudio", "memory", "cpu", "battery", "disk", "tray"], "sway/workspaces": { "disable-scroll": true, "format": "{name}" @@ -40,10 +27,7 @@ "format-muted": "", "format-icons": { "headphones": "", - "default": [ - "", - "" - ] + "default": ["", ""] }, "scroll-step": 5, "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", @@ -65,13 +49,7 @@ "critical": 15 }, "format": "{icon} {capacity}%", - "format-icons": [ - "", - "", - "", - "", - "" - ] + "format-icons": ["", "", "", "", ""] }, "disk": { "interval": 5, @@ -82,4 +60,4 @@ "icon-size": 22, "spacing": 6 } -} \ No newline at end of file +}