mirror of
https://github.com/ryanccn/flake.git
synced 2025-12-06 08:10:43 +01:00
feat: nixd, lix -> nix, update fonts
This commit is contained in:
parent
e9455b9098
commit
3404601a4a
SSH key fingerprint:
SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
8 changed files with 91 additions and 64 deletions
54
flake.lock
generated
54
flake.lock
generated
|
|
@ -22,11 +22,11 @@
|
|||
},
|
||||
"catppuccin": {
|
||||
"locked": {
|
||||
"lastModified": 1716337435,
|
||||
"narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=",
|
||||
"lastModified": 1718339789,
|
||||
"narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82",
|
||||
"rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -110,11 +110,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716457508,
|
||||
"narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
|
||||
"lastModified": 1718243258,
|
||||
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
|
||||
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -154,11 +154,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716506851,
|
||||
"narHash": "sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM=",
|
||||
"lastModified": 1717647344,
|
||||
"narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d",
|
||||
"revCount": 83,
|
||||
"rev": "4e25f1ab68f2270f9cff59216056c21073db0164",
|
||||
"revCount": 87,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||
},
|
||||
|
|
@ -194,11 +194,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716511055,
|
||||
"narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=",
|
||||
"lastModified": 1718440858,
|
||||
"narHash": "sha256-iMVwdob8F6P6Ib+pnhMZqyvYI10ZxmvA885jjnEaO54=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "0bea8222f6e83247dd13b055d83e64bce02ee532",
|
||||
"rev": "58b905ea87674592aa84c37873e6c07bc3807aba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -209,11 +209,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1716451822,
|
||||
"narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=",
|
||||
"lastModified": 1718276985,
|
||||
"narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3305b2b25e4ae4baee872346eae133cf6f611783",
|
||||
"rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -236,11 +236,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716625548,
|
||||
"narHash": "sha256-FuBUgaOepw3ewxDC8Ik1XDloit8raOqDK+fqG+QPT10=",
|
||||
"lastModified": 1718038477,
|
||||
"narHash": "sha256-D8y2lO+wClhgZ8NFxvnr5QOmYm2pN82NpsDbCNT6iiE=",
|
||||
"owner": "ryanccn",
|
||||
"repo": "nrr",
|
||||
"rev": "ca529deed726d53168f0c310ecd13638cdaa3542",
|
||||
"rev": "ce64c3f4d1dd99f9c33610e3c494810a8adb6da8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -258,8 +258,10 @@
|
|||
"locked": {
|
||||
"lastModified": 1705150397,
|
||||
"narHash": "sha256-vanzV4QLle7AbXywX7x50YWYZZhtWzKa4IZl4u1CRis=",
|
||||
"rev": "0a0d471e476bda2c6b031e291c4192712d9fbe31",
|
||||
"revCount": 159,
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/ryanccn/nyoom/0.%2A.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.4/018d02e2-e4be-79a2-9e02-33bd5e483d6c/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -269,11 +271,11 @@
|
|||
"ohmyzsh": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1716461462,
|
||||
"narHash": "sha256-XpEFBnIlv/plkCSHf8qSzeFDXGpFu8R/PYt7rj830iM=",
|
||||
"lastModified": 1718294894,
|
||||
"narHash": "sha256-8ZVYN97K4KJOG+JnVpCVbMx2HGypvk7KZmwNzUfcovo=",
|
||||
"owner": "ohmyzsh",
|
||||
"repo": "ohmyzsh",
|
||||
"rev": "1b29fd3a460e43d4a7581d6a6a7e5a1877a39068",
|
||||
"rev": "0c9b42a863778d67aee22bbd43f296110fe1f047",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -312,11 +314,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716603336,
|
||||
"narHash": "sha256-81u/zd7V+XRTq88zwRLxw5GnwZyEiAvGA2BvAXUe864=",
|
||||
"lastModified": 1718417877,
|
||||
"narHash": "sha256-s8QrTANEtY6UxzfkcBfoN93bgW9aCRIq54LPRVNu/4c=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "4d0f1e4d5d65c23cdbb77e4b0d91940be7309bd4",
|
||||
"rev": "7c2d603cb67c974ef8c5cfee1150060dbb299e04",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -88,7 +88,6 @@
|
|||
self,
|
||||
nix-darwin,
|
||||
home-manager,
|
||||
lix-module,
|
||||
darwin-custom-icons,
|
||||
...
|
||||
} @ inputs: {
|
||||
|
|
@ -96,7 +95,6 @@
|
|||
modules = [
|
||||
home-manager.darwinModules.home-manager
|
||||
darwin-custom-icons.darwinModules.default
|
||||
lix-module.nixosModules.default
|
||||
./system.nix
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@ adjust-cell-height = 50%
|
|||
adjust-underline-position = 5
|
||||
|
||||
command = /run/current-system/sw/bin/fish -l
|
||||
shell-integration-features = cursor, sudo
|
||||
|
||||
macos-titlebar-tabs = true
|
||||
macos-option-as-alt = true
|
||||
|
||||
window-step-resize = true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
self,
|
||||
...
|
||||
}: let
|
||||
extensions = [
|
||||
|
|
@ -15,8 +16,8 @@
|
|||
"charliermarsh.ruff"
|
||||
"dbaeumer.vscode-eslint"
|
||||
"denoland.vscode-deno"
|
||||
"dprint.dprint"
|
||||
"dotjoshjohnson.xml"
|
||||
"dprint.dprint"
|
||||
# "eamodio.gitlens"
|
||||
"editorconfig.editorconfig"
|
||||
# "enkia.tokyo-night"
|
||||
|
|
@ -34,6 +35,7 @@
|
|||
"ms-python.vscode-pylance"
|
||||
"ms-python.python"
|
||||
# "mvllow.rose-pine"
|
||||
"naumovs.color-highlight"
|
||||
"nvarner.typst-lsp"
|
||||
"prisma.prisma"
|
||||
"ronnidc.nunjucks"
|
||||
|
|
@ -47,7 +49,7 @@
|
|||
"usernamehw.errorlens"
|
||||
"vue.volar"
|
||||
"waderyan.gitblame"
|
||||
"xaver.clang-format"
|
||||
# "xaver.clang-format"
|
||||
"yoavbls.pretty-ts-errors"
|
||||
];
|
||||
in {
|
||||
|
|
@ -71,7 +73,7 @@ in {
|
|||
"workbench.sideBar.location" = "left";
|
||||
"workbench.activityBar.location" = "top";
|
||||
|
||||
"symbols.hidesExplorerArrows" = false;
|
||||
# "symbols.hidesExplorerArrows" = false;
|
||||
|
||||
"catppuccin.boldKeywords" = false;
|
||||
"catppuccin.italicKeywords" = true;
|
||||
|
|
@ -99,9 +101,9 @@ in {
|
|||
"gitblame.inlineMessageEnabled" = true;
|
||||
"gitblame.inlineMessageFormat" = "\${author.name} · \${time.ago} · \${commit.summary,120}";
|
||||
|
||||
"editor.fontFamily" = "\"Ryan Mono\", \"Symbols Nerd Font\", \"Apple Color Emoji\", monospace";
|
||||
"editor.fontLigatures" = true;
|
||||
# "editor.fontLigatures" = "'calt', 'ss01'";
|
||||
"editor.fontFamily" = "\"RyanMono Nerd Font\", \"Apple Color Emoji\", monospace";
|
||||
# "editor.fontLigatures" = true;
|
||||
"editor.fontLigatures" = "'calt', 'ss01'";
|
||||
"editor.fontSize" = 16;
|
||||
"editor.lineHeight" = 1.5;
|
||||
"editor.cursorSmoothCaretAnimation" = "on";
|
||||
|
|
@ -115,7 +117,7 @@ in {
|
|||
"editor.insertSpaces" = true;
|
||||
"editor.formatOnSave" = true;
|
||||
|
||||
"terminal.integrated.fontFamily" = "\"Ryan Term\", \"Symbols Nerd Font Mono\", \"Apple Color Emoji\", monospace";
|
||||
"terminal.integrated.fontFamily" = "\"RyanTerm Nerd Font\", \"Apple Color Emoji\", monospace";
|
||||
"terminal.integrated.fontSize" = 14;
|
||||
"terminal.integrated.lineHeight" = 1.5;
|
||||
"terminal.integrated.cursorBlinking" = true;
|
||||
|
|
@ -185,16 +187,18 @@ in {
|
|||
|
||||
"svelte.enable-ts-plugin" = true;
|
||||
|
||||
"clang-format.executable" = "${pkgs.clang-tools}/bin/clang-format";
|
||||
"color-highlight.matchRgbWithNoFunction" = true;
|
||||
"color-highlight.matchHslWithNoFunction" = true;
|
||||
|
||||
# "clang-format.executable" = "${pkgs.clang-tools}/bin/clang-format";
|
||||
|
||||
"[nix]"."editor.defaultFormatter" = "jnoortheen.nix-ide";
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = "${pkgs.nil}/bin/nil";
|
||||
"nix.serverPath" = lib.getExe pkgs.nixd;
|
||||
"nix.serverSettings" = {
|
||||
nil = {
|
||||
formatting = {
|
||||
command = ["${pkgs.alejandra}/bin/alejandra"];
|
||||
};
|
||||
nixd = {
|
||||
formatting.command = [(lib.getExe pkgs.alejandra)];
|
||||
nixpkgs.expr = "(builtins.getFlake \"${self}\").pkgs";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,19 @@
|
|||
ibm-plex
|
||||
|
||||
ryan-mono-bin
|
||||
ryan-term-bin
|
||||
|
||||
# Install the variable fonts for Cascadia Code (which
|
||||
# are recommended) instead of the static fonts
|
||||
(cascadia-code.overrideAttrs {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 ttf/*.ttf -t $out/share/fonts/truetype
|
||||
runHook postInstall
|
||||
'';
|
||||
})
|
||||
|
||||
(nerdfonts.override {
|
||||
fonts = [
|
||||
"CascadiaCode"
|
||||
"NerdFontsSymbolsOnly"
|
||||
];
|
||||
fonts = ["NerdFontsSymbolsOnly"];
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
self,
|
||||
# pkgs,
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
services.nix-daemon.enable = true;
|
||||
# nix.package = pkgs.nixVersions.latest;
|
||||
nix.package = pkgs.nixVersions.latest;
|
||||
|
||||
nix.registry = {
|
||||
n.flake = inputs.nixpkgs;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
(_: prev: let
|
||||
version = "2024.04.06";
|
||||
_: prev: let
|
||||
version = "2024.05.26";
|
||||
|
||||
mkFontVariant = {
|
||||
variant,
|
||||
|
|
@ -19,9 +19,10 @@
|
|||
inherit hash;
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p "$out"/share/fonts/truetype
|
||||
cp *.ttf "$out"/share/fonts/truetype
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -31,13 +32,29 @@
|
|||
};
|
||||
}) {};
|
||||
in {
|
||||
ryan-mono-bin = mkFontVariant {
|
||||
variant = "RyanMono";
|
||||
hash = "sha256-oqrG258ONpwekBdyBnxl9x+8wHlBaUpYoP4PIIeD4+4=";
|
||||
};
|
||||
ryan-mono-bin = prev.symlinkJoin {
|
||||
name = "ryan-mono-bin-${version}";
|
||||
|
||||
ryan-term-bin = mkFontVariant {
|
||||
variant = "RyanTerm";
|
||||
hash = "sha256-FwIo1bVNkIrd9LIQUg4hSKv13dv97X7IVo3/IejVuGg=";
|
||||
paths = [
|
||||
(mkFontVariant {
|
||||
variant = "RyanMono";
|
||||
hash = "sha256-smlvBfpwVoD0qfmmHcJjsLdiblXjy5eevZfK4qDc9x8=";
|
||||
})
|
||||
|
||||
(mkFontVariant {
|
||||
variant = "RyanTerm";
|
||||
hash = "sha256-12xaJqgR5R6SZnZ7vJeD5zg2TZbWEiUrdyK+ljekMvc=";
|
||||
})
|
||||
|
||||
(mkFontVariant {
|
||||
variant = "RyanMonoNerdFont";
|
||||
hash = "sha256-n2d9K1rJuWCF2NgkRLQQCNCAxYfiBVv/jpn+BzqBvAI=";
|
||||
})
|
||||
|
||||
(mkFontVariant {
|
||||
variant = "RyanTermNerdFont";
|
||||
hash = "sha256-yrzgNRD560FhHLSK1neHVSnB+ZiHP2bmKzD1pGTu9Ro=";
|
||||
})
|
||||
];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
self,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
|
@ -45,7 +46,7 @@
|
|||
useUserPackages = true;
|
||||
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
inherit self inputs;
|
||||
};
|
||||
|
||||
users.ryanccn = import ./home;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue