reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat!(flake): update homix

Browse source 
Update flake (`neovim-nightly-overlay` is fixed)
Format all `.nix` files
Unify package/module argument order:
    - `inputs`, `outputs`, `lib`, `pkgs`, `config`, ...
Move Jellyfin config to a `NixOS` module (first one, yay)
Add `direnv` to `reo101-shell` modules (was used, but not defined as wanted)
    - TODO: make it optional (module config options)
This commit is contained in:
reo101 2023-02-13 00:33:57 +02:00
parent 6a0898753d
commit df9ce2d4e2
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
17 changed files with 194 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

58
flake.nix
View file

@ -64,8 +64,8 @@
, nix-on-droid
, nix-darwin
, home-manager
# , hardware
# , nix-colors
# , hardware
# , nix-colors
, neovim-nightly-overlay
, zig-overlay
, zls-overlay
@ -93,7 +93,7 @@
);
# Apps (`nix run`)
apps = {};
apps = { };
# Dev Shells (`nix develop`)
devShells = forEachPkgs (pkgs:
@ -119,13 +119,13 @@
# Machines
machines = recurseDir ./machines;
homeManagerMachines = machines.home-manager or {};
nixDarwinMachines = machines.nix-darwin or {};
nixOnDroidMachines = machines.nix-on-droid or {};
nixosMachines = machines.nixos or {};
homeManagerMachines = machines.home-manager or { };
nixDarwinMachines = machines.nix-darwin or { };
nixOnDroidMachines = machines.nix-on-droid or { };
nixosMachines = machines.nixos or { };
# mkHost helpers
mkNixosHost = system: hostname: users: nixpkgs.lib.nixosSystem {
mkNixosHost = system: hostname: users: lib.nixosSystem {
inherit system;
modules = [
@ -135,7 +135,7 @@
home-manager = {
useGlobalPkgs = false;
useUserPackages = true;
users = nixpkgs.lib.attrsets.genAttrs
users = lib.attrsets.genAttrs
users
(user: import ./machines/nixos/${system}/${hostname}/home/${user}.nix);
@ -183,7 +183,7 @@
home-manager = {
useGlobalPkgs = false;
useUserPackages = true;
users = nixpkgs.lib.attrsets.genAttrs
users = lib.attrsets.genAttrs
users
(user: import ./machines/nix-darwin/${system}/${hostname}/home/${user}.nix);
@ -208,21 +208,21 @@
createConfigurations =
pred: mkHost: machines:
nixpkgs.lib.foldAttrs
(acc: x: acc)
[]
(builtins.attrValues
(builtins.mapAttrs
(system: hosts:
nixpkgs.lib.attrsets.filterAttrs
(host: config: config != null)
(builtins.mapAttrs
(host: config:
if (pred system host config)
then mkHost system host config
else null)
hosts))
machines));
lib.foldAttrs
(acc: x: acc)
[ ]
(builtins.attrValues
(builtins.mapAttrs
(system: hosts:
lib.attrsets.filterAttrs
(host: config: config != null)
(builtins.mapAttrs
(host: config:
if (pred system host config)
then mkHost system host config
else null)
hosts))
machines));
# Final configurations
nixosConfigurations =
@ -236,8 +236,8 @@
system
host
(builtins.map
(nixpkgs.lib.strings.removeSuffix ".nix")
(builtins.attrNames (config."home" or {}))))
(lib.strings.removeSuffix ".nix")
(builtins.attrNames (config."home" or { }))))
nixosMachines;
nixOnDroidConfigurations =
@ -263,8 +263,8 @@
system
host
(builtins.map
(nixpkgs.lib.strings.removeSuffix ".nix")
(builtins.attrNames (config."home" or {}))))
(lib.strings.removeSuffix ".nix")
(builtins.attrNames (config."home" or { }))))
nixDarwinMachines;
homeConfigurations =