diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix index 107c116..91e7897 100644 --- a/home/qenya/vscode.nix +++ b/home/qenya/vscode.nix @@ -20,16 +20,29 @@ in ]; mutableExtensionsDir = false; userSettings = { - "[go]" = { - "editor.defaultFormatter" = "golang.go"; - "editor.formatOnSave" = false; - }; "extensions.autoUpdate" = false; + "files.insertFinalNewline" = true; "git.autofetch" = true; "git.confirmSync" = false; "git.enableSmartCommit" = true; "git.inputValidation" = true; "git.inputValidationSubjectLength" = null; + "javascript.updateImportsOnFileMove.enabled" = "always"; + "nix.enableLanguageServer" = true; + "nix.serverPath" = "${pkgs.nil}/bin/nil"; + "nix.serverSettings".nil = { + diagnostics.ignored = [ "unused_binding" "unused_with" ]; + formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ]; + nix.flake.autoArchive = true; + }; + "terminal.integrated.allowChords" = false; + "terminal.integrated.defaultProfile.linux" = "zsh"; + "workbench.colorTheme" = "Gruvbox Dark Medium"; + + "[go]" = { + "editor.defaultFormatter" = "golang.go"; + "editor.formatOnSave" = false; + }; "go.alternateTools" = { "go" = "${pkgs.go}/bin/go"; "golangci-lint" = "${pkgs.golangci-lint}/bin/golangci-lint"; @@ -43,17 +56,6 @@ in "formatting.gofumpt" = true; "ui.semanticTokens" = true; }; - "javascript.updateImportsOnFileMove.enabled" = "always"; - "nix.enableLanguageServer" = true; - "nix.serverPath" = "${pkgs.nil}/bin/nil"; - "nix.serverSettings".nil = { - diagnostics.ignored = [ "unused_binding" "unused_with" ]; - formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ]; - nix.flake.autoArchive = true; - }; - "terminal.integrated.allowChords" = false; - "terminal.integrated.defaultProfile.linux" = "zsh"; - "workbench.colorTheme" = "Gruvbox Dark Medium"; }; }; } diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix index e4f9c8e..3bb4c52 100644 --- a/hosts/tohru/default.nix +++ b/hosts/tohru/default.nix @@ -26,9 +26,8 @@ in console.keyMap = "uk"; services.xserver.xkb.layout = "gb"; - # tohru does not have the resources to run these under other load and is generally powered off when not in use. - # instead, just run `nix-collect-garbage -d` and `nix-store --optimise` every so often. - nix.gc.automatic = mkForce false; + # tohru does not have the resources to run this under other load and is generally powered off when not in use. + # instead, just run `nix-store --optimise` every so often. nix.optimise.automatic = mkForce false; fountain.users.qenya.enable = true;