1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2025-12-06 08:10:43 +01:00

feat: reorganize, update

This commit is contained in:
Ryan Cao 2024-12-02 09:48:30 +08:00
parent eb6b664802
commit 872c6be493
Signed by: ryanccn
GPG key ID: 48C96B2057D71CB1
10 changed files with 140 additions and 139 deletions

View file

@ -1,8 +1,8 @@
{
pkgs,
lib,
# self,
config,
# self,
...
}:
let
@ -194,9 +194,9 @@ in
"nix.enableLanguageServer" = true;
"nix.serverPath" = lib.getExe pkgs.nil;
"nix.serverSettings" = {
nil = {
"nil" = {
formatting.command = [ (lib.getExe pkgs.nixfmt-rfc-style) ];
# nixpkgs.expr = "(builtins.getFlake \"${self}\").pkgs";
# nixpkgs.expr = "import (builtins.getFlake \"${self}\").inputs.nixpkgs { }";
};
};

View file

@ -1,10 +1,15 @@
{ config, inputs, ... }:
{
config,
inputs,
...
}:
{
programs.home-manager.enable = true;
imports = [
inputs.catppuccin.homeManagerModules.catppuccin
inputs.am.homeManagerModules.default
inputs.nix-index-database.hmModules.nix-index
./variables.nix
./fonts.nix
@ -35,6 +40,8 @@
logFile = "${config.home.homeDirectory}/Library/Logs/am-discord-rich-presence.log";
};
programs.nix-index-database.comma.enable = true;
catppuccin.flavor = "frappe";
catppuccin.accent = "sapphire";

View file

@ -4,11 +4,17 @@
inter
public-sans
flake'.packages.ibm-plex-compat
(flake'.packages.ibm-plex-compat.override {
families = [
"sans"
"serif"
"mono"
];
})
flake'.packages.ryan-mono-bin
# Install the variable fonts for Cascadia Code (which
# are recommended) instead of the static fonts
# Install variable fonts for Cascadia Code instead of static fonts
(cascadia-code.overrideAttrs {
installPhase = ''
runHook preInstall
@ -17,8 +23,6 @@
'';
})
(nerdfonts.override {
fonts = [ "NerdFontsSymbolsOnly" ];
})
nerd-fonts.symbols-only
];
}