diff --git a/modules/home/default.nix b/modules/home/default.nix index 5425480..adf140a 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,28 +1,26 @@ -{ inputs, ... }: -{ +{inputs, ...}: { imports = - [ (import ./waybar) ] - ++ [ (import ./firefox) ] - # ++ [ (import ./vscode) ] - ++ [ (import ./chromium) ] - ++ [ (import ./hyprland) ] - ++ [ (import ./gaming) ] - ++ [ (import ./git) ] - ++ [ (import ./btop) ] - ++ [ (import ./bat) ] - ++ [ (import ./cava) ] - ++ [ (import ./kitty) ] - ++ [ (import ./foot) ] - ++ [ (import ./swaylock) ] - ++ [ (import ./wofi) ] - ++ [ (import ./zsh) ] - ++ [ (import ./gtk) ] - ++ [ (import ./mako) ] - ++ [ (import ./scripts) ] - ++ [ (import ./neofetch) ] - ++ [ (import ./starship) ] - ++ [ (import ./wlogout) ] - ++ [ (import ./nvim) ] - ++ [ (import ./package) ]; - + [(import ./waybar)] + ++ [(import ./firefox)] + ++ [(import ./vscode)] + ++ [(import ./chromium)] + ++ [(import ./hyprland)] + ++ [(import ./gaming)] + ++ [(import ./git)] + ++ [(import ./btop)] + ++ [(import ./bat)] + ++ [(import ./cava)] + ++ [(import ./kitty)] + # ++ [(import ./foot)] + ++ [(import ./swaylock)] + ++ [(import ./wofi)] + ++ [(import ./zsh)] + ++ [(import ./gtk)] + ++ [(import ./mako)] + ++ [(import ./scripts)] + ++ [(import ./neofetch)] + ++ [(import ./starship)] + ++ [(import ./wlogout)] + ++ [(import ./nvim)] + ++ [(import ./package)]; } diff --git a/modules/home/package/default.nix b/modules/home/package/default.nix index c50c257..ee4fa89 100755 --- a/modules/home/package/default.nix +++ b/modules/home/package/default.nix @@ -13,7 +13,7 @@ ripgrep rnix-lsp rustup - vscode + # vscode xfce.thunar bleachbit diff --git a/modules/home/vscode/default.nix b/modules/home/vscode/default.nix index 12f8421..0179bf9 100644 --- a/modules/home/vscode/default.nix +++ b/modules/home/vscode/default.nix @@ -3,17 +3,27 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions;[ - esbenp.prettier-vscode - bradlc.vscode-tailwindcss - jnoortheen.nix-ide - ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "min-theme"; - publisher = "miguelsolorio"; - version = "1.5.0"; - sha256 = "DF/9OlWmjmnZNRBs2hk0qEWN38RcgacdVl9e75N8ZMY="; - } + extensions = with pkgs.vscode-extensions; [ + bbenoist.nix + catppuccin.catppuccin-vsc + vscode-icons-team.vscode-icons ]; + userSettings = { + "update.mode" = "none"; + "extensions.autoUpdate" = false; # This stuff fixes vscode freaking out when theres an update + + "window.menuBarVisibility" = "toggle"; + "editor.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont', 'monospace', monospace"; + "terminal.integrated.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont'"; + "workbench.colorTheme" = "Catppuccin Mocha"; + "workbench.iconTheme" = "vscode-icons"; + "vsicons.dontShowNewVersionMessage" = true; + "editor.fontLigatures" = true; + "editor.minimap.enabled" = false; + + "window.titleBarStyle" = "custom"; # needed otherwise vscode crashes, see https://github.com/NixOS/nixpkgs/issues/246509 + + "editor.action.commentLine" = "ctrl+d"; + }; }; }