config: improve parts of the codebase

This commit is contained in:
Gabriel Arazas 2023-12-26 10:20:32 +08:00
parent 201a4bc1b6
commit 193a4796ed
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
3 changed files with 8 additions and 7 deletions

View File

@ -11,11 +11,12 @@
inputs = { inputs = {
# I know NixOS can be stable but we're going cutting edge, baybee! While # I know NixOS can be stable but we're going cutting edge, baybee! While
# `nixpkgs-unstable` branch could be faster delivering updates, it is # `nixpkgs-unstable` branch could be faster delivering updates, it is
# looser when it comes to stability for the entirety of this configuration. # looser when it comes to stability for the entirety of this
# configuration...
nixpkgs.follows = "nixos-unstable"; nixpkgs.follows = "nixos-unstable";
# Here are the nixpkgs variants used for creating the system configuration # ...except we allow other configurations to use other nixpkgs branch so
# in `mkHost`. # that may not matter anyways.
nixos-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; nixos-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixos-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
@ -220,6 +221,7 @@
inputs.nur.hmModules.nur inputs.nur.hmModules.nur
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
inputs.nix-colors.homeManagerModules.default
]; ];
# Set some extra, yeah? # Set some extra, yeah?
@ -451,10 +453,10 @@
inputs.nur.overlay inputs.nur.overlay
]; ];
}; };
in { in import ./shells { inherit pkgs; } // {
default = import ./shell.nix { inherit pkgs; }; default = import ./shell.nix { inherit pkgs; };
docs = import ./docs/shell.nix { inherit pkgs; }; docs = import ./docs/shell.nix { inherit pkgs; };
} // (import ./shells { inherit pkgs; })); });
# Cookiecutter templates for your mama. # Cookiecutter templates for your mama.
templates = { templates = {

View File

@ -4,7 +4,6 @@
# settings of whatever image format configuration this host system will import # settings of whatever image format configuration this host system will import
# from nixos-generators. # from nixos-generators.
let let
inherit (builtins) toString;
inherit (import ../hardware/networks.nix) interfaces; inherit (import ../hardware/networks.nix) interfaces;
# This is just referring to the same interface just with alternative names. # This is just referring to the same interface just with alternative names.

View File

@ -95,7 +95,7 @@ in {
# A fuzzy finder that enables fuzzy finding not furry finding, a common misconception. # A fuzzy finder that enables fuzzy finding not furry finding, a common misconception.
programs.fzf = programs.fzf =
let let
fd = "${lib.getBin pkgs.fd}/bin/fd"; fd = lib.getExe' pkgs.fd "fd";
in in
{ {
enable = true; enable = true;