mirror of
https://github.com/ryanccn/flake.git
synced 2025-12-06 08:10:43 +01:00
feat: miscellaneous updates
This commit is contained in:
parent
42a1293f6d
commit
e495878b0e
12 changed files with 119 additions and 82 deletions
|
|
@ -18,7 +18,7 @@ let
|
|||
theme = "catppuccin-${config.catppuccin.flavor}";
|
||||
window-colorspace = "display-p3";
|
||||
|
||||
font-family = "IBM Plex Mono";
|
||||
font-family = "Ryan Term";
|
||||
font-size = 14;
|
||||
font-feature = [
|
||||
"-calt"
|
||||
|
|
|
|||
|
|
@ -28,12 +28,11 @@ let
|
|||
"graphql.vscode-graphql"
|
||||
"graphql.vscode-graphql-syntax"
|
||||
"golang.go"
|
||||
"griimick.vhs"
|
||||
"jnoortheen.nix-ide"
|
||||
"ms-python.debugpy"
|
||||
"ms-python.isort"
|
||||
"ms-python.vscode-pylance"
|
||||
"ms-python.python"
|
||||
"myriad-dreamin.tinymist"
|
||||
"ms-python.vscode-pylance"
|
||||
"naumovs.color-highlight"
|
||||
"prisma.prisma"
|
||||
"ronnidc.nunjucks"
|
||||
|
|
@ -60,18 +59,17 @@ let
|
|||
"[astro]" = "astro-build.astro-vscode";
|
||||
"[rust]" = "rust-lang.rust-analyzer";
|
||||
"[nix]" = "jnoortheen.nix-ide";
|
||||
"[typst]" = "myriad-dreamin.tinymist";
|
||||
};
|
||||
in
|
||||
{
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.writeShellApplication {
|
||||
name = "vscode-1.98.2";
|
||||
name = "vscode-1.100.2";
|
||||
text = "";
|
||||
derivationArgs = {
|
||||
pname = "vscode";
|
||||
version = "1.98.2";
|
||||
version = "1.100.2";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -104,12 +102,13 @@ in
|
|||
"git.confirmSync" = false;
|
||||
"git.inputValidation" = false;
|
||||
"git.suggestSmartCommit" = false;
|
||||
"git.branchRandomName.enable" = true;
|
||||
"git.blame.editorDecoration.enabled" = true;
|
||||
|
||||
"diffEditor.renderSideBySide" = false;
|
||||
"diffEditor.ignoreTrimWhitespace" = false;
|
||||
|
||||
"editor.fontFamily" = ''"IBM Plex Mono", "Symbols Nerd Font", monospace'';
|
||||
"editor.fontFamily" = ''"Ryan Mono", "Symbols Nerd Font", monospace'';
|
||||
"editor.fontLigatures" = true;
|
||||
"editor.fontSize" = 16;
|
||||
"editor.lineHeight" = 1.5;
|
||||
|
|
@ -125,7 +124,7 @@ in
|
|||
"editor.insertSpaces" = true;
|
||||
"editor.formatOnSave" = true;
|
||||
|
||||
"terminal.integrated.fontFamily" = ''"IBM Plex Mono", "Symbols Nerd Font Mono", monospace'';
|
||||
"terminal.integrated.fontFamily" = ''"Ryan Term", "Symbols Nerd Font Mono", monospace'';
|
||||
"terminal.integrated.fontSize" = 14;
|
||||
"terminal.integrated.lineHeight" = 1.5;
|
||||
"terminal.integrated.cursorBlinking" = true;
|
||||
|
|
@ -150,6 +149,7 @@ in
|
|||
};
|
||||
|
||||
"telemetry.telemetryLevel" = "off";
|
||||
"telemetry.feedback.enabled" = false;
|
||||
"workbench.enableExperiments" = false;
|
||||
"workbench.settings.enableNaturalLanguageSearch" = false;
|
||||
"extensions.ignoreRecommendations" = true;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
programs.home-manager.enable = true;
|
||||
|
||||
imports = [
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
|
||||
./variables.nix
|
||||
|
|
@ -37,6 +37,7 @@
|
|||
programs.bash.enable = true;
|
||||
xdg.enable = true;
|
||||
|
||||
programs.nix-index.enable = true;
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
|
||||
home.stateVersion = "24.11";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,21 @@
|
|||
if status is-interactive
|
||||
nix-your-shell fish | source
|
||||
|
||||
if command -q nrr
|
||||
source "$(COMPLETE=fish nrr | psub)"
|
||||
if command -q nrx
|
||||
source "$(COMPLETE=fish nrx | psub)"
|
||||
end
|
||||
if test -d "$(brew --prefix)/share/fish/completions"
|
||||
set -p fish_complete_path "$(brew --prefix)/share/fish/completions"
|
||||
end
|
||||
if test -d "$(brew --prefix)/share/fish/vendor_completions.d"
|
||||
set -p fish_complete_path "$(brew --prefix)/share/fish/vendor_completions.d"
|
||||
end
|
||||
|
||||
if set -q GHOSTTY_RESOURCES_DIR
|
||||
if command -q nrr
|
||||
source "$(COMPLETE=fish nrr | psub)"
|
||||
end
|
||||
if command -q nrx
|
||||
source "$(COMPLETE=fish nrx | psub)"
|
||||
end
|
||||
|
||||
if test "$TERM_PROGRAM" = "ghostty" && set -q GHOSTTY_RESOURCES_DIR
|
||||
source "$GHOSTTY_RESOURCES_DIR/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -5,23 +5,12 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
toml = pkgs.formats.toml { };
|
||||
rust-bin = inputs.rust-overlay.lib.mkRustBin { } pkgs;
|
||||
in
|
||||
{
|
||||
home.file."${config.xdg.dataHome}/cargo/config.toml".source = toml.generate "config.toml" {
|
||||
linker = "${lib.getExe pkgs.clang}";
|
||||
rustflags = [
|
||||
"-C"
|
||||
"link-arg=-fuse-ld=${lib.getExe pkgs.mold}"
|
||||
];
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
(rust-bin.stable.latest.default.override {
|
||||
extensions = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
enable = true;
|
||||
settings = {
|
||||
display.compact = true;
|
||||
updates.auto_update = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@ in
|
|||
enableCompletion = true;
|
||||
|
||||
envExtra = builtins.readFile ./zsh/envExtra.zsh;
|
||||
# initExtraBeforeCompInit = builtins.readFile ./zsh/initExtraBeforeCompInit.zsh;
|
||||
initExtra = builtins.readFile ./zsh/initExtra.zsh;
|
||||
initContent = builtins.readFile ./zsh/initExtra.zsh;
|
||||
|
||||
inherit shellAliases;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue