diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/aerospace.nix | 4 | ||||
| -rw-r--r-- | modules/default.nix | 1 | ||||
| -rw-r--r-- | modules/foot.nix | 2 | ||||
| -rw-r--r-- | modules/vscode.nix | 76 | ||||
| -rw-r--r-- | modules/wezterm.nix | 6 |
5 files changed, 44 insertions, 45 deletions
diff --git a/modules/aerospace.nix b/modules/aerospace.nix index 34e7bf4..6c1164e 100644 --- a/modules/aerospace.nix +++ b/modules/aerospace.nix @@ -1,8 +1,8 @@ { config, pkgs, lib, ...}: { - config.aerospace.enable = lib.mkEnableOption "Enalbe aerospace and setup"; - config.enable = lib.mkIf config.aerospace.enable { + options.aerospace.enable = lib.mkEnableOption "Enalbe aerospace and setup"; + config = lib.mkIf config.aerospace.enable { programs.aerospace = { enable = true; userSettings = { diff --git a/modules/default.nix b/modules/default.nix index 911b8b1..ccd3b8f 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -16,5 +16,6 @@ ./wezterm.nix ./firefox.nix ./nvf.nix + ./aerospace.nix ]; } diff --git a/modules/foot.nix b/modules/foot.nix index 880342f..69f6bf2 100644 --- a/modules/foot.nix +++ b/modules/foot.nix @@ -4,7 +4,7 @@ options.foot.enable = lib.mkEnableOption "Enable and configure the Foot terminal emulator"; config = lib.mkIf config.foot.enable { home.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "SpaceMono" "IBMPlexMono" "Terminus" ]; }) + nerd-fonts.space-mono ]; programs.foot = { diff --git a/modules/vscode.nix b/modules/vscode.nix index ee46ca5..3dd2541 100644 --- a/modules/vscode.nix +++ b/modules/vscode.nix @@ -5,45 +5,47 @@ config = lib.mkIf config.vscode.enable { programs.vscode = { enable = true; - enableUpdateCheck = true; - enableExtensionUpdateCheck = true; mutableExtensionsDir = false; - - userSettings = { - "extensions.autoCheckUpdates" = false; - "workbench.colorTheme" = "Minimal"; - "editor.fontFamily" = "'SpaceMono Nerd Font Mono', monospace"; - "editor.tabSize" = 2; - "editor.minimap.enabled" = false; - "terminal.integrated.cursorStyle" = "underline"; - "terminal.integrated.cursorStyleInactive" = "underline"; - "terminal.integrated.fontFamily" = "'BlexMono Nerd Font Mono', monospace"; - "terminal.integrated.fontSize" = 13; - "git.autofetch" = true; - "window.controlsStyle" = "custom"; - }; + profiles.default = { + enableUpdateCheck = true; + enableExtensionUpdateCheck = true; + + userSettings = { + "update.mode" = "none"; + "workbench.colorTheme" = "Minimal"; + "editor.fontFamily" = "'SpaceMono Nerd Font Mono', monospace"; + "editor.tabSize" = 2; + "editor.minimap.enabled" = false; + "terminal.integrated.cursorStyle" = "underline"; + "terminal.integrated.cursorStyleInactive" = "underline"; + "terminal.integrated.fontFamily" = "'BlexMono Nerd Font Mono', monospace"; + "terminal.integrated.fontSize" = 13; + "git.autofetch" = true; + "window.controlsStyle" = "custom"; + }; - extensions = (with pkgs.vscode-extensions; [ - ms-vscode.cmake-tools - ms-azuretools.vscode-docker - eamodio.gitlens - ms-python.python - golang.go - rust-lang.rust-analyzer - vscjava.vscode-maven - sumneko.lua - #fwcd.kotlin - bradlc.vscode-tailwindcss - adpyke.codesnap - esbenp.prettier-vscode - ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "minimalist-dark"; - publisher = "nichabosh"; - version = "1.0.0"; - sha256 = "sha256-lw+Scfada6DycLdRT2Cz+Fd12JucglIrw3uRd2ZhabQ="; - } - ]); + extensions = (with pkgs.vscode-extensions; [ + ms-vscode.cmake-tools + ms-azuretools.vscode-docker + eamodio.gitlens + ms-python.python + golang.go + rust-lang.rust-analyzer + vscjava.vscode-maven + sumneko.lua + #fwcd.kotlin + bradlc.vscode-tailwindcss + adpyke.codesnap + esbenp.prettier-vscode + ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "minimalist-dark"; + publisher = "nichabosh"; + version = "1.0.0"; + sha256 = "sha256-lw+Scfada6DycLdRT2Cz+Fd12JucglIrw3uRd2ZhabQ="; + } + ]); + }; }; }; } diff --git a/modules/wezterm.nix b/modules/wezterm.nix index ca19e1a..b0fca5a 100644 --- a/modules/wezterm.nix +++ b/modules/wezterm.nix @@ -3,10 +3,6 @@ { options.wezterm.enable = lib.mkEnableOption "Enable wezterm and setup"; config = lib.mkIf config.wezterm.enable { - home.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "SpaceMono" "IBMPlexMono" "Terminus" ]; }) - ]; - programs.wezterm = { enable = true; enableZshIntegration = true; @@ -27,4 +23,4 @@ ''; }; }; -}
\ No newline at end of file +} |