1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-29 19:17:45 +00:00

Packages: Add go, fix formatting, make packages.nix and fonts.nix take attrsets as args

This commit is contained in:
RGBCube 2023-05-06 15:11:16 +03:00
parent 9a0e849632
commit 469c42c165
5 changed files with 24 additions and 20 deletions

10
flake.lock generated
View file

@ -1,17 +1,17 @@
{ {
"nodes": { "nodes": {
"home-manager": { "homeManager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1682977601, "lastModified": 1683276747,
"narHash": "sha256-F1Va/Uiw2tVNn27FLqWyBkiqDyIm/eCamw9wA/GK8Fw=", "narHash": "sha256-T3st1VBg3wmhHyBQb0z12sTSGsQgiu3mxkS61nLO8Xs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0e4c33d76006c9080d2f228ba1c2308e3e4d7be6", "rev": "669669fcb403e3137dfe599bbcc26e60502c3543",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,7 +38,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "homeManager": "homeManager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

View file

@ -13,7 +13,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager = { homeManager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -21,20 +21,20 @@
outputs = { outputs = {
nixpkgs, nixpkgs,
home-manager, homeManager,
... ...
}: }:
let let
importConfiguration = directory: importConfiguration = directory:
let let
hostPlatform = import (directory + "/platform.nix"); hostPlatform = import (directory + "/platform.nix");
# The folder name is the host name of the machine. # The folder name is the host name of the machine.
hostName = builtins.baseNameOf directory; hostName = builtins.baseNameOf directory;
userName = import (directory + "/username.nix"); userName = import (directory + "/username.nix");
in in
{ {
nixosConfigurations.${hostName} = nixpkgs.lib.nixosSystem { nixosConfigurations.${hostName} = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
lib = nixpkgs.lib; lib = nixpkgs.lib;
@ -52,7 +52,7 @@
modules = [ modules = [
directory directory
home-manager.nixosModules.home-manager homeManager.nixosModules.home-manager
# Extra configuration derived from the metadata. # Extra configuration derived from the metadata.
{ {

View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... } @ args:
{ {
environment.systemPackages = import ./packages.nix pkgs; environment.systemPackages = import ./packages.nix args;
fonts.fonts = import ./fonts.nix pkgs; fonts.fonts = import ./fonts.nix args;
} }

View file

@ -1,4 +1,4 @@
pkgs: with pkgs; [] { pkgs, ... }: with pkgs; []
++ [ (nerdfonts.override { fonts = [ # NERD FONTS ++ [ (nerdfonts.override { fonts = [ # NERD FONTS
"JetBrainsMono" "JetBrainsMono"

View file

@ -1,4 +1,4 @@
pkgs: with pkgs; [] { pkgs, ... }: with pkgs; []
++ [ # APPLICATIONS ++ [ # APPLICATIONS
firefox firefox
@ -40,6 +40,10 @@ pkgs: with pkgs; []
lightly-qt lightly-qt
] ]
++ [ # PROGRAMMING LANGUAGES
go
]
++ [ # PYTHON ++ [ # PYTHON
(python311.withPackages (pkgs: with pkgs; [ (python311.withPackages (pkgs: with pkgs; [
pip pip