From b7344d42acf857a475b2466697e93c1380239930 Mon Sep 17 00:00:00 2001 From: Veneficium <85629831+veneficium42@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:24:39 +0200 Subject: [PATCH] update: move vscodium config to json file --- .../desktopPrograms/vscodium.nix | 73 ------------------- .../desktopPrograms/vscodium/settings.json | 39 ++++++++++ .../desktopPrograms/vscodium/vscodium.nix | 37 ++++++++++ hosts/main-laptop/home.nix | 2 +- 4 files changed, 77 insertions(+), 74 deletions(-) delete mode 100644 homeManagerModules/desktopPrograms/vscodium.nix create mode 100644 homeManagerModules/desktopPrograms/vscodium/settings.json create mode 100644 homeManagerModules/desktopPrograms/vscodium/vscodium.nix diff --git a/homeManagerModules/desktopPrograms/vscodium.nix b/homeManagerModules/desktopPrograms/vscodium.nix deleted file mode 100644 index dc0e42b..0000000 --- a/homeManagerModules/desktopPrograms/vscodium.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ pkgs, ... }: -{ - #The VSCoderrrrrrrr - #codepilled nixmaxxer - #god I love tumblr - #tumblrpilled mememaxxer - - programs.vscode = { - enable = true; - package = pkgs.vscodium; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; - mutableExtensionsDir = false; - - extensions = - with pkgs.vscode-extensions; - [ - ms-vscode.cpptools - ms-vscode.live-server - mhutchie.git-graph - pkief.material-icon-theme - pkief.material-product-icons - oderwat.indent-rainbow - bierner.markdown-emoji - bierner.emojisense - jnoortheen.nix-ide - rust-lang.rust-analyzer - biomejs.biome - ] - ++ (with pkgs.open-vsx; [ - jeanp413.open-remote-ssh - antfu.unocss - ]); - - userSettings = { - "workbench.iconTheme" = "material-icon-theme"; - "workbench.productIconTheme" = "material-product-icons"; - - "terminal.integrated.fontFamily" = "FiraCode Nerd Font"; - "terminal.integrated.fontSize" = 14; - "terminal.integrated.fontWeight" = 500; - "editor.fontFamily" = "FiraCode Nerd Font Mono"; - "editor.fontLigatures" = true; - - "editor.formatOnSave" = true; - "workbench.sideBar.location" = "right"; - "workbench.startupEditor" = "welcomePageInEmptyWorkbench"; - - "nix.enableLanguageServer" = true; - "nix.serverPath" = "nixd"; - "nix.serverSettings" = { - "nixd" = { - "formatting" = { - "command" = [ "nixfmt" ]; - }; - "options" = { - #// By default, this entriy will be read from `import { }` - #// You can write arbitary nix expression here, to produce valid "options" declaration result. - #// Tip: for flake-based configuration, utilize `builtins.getFlake` - "nixos" = { - "expr" = "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options"; - }; - "home-manager" = { - "expr" = "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").homeConfigurations.fedfer.options"; - }; - }; - }; - }; - - "C_Cpp.clang_format_fallbackStyle" = "LLVM"; - }; - }; -} diff --git a/homeManagerModules/desktopPrograms/vscodium/settings.json b/homeManagerModules/desktopPrograms/vscodium/settings.json new file mode 100644 index 0000000..c99cf78 --- /dev/null +++ b/homeManagerModules/desktopPrograms/vscodium/settings.json @@ -0,0 +1,39 @@ +{ + "update.mode": "none", + "extensions.autoCheckUpdates": false, + + "workbench.iconTheme": "material-icon-theme", + "workbench.productIconTheme": "material-product-icons", + + "terminal.integrated.fontFamily": "FiraCode Nerd Font", + "terminal.integrated.fontSize": 14, + "terminal.integrated.fontWeight": 500, + "editor.fontFamily": "FiraCode Nerd Font Mono", + "editor.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 diff --git a/homeManagerModules/desktopPrograms/vscodium/vscodium.nix b/homeManagerModules/desktopPrograms/vscodium/vscodium.nix new file mode 100644 index 0000000..2800304 --- /dev/null +++ b/homeManagerModules/desktopPrograms/vscodium/vscodium.nix @@ -0,0 +1,37 @@ +{ pkgs, ... }: +{ + #The VSCoderrrrrrrr + #codepilled nixmaxxer + #god I love tumblr + #tumblrpilled mememaxxer + + programs.vscode = { + enable = true; + package = pkgs.vscodium; + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + mutableExtensionsDir = false; + + extensions = + with pkgs.vscode-extensions; + [ + ms-vscode.cpptools + ms-vscode.live-server + mhutchie.git-graph + pkief.material-icon-theme + pkief.material-product-icons + oderwat.indent-rainbow + bierner.markdown-emoji + bierner.emojisense + jnoortheen.nix-ide + rust-lang.rust-analyzer + biomejs.biome + ] + ++ (with pkgs.open-vsx; [ + jeanp413.open-remote-ssh + antfu.unocss + ]); + + userSettings = builtins.fromJSON (builtins.readFile ./settings.json); + }; +} diff --git a/hosts/main-laptop/home.nix b/hosts/main-laptop/home.nix index 8b67f4e..29a229e 100644 --- a/hosts/main-laptop/home.nix +++ b/hosts/main-laptop/home.nix @@ -6,7 +6,7 @@ ../../homeManagerModules/starship.nix ../../homeManagerModules/desktopPrograms/essentials/firefox.nix - ../../homeManagerModules/desktopPrograms/vscodium.nix + ../../homeManagerModules/desktopPrograms/vscodium/vscodium.nix ../../homeManagerModules/desktopPrograms/amberol.nix ../../homeManagerModules/cliPrograms/hyfetch.nix