nix
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Missing some source file?

This commit is contained in:
Niten 2021-08-16 16:20:30 -07:00
parent c3fe6c59e3
commit b5f62d0459
6 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock
View File

@ -26,7 +26,7 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"narHash": "sha256-LbajVWkqSpZt2SW7tGqxIn391hCT02AyokxFuNyA/4w=", "narHash": "sha256-28zT4n5SyxcE9KI4b6RowZyMuzlZ6FIw2KE6xX8OTnA=",
"path": "../fudo-hosts", "path": "../fudo-hosts",
"type": "path" "type": "path"
}, },
@ -37,11 +37,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1628427351, "lastModified": 1629033443,
"narHash": "sha256-WuZUIQ07AvRw+T9wvQ3qFf8MXmKZ+ktZz9drNgWXDbs=", "narHash": "sha256-Vo3TvQvR5hsd3incx/xOt6GFgTm651CYVauHS/irOFo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "348bc5de8bca09c624f5c4975f538684da4713d2", "rev": "8ac785da9843aa110caeed6c912875e46a415a11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +52,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1628427351, "lastModified": 1629033443,
"narHash": "sha256-WuZUIQ07AvRw+T9wvQ3qFf8MXmKZ+ktZz9drNgWXDbs=", "narHash": "sha256-Vo3TvQvR5hsd3incx/xOt6GFgTm651CYVauHS/irOFo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "348bc5de8bca09c624f5c4975f538684da4713d2", "rev": "8ac785da9843aa110caeed6c912875e46a415a11",
"type": "github" "type": "github"
}, },
"original": { "original": {

37
flake.nix
View File

@ -10,23 +10,26 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { nixpkgs, hosts, home-manager, ... }: outputs = { nixpkgs, hosts, home-manager, ... }: with builtins;
let {
pkgs = import nixpkgs { }; nixosConfigurations = listToAttrs (map (hostname:
lib = nixpkgs.lib; let
hostOpts = hosts.host-configs.${hostname};
pkgs = import nixpkgs { system = hostOpts.arch; };
in { in {
nixConfigurations = lib.mapAttrs (hostname: hostOpts: name = hostname;
lib.nixosSystem { value = pkgs.lib.nixosSystem {
system = hostOpts.platform; system = hostOpts.arch;
modules = [ modules = [
(import ./initialize.nix { (import ./initialize.nix {
hostname = hostname; hostname = hostname;
home-manager-package = home-manager; home-manager-package = home-manager;
pkgs = pkgs; pkgs = pkgs;
include-secrets = true; include-secrets = true;
}) })
]; ];
}) hosts.host-configs; };
}) (attrNames hosts.host-configs));
}; };
} }

10
home-manager/niten.nix
View File

@ -49,11 +49,11 @@ let
redshift redshift
signal-desktop signal-desktop
spotify spotify
steam-with-pipewire # steam-with-pipewire
steam-with-pipewire.run # steam-with-pipewire.run
steamPackages.steamcmd # steamPackages.steamcmd
steamPackages.steam-fonts # steamPackages.steam-fonts
steamPackages.steam-runtime # steamPackages.steam-runtime
xclip xclip
]; ];

5
initialize.nix
View File

@ -8,14 +8,13 @@ in {
./lib ./lib
./config ./config
./packages ./packages
"${home-manager-package}/nixos"
] ++ pkgs.lib.optional host-config.nixos-system [
(./. + "/config/hardware/${hostname}.nix") (./. + "/config/hardware/${hostname}.nix")
(./. + "/config/host-config/${hostname}.nix") (./. + "/config/host-config/${hostname}.nix")
(./. + "/config/profile-config/${host-config.profile}.nix") (./. + "/config/profile-config/${host-config.profile}.nix")
(./. + "/config/domain-config/${host-config.domain}.nix") (./. + "/config/domain-config/${host-config.domain}.nix")
(./. + "/config/site-config/${host-config.site}.nix") (./. + "/config/site-config/${host-config.site}.nix")
"${home-manager-package}/nixos"
]; ];
config = { config = {

12
lib/fudo/hosts.nix
View File

@ -138,10 +138,16 @@ let
default = false; default = false;
}; };
platform = mkOption { nixos-system = mkOption {
type = bool;
description = "Whether the host is a NixOS system.";
default = true;
};
arch = mkOption {
type = str; type = str;
description = "System platform of the host."; description = "System architecture of the system.";
default = "x86_64"; default = "x86_64-linux";
}; };
}; };
}; };

3
packages/flatpak/default.nix
View File

@ -1,3 +1,6 @@
# NOTE TO FUTURE SELF: Nixpkgs Flatpak is currently only at 10.2, which doesn't
# allow nested containers...no Steam.
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, docbook_xml_dtd_45 { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, docbook_xml_dtd_45
, docbook-xsl-nons, which, libxml2, gobject-introspection, gtk-doc, intltool , docbook-xsl-nons, which, libxml2, gobject-introspection, gtk-doc, intltool
, libxslt, pkg-config, xmlto, appstream-glib, substituteAll, bison , libxslt, pkg-config, xmlto, appstream-glib, substituteAll, bison