Adding nerdfonts
This commit is contained in:
@@ -150,7 +150,6 @@ The Nix flake definition for Droidnix.
|
|||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nerdfonts.url = "github:nix-community/nerdfonts";
|
|
||||||
emacs-overlay = {
|
emacs-overlay = {
|
||||||
url = "github:nix-community/emacs-overlay";
|
url = "github:nix-community/emacs-overlay";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -193,21 +192,12 @@ outputs =
|
|||||||
lib.nixosSystem {
|
lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
inputs.nerdfonts.overlays.default
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
# Import machine-specific configurations
|
# Import machine-specific configurations
|
||||||
./assets/flake/machines/traveldroid/top.nix
|
./assets/flake/machines/traveldroid/top.nix
|
||||||
|
|
||||||
# Catppuccin theme module
|
# Catppuccin theme module
|
||||||
inputs.catppuccin.nixosModules.catppuccin
|
inputs.catppuccin.nixosModules.catppuccin
|
||||||
|
|
||||||
# Anchoring all the other nixes
|
# Anchoring all the other nixes
|
||||||
./generated/top.nix
|
./generated/top.nix
|
||||||
|
|
||||||
# Home Manager module
|
# Home Manager module
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
@@ -924,7 +914,6 @@ This file installs and configures fonts
|
|||||||
nerdfonts.packages.firacode
|
nerdfonts.packages.firacode
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** =generated/system/core/eww.nix=
|
** =generated/system/core/eww.nix=
|
||||||
|
|||||||
+55
-69
@@ -7,7 +7,6 @@
|
|||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nerdfonts.url = "github:nix-community/nerdfonts";
|
|
||||||
emacs-overlay = {
|
emacs-overlay = {
|
||||||
url = "github:nix-community/emacs-overlay";
|
url = "github:nix-community/emacs-overlay";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -23,75 +22,62 @@
|
|||||||
hyprland.url = "github:hyprwm/Hyprland";
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
inputs@{
|
inputs@{
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
home-manager,
|
home-manager,
|
||||||
emacs-overlay,
|
emacs-overlay,
|
||||||
catppuccin,
|
catppuccin,
|
||||||
zen-browser,
|
zen-browser,
|
||||||
hyprland,
|
hyprland,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
user = import ./assets/flake/users/henrov.nix;
|
user = import ./assets/flake/users/henrov.nix;
|
||||||
machines = [
|
machines = [
|
||||||
"traveldroid"
|
"traveldroid"
|
||||||
"maindroid"
|
"maindroid"
|
||||||
];
|
];
|
||||||
flakeRoot = ./.; # Define flakeRoot here
|
flakeRoot = ./.; # Define flakeRoot here
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = lib.genAttrs machines (
|
nixosConfigurations = lib.genAttrs machines (
|
||||||
machine:
|
machine:
|
||||||
lib.nixosSystem {
|
lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
(
|
# Import machine-specific configurations
|
||||||
{ config, pkgs, ... }:
|
./assets/flake/machines/traveldroid/top.nix
|
||||||
{
|
# Catppuccin theme module
|
||||||
nixpkgs.overlays = [
|
inputs.catppuccin.nixosModules.catppuccin
|
||||||
inputs.nerdfonts.overlays.default
|
# Anchoring all the other nixes
|
||||||
];
|
./generated/top.nix
|
||||||
}
|
# Home Manager module
|
||||||
)
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
|
home-manager.useGlobalPkgs = true;
|
||||||
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
|
||||||
|
}
|
||||||
|
];
|
||||||
|
specialArgs = { inherit user inputs flakeRoot; };
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
# Import machine-specific configurations
|
homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
|
||||||
./assets/flake/machines/traveldroid/top.nix
|
userMachine:
|
||||||
|
home-manager.lib.homeManagerConfiguration {
|
||||||
|
inherit system;
|
||||||
|
configuration = import ./user.nix { inherit inputs user flakeRoot; };
|
||||||
|
extraSpecialArgs = { inherit user inputs flakeRoot; };
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
# Catppuccin theme module
|
devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
|
||||||
inputs.catppuccin.nixosModules.catppuccin
|
inherit (nixpkgs.legacyPackages.${system}) mkShell;
|
||||||
|
|
||||||
# Anchoring all the other nixes
|
|
||||||
./generated/top.nix
|
|
||||||
|
|
||||||
# Home Manager module
|
|
||||||
inputs.home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
specialArgs = { inherit user inputs flakeRoot; };
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
|
|
||||||
userMachine:
|
|
||||||
home-manager.lib.homeManagerConfiguration {
|
|
||||||
inherit system;
|
|
||||||
configuration = import ./user.nix { inherit inputs user flakeRoot; };
|
|
||||||
extraSpecialArgs = { inherit user inputs flakeRoot; };
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
|
|
||||||
inherit (nixpkgs.legacyPackages.${system}) mkShell;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user