RGBCube/ncc
1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 03:27:45 +00:00
Code Issues Activity

Update flake

Browse source
This commit is contained in:
RGBCube 2025-01-24 23:50:51 +03:00
parent fa80a17f59
commit 0d22d39a83
7 changed files with 120 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/common/git.nix
View file

@ -63,9 +63,9 @@ in {
gst = "git status";
} <| mkIf config.isDesktop {
"\"??\"" = "gh copilot suggest --target shell";
"\"gh?\"" = "gh copilot suggest --target gh";
"\"git?\"" = "gh copilot suggest --target git";
"??" = "gh copilot suggest --target shell --";
"gh?" = "gh copilot suggest --target gh --";
"git?" = "gh copilot suggest --target git --";
};
environment.systemPackages = [

116
modules/common/helix.nix → modules/common/helix/default.nix
View file

@ -6,25 +6,25 @@ in {
shellAliases.x = "hx";
};
nixpkgs.overlays = [(self: super: {
helix = super.helix.overrideAttrs (old: {
version = "25.01.1";
# nixpkgs.overlays = [(self: super: {
# helix = super.helix.overrideAttrs (old: {
# version = "25.01.1";
src = self.fetchzip {
url = "https://github.com/cull-os/helix/releases/download/ci-release-25.01.1/helix-ci-release-25.01.1-source.tar.xz";
hash = "sha256-bvlzXRAdPvz8P49KENSw9gupQNaUm/+3eZZ1q7+fTsw=";
stripRoot = false;
};
# src = self.fetchzip {
# url = "https://github.com/cull-os/helix/releases/download/ci-release-25.01.1/helix-ci-release-25.01.1-source.tar.xz";
# hash = "sha256-bvlzXRAdPvz8P49KENSw9gupQNaUm/+3eZZ1q7+fTsw=";
# stripRoot = false;
# };
# TODO: Delete this as this was fixed on latest unstable.
preVersionCheck = "";
# # TODO: Delete this as this was fixed on latest unstable.
# preVersionCheck = "";
cargoDeps = super.helix.cargoDeps.overrideAttrs (_: {
inherit (self.helix) src;
outputHash = "sha256-O5ECrKyF9x5r7w9wMIqbYYuGFIeUaRgtzDfYK9dFjp4=";
});
});
})];
# cargoDeps = super.helix.cargoDeps.overrideAttrs (_: {
# inherit (self.helix) src;
# outputHash = "sha256-O5ECrKyF9x5r7w9wMIqbYYuGFIeUaRgtzDfYK9dFjp4=";
# });
# });
# })];
home-manager.sharedModules = [{
@ -68,11 +68,6 @@ in {
formatter = prettier name;
}) [ "css" "scss" "yaml" ];
in denoFormatterLanguages ++ prettierLanguages ++ [
{
name = "nix";
auto-format = false;
formatter.command = "alejandra";
}
{
name = "html";
# Added vto.
@ -104,33 +99,74 @@ in {
formatter = denoFormatter "tsx";
language-servers = [ "deno" ];
}
# NON-DENO
{
name = "nix";
auto-format = false;
formatter.command = "alejandra";
}
{
name = "rust";
debugger.name = "lldb-dap";
debugger.transport = "stdio";
debugger.command = "lldb-dap";
debugger.templates = [{
name = "binary";
request = "launch";
completion = [{
name = "binary";
completion = "filename";
}];
args.program = "{0}";
args.initCommands = [ "command script import ${pkgs.writeText "lldb_dap_rustc_primer.py" ''
import subprocess
import pathlib
import lldb
# Not hardcoding a nix store path here on purpose.
rustlib_etc = pathlib.Path(subprocess.getoutput("rustc --print sysroot")) / "lib" / "rustlib" / "etc"
if not rustlib_etc.exists():
raise RuntimeError("Unable to determine rustc sysroot")
# Load lldb_lookup.py and execute lldb_commands with the correct path
lldb.debugger.HandleCommand(f"""command script import "{rustlib_etc / 'lldb_lookup.py'}" """)
lldb.debugger.HandleCommand(f"""command source -s 0 "{rustlib_etc / 'lldb_commands'}" """)
''}" ];
}];
}
];
languages.language-server = {
deno = {
command = "deno";
args = [ "lsp" ];
languages.language-server.deno = {
command = "deno";
args = [ "lsp" ];
environment.NO_COLOR = "1";
environment.NO_COLOR = "1";
config.javascript = enabled {
lint = true;
unstable = true;
config.javascript = enabled {
lint = true;
unstable = true;
suggest.imports.hosts."https://deno.land" = true;
suggest.imports.hosts."https://deno.land" = true;
inlayHints = {
enumMemberValues.enabled = true;
functionLikeReturnTypes.enabled = true;
parameterNames.enabled = "all";
parameterTypes.enabled = true;
propertyDeclarationTypes.enabled = true;
variableTypes.enabled = true;
};
inlayHints = {
enumMemberValues.enabled = true;
functionLikeReturnTypes.enabled = true;
parameterNames.enabled = "all";
parameterTypes.enabled = true;
propertyDeclarationTypes.enabled = true;
variableTypes.enabled = true;
};
};
};
rust-analyzer.config.check.command = "clippy";
languages.language-server.rust-analyzer = {
config.check.command = "clippy";
};
settings.theme = "gruvbox_dark_hard";
@ -203,6 +239,7 @@ in {
# RUST
pkgs.rust-analyzer-nightly
pkgs.lldb_20
# TYPESCRIPT & OTHERS
pkgs.deno
@ -214,4 +251,3 @@ in {
pkgs.zls
];
}

5
modules/common/nushell/configuration.nu
View file

@ -151,11 +151,6 @@ $env.config.completions = {
}
}
$env.config.filesize = {
format: auto
metric: true
}
$env.config.cursor_shape = {
vi_insert: line
vi_normal: block

28
modules/common/nushell/default.nix
View file

@ -26,21 +26,21 @@ in {
environment.variables.STARSHIP_LOG = "error";
nixpkgs.overlays = [(self: super: {
starship = super.starship.overrideAttrs (old: {
src = self.fetchFromGitHub {
owner = "poliorcetics";
repo = "starship";
rev = "19926e1e0aa25eddf63f93ba270d60eef023338f";
hash = "sha256-mi2O8JzXNLIF0/GuXVyf27JVV7d6zoskIjB29r5fPso=";
};
# nixpkgs.overlays = [(self: super: {
# starship = super.starship.overrideAttrs (old: {
# src = self.fetchFromGitHub {
# owner = "poliorcetics";
# repo = "starship";
# rev = "19926e1e0aa25eddf63f93ba270d60eef023338f";
# hash = "sha256-mi2O8JzXNLIF0/GuXVyf27JVV7d6zoskIjB29r5fPso=";
# };
cargoDeps = super.starship.cargoDeps.overrideAttrs (_: {
inherit (self.starship) src;
outputHash = "sha256-3NJV+hsgX3H8pycso0gCdzxJg8SgVwGMbIoHDDRZBvY=";
});
});
})];
# cargoDeps = super.starship.cargoDeps.overrideAttrs (_: {
# inherit (self.starship) src;
# outputHash = "sha256-3NJV+hsgX3H8pycso0gCdzxJg8SgVwGMbIoHDDRZBvY=";
# });
# });
# })];
home-manager.sharedModules = [(homeArgs: let
homeConfig = homeArgs.config;