switch to the rfc nixfmt version and reformatted repository
This commit is contained in:
parent
f4f53659bd
commit
c6a31bb751
GPG key ID:
0EC431A8DA8F8087
22 changed files with 402 additions and 266 deletions
|
|
@ -1,22 +1,21 @@
|
|||
{ pkgs, config, user, ... }: {
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
user,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.username = user;
|
||||
home.homeDirectory = "/home/${user}";
|
||||
|
||||
home.file = {
|
||||
".face.icon".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/assets/img/clownfish.png";
|
||||
".config/fastfetch/config.jsonc".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/fastfetch.jsonc";
|
||||
".psqlrc".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/.psqlrc";
|
||||
".config/btop/btop.conf".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/btop.conf";
|
||||
".config/btop/themes/catppuccin_mocha.theme".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/btop.theme";
|
||||
".config/glow/glow.yml".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/glow.yml";
|
||||
".config/glow/theme.json".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/glow.json";
|
||||
".face.icon".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/assets/img/clownfish.png";
|
||||
".config/fastfetch/config.jsonc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/fastfetch.jsonc";
|
||||
".psqlrc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/.psqlrc";
|
||||
".config/btop/btop.conf".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/btop.conf";
|
||||
".config/btop/themes/catppuccin_mocha.theme".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/btop.theme";
|
||||
".config/glow/glow.yml".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/glow.yml";
|
||||
".config/glow/theme.json".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/glow.json";
|
||||
};
|
||||
|
||||
# link the configuration file in current directory to the specified location in home directory
|
||||
|
|
@ -49,19 +48,32 @@
|
|||
userName = user;
|
||||
userEmail = "seaswimmerthefsh@gmail.com";
|
||||
extraConfig = {
|
||||
commit = { gpgsign = true; };
|
||||
commit = {
|
||||
gpgsign = true;
|
||||
};
|
||||
signing = {
|
||||
signByDefault = true;
|
||||
};
|
||||
init = { defaultBranch = "master"; };
|
||||
safe = { directory = "/etc/nixos"; };
|
||||
init = {
|
||||
defaultBranch = "master";
|
||||
};
|
||||
safe = {
|
||||
directory = "/etc/nixos";
|
||||
};
|
||||
url = {
|
||||
"git@coastalcommits.com:" = {
|
||||
insteadOf =
|
||||
[ "https://www.coastalcommits.com/" "cc:" "coastalcommits:" ];
|
||||
insteadOf = [
|
||||
"https://www.coastalcommits.com/"
|
||||
"cc:"
|
||||
"coastalcommits:"
|
||||
];
|
||||
};
|
||||
"git@github.com:" = {
|
||||
insteadOf = [ "https://github.com/" "gh:" "github:" ];
|
||||
insteadOf = [
|
||||
"https://github.com/"
|
||||
"gh:"
|
||||
"github:"
|
||||
];
|
||||
};
|
||||
};
|
||||
hub.protocol = "ssh";
|
||||
|
|
|
|||
|
|
@ -1,39 +1,64 @@
|
|||
{ pkgs, config, system, inputs, ... }: rec {
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
system,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
rec {
|
||||
|
||||
# Make VSCode config writable
|
||||
# https://github.com/nix-community/home-manager/issues/1800#issuecomment-2262881846
|
||||
home.activation.makeVSCodeConfigWritable = let
|
||||
configDirName = {
|
||||
"vscode" = "Code";
|
||||
"vscode-insiders" = "Code - Insiders";
|
||||
"vscodium" = "VSCodium";
|
||||
}.${programs.vscode.package.pname};
|
||||
configPath = "${config.xdg.configHome}/${configDirName}/User/settings.json";
|
||||
in {
|
||||
after = [ "writeBoundary" ];
|
||||
before = [ ];
|
||||
data = ''
|
||||
install -m 0640 "$(readlink ${configPath})" ${configPath}
|
||||
'';
|
||||
};
|
||||
home.activation.makeVSCodeConfigWritable =
|
||||
let
|
||||
configDirName =
|
||||
{
|
||||
"vscode" = "Code";
|
||||
"vscode-insiders" = "Code - Insiders";
|
||||
"vscodium" = "VSCodium";
|
||||
}
|
||||
.${programs.vscode.package.pname};
|
||||
configPath = "${config.xdg.configHome}/${configDirName}/User/settings.json";
|
||||
in
|
||||
{
|
||||
after = [ "writeBoundary" ];
|
||||
before = [ ];
|
||||
data = ''
|
||||
install -m 0640 "$(readlink ${configPath})" ${configPath}
|
||||
'';
|
||||
};
|
||||
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscode.fhsWithPackages
|
||||
(ps: with pkgs; [ dotnetCorePackages.sdk_8_0 jdk21 go ]);
|
||||
package = pkgs.vscode.fhsWithPackages (
|
||||
ps: with pkgs; [
|
||||
dotnetCorePackages.sdk_8_0
|
||||
jdk21
|
||||
go
|
||||
]
|
||||
);
|
||||
extensions =
|
||||
with inputs.nix-vscode-extensions.extensions.${system}.vscode-marketplace;
|
||||
with inputs.nix-vscode-extensions.extensions.${system}.vscode-marketplace-release; [
|
||||
with inputs.nix-vscode-extensions.extensions.${system}.vscode-marketplace-release;
|
||||
[
|
||||
# Themes
|
||||
(pkgs.catppuccin-vsc.override {
|
||||
accent = "blue";
|
||||
extraBordersEnabled = true;
|
||||
italicKeywords = false;
|
||||
customUIColors = {
|
||||
mocha = { "statusBar.foreground" = "accent"; };
|
||||
macchiato = { "statusBar.foreground" = "accent"; };
|
||||
frappe = { "statusBar.foreground" = "accent"; };
|
||||
latte = { "statusBar.foreground" = "accent"; };
|
||||
mocha = {
|
||||
"statusBar.foreground" = "accent";
|
||||
};
|
||||
macchiato = {
|
||||
"statusBar.foreground" = "accent";
|
||||
};
|
||||
frappe = {
|
||||
"statusBar.foreground" = "accent";
|
||||
};
|
||||
latte = {
|
||||
"statusBar.foreground" = "accent";
|
||||
};
|
||||
};
|
||||
})
|
||||
catppuccin.catppuccin-vsc-icons
|
||||
|
|
@ -185,15 +210,21 @@
|
|||
}
|
||||
{
|
||||
"scope" = "variable.other.readwrite";
|
||||
"settings" = { "foreground" = "#82eaf0"; };
|
||||
"settings" = {
|
||||
"foreground" = "#82eaf0";
|
||||
};
|
||||
}
|
||||
{
|
||||
"scope" = "keyword.operator";
|
||||
"settings" = { "foreground" = "#EBA0AC"; };
|
||||
"settings" = {
|
||||
"foreground" = "#EBA0AC";
|
||||
};
|
||||
}
|
||||
{
|
||||
"scope" = "meta.block.paradox";
|
||||
"settings" = { "foreground" = "#EBA0AC"; };
|
||||
"settings" = {
|
||||
"foreground" = "#EBA0AC";
|
||||
};
|
||||
}
|
||||
{
|
||||
"scope" = "meta.shebang.shell";
|
||||
|
|
@ -210,13 +241,16 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
"scope" =
|
||||
"string.quoted.double.shell variable.other.normal.shell";
|
||||
"settings" = { "foreground" = "#82e5f0"; };
|
||||
"scope" = "string.quoted.double.shell variable.other.normal.shell";
|
||||
"settings" = {
|
||||
"foreground" = "#82e5f0";
|
||||
};
|
||||
}
|
||||
{
|
||||
"scope" = "variable.other.property.ts";
|
||||
"settings" = { "foreground" = "#32d5e7"; };
|
||||
"settings" = {
|
||||
"foreground" = "#32d5e7";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
@ -245,7 +279,9 @@
|
|||
"editor.formatOnSaveMode" = "file";
|
||||
"files.autoSave" = "onFocusChange";
|
||||
};
|
||||
"[markdown]" = { "files.trimTrailingWhitespace" = false; };
|
||||
"[markdown]" = {
|
||||
"files.trimTrailingWhitespace" = false;
|
||||
};
|
||||
"yaml.schemas" = {
|
||||
"https://json.schemastore.org/github-workflow.json" = [
|
||||
".github/workflows/*.{yml,yaml}"
|
||||
|
|
@ -256,29 +292,23 @@
|
|||
"yaml.schemaStore.enable" = true;
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverSettings" = {
|
||||
"nil" = { "formatting" = { "command" = [ "nixfmt" ]; }; };
|
||||
"nil" = {
|
||||
"formatting" = {
|
||||
"command" = [ "nixfmt" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
"nix.serverPath" = "nil";
|
||||
"vscord.status.image.large.debugging.key" =
|
||||
"https://vscord.catppuccin.com/mocha/debugging.webp";
|
||||
"vscord.status.image.large.editing.key" =
|
||||
"https://vscord.catppuccin.com/mocha/{lang}.webp";
|
||||
"vscord.status.image.large.idle.key" =
|
||||
"https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
|
||||
"vscord.status.image.large.notInFile.key" =
|
||||
"https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
|
||||
"vscord.status.image.large.viewing.key" =
|
||||
"https://vscord.catppuccin.com/mocha/{lang}.webp";
|
||||
"vscord.status.image.small.debugging.key" =
|
||||
"https://vscord.catppuccin.com/mocha/debugging.webp";
|
||||
"vscord.status.image.small.editing.key" =
|
||||
"https://vscord.catppuccin.com/mocha/{app_id}.webp";
|
||||
"vscord.status.image.small.idle.key" =
|
||||
"https://vscord.catppuccin.com/mocha/idle.webp";
|
||||
"vscord.status.image.small.notInFile.key" =
|
||||
"https://vscord.catppuccin.com/mocha/idle.webp";
|
||||
"vscord.status.image.small.viewing.key" =
|
||||
"https://vscord.catppuccin.com/mocha/{app_id}.webp";
|
||||
"vscord.status.image.large.debugging.key" = "https://vscord.catppuccin.com/mocha/debugging.webp";
|
||||
"vscord.status.image.large.editing.key" = "https://vscord.catppuccin.com/mocha/{lang}.webp";
|
||||
"vscord.status.image.large.idle.key" = "https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
|
||||
"vscord.status.image.large.notInFile.key" = "https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
|
||||
"vscord.status.image.large.viewing.key" = "https://vscord.catppuccin.com/mocha/{lang}.webp";
|
||||
"vscord.status.image.small.debugging.key" = "https://vscord.catppuccin.com/mocha/debugging.webp";
|
||||
"vscord.status.image.small.editing.key" = "https://vscord.catppuccin.com/mocha/{app_id}.webp";
|
||||
"vscord.status.image.small.idle.key" = "https://vscord.catppuccin.com/mocha/idle.webp";
|
||||
"vscord.status.image.small.notInFile.key" = "https://vscord.catppuccin.com/mocha/idle.webp";
|
||||
"vscord.status.image.small.viewing.key" = "https://vscord.catppuccin.com/mocha/{app_id}.webp";
|
||||
"git.enableSmartCommit" = true;
|
||||
"git.autofetch" = true;
|
||||
"git.confirmSync" = false;
|
||||
|
|
@ -292,20 +322,21 @@
|
|||
"editor.accessibilitySupport" = "off";
|
||||
"git.inputValidationSubjectLength" = null;
|
||||
"git.inputValidationLength" = 150;
|
||||
"editor.fontLigatures" =
|
||||
"'cv01', 'cv02', 'ss05', 'ss08', 'ss03', 'cv29', 'cv30', 'cv11'";
|
||||
"editor.fontLigatures" = "'cv01', 'cv02', 'ss05', 'ss08', 'ss03', 'cv29', 'cv30', 'cv11'";
|
||||
"workbench.iconTheme" = "catppuccin-latte";
|
||||
"catppuccin.syncWithIconPack" = false;
|
||||
"catppuccin.syncWithIconPack" = false;
|
||||
"codesnap.shutterAction" = "copy";
|
||||
"codesnap.transparentBackground" = true;
|
||||
"codesnap.realLineNumbers" = true;
|
||||
"codesnap.roundedCorners" = true;
|
||||
"codesnap.showWindowTitle" = true;
|
||||
"codesnap.showWindowControls" = false;
|
||||
"gitlens.remotes" = [{
|
||||
"domain" = "www.coastalcommits.com";
|
||||
"type" = "Gitea";
|
||||
}];
|
||||
"gitlens.remotes" = [
|
||||
{
|
||||
"domain" = "www.coastalcommits.com";
|
||||
"type" = "Gitea";
|
||||
}
|
||||
];
|
||||
"markdownlint.config" = {
|
||||
"ol-prefix" = false;
|
||||
"html" = false;
|
||||
|
|
@ -326,26 +357,27 @@
|
|||
"**/xonsh/*.py" = "xonsh";
|
||||
};
|
||||
"editor.semanticHighlighting.enabled" = true;
|
||||
"[css]" = { "editor.defaultFormatter" = "vscode.css-language-features"; };
|
||||
"[css]" = {
|
||||
"editor.defaultFormatter" = "vscode.css-language-features";
|
||||
};
|
||||
"git.ignoreRebaseWarning" = true;
|
||||
"remote.autoForwardPortsSource" = "hybrid";
|
||||
"git.replaceTagsWhenPull" = true;
|
||||
"redhat.telemetry.enabled" = true;
|
||||
"editor.fontSize" = 14;
|
||||
"workbench.colorTheme" = "Catppuccin Mocha";
|
||||
"editor.codeLensFontFamily" =
|
||||
"'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
|
||||
"editor.inlayHints.fontFamily" =
|
||||
"'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font', 'FiraCode Nerd Font Light'";
|
||||
"editor.fontFamily" =
|
||||
"'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
|
||||
"editor.codeLensFontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
|
||||
"editor.inlayHints.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font', 'FiraCode Nerd Font Light'";
|
||||
"editor.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
|
||||
"explorer.confirmDelete" = false;
|
||||
"window.confirmSaveUntitledWorkspace" = false;
|
||||
"cwtools.cache.stellaris" = "/bulk/steam/steamapps/common/Stellaris";
|
||||
"python.analysis.inlayHints.callArgumentNames" = "partial";
|
||||
"python.analysis.inlayHints.functionReturnTypes" = true;
|
||||
"explorer.confirmDragAndDrop" = false;
|
||||
"editor.unicodeHighlight.allowedLocales" = { ru = true; };
|
||||
"editor.unicodeHighlight.allowedLocales" = {
|
||||
ru = true;
|
||||
};
|
||||
"terminal.integrated.defaultProfile.linux" = "xonsh";
|
||||
"explorer.confirmPasteNative" = false;
|
||||
"editor.renderWhitespace" = "none";
|
||||
|
|
@ -355,8 +387,7 @@
|
|||
"*.jsx" = "\${capture}.js";
|
||||
"*.tsx" = "\${capture}.ts";
|
||||
"tsconfig.json" = "tsconfig.*.json";
|
||||
"package.json" =
|
||||
"package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb";
|
||||
"package.json" = "package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb";
|
||||
"Cargo.toml" = "Cargo.lock";
|
||||
"*.sqlite" = "\${capture}.\${extname}-*";
|
||||
"*.db" = "\${capture}.\${extname}-*";
|
||||
|
|
@ -369,7 +400,9 @@
|
|||
"editor.defaultFormatter" = "shakram02.bash-beautify";
|
||||
};
|
||||
"vscord.app.name" = "Visual Studio Code";
|
||||
"workbench.editorAssociations" = { "*.db" = "sqlite3-editor.editor"; };
|
||||
"workbench.editorAssociations" = {
|
||||
"*.db" = "sqlite3-editor.editor";
|
||||
};
|
||||
"vs-code-prettier-eslint.prettierLast" = false;
|
||||
"typescript.updateImportsOnFileMove.enabled" = "always";
|
||||
"supermaven.allowGitignore" = true;
|
||||
|
|
@ -380,11 +413,14 @@
|
|||
"editor.defaultFormatter" = "vscode.json-language-features";
|
||||
};
|
||||
"go.toolsManagement.autoUpdate" = true;
|
||||
"remote.SSH.remotePlatform" = { "eclipse" = "linux"; };
|
||||
"remote.SSH.remotePlatform" = {
|
||||
"eclipse" = "linux";
|
||||
};
|
||||
"terminal.integrated.fontWeightBold" = "bold";
|
||||
"terminal.integrated.fontFamily" =
|
||||
"'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
|
||||
"[jsonc]" = { "editor.defaultFormatter" = "esbenp.prettier-vscode"; };
|
||||
"terminal.integrated.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
|
||||
"[jsonc]" = {
|
||||
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue